diff options
Diffstat (limited to 'sys/dev/xe/if_xevar.h')
| -rw-r--r-- | sys/dev/xe/if_xevar.h | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h index 12c37cbffbd2..616b52c2e918 100644 --- a/sys/dev/xe/if_xevar.h +++ b/sys/dev/xe/if_xevar.h @@ -33,40 +33,40 @@ * One of these structures per allocated device */ struct xe_softc { - struct ifmedia ifmedia; - struct ifmib_iso_8802_3 mibdata; - struct callout media_timer; - struct callout wdog_timer; - int tx_timeout; - struct mtx lock; - struct ifnet *ifp; - struct ifmedia *ifm; - u_char enaddr[6]; - const char *card_type;/* Card model name */ - const char *vendor; /* Card manufacturer */ - device_t dev; /* Device */ - void *intrhand; - struct resource *irq_res; - int irq_rid; - struct resource *port_res; - int port_rid; - struct resource *ce2_port_res; - int ce2_port_rid; - int srev; /* Silicon revision */ - int tx_queued; /* Packets currently waiting to transmit */ - int tx_tpr; /* Last value of TPR reg on card */ - int tx_timeouts; /* Count of transmit timeouts */ - u_int16_t tx_min; /* Smallest packet we can send without padding */ - u_int16_t tx_thres; /* Threshold bytes for early transmit */ - int autoneg_status; /* Autonegotiation progress state */ - int media; /* Private media word */ - u_char version; /* Bonding Version register from card */ - u_char modem; /* 1 = Card has a modem */ - u_char ce2; /* 1 = Card has CE2 silicon */ - u_char mohawk; /* 1 = Card has Mohawk (CE3) silicon */ - u_char dingo; /* 1 = Card has Dingo (CEM56) silicon */ - u_char phy_ok; /* 1 = MII-compliant PHY found and initialised */ - u_char gone; /* 1 = Card bailed out */ + struct ifmedia ifmedia; + struct ifmib_iso_8802_3 mibdata; + struct callout media_timer; + struct callout wdog_timer; + int tx_timeout; + struct mtx lock; + struct ifnet *ifp; + struct ifmedia *ifm; + u_char enaddr[ETHER_ADDR_LEN]; + const char *card_type; /* Card model name */ + const char *vendor; /* Card manufacturer */ + device_t dev; /* Device */ + void *intrhand; + struct resource *irq_res; + int irq_rid; + struct resource *port_res; + int port_rid; + struct resource *ce2_port_res; + int ce2_port_rid; + int srev; /* Silicon revision */ + int tx_queued; /* Transmit packets currently waiting */ + int tx_tpr; /* Last value of TPR reg on card */ + int tx_timeouts; /* Count of transmit timeouts */ + uint16_t tx_min; /* Smallest packet for no padding */ + uint16_t tx_thres; /* Threshold bytes for early transmit */ + int autoneg_status; /* Autonegotiation progress state */ + int media; /* Private media word */ + u_char version; /* Bonding Version register from card */ + u_char modem; /* 1 = Card has a modem */ + u_char ce2; /* 1 = Card has CE2 silicon */ + u_char mohawk; /* 1 = Card has Mohawk (CE3) silicon */ + u_char dingo; /* 1 = Card has Dingo (CEM56) silicon */ + u_char phy_ok; /* 1 = MII-compliant PHY found */ + u_char gone; /* 1 = Card bailed out */ }; #define XE_LOCK(sc) mtx_lock(&(sc)->lock) @@ -76,15 +76,15 @@ struct xe_softc { /* * For accessing card registers */ -#define XE_INB(r) bus_read_1(scp->port_res, (r)) -#define XE_INW(r) bus_read_2(scp->port_res, (r)) -#define XE_OUTB(r, b) bus_write_1(scp->port_res, (r), (b)) -#define XE_OUTW(r, w) bus_write_2(scp->port_res, (r), (w)) -#define XE_SELECT_PAGE(p) XE_OUTB(XE_PR, (p)) +#define XE_INB(r) bus_read_1(scp->port_res, (r)) +#define XE_INW(r) bus_read_2(scp->port_res, (r)) +#define XE_OUTB(r, b) bus_write_1(scp->port_res, (r), (b)) +#define XE_OUTW(r, w) bus_write_2(scp->port_res, (r), (w)) +#define XE_SELECT_PAGE(p) XE_OUTB(XE_PR, (p)) -int xe_attach(device_t dev); -int xe_activate(device_t dev); -void xe_deactivate(device_t dev); -void xe_stop(struct xe_softc *scp); +int xe_attach(device_t dev); +int xe_activate(device_t dev); +void xe_deactivate(device_t dev); +void xe_stop(struct xe_softc *scp); #endif /* DEV_XE_IF_XEVAR_H */ |