summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2009-04-16 14:08:18 +0000
committertsutsui <tsutsui@NetBSD.org>2009-04-16 14:08:18 +0000
commit04a4566adebbcbe2a8f015efb617828c32a591a2 (patch)
tree29b9e84a4c76632f37116231f241f8c59acb5d68 /sys/dev
parentdaebba810f55db8af4ad67af88405118c7d62f9c (diff)
u_intNN_t -> uintNN_t
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/hme.c36
-rw-r--r--sys/dev/ic/hmereg.h14
-rw-r--r--sys/dev/ic/hmevar.h4
3 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 90a20d65d61..81fa7ea4ea2 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.74 2009/03/29 07:33:52 tsutsui Exp $ */
+/* $NetBSD: hme.c,v 1.75 2009/04/16 14:08:18 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.74 2009/03/29 07:33:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.75 2009/04/16 14:08:18 tsutsui Exp $");
/* #define HMEDEBUG */
@@ -360,7 +360,7 @@ hme_stop(struct hme_softc *sc, bool chip_only)
(HME_SEB_RESET_ETX | HME_SEB_RESET_ERX));
for (n = 0; n < 20; n++) {
- u_int32_t v = bus_space_read_4(t, seb, HME_SEBI_RESET);
+ uint32_t v = bus_space_read_4(t, seb, HME_SEBI_RESET);
if ((v & (HME_SEB_RESET_ETX | HME_SEB_RESET_ERX)) == 0)
return;
DELAY(20);
@@ -458,8 +458,8 @@ hme_init(struct hme_softc *sc)
bus_space_handle_t etx = sc->sc_etx;
bus_space_handle_t erx = sc->sc_erx;
bus_space_handle_t mac = sc->sc_mac;
- u_int8_t *ea;
- u_int32_t v;
+ uint8_t *ea;
+ uint32_t v;
int rc;
/*
@@ -669,7 +669,7 @@ hme_put(struct hme_softc *sc, int ri, struct mbuf *m)
* we copy into clusters.
*/
struct mbuf *
-hme_get(struct hme_softc *sc, int ri, u_int32_t flags)
+hme_get(struct hme_softc *sc, int ri, uint32_t flags)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct mbuf *m, *m0, *newm;
@@ -831,7 +831,7 @@ bad:
* Pass a packet to the higher levels.
*/
void
-hme_read(struct hme_softc *sc, int ix, u_int32_t flags)
+hme_read(struct hme_softc *sc, int ix, uint32_t flags)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct mbuf *m;
@@ -1028,7 +1028,7 @@ hme_rint(struct hme_softc *sc)
void *xdr = sc->sc_rb.rb_rxd;
unsigned int nrbuf = sc->sc_rb.rb_nrbuf;
unsigned int ri;
- u_int32_t flags;
+ uint32_t flags;
ri = sc->sc_rb.rb_rdtail;
@@ -1067,7 +1067,7 @@ hme_eint(struct hme_softc *sc, u_int status)
if ((status & HME_SEB_STAT_MIFIRQ) != 0) {
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mif = sc->sc_mif;
- u_int32_t cf, st, sm;
+ uint32_t cf, st, sm;
cf = bus_space_read_4(t, mif, HME_MIFI_CFG);
st = bus_space_read_4(t, mif, HME_MIFI_STAT);
sm = bus_space_read_4(t, mif, HME_MIFI_SM);
@@ -1087,7 +1087,7 @@ hme_intr(void *v)
struct hme_softc *sc = (struct hme_softc *)v;
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t seb = sc->sc_seb;
- u_int32_t status;
+ uint32_t status;
int r = 0;
status = bus_space_read_4(t, seb, HME_SEBI_STAT);
@@ -1130,7 +1130,7 @@ hme_mifinit(struct hme_softc *sc)
bus_space_handle_t mif = sc->sc_mif;
bus_space_handle_t mac = sc->sc_mac;
int instance, phy;
- u_int32_t v;
+ uint32_t v;
if (sc->sc_mii.mii_media.ifm_cur != NULL) {
instance = IFM_INST(sc->sc_mii.mii_media.ifm_cur->ifm_media);
@@ -1163,7 +1163,7 @@ hme_mii_readreg(struct device *self, int phy, int reg)
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mif = sc->sc_mif;
bus_space_handle_t mac = sc->sc_mac;
- u_int32_t v, xif_cfg, mifi_cfg;
+ uint32_t v, xif_cfg, mifi_cfg;
int n;
/* We can at most have two PHYs */
@@ -1234,7 +1234,7 @@ hme_mii_writereg(struct device *self, int phy, int reg, int val)
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mif = sc->sc_mif;
bus_space_handle_t mac = sc->sc_mac;
- u_int32_t v, xif_cfg, mifi_cfg;
+ uint32_t v, xif_cfg, mifi_cfg;
int n;
/* We can at most have two PHYs */
@@ -1300,7 +1300,7 @@ hme_mii_statchg(struct device *dev)
struct hme_softc *sc = (void *)dev;
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mac = sc->sc_mac;
- u_int32_t v;
+ uint32_t v;
#ifdef HMEDEBUG
if (sc->sc_debug)
@@ -1332,7 +1332,7 @@ hme_mediachange(struct ifnet *ifp)
int instance = IFM_INST(sc->sc_mii.mii_media.ifm_cur->ifm_media);
int phy = sc->sc_phys[instance];
int rc;
- u_int32_t v;
+ uint32_t v;
#ifdef HMEDEBUG
if (sc->sc_debug)
@@ -1487,9 +1487,9 @@ hme_setladrf(struct hme_softc *sc)
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mac = sc->sc_mac;
u_char *cp;
- u_int32_t crc;
- u_int32_t hash[4];
- u_int32_t v;
+ uint32_t crc;
+ uint32_t hash[4];
+ uint32_t v;
int len;
/* Clear hash table */
diff --git a/sys/dev/ic/hmereg.h b/sys/dev/ic/hmereg.h
index 09d5611b89d..5da5f0ac89d 100644
--- a/sys/dev/ic/hmereg.h
+++ b/sys/dev/ic/hmereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hmereg.h,v 1.20 2008/04/28 20:23:50 martin Exp $ */
+/* $NetBSD: hmereg.h,v 1.21 2009/04/16 14:08:18 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -288,21 +288,21 @@
*/
#ifdef notdef
struct hme_xd {
- volatile u_int32_t xd_flags;
- volatile u_int32_t xd_addr; /* Buffer address (DMA) */
+ volatile uint32_t xd_flags;
+ volatile uint32_t xd_addr; /* Buffer address (DMA) */
};
#endif
#define HME_XD_SIZE 8
#define HME_XD_FLAGS(b, i) ((char *)(b) + ((i) * HME_XD_SIZE) + 0)
#define HME_XD_ADDR(b, i) ((char *)(b) + ((i) * HME_XD_SIZE) + 4)
#define HME_XD_GETFLAGS(p, b, i) \
- (p) ? le32toh(*((u_int32_t *)HME_XD_FLAGS(b,i))) : \
- (*((u_int32_t *)HME_XD_FLAGS(b,i)))
+ (p) ? le32toh(*((uint32_t *)HME_XD_FLAGS(b,i))) : \
+ (*((uint32_t *)HME_XD_FLAGS(b,i)))
#define HME_XD_SETFLAGS(p, b, i, f) do { \
- *((u_int32_t *)HME_XD_FLAGS(b,i)) = ((p) ? htole32((f)) : (f)); \
+ *((uint32_t *)HME_XD_FLAGS(b,i)) = ((p) ? htole32((f)) : (f)); \
} while(/* CONSTCOND */ 0)
#define HME_XD_SETADDR(p, b, i, a) do { \
- *((u_int32_t *)HME_XD_ADDR(b,i)) = ((p) ? htole32((a)) : (a)); \
+ *((uint32_t *)HME_XD_ADDR(b,i)) = ((p) ? htole32((a)) : (a)); \
} while(/* CONSTCOND */ 0)
/* Descriptor control word flag values */
diff --git a/sys/dev/ic/hmevar.h b/sys/dev/ic/hmevar.h
index a10ad6392bb..0ae46633f15 100644
--- a/sys/dev/ic/hmevar.h
+++ b/sys/dev/ic/hmevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hmevar.h,v 1.17 2008/04/28 20:23:50 martin Exp $ */
+/* $NetBSD: hmevar.h,v 1.18 2009/04/16 14:08:18 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@ struct hme_softc {
void *sc_sh; /* shutdownhook cookie */
int sc_ec_capenable;
short sc_if_flags;
- u_int8_t sc_enaddr[ETHER_ADDR_LEN]; /* MAC address */
+ uint8_t sc_enaddr[ETHER_ADDR_LEN]; /* MAC address */
/* Special hardware hooks */
void (*sc_hwreset)(struct hme_softc *);