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

2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* network/network.c: Eliminate patterns that look like CVS conflict
	markers.
This commit is contained in:
Joel Sherrill
2008-05-15 16:33:49 +00:00
parent 61b7dae3d6
commit 94056364ad
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/i386/i386ex/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* network/network.c: Eliminate patterns that look like CVS conflict
markers.
2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/bspstart.c: Add capability for bootcard.c BSP Initialization * startup/bspstart.c: Add capability for bootcard.c BSP Initialization

4
c/src/lib/libbsp/i386/i386ex/network/network.c
View File

@@ -962,11 +962,11 @@ void uti596reset(void)
/* abort ALL of the current work */ /* abort ALL of the current work */
/* FEB 17 REMOVED /* FEB 17 REMOVED
>>>>> ====>
sc->scb.command = CUC_ABORT | RX_ABORT; sc->scb.command = CUC_ABORT | RX_ABORT;
outport_word(CHAN_ATTN,0); outport_word(CHAN_ATTN,0);
UTI_WAIT_COMMAND_ACCEPTED(4000, "reset: abort requested"); UTI_WAIT_COMMAND_ACCEPTED(4000, "reset: abort requested");
<<<<< <====
*/ */
uti596_reset_hardware(&uti596_softc); /* reset the ethernet hardware. must re-config */ uti596_reset_hardware(&uti596_softc); /* reset the ethernet hardware. must re-config */