u_intXX_t -> uintXX_t while I'm here.

6 files changed, 33 insertions, 33 deletions

diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 7cb2573..a860502 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -128,7 +128,7 @@ eeprom_rdy(struct ep_softc *sc)
  * before
  */
 int
-get_e(struct ep_softc *sc, u_int16_t offset, u_int16_t *result)
+get_e(struct ep_softc *sc, uint16_t offset, uint16_t *result)
 {
 
 	if (eeprom_rdy(sc))
@@ -149,11 +149,11 @@ int
 ep_get_macaddr(struct ep_softc *sc, u_char *addr)
 {
 	int i;
-	u_int16_t result;
+	uint16_t result;
 	int error;
-	u_int16_t *macaddr;
+	uint16_t *macaddr;
 
-	macaddr = (u_int16_t *) addr;
+	macaddr = (uint16_t *) addr;
 
 	GO_WINDOW(sc, 0);
 	for (i = EEPROM_NODE_ADDR_0; i <= EEPROM_NODE_ADDR_2; i++) {
@@ -172,7 +172,7 @@ ep_alloc(device_t dev)
 	struct ep_softc *sc = device_get_softc(dev);
 	int rid;
 	int error = 0;
-	u_int16_t result;
+	uint16_t result;
 
 	rid = 0;
 	sc->iobase = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
@@ -221,7 +221,7 @@ bad:
 void
 ep_get_media(struct ep_softc *sc)
 {
-	u_int16_t config;
+	uint16_t config;
 
 	GO_WINDOW(sc, 0);
 	config = CSR_READ_2(sc, EP_W0_CONFIG_CTRL);
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index efe49cf..319b561 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -173,7 +173,7 @@ ep_eisa_attach(device_t dev)
 {
 	struct ep_softc *sc = device_get_softc(dev);
 	struct resource *eisa_io = NULL;
-	u_int32_t eisa_iobase;
+	uint32_t eisa_iobase;
 	int irq;
 	int error = 0;
 	int rid;
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index bd9c5c2..407b689 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #ifdef __i386__
-static u_int16_t get_eeprom_data(int, int);
+static uint16_t get_eeprom_data(int, int);
 static void ep_isa_identify(driver_t *, device_t);
 #endif
 
@@ -65,10 +65,10 @@ static int ep_isa_attach(device_t);
 static int ep_eeprom_cksum(struct ep_softc *);
 
 struct isa_ident {
-	u_int32_t id;
+	uint32_t id;
 	char *name;
 };
-const char *ep_isa_match_id(u_int32_t, struct isa_ident *);
+const char *ep_isa_match_id(uint32_t, struct isa_ident *);
 
 #define ISA_ID_3C509_XXX   0x0506d509
 #define ISA_ID_3C509_TP    0x506d5090
@@ -119,11 +119,11 @@ static struct isa_pnp_id ep_ids[] = {
  * read 16 times getting one bit of data with each read.
  */
 #ifdef __i386__
-static u_int16_t
+static uint16_t
 get_eeprom_data(int id_port, int offset)
 {
 	int i;
-	u_int16_t data = 0;
+	uint16_t data = 0;
 
 	outb(id_port, EEPROM_CMD_RD | offset);
 	DELAY(BIT_DELAY_MULTIPLE * 1000);
@@ -136,7 +136,7 @@ get_eeprom_data(int id_port, int offset)
 #endif
 
 const char *
-ep_isa_match_id(u_int32_t id, struct isa_ident *isa_devs)
+ep_isa_match_id(uint32_t id, struct isa_ident *isa_devs)
 {
 	struct isa_ident *i = isa_devs;
 
@@ -164,10 +164,10 @@ ep_isa_identify(driver_t * driver, device_t parent)
 	int i;
 	int j;
 	const char *desc;
-	u_int16_t data;
-	u_int32_t irq;
-	u_int32_t ioport;
-	u_int32_t isa_id;
+	uint16_t data;
+	uint32_t irq;
+	uint32_t ioport;
+	uint32_t isa_id;
 	device_t child;
 
 	outb(ELINK_ID_PORT, 0);
@@ -356,10 +356,10 @@ ep_eeprom_cksum(struct ep_softc *sc)
 {
 	int i;
 	int error;
-	u_int16_t val;
-	u_int16_t cksum;
-	u_int8_t cksum_high = 0;
-	u_int8_t cksum_low = 0;
+	uint16_t val;
+	uint16_t cksum;
+	uint8_t cksum_high = 0;
+	uint8_t cksum_low = 0;
 
 	error = get_e(sc, 0x0f, &val);
 	if (error)
@@ -374,16 +374,16 @@ ep_eeprom_cksum(struct ep_softc *sc)
 		case 0x08:
 		case 0x09:
 		case 0x0d:
-			cksum_low ^= (u_int8_t) (val & 0x00ff) ^
-			    (u_int8_t)((val & 0xff00) >> 8);
+			cksum_low ^= (uint8_t) (val & 0x00ff) ^
+			    (uint8_t)((val & 0xff00) >> 8);
 			break;
 		default:
-			cksum_high ^= (u_int8_t) (val & 0x00ff) ^
-			    (u_int8_t)((val & 0xff00) >> 8);
+			cksum_high ^= (uint8_t) (val & 0x00ff) ^
+			    (uint8_t)((val & 0xff00) >> 8);
 			break;
 		}
 	}
-	return (cksum != ((u_int16_t)cksum_low | (u_int16_t)(cksum_high << 8)));
+	return (cksum != ((uint16_t)cksum_low | (uint16_t)(cksum_high << 8)));
 }
 
 static device_method_t ep_isa_methods[] = {
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index 3bd1af8..5cb74d4 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.c
@@ -75,7 +75,7 @@ static struct mca_ident ep_mca_devs[] = {
 #define EP_MCA_IOPORT_POS	MCA_ADP_POS(MCA_POS2)
 #define EP_MCA_IOPORT_MASK	0xfc
 #define EP_MCA_IOPORT_SIZE	EP_IOSIZE
-#define EP_MCA_IOPORT(pos)	((((u_int32_t)pos & EP_MCA_IOPORT_MASK) \
+#define EP_MCA_IOPORT(pos)	((((uint32_t)pos & EP_MCA_IOPORT_MASK) \
 					| 0x02) << 8)
 
 #define EP_MCA_IRQ_POS		MCA_ADP_POS(MCA_POS3)
@@ -90,9 +90,9 @@ static int
 ep_mca_probe(device_t dev)
 {
 	const char *desc;
-	u_int32_t iobase = 0;
-	u_int8_t irq = 0;
-	u_int8_t pos;
+	uint32_t iobase = 0;
+	uint8_t irq = 0;
+	uint8_t pos;
 
 	desc = mca_match_id(mca_get_id(dev), ep_mca_devs);
 	if (!desc)
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 163f168..6ef4aa9 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -72,7 +72,7 @@ ep_pccard_probe(device_t dev)
 	struct ep_softc *sc = device_get_softc(dev);
 	struct ep_board *epb = &sc->epb;
 	const char *desc;
-	u_int16_t result;
+	uint16_t result;
 	int error;
 
 	error = ep_alloc(dev);
@@ -180,7 +180,7 @@ static int
 ep_pccard_attach(device_t dev)
 {
 	struct ep_softc *sc = device_get_softc(dev);
-	u_int16_t result;
+	uint16_t result;
 	int error = 0;
 
 	if ((error = ep_alloc(dev))) {
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 6ba7bf4..14a0165 100644
--- a/sys/dev/ep/if_epvar.h
+++ b/sys/dev/ep/if_epvar.h
@@ -79,7 +79,7 @@ int ep_detach(device_t);
 void ep_get_media(struct ep_softc *);
 int ep_attach(struct ep_softc *);
 void ep_intr(void *);
-int get_e(struct ep_softc *, u_int16_t, u_int16_t *);
+int get_e(struct ep_softc *, uint16_t, uint16_t *);
 int ep_get_macaddr(struct ep_softc *, u_char *);
 
 #define CSR_READ_1(sc, off) (bus_space_read_1((sc)->bst, (sc)->bsh, off))