diff options
author | Till Straumann <strauman@slac.stanford.edu> | 2009-04-23 05:00:38 +0000 |
---|---|---|
committer | Till Straumann <strauman@slac.stanford.edu> | 2009-04-23 05:00:38 +0000 |
commit | b761ee93dbbabe92b0c6dd4f37696e8f7fd27ab0 (patch) | |
tree | 0db55c1f0fbed37230de2caafd480f99ac5feb9f /bsd_eth_drivers/libbsdport | |
parent | - resolved conflict (diff) | |
download | libbsdport-b761ee93dbbabe92b0c6dd4f37696e8f7fd27ab0.tar.bz2 |
- had lost a few things during the merge :-(
Diffstat (limited to '')
-rw-r--r-- | bsd_eth_drivers/libbsdport/Makefile.am | 3 | ||||
-rw-r--r-- | bsd_eth_drivers/libbsdport/libbsdport.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/bsd_eth_drivers/libbsdport/Makefile.am b/bsd_eth_drivers/libbsdport/Makefile.am index 2abfcfb..55b4662 100644 --- a/bsd_eth_drivers/libbsdport/Makefile.am +++ b/bsd_eth_drivers/libbsdport/Makefile.am @@ -38,6 +38,9 @@ DUMMYHEADERS+=dummyheaders/netinet/ip6.h DUMMYHEADERS+=dummyheaders/vm/pmap.h DUMMYHEADERS+=dummyheaders/miibus_if.h +DUMMYHEADERS+=dummyheaders/miidevs.h +DUMMYHEADERS+=dummyheaders/dev/mii/brgphyreg.h + BUILT_SOURCES= include ../links.am diff --git a/bsd_eth_drivers/libbsdport/libbsdport.h b/bsd_eth_drivers/libbsdport/libbsdport.h index 3d66e7c..cb233bb 100644 --- a/bsd_eth_drivers/libbsdport/libbsdport.h +++ b/bsd_eth_drivers/libbsdport/libbsdport.h @@ -31,6 +31,10 @@ #include <rtems_udelay.h> +#ifndef bswap32 +#define bswap32(_x) CPU_swap_u32(_x) +#endif + #if defined(__LITTLE_ENDIAN__) || defined(__i386__) static inline uint16_t htole16(uint16_t v) { return v; } static inline uint32_t htole32(uint32_t v) { return v; } @@ -206,6 +210,9 @@ le32enc(void *pp, uint32_t u) #define PCIY_PMG 0x01 #endif +#ifndef PCI_RF_DENSE +#define PCI_RF_DENSE 0 +#endif static inline uint32_t pci_read_config(device_t dev, unsigned reg, int width) |