diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-21 14:02:17 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-21 14:02:17 +0000 |
| commit | a1c86a4c518fbc15781549f9133e0bb9f842f4d0 (patch) | |
| tree | 8dc2d67acd321a4a7dfc76775e695ddc4fb4b9a8 /c/src/lib/libbsp/sparc | |
| parent | 2000-11-17 Jennifer Averett <jennifer@OARcorp.com> (diff) | |
| download | rtems-a1c86a4c518fbc15781549f9133e0bb9f842f4d0.tar.bz2 | |
2000-11-21 Jiri Gaisler <jgais@ws.estec.esa.nl>
* erc32sonic/erc32sonic.c: Minor modifications which enable
network interface to come up and work for some time before
getting an error in the SONIC driver. The error is a bit random,
sometimes MCLGET (m, M_WAIT) tries to access memory way outside the
available ram (and traps) while sometimes there is a panic due
to RBAE/RXEN.
Diffstat (limited to 'c/src/lib/libbsp/sparc')
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/ChangeLog | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index ebd1b737a9..047ef5d570 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,12 @@ +2000-11-21 Jiri Gaisler <jgais@ws.estec.esa.nl> + + * erc32sonic/erc32sonic.c: Minor modifications which enable + network interface to come up and work for some time before + getting an error in the SONIC driver. The error is a bit random, + sometimes MCLGET (m, M_WAIT) tries to access memory way outside the + available ram (and traps) while sometimes there is a panic due + to RBAE/RXEN. + 2000-11-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Cleanup. diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c index 82f05c9c57..753254b5ed 100644 --- a/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c +++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c @@ -101,10 +101,9 @@ int rtems_erc32_sonic_driver_attach(struct rtems_bsdnet_ifconfig *config) { ERC32_MEC.IO_Configuration |= (0x15 << (((SONIC_BASE_ADDRESS >> 24) & 0x3) * 8)); - ERC32_MEC.Control &= ~0xe0000; /* Disable DMA time-out and parity */ - ERC32_MEC.Control |= 0x10001; /* Enable DMA */ - ERC32_MEC.Interrupt_Mask &= ~0x000340; - *((volatile int *) 0x10000300) = 0; + ERC32_MEC.Control &= ~0x60001; /* Disable DMA time-out, parity & power-down */ + ERC32_MEC.Control |= 0x10000; /* Enable DMA */ + ERC32_MEC.Interrupt_Mask &= ~(1 << (SONIC_VECTOR - 0x10)); return(rtems_sonic_driver_attach( config, &erc32_sonic_configuration )); } |