Author: yongari
Date: Fri Nov 4 19:12:07 2011
New Revision: 227089
URL: http://svn.freebsd.org/changeset/base/227089
Log:
s/u_intXX_t/uintXX_t/g
Modified:
head/sys/dev/ti/if_ti.c
head/sys/dev/ti/if_tireg.h
Modified: head/sys/dev/ti/if_ti.c
==============================================================================
--- head/sys/dev/ti/if_ti.c Fri Nov 4 18:39:39 2011 (r227088)
+++ head/sys/dev/ti/if_ti.c Fri Nov 4 19:12:07 2011 (r227089)
@@ -198,20 +198,20 @@ static int ti_shutdown(device_t);
static int ti_ifmedia_upd(struct ifnet *);
static void ti_ifmedia_sts(struct ifnet *, struct ifmediareq *);
-static u_int32_t ti_eeprom_putbyte(struct ti_softc *, int);
-static u_int8_t ti_eeprom_getbyte(struct ti_softc *, int, u_int8_t *);
+static uint32_t ti_eeprom_putbyte(struct ti_softc *, int);
+static uint8_t ti_eeprom_getbyte(struct ti_softc *, int, uint8_t *);
static int ti_read_eeprom(struct ti_softc *, caddr_t, int, int);
static void ti_add_mcast(struct ti_softc *, struct ether_addr *);
static void ti_del_mcast(struct ti_softc *, struct ether_addr *);
static void ti_setmulti(struct ti_softc *);
-static void ti_mem_read(struct ti_softc *, u_int32_t, u_int32_t, void *);
-static void ti_mem_write(struct ti_softc *, u_int32_t, u_int32_t, void *);
-static void ti_mem_zero(struct ti_softc *, u_int32_t, u_int32_t);
-static int ti_copy_mem(struct ti_softc *, u_int32_t, u_int32_t, caddr_t, int,
+static void ti_mem_read(struct ti_softc *, uint32_t, uint32_t, void *);
+static void ti_mem_write(struct ti_softc *, uint32_t, uint32_t, void *);
+static void ti_mem_zero(struct ti_softc *, uint32_t, uint32_t);
+static int ti_copy_mem(struct ti_softc *, uint32_t, uint32_t, caddr_t, int,
int);
-static int ti_copy_scratch(struct ti_softc *, u_int32_t, u_int32_t, caddr_t,
+static int ti_copy_scratch(struct ti_softc *, uint32_t, uint32_t, caddr_t,
int, int, int);
static int ti_bcopy_swap(const void *, void *, size_t, ti_swap_type);
static void ti_loadfw(struct ti_softc *);
@@ -270,7 +270,7 @@ MODULE_DEPEND(ti, ether, 1, 1, 1);
/*
* Send an instruction or address to the EEPROM, check for ACK.
*/
-static u_int32_t
+static uint32_t
ti_eeprom_putbyte(struct ti_softc *sc, int byte)
{
int i, ack = 0;
@@ -315,11 +315,11 @@ ti_eeprom_putbyte(struct ti_softc *sc, i
* We have to send two address bytes since the EEPROM can hold
* more than 256 bytes of data.
*/
-static u_int8_t
-ti_eeprom_getbyte(struct ti_softc *sc, int addr, u_int8_t *dest)
+static uint8_t
+ti_eeprom_getbyte(struct ti_softc *sc, int addr, uint8_t *dest)
{
int i;
- u_int8_t byte = 0;
+ uint8_t byte = 0;
EEPROM_START;
@@ -393,7 +393,7 @@ static int
ti_read_eeprom(struct ti_softc *sc, caddr_t dest, int off, int cnt)
{
int err = 0, i;
- u_int8_t byte = 0;
+ uint8_t byte = 0;
for (i = 0; i < cnt; i++) {
err = ti_eeprom_getbyte(sc, off + i, &byte);
@@ -410,7 +410,7 @@ ti_read_eeprom(struct ti_softc *sc, cadd
* Can be used to copy data from NIC local memory.
*/
static void
-ti_mem_read(struct ti_softc *sc, u_int32_t addr, u_int32_t len, void *buf)
+ti_mem_read(struct ti_softc *sc, uint32_t addr, uint32_t len, void *buf)
{
int segptr, segsize, cnt;
char *ptr;
@@ -426,7 +426,7 @@ ti_mem_read(struct ti_softc *sc, u_int32
segsize = TI_WINLEN - (segptr % TI_WINLEN);
CSR_WRITE_4(sc, TI_WINBASE, (segptr & ~(TI_WINLEN - 1)));
bus_space_read_region_4(sc->ti_btag, sc->ti_bhandle,
- TI_WINDOW + (segptr & (TI_WINLEN - 1)), (u_int32_t *)ptr,
+ TI_WINDOW + (segptr & (TI_WINLEN - 1)), (uint32_t *)ptr,
segsize / 4);
ptr += segsize;
segptr += segsize;
@@ -440,7 +440,7 @@ ti_mem_read(struct ti_softc *sc, u_int32
* Can be used to copy data into NIC local memory.
*/
static void
-ti_mem_write(struct ti_softc *sc, u_int32_t addr, u_int32_t len, void *buf)
+ti_mem_write(struct ti_softc *sc, uint32_t addr, uint32_t len, void *buf)
{
int segptr, segsize, cnt;
char *ptr;
@@ -456,7 +456,7 @@ ti_mem_write(struct ti_softc *sc, u_int3
segsize = TI_WINLEN - (segptr % TI_WINLEN);
CSR_WRITE_4(sc, TI_WINBASE, (segptr & ~(TI_WINLEN - 1)));
bus_space_write_region_4(sc->ti_btag, sc->ti_bhandle,
- TI_WINDOW + (segptr & (TI_WINLEN - 1)), (u_int32_t *)ptr,
+ TI_WINDOW + (segptr & (TI_WINLEN - 1)), (uint32_t *)ptr,
segsize / 4);
ptr += segsize;
segptr += segsize;
@@ -469,7 +469,7 @@ ti_mem_write(struct ti_softc *sc, u_int3
* Can be used to clear a section of NIC local memory.
*/
static void
-ti_mem_zero(struct ti_softc *sc, u_int32_t addr, u_int32_t len)
+ti_mem_zero(struct ti_softc *sc, uint32_t addr, uint32_t len)
{
int segptr, segsize, cnt;
@@ -490,13 +490,13 @@ ti_mem_zero(struct ti_softc *sc, u_int32
}
static int
-ti_copy_mem(struct ti_softc *sc, u_int32_t tigon_addr, u_int32_t len,
+ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len,
caddr_t buf, int useraddr, int readdata)
{
int segptr, segsize, cnt;
caddr_t ptr;
- u_int32_t origwin;
- u_int8_t tmparray[TI_WINLEN], tmparray2[TI_WINLEN];
+ uint32_t origwin;
+ uint8_t tmparray[TI_WINLEN], tmparray2[TI_WINLEN];
int resid, segresid;
int first_pass;
@@ -559,7 +559,7 @@ ti_copy_mem(struct ti_softc *sc, u_int32
bus_space_read_region_4(sc->ti_btag,
sc->ti_bhandle, ti_offset,
- (u_int32_t *)tmparray,
+ (uint32_t *)tmparray,
segsize >> 2);
if (useraddr) {
/*
@@ -606,7 +606,7 @@ ti_copy_mem(struct ti_softc *sc, u_int32
bus_space_write_region_4(sc->ti_btag,
sc->ti_bhandle, ti_offset,
- (u_int32_t *)tmparray,
+ (uint32_t *)tmparray,
segsize >> 2);
}
segptr += segsize;
@@ -618,7 +618,7 @@ ti_copy_mem(struct ti_softc *sc, u_int32
* Handle leftover, non-word-aligned bytes.
*/
if (resid != 0) {
- u_int32_t tmpval, tmpval2;
+ uint32_t tmpval, tmpval2;
bus_size_t ti_offset;
/*
@@ -686,12 +686,12 @@ ti_copy_mem(struct ti_softc *sc, u_int32
}
static int
-ti_copy_scratch(struct ti_softc *sc, u_int32_t tigon_addr, u_int32_t len,
+ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len,
caddr_t buf, int useraddr, int readdata, int cpu)
{
- u_int32_t segptr;
+ uint32_t segptr;
int cnt;
- u_int32_t tmpval, tmpval2;
+ uint32_t tmpval, tmpval2;
caddr_t ptr;
TI_LOCK_ASSERT(sc);
@@ -782,8 +782,8 @@ ti_copy_scratch(struct ti_softc *sc, u_i
static int
ti_bcopy_swap(const void *src, void *dst, size_t len, ti_swap_type swap_type)
{
- const u_int8_t *tmpsrc;
- u_int8_t *tmpdst;
+ const uint8_t *tmpsrc;
+ uint8_t *tmpdst;
size_t tmplen;
if (len & 0x3) {
@@ -798,11 +798,11 @@ ti_bcopy_swap(const void *src, void *dst
while (tmplen) {
if (swap_type == TI_SWAP_NTOH)
- *(u_int32_t *)tmpdst =
- ntohl(*(const u_int32_t *)tmpsrc);
+ *(uint32_t *)tmpdst =
+ ntohl(*(const uint32_t *)tmpsrc);
else
- *(u_int32_t *)tmpdst =
- htonl(*(const u_int32_t *)tmpsrc);
+ *(uint32_t *)tmpdst =
+ htonl(*(const uint32_t *)tmpsrc);
tmpsrc += 4;
tmpdst += 4;
@@ -880,7 +880,7 @@ ti_cmd(struct ti_softc *sc, struct ti_cm
int index;
index = sc->ti_cmd_saved_prodidx;
- CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4), *(u_int32_t *)(cmd));
+ CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4), *(uint32_t *)(cmd));
TI_INC(index, TI_CMD_RING_CNT);
CSR_WRITE_4(sc, TI_MB_CMDPROD_IDX, index);
sc->ti_cmd_saved_prodidx = index;
@@ -897,11 +897,11 @@ ti_cmd_ext(struct ti_softc *sc, struct t
int i;
index = sc->ti_cmd_saved_prodidx;
- CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4), *(u_int32_t *)(cmd));
+ CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4), *(uint32_t *)(cmd));
TI_INC(index, TI_CMD_RING_CNT);
for (i = 0; i < len; i++) {
CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4),
- *(u_int32_t *)(&arg[i * 4]));
+ *(uint32_t *)(&arg[i * 4]));
TI_INC(index, TI_CMD_RING_CNT);
}
CSR_WRITE_4(sc, TI_MB_CMDPROD_IDX, index);
@@ -1688,10 +1688,10 @@ static void
ti_add_mcast(struct ti_softc *sc, struct ether_addr *addr)
{
struct ti_cmd_desc cmd;
- u_int16_t *m;
- u_int32_t ext[2] = {0, 0};
+ uint16_t *m;
+ uint32_t ext[2] = {0, 0};
- m = (u_int16_t *)&addr->octet[0];
+ m = (uint16_t *)&addr->octet[0];
switch (sc->ti_hwrev) {
case TI_HWREV_TIGON:
@@ -1714,10 +1714,10 @@ static void
ti_del_mcast(struct ti_softc *sc, struct ether_addr *addr)
{
struct ti_cmd_desc cmd;
- u_int16_t *m;
- u_int32_t ext[2] = {0, 0};
+ uint16_t *m;
+ uint32_t ext[2] = {0, 0};
- m = (u_int16_t *)&addr->octet[0];
+ m = (uint16_t *)&addr->octet[0];
switch (sc->ti_hwrev) {
case TI_HWREV_TIGON:
@@ -1757,7 +1757,7 @@ ti_setmulti(struct ti_softc *sc)
struct ifmultiaddr *ifma;
struct ti_cmd_desc cmd;
struct ti_mc_entry *mc;
- u_int32_t intrs;
+ uint32_t intrs;
TI_LOCK_ASSERT(sc);
@@ -1838,9 +1838,9 @@ static int ti_64bitslot_war(struct ti_so
static int
ti_chipinit(struct ti_softc *sc)
{
- u_int32_t cacheline;
- u_int32_t pci_writemax = 0;
- u_int32_t hdrsplit;
+ uint32_t cacheline;
+ uint32_t pci_writemax = 0;
+ uint32_t hdrsplit;
/* Initialize link to down state. */
sc->ti_linkstat = TI_EV_CODE_LINK_DOWN;
@@ -2627,8 +2627,8 @@ ti_rxeof(struct ti_softc *sc)
while (sc->ti_rx_saved_considx != sc->ti_return_prodidx.ti_idx) {
struct ti_rx_desc *cur_rx;
struct mbuf *m = NULL;
- u_int32_t rxidx;
- u_int16_t vlan_tag = 0;
+ uint32_t rxidx;
+ uint16_t vlan_tag = 0;
int have_tag = 0;
cur_rx =
@@ -2867,7 +2867,7 @@ ti_encap(struct ti_softc *sc, struct mbu
struct ti_tx_desc txdesc;
struct mbuf *m;
bus_dma_segment_t txsegs[TI_MAXTXSEGS];
- u_int16_t csum_flags;
+ uint16_t csum_flags;
int error, frag, i, nseg;
if ((txd = STAILQ_FIRST(&sc->ti_cdata.ti_txfreeq)) == NULL)
@@ -3072,7 +3072,7 @@ static void ti_init2(struct ti_softc *sc
{
struct ti_cmd_desc cmd;
struct ifnet *ifp;
- u_int8_t *ea;
+ uint8_t *ea;
struct ifmedia *ifm;
int tmp;
@@ -3163,7 +3163,7 @@ ti_ifmedia_upd(struct ifnet *ifp)
struct ti_softc *sc;
struct ifmedia *ifm;
struct ti_cmd_desc cmd;
- u_int32_t flowctl;
+ uint32_t flowctl;
sc = ifp->if_softc;
ifm = &sc->ifmedia;
@@ -3262,7 +3262,7 @@ static void
ti_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct ti_softc *sc;
- u_int32_t media = 0;
+ uint32_t media = 0;
sc = ifp->if_softc;
@@ -3532,7 +3532,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd,
}
case TIIOCGETTRACE: {
struct ti_trace_buf *trace_buf;
- u_int32_t trace_start, cur_trace_ptr, trace_len;
+ uint32_t trace_start, cur_trace_ptr, trace_len;
trace_buf = (struct ti_trace_buf *)addr;
@@ -3593,7 +3593,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd,
case ALT_WRITE_TG_MEM:
{
struct tg_mem *mem_param;
- u_int32_t sram_end, scratch_end;
+ uint32_t sram_end, scratch_end;
mem_param = (struct tg_mem *)addr;
@@ -3655,7 +3655,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd,
case ALT_WRITE_TG_REG:
{
struct tg_reg *regs;
- u_int32_t tmpval;
+ uint32_t tmpval;
regs = (struct tg_reg *)addr;
Modified: head/sys/dev/ti/if_tireg.h
==============================================================================
--- head/sys/dev/ti/if_tireg.h Fri Nov 4 18:39:39 2011 (r227088)
+++ head/sys/dev/ti/if_tireg.h Fri Nov 4 19:12:07 2011 (r227089)
@@ -477,8 +477,8 @@
*/
typedef struct {
- u_int32_t ti_addr_hi;
- u_int32_t ti_addr_lo;
+ uint32_t ti_addr_hi;
+ uint32_t ti_addr_lo;
} ti_hostaddr;
#define TI_HOSTADDR(x) x.ti_addr_lo
@@ -516,13 +516,13 @@ ti_hostaddr64(ti_hostaddr *x, bus_addr_t
struct ti_rcb {
ti_hostaddr ti_hostaddr;
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_max_len;
- u_int16_t ti_flags;
+ uint16_t ti_max_len;
+ uint16_t ti_flags;
#else
- u_int16_t ti_flags;
- u_int16_t ti_max_len;
+ uint16_t ti_flags;
+ uint16_t ti_max_len;
#endif
- u_int32_t ti_unused;
+ uint32_t ti_unused;
};
#define TI_RCB_FLAG_TCP_UDP_CKSUM 0x00000001
@@ -536,8 +536,8 @@ struct ti_rcb {
#define TI_RCB_FLAG_RING_DISABLED 0x00000200
struct ti_producer {
- u_int32_t ti_idx;
- u_int32_t ti_unused;
+ uint32_t ti_idx;
+ uint32_t ti_unused;
};
/*
@@ -571,35 +571,35 @@ struct ti_gib {
struct ti_rx_desc {
ti_hostaddr ti_addr;
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_idx;
- u_int16_t ti_len;
+ uint16_t ti_idx;
+ uint16_t ti_len;
#else
- u_int16_t ti_len;
- u_int16_t ti_idx;
+ uint16_t ti_len;
+ uint16_t ti_idx;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_type;
- u_int16_t ti_flags;
+ uint16_t ti_type;
+ uint16_t ti_flags;
#else
- u_int16_t ti_flags;
- u_int16_t ti_type;
+ uint16_t ti_flags;
+ uint16_t ti_type;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_ip_cksum;
- u_int16_t ti_tcp_udp_cksum;
+ uint16_t ti_ip_cksum;
+ uint16_t ti_tcp_udp_cksum;
#else
- u_int16_t ti_tcp_udp_cksum;
- u_int16_t ti_ip_cksum;
+ uint16_t ti_tcp_udp_cksum;
+ uint16_t ti_ip_cksum;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_error_flags;
- u_int16_t ti_vlan_tag;
+ uint16_t ti_error_flags;
+ uint16_t ti_vlan_tag;
#else
- u_int16_t ti_vlan_tag;
- u_int16_t ti_error_flags;
+ uint16_t ti_vlan_tag;
+ uint16_t ti_error_flags;
#endif
- u_int32_t ti_rsvd;
- u_int32_t ti_opaque;
+ uint32_t ti_rsvd;
+ uint32_t ti_opaque;
};
struct ti_rx_desc_ext {
@@ -607,50 +607,50 @@ struct ti_rx_desc_ext {
ti_hostaddr ti_addr2;
ti_hostaddr ti_addr3;
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_len1;
- u_int16_t ti_len2;
+ uint16_t ti_len1;
+ uint16_t ti_len2;
#else
- u_int16_t ti_len2;
- u_int16_t ti_len1;
+ uint16_t ti_len2;
+ uint16_t ti_len1;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_len3;
- u_int16_t ti_rsvd0;
+ uint16_t ti_len3;
+ uint16_t ti_rsvd0;
#else
- u_int16_t ti_rsvd0;
- u_int16_t ti_len3;
+ uint16_t ti_rsvd0;
+ uint16_t ti_len3;
#endif
ti_hostaddr ti_addr0;
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_idx;
- u_int16_t ti_len0;
+ uint16_t ti_idx;
+ uint16_t ti_len0;
#else
- u_int16_t ti_len0;
- u_int16_t ti_idx;
+ uint16_t ti_len0;
+ uint16_t ti_idx;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_type;
- u_int16_t ti_flags;
+ uint16_t ti_type;
+ uint16_t ti_flags;
#else
- u_int16_t ti_flags;
- u_int16_t ti_type;
+ uint16_t ti_flags;
+ uint16_t ti_type;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_ip_cksum;
- u_int16_t ti_tcp_udp_cksum;
+ uint16_t ti_ip_cksum;
+ uint16_t ti_tcp_udp_cksum;
#else
- u_int16_t ti_tcp_udp_cksum;
- u_int16_t ti_ip_cksum;
+ uint16_t ti_tcp_udp_cksum;
+ uint16_t ti_ip_cksum;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_error_flags;
- u_int16_t ti_vlan_tag;
+ uint16_t ti_error_flags;
+ uint16_t ti_vlan_tag;
#else
- u_int16_t ti_vlan_tag;
- u_int16_t ti_error_flags;
+ uint16_t ti_vlan_tag;
+ uint16_t ti_error_flags;
#endif
- u_int32_t ti_rsvd1;
- u_int32_t ti_opaque;
+ uint32_t ti_rsvd1;
+ uint32_t ti_opaque;
};
/*
@@ -659,18 +659,18 @@ struct ti_rx_desc_ext {
struct ti_tx_desc {
ti_hostaddr ti_addr;
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_len;
- u_int16_t ti_flags;
+ uint16_t ti_len;
+ uint16_t ti_flags;
#else
- u_int16_t ti_flags;
- u_int16_t ti_len;
+ uint16_t ti_flags;
+ uint16_t ti_len;
#endif
#if BYTE_ORDER == BIG_ENDIAN
- u_int16_t ti_rsvd;
- u_int16_t ti_vlan_tag;
+ uint16_t ti_rsvd;
+ uint16_t ti_vlan_tag;
#else
- u_int16_t ti_vlan_tag;
- u_int16_t ti_rsvd;
+ uint16_t ti_vlan_tag;
+ uint16_t ti_rsvd;
#endif
};
@@ -753,7 +753,7 @@ struct ti_tx_desc {
* Tigon command structure.
*/
struct ti_cmd_desc {
- u_int32_t ti_cmdx;
+ uint32_t ti_cmdx;
};
#define TI_CMD_CMD(cmd) (((((cmd)->ti_cmdx)) >> 24) & 0xff)
@@ -842,8 +842,8 @@ struct ti_cmd_desc {
* Tigon event structure.
*/
struct ti_event_desc {
- u_int32_t ti_eventx;
- u_int32_t ti_rsvd;
+ uint32_t ti_eventx;
+ uint32_t ti_rsvd;
};
#define TI_EVENT_EVENT(e) (((((e)->ti_eventx)) >> 24) & 0xff)
@@ -898,8 +898,8 @@ struct ti_event_desc {
#define TI_JSLOTS 256
#define TI_JRAWLEN (TI_JUMBO_FRAMELEN + ETHER_ALIGN)
-#define TI_JLEN (TI_JRAWLEN + (sizeof(u_int64_t) - \
- (TI_JRAWLEN % sizeof(u_int64_t))))
+#define TI_JLEN (TI_JRAWLEN + (sizeof(uint64_t) - \
+ (TI_JRAWLEN % sizeof(uint64_t))))
#define TI_JPAGESZ PAGE_SIZE
#define TI_RESID (TI_JPAGESZ - (TI_JLEN * TI_JSLOTS) % TI_JPAGESZ)
#define TI_JMEM ((TI_JLEN * TI_JSLOTS) + TI_RESID)
@@ -934,11 +934,11 @@ struct ti_ring_data {
* line boundaries.
*/
struct ti_producer ti_ev_prodidx_r;
- u_int32_t ti_pad0[6];
+ uint32_t ti_pad0[6];
struct ti_producer ti_return_prodidx_r;
- u_int32_t ti_pad1[6];
+ uint32_t ti_pad1[6];
struct ti_producer ti_tx_considx_r;
- u_int32_t ti_pad2[6];
+ uint32_t ti_pad2[6];
struct ti_gib ti_info;
};
@@ -965,8 +965,8 @@ struct ti_chain_data {
};
struct ti_type {
- u_int16_t ti_vid;
- u_int16_t ti_did;
+ uint16_t ti_vid;
+ uint16_t ti_did;
const char *ti_name;
};
@@ -1000,10 +1000,10 @@ struct ti_softc {
struct resource *ti_irq;
struct resource *ti_res;
struct ifmedia ifmedia; /* media info */
- u_int8_t ti_unit; /* interface number */
- u_int8_t ti_hwrev; /* Tigon rev (1 or 2) */
- u_int8_t ti_copper; /* 1000baseTX card */
- u_int8_t ti_linkstat; /* Link state */
+ uint8_t ti_unit; /* interface number */
+ uint8_t ti_hwrev; /* Tigon rev (1 or 2) */
+ uint8_t ti_copper; /* 1000baseTX card */
+ uint8_t ti_linkstat; /* Link state */
int ti_hdrsplit; /* enable header splitting */
bus_dma_tag_t ti_parent_dmat;
bus_dma_tag_t ti_jumbo_dmat;
@@ -1029,12 +1029,12 @@ struct ti_softc {
SLIST_HEAD(__ti_mchead, ti_mc_entry) ti_mc_listhead;
SLIST_HEAD(__ti_jfreehead, ti_jpool_entry) ti_jfree_listhead;
SLIST_HEAD(__ti_jinusehead, ti_jpool_entry) ti_jinuse_listhead;
- u_int32_t ti_stat_ticks;
- u_int32_t ti_rx_coal_ticks;
- u_int32_t ti_tx_coal_ticks;
- u_int32_t ti_rx_max_coal_bds;
- u_int32_t ti_tx_max_coal_bds;
- u_int32_t ti_tx_buf_ratio;
+ uint32_t ti_stat_ticks;
+ uint32_t ti_rx_coal_ticks;
+ uint32_t ti_tx_coal_ticks;
+ uint32_t ti_rx_max_coal_bds;
+ uint32_t ti_tx_max_coal_bds;
+ uint32_t ti_tx_buf_ratio;
int ti_if_flags;
int ti_txcnt;
struct mtx ti_mtx;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
