Module Name: src
Committed By: tsutsui
Date: Thu Apr 16 14:08:18 UTC 2009
Modified Files:
src/sys/dev/ic: hme.c hmereg.h hmevar.h
Log Message:
u_intNN_t -> uintNN_t
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/hmereg.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/hmevar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.74 src/sys/dev/ic/hme.c:1.75
--- src/sys/dev/ic/hme.c:1.74 Sun Mar 29 07:33:52 2009
+++ src/sys/dev/ic/hme.c Thu Apr 16 14:08:18 2009
@@ -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_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 @@
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 @@
* 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 @@
* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 */
Index: src/sys/dev/ic/hmereg.h
diff -u src/sys/dev/ic/hmereg.h:1.20 src/sys/dev/ic/hmereg.h:1.21
--- src/sys/dev/ic/hmereg.h:1.20 Mon Apr 28 20:23:50 2008
+++ src/sys/dev/ic/hmereg.h Thu Apr 16 14:08:18 2009
@@ -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 */
Index: src/sys/dev/ic/hmevar.h
diff -u src/sys/dev/ic/hmevar.h:1.17 src/sys/dev/ic/hmevar.h:1.18
--- src/sys/dev/ic/hmevar.h:1.17 Mon Apr 28 20:23:50 2008
+++ src/sys/dev/ic/hmevar.h Thu Apr 16 14:08:18 2009
@@ -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 @@
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 *);
