Author: yongari
Date: Tue Jan 3 18:58:20 2012
New Revision: 229404
URL: http://svn.freebsd.org/changeset/base/229404
Log:
MFC r227086-227089:
r227086:
Use ANSI function definations.
r227087:
No functional changes.
r227088:
Make ti(4) build with 'options TI_PRIVATE_JUMBOS'.
This was broken in r175872.
We have a UMA backed jumbo allocator and that is much better
implementation than having a local jumbo buffer allocator in
driver. This local allocator would be removed in near future but
fixing build before removal wouldn't be a bad idea.
r227089:
s/u_intXX_t/uintXX_t/g
Modified:
stable/9/sys/dev/ti/if_ti.c
stable/9/sys/dev/ti/if_tireg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/ti/if_ti.c
==============================================================================
--- stable/9/sys/dev/ti/if_ti.c Tue Jan 3 18:51:58 2012 (r229403)
+++ stable/9/sys/dev/ti/if_ti.c Tue Jan 3 18:58:20 2012 (r229404)
@@ -140,7 +140,6 @@ typedef enum {
TI_SWAP_NTOH
} ti_swap_type;
-
/*
* Various supported device vendors/types and their names.
*/
@@ -199,20 +198,21 @@ 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,
int);
-static int ti_copy_scratch(struct ti_softc *, u_int32_t, u_int32_t, caddr_t,
- int, int, 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 *, 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 *);
static void ti_cmd(struct ti_softc *, struct ti_cmd_desc *);
@@ -242,8 +242,8 @@ static int ti_chipinit(struct ti_softc *
static int ti_gibinit(struct ti_softc *);
#ifdef TI_JUMBO_HDRSPLIT
-static __inline void ti_hdr_split (struct mbuf *top, int hdr_len,
- int pkt_len, int idx);
+static __inline void ti_hdr_split(struct mbuf *top, int hdr_len, int pkt_len,
+ int idx);
#endif /* TI_JUMBO_HDRSPLIT */
static device_method_t ti_methods[] = {
@@ -270,11 +270,10 @@ MODULE_DEPEND(ti, ether, 1, 1, 1);
/*
* Send an instruction or address to the EEPROM, check for ACK.
*/
-static u_int32_t ti_eeprom_putbyte(sc, byte)
- struct ti_softc *sc;
- int byte;
+static uint32_t
+ti_eeprom_putbyte(struct ti_softc *sc, int byte)
{
- int i, ack = 0;
+ int i, ack = 0;
/*
* Make sure we're in TX mode.
@@ -316,13 +315,11 @@ static u_int32_t ti_eeprom_putbyte(sc, b
* 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(sc, addr, dest)
- 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;
+ int i;
+ uint8_t byte = 0;
EEPROM_START;
@@ -393,14 +390,10 @@ static u_int8_t ti_eeprom_getbyte(sc, ad
* Read a sequence of bytes from the EEPROM.
*/
static int
-ti_read_eeprom(sc, dest, off, cnt)
- struct ti_softc *sc;
- caddr_t dest;
- int off;
- int cnt;
+ti_read_eeprom(struct ti_softc *sc, caddr_t dest, int off, int cnt)
{
- int err = 0, i;
- u_int8_t byte = 0;
+ int err = 0, i;
+ uint8_t byte = 0;
for (i = 0; i < cnt; i++) {
err = ti_eeprom_getbyte(sc, off + i, &byte);
@@ -417,13 +410,10 @@ ti_read_eeprom(sc, dest, off, cnt)
* Can be used to copy data from NIC local memory.
*/
static void
-ti_mem_read(sc, addr, len, buf)
- struct ti_softc *sc;
- u_int32_t addr, len;
- void *buf;
+ti_mem_read(struct ti_softc *sc, uint32_t addr, uint32_t len, void *buf)
{
- int segptr, segsize, cnt;
- char *ptr;
+ int segptr, segsize, cnt;
+ char *ptr;
segptr = addr;
cnt = len;
@@ -436,7 +426,7 @@ ti_mem_read(sc, addr, len, buf)
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;
@@ -450,13 +440,10 @@ ti_mem_read(sc, addr, len, buf)
* Can be used to copy data into NIC local memory.
*/
static void
-ti_mem_write(sc, addr, len, buf)
- struct ti_softc *sc;
- u_int32_t addr, len;
- void *buf;
+ti_mem_write(struct ti_softc *sc, uint32_t addr, uint32_t len, void *buf)
{
- int segptr, segsize, cnt;
- char *ptr;
+ int segptr, segsize, cnt;
+ char *ptr;
segptr = addr;
cnt = len;
@@ -469,7 +456,7 @@ ti_mem_write(sc, addr, len, buf)
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;
@@ -482,11 +469,9 @@ ti_mem_write(sc, addr, len, buf)
* Can be used to clear a section of NIC local memory.
*/
static void
-ti_mem_zero(sc, addr, len)
- struct ti_softc *sc;
- u_int32_t addr, len;
+ti_mem_zero(struct ti_softc *sc, uint32_t addr, uint32_t len)
{
- int segptr, segsize, cnt;
+ int segptr, segsize, cnt;
segptr = addr;
cnt = len;
@@ -505,18 +490,15 @@ ti_mem_zero(sc, addr, len)
}
static int
-ti_copy_mem(sc, tigon_addr, len, buf, useraddr, readdata)
- struct ti_softc *sc;
- u_int32_t tigon_addr, len;
- caddr_t buf;
- int useraddr, readdata;
-{
- int segptr, segsize, cnt;
- caddr_t ptr;
- u_int32_t origwin;
- u_int8_t tmparray[TI_WINLEN], tmparray2[TI_WINLEN];
- int resid, segresid;
- int first_pass;
+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;
+ uint32_t origwin;
+ uint8_t tmparray[TI_WINLEN], tmparray2[TI_WINLEN];
+ int resid, segresid;
+ int first_pass;
TI_LOCK_ASSERT(sc);
@@ -577,7 +559,7 @@ ti_copy_mem(sc, tigon_addr, len, buf, us
bus_space_read_region_4(sc->ti_btag,
sc->ti_bhandle, ti_offset,
- (u_int32_t *)tmparray,
+ (uint32_t *)tmparray,
segsize >> 2);
if (useraddr) {
/*
@@ -624,7 +606,7 @@ ti_copy_mem(sc, tigon_addr, len, buf, us
bus_space_write_region_4(sc->ti_btag,
sc->ti_bhandle, ti_offset,
- (u_int32_t *)tmparray,
+ (uint32_t *)tmparray,
segsize >> 2);
}
segptr += segsize;
@@ -636,7 +618,7 @@ ti_copy_mem(sc, tigon_addr, len, buf, us
* Handle leftover, non-word-aligned bytes.
*/
if (resid != 0) {
- u_int32_t tmpval, tmpval2;
+ uint32_t tmpval, tmpval2;
bus_size_t ti_offset;
/*
@@ -704,17 +686,13 @@ ti_copy_mem(sc, tigon_addr, len, buf, us
}
static int
-ti_copy_scratch(sc, tigon_addr, len, buf, useraddr, readdata, cpu)
- struct ti_softc *sc;
- u_int32_t tigon_addr, len;
- caddr_t buf;
- int useraddr, readdata;
- int cpu;
-{
- u_int32_t segptr;
- int cnt;
- u_int32_t tmpval, tmpval2;
- caddr_t ptr;
+ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len,
+ caddr_t buf, int useraddr, int readdata, int cpu)
+{
+ uint32_t segptr;
+ int cnt;
+ uint32_t tmpval, tmpval2;
+ caddr_t ptr;
TI_LOCK_ASSERT(sc);
@@ -802,14 +780,10 @@ ti_copy_scratch(sc, tigon_addr, len, buf
}
static int
-ti_bcopy_swap(src, dst, len, swap_type)
- const void *src;
- void *dst;
- size_t len;
- ti_swap_type swap_type;
+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) {
@@ -824,11 +798,11 @@ ti_bcopy_swap(src, dst, len, swap_type)
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;
@@ -844,8 +818,7 @@ ti_bcopy_swap(src, dst, len, swap_type)
* Tigon 2.
*/
static void
-ti_loadfw(sc)
- struct ti_softc *sc;
+ti_loadfw(struct ti_softc *sc)
{
TI_LOCK_ASSERT(sc);
@@ -902,14 +875,12 @@ ti_loadfw(sc)
* Send the NIC a command via the command ring.
*/
static void
-ti_cmd(sc, cmd)
- struct ti_softc *sc;
- struct ti_cmd_desc *cmd;
+ti_cmd(struct ti_softc *sc, struct ti_cmd_desc *cmd)
{
- int index;
+ 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;
@@ -920,21 +891,17 @@ ti_cmd(sc, cmd)
* number of command slots to include after the initial command.
*/
static void
-ti_cmd_ext(sc, cmd, arg, len)
- struct ti_softc *sc;
- struct ti_cmd_desc *cmd;
- caddr_t arg;
- int len;
+ti_cmd_ext(struct ti_softc *sc, struct ti_cmd_desc *cmd, caddr_t arg, int len)
{
- int index;
- int i;
+ int index;
+ 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);
@@ -945,10 +912,9 @@ ti_cmd_ext(sc, cmd, arg, len)
* Handle events that have triggered interrupts.
*/
static void
-ti_handle_events(sc)
- struct ti_softc *sc;
+ti_handle_events(struct ti_softc *sc)
{
- struct ti_event_desc *e;
+ struct ti_event_desc *e;
if (sc->ti_rdata->ti_event_ring == NULL)
return;
@@ -1089,12 +1055,11 @@ ti_free_dmamaps(struct ti_softc *sc)
*/
static int
-ti_alloc_jumbo_mem(sc)
- struct ti_softc *sc;
+ti_alloc_jumbo_mem(struct ti_softc *sc)
{
- caddr_t ptr;
- int i;
- struct ti_jpool_entry *entry;
+ struct ti_jpool_entry *entry;
+ caddr_t ptr;
+ int i;
/*
* Grab a big chunk o' storage. Since we are chopping this pool up
@@ -1152,10 +1117,9 @@ ti_alloc_jumbo_mem(sc)
/*
* Allocate a jumbo buffer.
*/
-static void *ti_jalloc(sc)
- struct ti_softc *sc;
+static void *ti_jalloc(struct ti_softc *sc)
{
- struct ti_jpool_entry *entry;
+ struct ti_jpool_entry *entry;
entry = SLIST_FIRST(&sc->ti_jfree_listhead);
@@ -1173,13 +1137,11 @@ static void *ti_jalloc(sc)
* Release a jumbo buffer.
*/
static void
-ti_jfree(buf, args)
- void *buf;
- void *args;
-{
- struct ti_softc *sc;
- int i;
- struct ti_jpool_entry *entry;
+ti_jfree(void *buf, void *args)
+{
+ struct ti_softc *sc;
+ int i;
+ struct ti_jpool_entry *entry;
/* Extract the softc struct pointer. */
sc = (struct ti_softc *)args;
@@ -1205,8 +1167,7 @@ ti_jfree(buf, args)
#else
static int
-ti_alloc_jumbo_mem(sc)
- struct ti_softc *sc;
+ti_alloc_jumbo_mem(struct ti_softc *sc)
{
/*
@@ -1237,16 +1198,13 @@ ti_alloc_jumbo_mem(sc)
* Intialize a standard receive ring descriptor.
*/
static int
-ti_newbuf_std(sc, i, m)
- struct ti_softc *sc;
- int i;
- struct mbuf *m;
-{
- bus_dmamap_t map;
- bus_dma_segment_t segs;
- struct mbuf *m_new = NULL;
- struct ti_rx_desc *r;
- int nsegs;
+ti_newbuf_std(struct ti_softc *sc, int i, struct mbuf *m)
+{
+ bus_dmamap_t map;
+ bus_dma_segment_t segs;
+ struct mbuf *m_new = NULL;
+ struct ti_rx_desc *r;
+ int nsegs;
nsegs = 0;
if (m == NULL) {
@@ -1292,16 +1250,13 @@ ti_newbuf_std(sc, i, m)
* the Tigon 2.
*/
static int
-ti_newbuf_mini(sc, i, m)
- struct ti_softc *sc;
- int i;
- struct mbuf *m;
-{
- bus_dma_segment_t segs;
- bus_dmamap_t map;
- struct mbuf *m_new = NULL;
- struct ti_rx_desc *r;
- int nsegs;
+ti_newbuf_mini(struct ti_softc *sc, int i, struct mbuf *m)
+{
+ bus_dma_segment_t segs;
+ bus_dmamap_t map;
+ struct mbuf *m_new = NULL;
+ struct ti_rx_desc *r;
+ int nsegs;
nsegs = 0;
if (m == NULL) {
@@ -1344,19 +1299,16 @@ ti_newbuf_mini(sc, i, m)
* a jumbo buffer from the pool managed internally by the driver.
*/
static int
-ti_newbuf_jumbo(sc, i, m)
- struct ti_softc *sc;
- int i;
- struct mbuf *m;
-{
- bus_dmamap_t map;
- struct mbuf *m_new = NULL;
- struct ti_rx_desc *r;
- int nsegs;
- bus_dma_segment_t segs;
+ti_newbuf_jumbo(struct ti_softc *sc, int i, struct mbuf *m)
+{
+ bus_dmamap_t map;
+ struct mbuf *m_new = NULL;
+ struct ti_rx_desc *r;
+ int nsegs;
+ bus_dma_segment_t segs;
if (m == NULL) {
- caddr_t *buf = NULL;
+ caddr_t *buf = NULL;
/* Allocate the mbuf. */
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -1376,7 +1328,7 @@ ti_newbuf_jumbo(sc, i, m)
/* Attach the buffer to the mbuf. */
m_new->m_data = (void *) buf;
m_new->m_len = m_new->m_pkthdr.len = TI_JUMBO_FRAMELEN;
- MEXTADD(m_new, buf, TI_JUMBO_FRAMELEN, ti_jfree,
+ MEXTADD(m_new, buf, TI_JUMBO_FRAMELEN, ti_jfree, buf,
(struct ti_softc *)sc, 0, EXT_NET_DRV);
} else {
m_new = m;
@@ -1417,30 +1369,26 @@ ti_newbuf_jumbo(sc, i, m)
#define TCP_HDR_LEN (52 + sizeof(struct ether_header))
#define UDP_HDR_LEN (28 + sizeof(struct ether_header))
#define NFS_HDR_LEN (UDP_HDR_LEN)
-static int HDR_LEN = TCP_HDR_LEN;
-
+static int HDR_LEN = TCP_HDR_LEN;
/*
* Initialize a jumbo receive ring descriptor. This allocates
* a jumbo buffer from the pool managed internally by the driver.
*/
static int
-ti_newbuf_jumbo(sc, idx, m_old)
- struct ti_softc *sc;
- int idx;
- struct mbuf *m_old;
-{
- bus_dmamap_t map;
- struct mbuf *cur, *m_new = NULL;
- struct mbuf *m[3] = {NULL, NULL, NULL};
- struct ti_rx_desc_ext *r;
- vm_page_t frame;
- static int color;
- /* 1 extra buf to make nobufs easy*/
- struct sf_buf *sf[3] = {NULL, NULL, NULL};
- int i;
- bus_dma_segment_t segs[4];
- int nsegs;
+ti_newbuf_jumbo(struct ti_softc *sc, int idx, struct mbuf *m_old)
+{
+ bus_dmamap_t map;
+ struct mbuf *cur, *m_new = NULL;
+ struct mbuf *m[3] = {NULL, NULL, NULL};
+ struct ti_rx_desc_ext *r;
+ vm_page_t frame;
+ static int color;
+ /* 1 extra buf to make nobufs easy*/
+ struct sf_buf *sf[3] = {NULL, NULL, NULL};
+ int i;
+ bus_dma_segment_t segs[4];
+ int nsegs;
if (m_old != NULL) {
m_new = m_old;
@@ -1573,8 +1521,6 @@ nobufs:
}
#endif
-
-
/*
* The standard receive ring has 512 entries in it. At 2K per mbuf cluster,
* that's 1MB or memory, which is a lot. For now, we fill only the first
@@ -1582,11 +1528,10 @@ nobufs:
* the NIC.
*/
static int
-ti_init_rx_ring_std(sc)
- struct ti_softc *sc;
+ti_init_rx_ring_std(struct ti_softc *sc)
{
- int i;
- struct ti_cmd_desc cmd;
+ int i;
+ struct ti_cmd_desc cmd;
for (i = 0; i < TI_SSLOTS; i++) {
if (ti_newbuf_std(sc, i, NULL) == ENOBUFS)
@@ -1600,11 +1545,10 @@ ti_init_rx_ring_std(sc)
}
static void
-ti_free_rx_ring_std(sc)
- struct ti_softc *sc;
+ti_free_rx_ring_std(struct ti_softc *sc)
{
- bus_dmamap_t map;
- int i;
+ bus_dmamap_t map;
+ int i;
for (i = 0; i < TI_STD_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_std_chain[i] != NULL) {
@@ -1621,11 +1565,10 @@ ti_free_rx_ring_std(sc)
}
static int
-ti_init_rx_ring_jumbo(sc)
- struct ti_softc *sc;
+ti_init_rx_ring_jumbo(struct ti_softc *sc)
{
- int i;
- struct ti_cmd_desc cmd;
+ struct ti_cmd_desc cmd;
+ int i;
for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
if (ti_newbuf_jumbo(sc, i, NULL) == ENOBUFS)
@@ -1639,11 +1582,10 @@ ti_init_rx_ring_jumbo(sc)
}
static void
-ti_free_rx_ring_jumbo(sc)
- struct ti_softc *sc;
+ti_free_rx_ring_jumbo(struct ti_softc *sc)
{
- bus_dmamap_t map;
- int i;
+ bus_dmamap_t map;
+ int i;
for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_jumbo_chain[i] != NULL) {
@@ -1660,10 +1602,9 @@ ti_free_rx_ring_jumbo(sc)
}
static int
-ti_init_rx_ring_mini(sc)
- struct ti_softc *sc;
+ti_init_rx_ring_mini(struct ti_softc *sc)
{
- int i;
+ int i;
for (i = 0; i < TI_MSLOTS; i++) {
if (ti_newbuf_mini(sc, i, NULL) == ENOBUFS)
@@ -1677,11 +1618,10 @@ ti_init_rx_ring_mini(sc)
}
static void
-ti_free_rx_ring_mini(sc)
- struct ti_softc *sc;
+ti_free_rx_ring_mini(struct ti_softc *sc)
{
- bus_dmamap_t map;
- int i;
+ bus_dmamap_t map;
+ int i;
for (i = 0; i < TI_MINI_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_mini_chain[i] != NULL) {
@@ -1698,11 +1638,10 @@ ti_free_rx_ring_mini(sc)
}
static void
-ti_free_tx_ring(sc)
- struct ti_softc *sc;
+ti_free_tx_ring(struct ti_softc *sc)
{
- struct ti_txdesc *txd;
- int i;
+ struct ti_txdesc *txd;
+ int i;
if (sc->ti_rdata->ti_tx_ring == NULL)
return;
@@ -1722,11 +1661,10 @@ ti_free_tx_ring(sc)
}
static int
-ti_init_tx_ring(sc)
- struct ti_softc *sc;
+ti_init_tx_ring(struct ti_softc *sc)
{
- struct ti_txdesc *txd;
- int i;
+ struct ti_txdesc *txd;
+ int i;
STAILQ_INIT(&sc->ti_cdata.ti_txfreeq);
STAILQ_INIT(&sc->ti_cdata.ti_txbusyq);
@@ -1747,15 +1685,13 @@ ti_init_tx_ring(sc)
* work.
*/
static void
-ti_add_mcast(sc, addr)
- struct ti_softc *sc;
- struct ether_addr *addr;
-{
- struct ti_cmd_desc cmd;
- u_int16_t *m;
- u_int32_t ext[2] = {0, 0};
+ti_add_mcast(struct ti_softc *sc, struct ether_addr *addr)
+{
+ struct ti_cmd_desc cmd;
+ 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:
@@ -1775,15 +1711,13 @@ ti_add_mcast(sc, addr)
}
static void
-ti_del_mcast(sc, addr)
- struct ti_softc *sc;
- struct ether_addr *addr;
-{
- struct ti_cmd_desc cmd;
- u_int16_t *m;
- u_int32_t ext[2] = {0, 0};
+ti_del_mcast(struct ti_softc *sc, struct ether_addr *addr)
+{
+ struct ti_cmd_desc cmd;
+ 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:
@@ -1817,14 +1751,13 @@ ti_del_mcast(sc, addr)
* any given time.
*/
static void
-ti_setmulti(sc)
- struct ti_softc *sc;
+ti_setmulti(struct ti_softc *sc)
{
- struct ifnet *ifp;
- struct ifmultiaddr *ifma;
- struct ti_cmd_desc cmd;
- struct ti_mc_entry *mc;
- u_int32_t intrs;
+ struct ifnet *ifp;
+ struct ifmultiaddr *ifma;
+ struct ti_cmd_desc cmd;
+ struct ti_mc_entry *mc;
+ uint32_t intrs;
TI_LOCK_ASSERT(sc);
@@ -1877,9 +1810,9 @@ ti_setmulti(sc)
* around it on the Tigon 2 by setting a bit in the PCI state register,
* but for the Tigon 1 we must give up and abort the interface attach.
*/
-static int ti_64bitslot_war(sc)
- struct ti_softc *sc;
+static int ti_64bitslot_war(struct ti_softc *sc)
{
+
if (!(CSR_READ_4(sc, TI_PCI_STATE) & TI_PCISTATE_32BIT_BUS)) {
CSR_WRITE_4(sc, 0x600, 0);
CSR_WRITE_4(sc, 0x604, 0);
@@ -1903,12 +1836,11 @@ static int ti_64bitslot_war(sc)
* self-test results.
*/
static int
-ti_chipinit(sc)
- struct ti_softc *sc;
+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;
@@ -2057,13 +1989,12 @@ ti_chipinit(sc)
* start the CPU(s) running.
*/
static int
-ti_gibinit(sc)
- struct ti_softc *sc;
+ti_gibinit(struct ti_softc *sc)
{
- struct ti_rcb *rcb;
- int i;
- struct ifnet *ifp;
- uint32_t rdphys;
+ struct ifnet *ifp;
+ struct ti_rcb *rcb;
+ uint32_t rdphys;
+ int i;
TI_LOCK_ASSERT(sc);
@@ -2244,16 +2175,15 @@ ti_rdata_cb(void *arg, bus_dma_segment_t
sc->ti_rdata_phys = segs[0].ds_addr;
return;
}
-
+
/*
* Probe for a Tigon chip. Check the PCI vendor and device IDs
* against our list and return its name if we find a match.
*/
static int
-ti_probe(dev)
- device_t dev;
+ti_probe(device_t dev)
{
- const struct ti_type *t;
+ const struct ti_type *t;
t = ti_devs;
@@ -2270,13 +2200,12 @@ ti_probe(dev)
}
static int
-ti_attach(dev)
- device_t dev;
+ti_attach(device_t dev)
{
- struct ifnet *ifp;
- struct ti_softc *sc;
- int error = 0, rid;
- u_char eaddr[6];
+ struct ifnet *ifp;
+ struct ti_softc *sc;
+ int error = 0, rid;
+ u_char eaddr[6];
sc = device_get_softc(dev);
sc->ti_unit = device_get_unit(dev);
@@ -2559,11 +2488,10 @@ fail:
* allocated.
*/
static int
-ti_detach(dev)
- device_t dev;
+ti_detach(device_t dev)
{
- struct ti_softc *sc;
- struct ifnet *ifp;
+ struct ti_softc *sc;
+ struct ifnet *ifp;
sc = device_get_softc(dev);
if (sc->dev)
@@ -2686,23 +2614,22 @@ ti_hdr_split(struct mbuf *top, int hdr_l
*/
static void
-ti_rxeof(sc)
- struct ti_softc *sc;
+ti_rxeof(struct ti_softc *sc)
{
- bus_dmamap_t map;
- struct ifnet *ifp;
- struct ti_cmd_desc cmd;
+ struct ifnet *ifp;
+ bus_dmamap_t map;
+ struct ti_cmd_desc cmd;
TI_LOCK_ASSERT(sc);
ifp = sc->ti_ifp;
while (sc->ti_rx_saved_considx != sc->ti_return_prodidx.ti_idx) {
- struct ti_rx_desc *cur_rx;
- u_int32_t rxidx;
- struct mbuf *m = NULL;
- u_int16_t vlan_tag = 0;
- int have_tag = 0;
+ struct ti_rx_desc *cur_rx;
+ struct mbuf *m = NULL;
+ uint32_t rxidx;
+ uint16_t vlan_tag = 0;
+ int have_tag = 0;
cur_rx =
&sc->ti_rdata->ti_rx_return_ring[sc->ti_rx_saved_considx];
@@ -2820,14 +2747,13 @@ ti_rxeof(sc)
}
static void
-ti_txeof(sc)
- struct ti_softc *sc;
+ti_txeof(struct ti_softc *sc)
{
- struct ti_txdesc *txd;
- struct ti_tx_desc txdesc;
- struct ti_tx_desc *cur_tx = NULL;
- struct ifnet *ifp;
- int idx;
+ struct ti_txdesc *txd;
+ struct ti_tx_desc txdesc;
+ struct ti_tx_desc *cur_tx = NULL;
+ struct ifnet *ifp;
+ int idx;
ifp = sc->ti_ifp;
@@ -2867,11 +2793,10 @@ ti_txeof(sc)
}
static void
-ti_intr(xsc)
- void *xsc;
+ti_intr(void *xsc)
{
- struct ti_softc *sc;
- struct ifnet *ifp;
+ struct ti_softc *sc;
+ struct ifnet *ifp;
sc = xsc;
TI_LOCK(sc);
@@ -2910,10 +2835,9 @@ ti_intr(xsc)
}
static void
-ti_stats_update(sc)
- struct ti_softc *sc;
+ti_stats_update(struct ti_softc *sc)
{
- struct ifnet *ifp;
+ struct ifnet *ifp;
ifp = sc->ti_ifp;
@@ -2936,17 +2860,15 @@ ti_stats_update(sc)
* pointers to descriptors.
*/
static int
-ti_encap(sc, m_head)
- struct ti_softc *sc;
- struct mbuf **m_head;
-{
- struct ti_txdesc *txd;
- struct ti_tx_desc *f;
- struct ti_tx_desc txdesc;
- struct mbuf *m;
- bus_dma_segment_t txsegs[TI_MAXTXSEGS];
- u_int16_t csum_flags;
- int error, frag, i, nseg;
+ti_encap(struct ti_softc *sc, struct mbuf **m_head)
+{
+ struct ti_txdesc *txd;
+ struct ti_tx_desc *f;
+ struct ti_tx_desc txdesc;
+ struct mbuf *m;
+ bus_dma_segment_t txsegs[TI_MAXTXSEGS];
+ uint16_t csum_flags;
+ int error, frag, i, nseg;
if ((txd = STAILQ_FIRST(&sc->ti_cdata.ti_txfreeq)) == NULL)
return (ENOBUFS);
@@ -3041,10 +2963,9 @@ ti_encap(sc, m_head)
}
static void
-ti_start(ifp)
- struct ifnet *ifp;
+ti_start(struct ifnet *ifp)
{
- struct ti_softc *sc;
+ struct ti_softc *sc;
sc = ifp->if_softc;
TI_LOCK(sc);
@@ -3057,12 +2978,11 @@ ti_start(ifp)
* to the mbuf data regions directly in the transmit descriptors.
*/
static void
-ti_start_locked(ifp)
- struct ifnet *ifp;
+ti_start_locked(struct ifnet *ifp)
{
- struct ti_softc *sc;
- struct mbuf *m_head = NULL;
- int enq = 0;
+ struct ti_softc *sc;
+ struct mbuf *m_head = NULL;
+ int enq = 0;
sc = ifp->if_softc;
@@ -3123,10 +3043,9 @@ ti_start_locked(ifp)
}
static void
-ti_init(xsc)
- void *xsc;
+ti_init(void *xsc)
{
- struct ti_softc *sc;
+ struct ti_softc *sc;
sc = xsc;
TI_LOCK(sc);
@@ -3135,10 +3054,9 @@ ti_init(xsc)
}
static void
-ti_init_locked(xsc)
- void *xsc;
+ti_init_locked(void *xsc)
{
- struct ti_softc *sc = xsc;
+ struct ti_softc *sc = xsc;
/* Cancel pending I/O and flush buffers. */
ti_stop(sc);
@@ -3150,14 +3068,13 @@ ti_init_locked(xsc)
}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
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"
