diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-20 22:20:14 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-20 22:20:14 +0000 |
| commit | 0b6ca8aa241b149df3ceccf79c84a121383dc001 (patch) | |
| tree | e6b2761f95bece57265e373b871f398646b1e5f7 | |
| parent | 2008-09-20 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-0b6ca8aa241b149df3ceccf79c84a121383dc001.tar.bz2 | |
2008-09-20 Joel Sherrill <joel.sherrill@oarcorp.com>
* libchip/network/dec21140.c, libchip/network/elnk.c: Detect when there
is no PCI bus based upon the BSP not having a base address defined.
This means this driver cannot be supported on that board.
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libchip/network/dec21140.c | 6 | ||||
| -rw-r--r-- | c/src/libchip/network/elnk.c | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 548571625c..da79792590 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2008-09-20 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libchip/network/dec21140.c, libchip/network/elnk.c: Detect when there + is no PCI bus based upon the BSP not having a base address defined. + This means this driver cannot be supported on that board. + 2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com> * libchip/network/dec21140.c, libchip/network/elnk.c, diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 40123f133f..26e18a224a 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -52,6 +52,12 @@ #define DEC21140_SUPPORTED #endif +#if !defined(PCI_DRAM_OFFSET) + #undef DEC21140_SUPPORTED +#endif + +#define phys_to_bus(address) ((unsigned int)((address)) + PCI_DRAM_OFFSET) + #if defined(DEC21140_SUPPORTED) #include <bsp.h> #include <rtems/pci.h> diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index 51d170b255..9e080b65c2 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -78,6 +78,10 @@ #define ELNK_SUPPORTED #endif +#if !defined(PCI_DRAM_OFFSET) + #undef ELNK_SUPPORTED +#endif + /* #undef ELNK_SUPPORTED */ |