diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 12:37:19 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 12:37:19 +0000 |
| commit | e453d5cbb7e4fc41909957383d2173a531aad4ec (patch) | |
| tree | c93f0fd47f8406068aba035f459a2c4dd1f75821 /c/src/lib/libbsp/m68k | |
| parent | 2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-e453d5cbb7e4fc41909957383d2173a531aad4ec.tar.bz2 | |
2000-09-12 Joel Sherrill <joel@OARcorp.com>
* network/network.c (uti596_attach): Adjust cpp directives
and conditional braces so all cases compile.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/network/network.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index f88cc68ca4..49370bfe22 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,8 @@ +2000-09-12 Joel Sherrill <joel@OARcorp.com> + + * network/network.c (uti596_attach): Adjust cpp directives + and conditional braces so all cases compile. + 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * clock/Makefile.am, console/Makefile.am, fatal/Makefile.am, diff --git a/c/src/lib/libbsp/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c index 398f321724..a118bbf497 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/network.c +++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c @@ -1701,6 +1701,7 @@ int uti596_attach( /* Read the J1 header */ j1 = (unsigned char)(lcsr->vector_base & 0xFF); +#if defined(mvme167) if ( !(j1 & 0x10) ) { /* Jumper J1-4 is on, configure from NVRAM */ @@ -1749,7 +1750,9 @@ int uti596_attach( */ memcpy ((void *)sc->arpcom.ac_enaddr, pConfig->hardware_address, ETHER_ADDR_LEN); } - else { + else +#endif + { /* We are not configuring from NVRAM (J1-4 is off), and there is no ethernet * address provided in the ifconfig struct, so it will be read from BBRAM at * $FFFC1F2C by default. [mvme167 manual p. 1-47] |