RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2000-09-12 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* network/network.c (uti596_attach): Adjust cpp directives
	and conditional braces so all cases compile.
This commit is contained in:
Joel Sherrill
2000-09-12 12:37:19 +00:00
parent 5fa62fc47e
commit e453d5cbb7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -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> 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am, console/Makefile.am, fatal/Makefile.am, * clock/Makefile.am, console/Makefile.am, fatal/Makefile.am,

5
c/src/lib/libbsp/m68k/mvme167/network/network.c
View File

@@ -1701,6 +1701,7 @@ int uti596_attach(
/* Read the J1 header */ /* Read the J1 header */
j1 = (unsigned char)(lcsr->vector_base & 0xFF); j1 = (unsigned char)(lcsr->vector_base & 0xFF);
#if defined(mvme167)
if ( !(j1 & 0x10) ) { if ( !(j1 & 0x10) ) {
/* Jumper J1-4 is on, configure from NVRAM */ /* 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); 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 /* 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 * address provided in the ifconfig struct, so it will be read from BBRAM at
* $FFFC1F2C by default. [mvme167 manual p. 1-47] * $FFFC1F2C by default. [mvme167 manual p. 1-47]