diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-08 16:54:20 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-08 16:54:20 +0000 |
| commit | a5b5b50866f599f2bb2fa5ba60dbb6182f5bcc5c (patch) | |
| tree | 770c199ebf7b9e923c22ff41d2c42ecd0eaa3934 | |
| parent | 2009-12-08 Eric Norum <wenorum@lbl.gov> (diff) | |
| download | rtems-a5b5b50866f599f2bb2fa5ba60dbb6182f5bcc5c.tar.bz2 | |
2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* libchip/network/dec21140.c, libchip/network/elnk.c,
libchip/network/if_dc.c: Ensure PCI drivers are built on all
supported configurations. PowerPC conditionals were not current and
code was not being built on supported BSPs.
| -rw-r--r-- | c/src/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/libchip/network/dec21140.c | 7 | ||||
| -rw-r--r-- | c/src/libchip/network/elnk.c | 7 | ||||
| -rw-r--r-- | c/src/libchip/network/if_dc.c | 11 |
4 files changed, 22 insertions, 10 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index a79bc9d669..e4170a367c 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libchip/network/dec21140.c, libchip/network/elnk.c, + libchip/network/if_dc.c: Ensure PCI drivers are built on all + supported configurations. PowerPC conditionals were not current and + code was not being built on supported BSPs. + 2009-11-23 Joel Sherrill <joel.sherrill@OARcorp.com> * libchip/network/smc91111.c: Formatting. diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 9cb0cd3e04..6432304b01 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -49,17 +49,18 @@ #define DEC21140_SUPPORTED #define PCI_DRAM_OFFSET 0 #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define DEC21140_SUPPORTED #endif +#include <bsp.h> +#include <rtems/pci.h> + #if !defined(PCI_DRAM_OFFSET) #undef DEC21140_SUPPORTED #endif #if defined(DEC21140_SUPPORTED) -#include <bsp.h> -#include <rtems/pci.h> #if defined(__PPC__) #include <libcpu/byteorder.h> diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index b3fd3a4c80..9f68c80f61 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -75,10 +75,13 @@ #define PCI_DRAM_OFFSET 0 #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define ELNK_SUPPORTED #endif +#include <bsp.h> +#include <rtems/pci.h> + #if !defined(PCI_DRAM_OFFSET) #undef ELNK_SUPPORTED #endif @@ -87,8 +90,6 @@ #if defined(ELNK_SUPPORTED) -#include <bsp.h> -#include <rtems/pci.h> #if defined(__PPC__) #include <libcpu/byteorder.h> diff --git a/c/src/libchip/network/if_dc.c b/c/src/libchip/network/if_dc.c index bdd1d8874f..b99e2967e8 100644 --- a/c/src/libchip/network/if_dc.c +++ b/c/src/libchip/network/if_dc.c @@ -108,17 +108,20 @@ #define DRIVER_SUPPORTED #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define DRIVER_SUPPORTED #warning The if_dc driver is untested on the PPC platform !!! #endif - -#if defined(DRIVER_SUPPORTED) /* this covers the file "globally"... */ #include <bsp.h> -#include <rtems.h> #include <rtems/pci.h> +#if !defined(PCI_DRAM_OFFSET) + #undef DRIVER_SUPPORTED +#endif + +#if defined(DRIVER_SUPPORTED) /* this covers the file "globally"... */ + #include <rtems/error.h> #include <errno.h> #include <rtems/rtems_bsdnet.h> |