diff options
| author | Scott Long <scottl@FreeBSD.org> | 2006-05-04 07:31:56 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2006-05-04 07:31:56 +0000 |
| commit | d5a2c3f47f388a60c42efd6d696b57b851613864 (patch) | |
| tree | 34449608a78c23e4ad19ecb459de380f07cdbbc2 /sys/dev/bce | |
| parent | 1ef0ad70138a8dd566ddede2b94ab775508a1137 (diff) | |
Notes
Diffstat (limited to 'sys/dev/bce')
| -rw-r--r-- | sys/dev/bce/if_bcereg.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h index d4cad02c95ba..4b30f1401f37 100644 --- a/sys/dev/bce/if_bcereg.h +++ b/sys/dev/bce/if_bcereg.h @@ -709,13 +709,11 @@ struct flash_spec { #define PCI_SETBIT(dev, reg, x, s) pci_write_config(dev, reg, (pci_read_config(dev, reg, s) | (x)), s) #define PCI_CLRBIT(dev, reg, x, s) pci_write_config(dev, reg, (pci_read_config(dev, reg, s) & ~(x)), s) +#define BCE_STATS(x) (u_long) stats->stat_ ## x ## _lo #if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) -#define BCE_STATS(x) ((u_long) stats->stat_ ## x ## _hi << 32) + \ - (u_long) stats->stat_ ## x ## _lo #define BCE_ADDR_LO(y) ((u64) (y) & 0xFFFFFFFF) #define BCE_ADDR_HI(y) ((u64) (y) >> 32) #else -#define BCE_STATS(x) (u_long) stats->stat_ ## x ## _lo #define BCE_ADDR_LO(y) ((u32)y) #define BCE_ADDR_HI(y) (0) #endif @@ -4703,7 +4701,7 @@ struct bce_softc #define BCE_PHY_INT_MODE_AUTO_POLLING_FLAG 0x100 #define BCE_PHY_INT_MODE_LINK_READY_FLAG 0x200 - bus_size_t max_bus_addr; + bus_addr_t max_bus_addr; u16 bus_speed_mhz; /* PCI bus speed */ struct flash_spec *bce_flash_info; /* Flash NVRAM settings */ u32 bce_flash_size; /* Flash NVRAM size */ |