diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-09-27 17:33:07 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-09-27 17:33:07 +0000 |
| commit | d3f0606f9ab49910e37b2d651078c7c4e9bf392e (patch) | |
| tree | 8f51a9605ce287b4aae2d0439f44bf79e3523280 | |
| parent | 2004-09-17 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-d3f0606f9ab49910e37b2d651078c7c4e9bf392e.tar.bz2 | |
2004-04-09 Greg Menke <gregory.menke@gsfc.nasa.gov>
PR 607/networking
* network/dec21140.c: Made PCI configuration minimum sane instead
of fully specifying unused PCI features.
| -rw-r--r-- | c/src/libchip/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libchip/network/dec21140.c | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index b3f7182de4..ce0eacc4d6 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,9 @@ +2004-04-09 Greg Menke <gregory.menke@gsfc.nasa.gov> + + PR 607/networking + * network/dec21140.c: Made PCI configuration minimum sane instead + of fully specifying unused PCI features. + 2004-05-21 Till Strauman <strauman@slac.stanford.edu> PR 625/networking diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 3d52bec1e8..5bf3dbd2fe 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -1173,8 +1173,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) PCI_BASE_ADDRESS_1, &lvalue); - tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) - + (unsigned int)PCI_MEM_BASE; + tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) + (unsigned int)PCI_MEM_BASE; sc->base = (unsigned int *)(tmp); @@ -1193,11 +1192,9 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) #if defined(__PPC) pci_write_config_word(pbus, pdev, pfun, PCI_COMMAND, - (unsigned16) ( PCI_COMMAND_MEMORY | - PCI_COMMAND_MASTER | - PCI_COMMAND_INVALIDATE | - PCI_COMMAND_WAIT | - PCI_COMMAND_FAST_BACK ) ); + (unsigned16) ( PCI_COMMAND_IO | + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER ) ); #endif #if defined(__i386__) pcib_conf_write16(signature, 0x04, ( 0x2 | 0x4 | 0x10 | 0x80 | 0x200) ); |