Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u_intNN_t -> uintNN_t

This commit is contained in:
tsutsui 2006-04-16 00:38:59 +00:00
parent cae22e3811
commit a5abba7c76
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/ic/smc83c170.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smc83c170.c,v 1.62 2006/04/16 00:35:10 tsutsui Exp $ */ /* $NetBSD: smc83c170.c,v 1.63 2006/04/16 00:38:59 tsutsui Exp $ */
/*- /*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.62 2006/04/16 00:35:10 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.63 2006/04/16 00:38:59 tsutsui Exp $");
#include "bpfilter.h" #include "bpfilter.h"
@ -89,12 +89,12 @@ void epic_shutdown(void *);
void epic_reset(struct epic_softc *); void epic_reset(struct epic_softc *);
void epic_rxdrain(struct epic_softc *); void epic_rxdrain(struct epic_softc *);
int epic_add_rxbuf(struct epic_softc *, int); int epic_add_rxbuf(struct epic_softc *, int);
void epic_read_eeprom(struct epic_softc *, int, int, u_int16_t *); void epic_read_eeprom(struct epic_softc *, int, int, uint16_t *);
void epic_set_mchash(struct epic_softc *); void epic_set_mchash(struct epic_softc *);
void epic_fixup_clock_source(struct epic_softc *); void epic_fixup_clock_source(struct epic_softc *);
int epic_mii_read(struct device *, int, int); int epic_mii_read(struct device *, int, int);
void epic_mii_write(struct device *, int, int, int); void epic_mii_write(struct device *, int, int, int);
int epic_mii_wait(struct epic_softc *, u_int32_t); int epic_mii_wait(struct epic_softc *, uint32_t);
void epic_tick(void *); void epic_tick(void *);
void epic_statchg(struct device *); void epic_statchg(struct device *);
@ -121,8 +121,8 @@ epic_attach(sc)
int rseg, error, miiflags; int rseg, error, miiflags;
u_int i; u_int i;
bus_dma_segment_t seg; bus_dma_segment_t seg;
u_int8_t enaddr[ETHER_ADDR_LEN], devname[12 + 1]; uint8_t enaddr[ETHER_ADDR_LEN], devname[12 + 1];
u_int16_t myea[ETHER_ADDR_LEN / 2], mydevname[6]; uint16_t myea[ETHER_ADDR_LEN / 2], mydevname[6];
char *nullbuf; char *nullbuf;
callout_init(&sc->sc_mii_callout); callout_init(&sc->sc_mii_callout);
@ -615,7 +615,7 @@ epic_intr(arg)
struct epic_txdesc *txd; struct epic_txdesc *txd;
struct epic_descsoft *ds; struct epic_descsoft *ds;
struct mbuf *m; struct mbuf *m;
u_int32_t intstat, rxstatus, txstatus; uint32_t intstat, rxstatus, txstatus;
int i, claimed = 0; int i, claimed = 0;
u_int len; u_int len;
@ -929,10 +929,10 @@ epic_init(ifp)
struct epic_softc *sc = ifp->if_softc; struct epic_softc *sc = ifp->if_softc;
bus_space_tag_t st = sc->sc_st; bus_space_tag_t st = sc->sc_st;
bus_space_handle_t sh = sc->sc_sh; bus_space_handle_t sh = sc->sc_sh;
u_int8_t *enaddr = LLADDR(ifp->if_sadl); uint8_t *enaddr = LLADDR(ifp->if_sadl);
struct epic_txdesc *txd; struct epic_txdesc *txd;
struct epic_descsoft *ds; struct epic_descsoft *ds;
u_int32_t genctl, reg0; uint32_t genctl, reg0;
int i, error = 0; int i, error = 0;
/* /*
@ -1113,7 +1113,7 @@ epic_stop(ifp, disable)
bus_space_tag_t st = sc->sc_st; bus_space_tag_t st = sc->sc_st;
bus_space_handle_t sh = sc->sc_sh; bus_space_handle_t sh = sc->sc_sh;
struct epic_descsoft *ds; struct epic_descsoft *ds;
u_int32_t reg; uint32_t reg;
int i; int i;
/* /*
@ -1169,11 +1169,11 @@ void
epic_read_eeprom(sc, word, wordcnt, data) epic_read_eeprom(sc, word, wordcnt, data)
struct epic_softc *sc; struct epic_softc *sc;
int word, wordcnt; int word, wordcnt;
u_int16_t *data; uint16_t *data;
{ {
bus_space_tag_t st = sc->sc_st; bus_space_tag_t st = sc->sc_st;
bus_space_handle_t sh = sc->sc_sh; bus_space_handle_t sh = sc->sc_sh;
u_int16_t reg; uint16_t reg;
int i, x; int i, x;
#define EEPROM_WAIT_READY(st, sh) \ #define EEPROM_WAIT_READY(st, sh) \
@ -1299,7 +1299,7 @@ epic_set_mchash(sc)
struct ifnet *ifp = &sc->sc_ethercom.ec_if; struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct ether_multi *enm; struct ether_multi *enm;
struct ether_multistep step; struct ether_multistep step;
u_int32_t hash, mchash[4]; uint32_t hash, mchash[4];
/* /*
* Set up the multicast address filter by passing all multicast * Set up the multicast address filter by passing all multicast
@ -1363,7 +1363,7 @@ epic_set_mchash(sc)
int int
epic_mii_wait(sc, rw) epic_mii_wait(sc, rw)
struct epic_softc *sc; struct epic_softc *sc;
u_int32_t rw; uint32_t rw;
{ {
int i; int i;
@ -1430,7 +1430,7 @@ epic_statchg(self)
struct device *self; struct device *self;
{ {
struct epic_softc *sc = (struct epic_softc *)self; struct epic_softc *sc = (struct epic_softc *)self;
u_int32_t txcon, miicfg; uint32_t txcon, miicfg;
/* /*
* Update loopback bits in TXCON to reflect duplex mode. * Update loopback bits in TXCON to reflect duplex mode.
@ -1485,7 +1485,7 @@ epic_mediachange(ifp)
struct mii_data *mii = &sc->sc_mii; struct mii_data *mii = &sc->sc_mii;
struct ifmedia *ifm = &mii->mii_media; struct ifmedia *ifm = &mii->mii_media;
int media = ifm->ifm_cur->ifm_media; int media = ifm->ifm_cur->ifm_media;
u_int32_t miicfg; uint32_t miicfg;
struct mii_softc *miisc; struct mii_softc *miisc;
int cfg; int cfg;

24
sys/dev/ic/smc83c170reg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: smc83c170reg.h,v 1.10 2005/12/11 12:21:28 christos Exp $ */ /* $NetBSD: smc83c170reg.h,v 1.11 2006/04/16 00:38:59 tsutsui Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -49,10 +49,10 @@
* EPIC transmit descriptor. Must be 4-byte aligned. * EPIC transmit descriptor. Must be 4-byte aligned.
*/ */
struct epic_txdesc { struct epic_txdesc {
u_int32_t et_txstatus; /* transmit status; see below */ uint32_t et_txstatus; /* transmit status; see below */
u_int32_t et_bufaddr; /* buffer address */ uint32_t et_bufaddr; /* buffer address */
u_int32_t et_control; /* control word; see below */ uint32_t et_control; /* control word; see below */
u_int32_t et_nextdesc; /* next descriptor pointer */ uint32_t et_nextdesc; /* next descriptor pointer */
}; };
/* et_txstatus */ /* et_txstatus */
@ -86,10 +86,10 @@ struct epic_txdesc {
* EPIC receive descriptor. Must be 4-byte aligned. * EPIC receive descriptor. Must be 4-byte aligned.
*/ */
struct epic_rxdesc { struct epic_rxdesc {
u_int32_t er_rxstatus; /* receive status; see below */ uint32_t er_rxstatus; /* receive status; see below */
u_int32_t er_bufaddr; /* buffer address */ uint32_t er_bufaddr; /* buffer address */
u_int32_t er_control; /* control word; see below */ uint32_t er_control; /* control word; see below */
u_int32_t er_nextdesc; /* next descriptor pointer */ uint32_t er_nextdesc; /* next descriptor pointer */
}; };
/* er_rxstatus */ /* er_rxstatus */
@ -126,10 +126,10 @@ struct epic_rxdesc {
* EPIC fraglist descriptor. * EPIC fraglist descriptor.
*/ */
struct epic_fraglist { struct epic_fraglist {
u_int32_t ef_nfrags; /* number of frags in list */ uint32_t ef_nfrags; /* number of frags in list */
struct { struct {
u_int32_t ef_addr; /* address of frag */ uint32_t ef_addr; /* address of frag */
u_int32_t ef_length; /* length of frag */ uint32_t ef_length; /* length of frag */
} ef_frags[EPIC_NFRAGS]; } ef_frags[EPIC_NFRAGS];
}; };