diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 22:27:55 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 22:27:55 +0000 |
| commit | b90855ceb3145675b9d1dcce3aa80e686734fc9a (patch) | |
| tree | fc0f40b1a8b244bafd07a290bb9bcf8d0599083a | |
| parent | 2004-11-10 Joel Sherrill <joel@oarcorp.com> (diff) | |
| download | rtems-b90855ceb3145675b9d1dcce3aa80e686734fc9a.tar.bz2 | |
2004-11-10 Richard Campbell <richard.campbell@oarcorp.com>
* network/dec21140.c: Cleanup a bit and remove message about not
supported on PowerPC since it works on the MVME2100 BSP.
| -rw-r--r-- | c/src/libchip/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/libchip/network/dec21140.c | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index b6a004d004..664b132dac 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,8 @@ +2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> + + * network/dec21140.c: Cleanup a bit and remove message about not + supported on PowerPC since it works on the MVME2100 BSP. + 2004-11-10 Joel Sherrill <joel@oarcorp.com> PR 715/bsps diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 5bf3dbd2fe..2365c211d4 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -627,6 +627,9 @@ dec21140Enet_initialize_hardware (struct dec21140_softc *sc) sc->irqInfo.off = no_op; sc->irqInfo.isOn = dec21140IsOn; +#ifdef DEC_DEBUG + printk( "dec2114x: Installing IRQ %d\n", sc->irqInfo.name ); +#endif #ifdef BSP_SHARED_HANDLER_SUPPORT st = BSP_install_rtems_shared_irq_handler( &sc->irqInfo ); #else @@ -1026,7 +1029,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) * Get the instance number for the board we're going to configure * from the user. */ - if( (unitNumber = rtems_bsdnet_parse_driver_name( config, &unitName)) == -1 ) + if( (unitNumber = rtems_bsdnet_parse_driver_name(config, &unitName)) == -1 ) { return 0; } @@ -1077,9 +1080,6 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) if( BSP_pciFindDevice( PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21143, unitNumber-1, &pbus, &pdev, &pfun) != -1 ) { - printk("dec21143 : found device '%s', PPC support has not been tested. Using it anyway.\n", - config->name ); - pci_write_config_dword(pbus, pdev, pfun, @@ -1154,7 +1154,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) PTE_CACHE_DISABLE | PTE_WRITABLE); else sc->base = (unsigned int *)(value & ~MEM_MASK); - + pcib_conf_read8(signature, 60, &interrupt); cvalue = interrupt; #endif @@ -1173,7 +1173,8 @@ 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_ADJUSTMENT; sc->base = (unsigned int *)(tmp); @@ -1209,7 +1210,9 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) sc->irqInfo.name = cvalue; - /* printk("dec2114x : unit %d base address %08x.\n", unitNumber, sc->base ); */ +#ifdef DEC_DEBUG + printk("dec2114x : unit %d base address %08x.\n", unitNumber, sc->base ); +#endif /* |