Skip to content

Commit

Permalink
Simplified (and hopefully more reliable) Ethernet MAC/PHY.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremybennett committed Dec 15, 2010
1 parent a644035 commit 65c8003
Show file tree
Hide file tree
Showing 9 changed files with 714 additions and 637 deletions.
18 changes: 17 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2010-12-15 Jeremy Bennett <[email protected]>

* configure: Regenerated.
* configure.ac: Updated version.
* peripheral/eth.c <mac_address>: Defined to ff:ff:ff:ff:ff:ff.
<struct eth_device>: loopback_offset removed. State reduced to
just BD indices, buffers removed.
(eth_read_rx_file, eth_skip_rx_file, eth_rx_next_packet): Deleted.
(eth_write_file_packet, eth_write_tap_packet, eth_write_packet)
(eth_blush_bd): Created.
(eth_controller_tx_clock): Completely rewritten.
(eth_read_file_packet, eth_read_tap_packet, eth_read_packet)
(eth_fill_bd, eth_ignore_packet): Created.
(eth_controller_rx_clock): Completely rewritten.
(eth_read32, eth_write32): Rewritten for new data structures.

2010-12-09 Julius Baxter <[email protected]>

* doc/or1ksim.texi: changed references to or32-uclinux-* to or32-elf-*.
Expand All @@ -8,7 +24,7 @@
* toplevel-support.c: <toggle_trace>: New function to toggle the trace
execution control variable.
* toplevel-support.h: <toggle_trace>: Add function prototype.

2010-12-08 Jeremy Bennett <[email protected]>

* configure: Regenerated.
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac 434 2010-11-26 18:45:29Z jeremybennett using automake version AC_ACVERSION.
# From configure.ac Id: configure.ac 440 2010-12-08 19:35:51Z jeremybennett using automake version AC_ACVERSION.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for or1ksim 2010-12-08.
# Generated by GNU Autoconf 2.65 for or1ksim 2010-12-15.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -722,8 +722,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='or1ksim'
PACKAGE_TARNAME='or1ksim'
PACKAGE_VERSION='2010-12-08'
PACKAGE_STRING='or1ksim 2010-12-08'
PACKAGE_VERSION='2010-12-15'
PACKAGE_STRING='or1ksim 2010-12-15'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1476,7 +1476,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures or1ksim 2010-12-08 to adapt to many kinds of systems.
\`configure' configures or1ksim 2010-12-15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1547,7 +1547,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of or1ksim 2010-12-08:";;
short | recursive ) echo "Configuration of or1ksim 2010-12-15:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1654,7 +1654,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
or1ksim configure 2010-12-08
or1ksim configure 2010-12-15
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2316,7 +2316,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by or1ksim $as_me 2010-12-08, which was
It was created by or1ksim $as_me 2010-12-15, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -10717,7 +10717,7 @@ fi
# Define the identity of the package.
PACKAGE='or1ksim'
VERSION='2010-12-08'
VERSION='2010-12-15'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -13736,7 +13736,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by or1ksim $as_me 2010-12-08, which was
This file was extended by or1ksim $as_me 2010-12-15, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -13802,7 +13802,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
or1ksim config.status 2010-12-08
or1ksim config.status 2010-12-15
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# Use a full version number (x.y.z, possibly with "rcn" as a suffix) when
# preparing a release, otherwise use a the date version (yyyy-mm-dd).
AC_INIT([or1ksim], [2010-12-08], [[email protected]])
AC_INIT([or1ksim], [2010-12-15], [[email protected]])
AC_CONFIG_MACRO_DIR([m4])

# Generically use extensions such as _GNU_SOURCE if available.
Expand Down
151 changes: 86 additions & 65 deletions doc/or1ksim.info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is ../../or1ksim/doc/or1ksim.info, produced by makeinfo version
4.13 from ../../or1ksim/doc/or1ksim.texi.
This is ../../doc/or1ksim.info, produced by makeinfo version 4.13 from
../../doc/or1ksim.texi.

INFO-DIR-SECTION Embedded development
START-INFO-DIR-ENTRY
Expand Down Expand Up @@ -64,7 +64,7 @@ File: or1ksim.info, Node: Preparation, Next: Configuring the Build, Up: Insta
Unpack the software and create a _separate_ directory in which to build
it:

tar jxf or1ksim-2010-12-08.tar.bz2
tar jxf or1ksim-2010-12-15.tar.bz2
mkdir builddir_or1ksim
cd builddir_or1ksim

Expand All @@ -81,7 +81,7 @@ The most significant argument is `--target', which should specify the
OpenRISC 1000 32-bit architecture. If this argument is omitted, it will
default to OpenRISC 1000 32-bit with a warning

../or1ksim-2010-12-08/configure --target=or32-elf ...
../or1ksim-2010-12-15/configure --target=or32-elf ...

There are several other options available, many of which are standard
to GNU `configure' scripts. Use `configure --help' to see all the
Expand Down Expand Up @@ -520,11 +520,32 @@ An execution trace can be generated at run time with options passed by
the command line, or via the operating system's signal passing
mechanism.

The following, passed at run time, can be used to create an execution
dump.

`-t'
`--trace'
Dump instruction just executed and any register/memory location
chaged after each instruction (one line per instruction).

Passing a signal `SIGUSR1' while the simulator is running toggles trace
generation. This can be done with the following command, assuming
Or1ksim's executable name is `or32-elf-sim':

pkill -SIGUSR1 or32-elf-sim

This is useful in the case where trace output is desired after a
significant amount of simulation time, where it would be inconvenient to
generate trace up to that point.

If the `pkill' utility is not available, the `kill' utility can be used
if Or1ksim's process number is known. Use the following to determine
the process ID of the `or32-elf-sim' and then send the `SIGUSR1'
command to toggle execution trace generation:

ps a | grep or32-elf-sim
kill -SIGUSR1 _process-number_


File: or1ksim.info, Node: Simulator Library, Next: Ethernet TUN/TAP Interface, Prev: Trace Generation, Up: Usage

Expand Down Expand Up @@ -3825,7 +3846,7 @@ Index
(line 60)
* --strict-npc: Standalone Simulator.
(line 100)
* --trace <1>: Trace Generation. (line 12)
* --trace <1>: Trace Generation. (line 15)
* --trace: Standalone Simulator.
(line 39)
* --verbose: Standalone Simulator.
Expand Down Expand Up @@ -3859,7 +3880,7 @@ Index
* -q <1>: Profiling Utility. (line 30)
* -q: Standalone Simulator.
(line 29)
* -t <1>: Trace Generation. (line 12)
* -t <1>: Trace Generation. (line 15)
* -t: Standalone Simulator.
(line 39)
* -V: Standalone Simulator.
Expand Down Expand Up @@ -4686,64 +4707,64 @@ Index


Tag Table:
Node: Top826
Node: Installation1236
Node: Preparation1483
Node: Configuring the Build1778
Node: Build and Install7918
Node: Known Issues8684
Node: Usage9739
Node: Standalone Simulator10005
Node: Profiling Utility14565
Node: Memory Profiling Utility15471
Node: Trace Generation16831
Node: Simulator Library17286
Node: Ethernet TUN/TAP Interface27718
Node: Setting Up a Persistent TAP device28801
Node: Establishing a Bridge29476
Node: Opening the Firewall31159
Node: Disabling Ethernet Filtering31650
Node: Networking from OpenRISC Linux and BusyBox32275
Node: Tearing Down a Bridge33937
Node: Configuration34680
Node: Configuration File Format35292
Node: Configuration File Preprocessing35677
Node: Configuration File Syntax35974
Node: Simulator Configuration38759
Node: Simulator Behavior39050
Node: Verification API Configuration43631
Node: CUC Configuration45571
Node: Core OpenRISC Configuration47563
Node: CPU Configuration48065
Node: Memory Configuration52184
Node: Memory Management Configuration58906
Node: Cache Configuration61283
Node: Interrupt Configuration63669
Node: Power Management Configuration65502
Node: Branch Prediction Configuration66779
Node: Debug Interface Configuration68139
Node: Peripheral Configuration70482
Node: Memory Controller Configuration71108
Node: UART Configuration74888
Node: DMA Configuration78407
Node: Ethernet Configuration80274
Node: GPIO Configuration84919
Node: Display Interface Configuration86552
Node: Frame Buffer Configuration88861
Node: Keyboard Configuration90725
Node: Disc Interface Configuration92963
Node: Generic Peripheral Configuration98067
Node: Interactive Command Line100362
Node: Verification API107336
Node: Code Internals111766
Node: Coding Conventions112349
Node: Global Data Structures116776
Node: Concepts119433
Ref: Output Redirection119578
Ref: Interrupts Internal120116
Node: Internal Debugging121269
Node: Regression Testing121793
Node: GNU Free Documentation License125582
Node: Index147989
Node: Top810
Node: Installation1220
Node: Preparation1467
Node: Configuring the Build1762
Node: Build and Install7902
Node: Known Issues8668
Node: Usage9723
Node: Standalone Simulator9989
Node: Profiling Utility14549
Node: Memory Profiling Utility15455
Node: Trace Generation16815
Node: Simulator Library18057
Node: Ethernet TUN/TAP Interface28489
Node: Setting Up a Persistent TAP device29572
Node: Establishing a Bridge30247
Node: Opening the Firewall31930
Node: Disabling Ethernet Filtering32421
Node: Networking from OpenRISC Linux and BusyBox33046
Node: Tearing Down a Bridge34708
Node: Configuration35451
Node: Configuration File Format36063
Node: Configuration File Preprocessing36448
Node: Configuration File Syntax36745
Node: Simulator Configuration39530
Node: Simulator Behavior39821
Node: Verification API Configuration44402
Node: CUC Configuration46342
Node: Core OpenRISC Configuration48334
Node: CPU Configuration48836
Node: Memory Configuration52955
Node: Memory Management Configuration59677
Node: Cache Configuration62054
Node: Interrupt Configuration64440
Node: Power Management Configuration66273
Node: Branch Prediction Configuration67550
Node: Debug Interface Configuration68910
Node: Peripheral Configuration71253
Node: Memory Controller Configuration71879
Node: UART Configuration75659
Node: DMA Configuration79178
Node: Ethernet Configuration81045
Node: GPIO Configuration85690
Node: Display Interface Configuration87323
Node: Frame Buffer Configuration89632
Node: Keyboard Configuration91496
Node: Disc Interface Configuration93734
Node: Generic Peripheral Configuration98838
Node: Interactive Command Line101133
Node: Verification API108107
Node: Code Internals112537
Node: Coding Conventions113120
Node: Global Data Structures117547
Node: Concepts120204
Ref: Output Redirection120349
Ref: Interrupts Internal120887
Node: Internal Debugging122040
Node: Regression Testing122564
Node: GNU Free Documentation License126353
Node: Index148760

End Tag Table
6 changes: 3 additions & 3 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 9 December 2010
@set UPDATED 10 December 2010
@set UPDATED-MONTH December 2010
@set EDITION 2010-12-08
@set VERSION 2010-12-08
@set EDITION 2010-12-15
@set VERSION 2010-12-15
Loading

0 comments on commit 65c8003

Please sign in to comment.