[src/trunk]: src/sys u_intNN_t -> uintNN_t

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a142b07c796e
branches:  trunk
changeset: 747426:a142b07c796e
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Mon Sep 14 12:49:33 2009 +0000

description:
u_intNN_t -> uintNN_t

diffstat:

 sys/arch/hpcmips/vr/vrecu.c |  10 +++++-----
 sys/dev/ic/i82365.c         |  18 +++++++++---------
 sys/dev/ic/i82365var.h      |   8 ++++----
 sys/dev/isa/i82365_isavar.h |   4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diffs (159 lines):

diff -r e360be5c0a8a -r a142b07c796e sys/arch/hpcmips/vr/vrecu.c
--- a/sys/arch/hpcmips/vr/vrecu.c       Mon Sep 14 12:43:46 2009 +0000
+++ b/sys/arch/hpcmips/vr/vrecu.c       Mon Sep 14 12:49:33 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vrecu.c,v 1.7 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: vrecu.c,v 1.8 2009/09/14 12:49:33 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrecu.c,v 1.7 2008/04/28 20:23:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrecu.c,v 1.8 2009/09/14 12:49:33 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -65,8 +65,8 @@
 
 struct pcic_vrip_softc {
        struct pcic_softc       sc_pcic;        /* real pcic softc */
-       u_int16_t               sc_intr_mask;
-       u_int16_t               sc_intr_valid;
+       uint16_t                sc_intr_mask;
+       uint16_t                sc_intr_valid;
        struct intrhand {
                int     (*ih_fun)(void *);
                void    *ih_arg;
@@ -273,7 +273,7 @@
        struct pcic_softc       *sc = arg;
        struct pcic_vrip_softc  *vsc = arg;
        int                     i;
-       u_int16_t               r;
+       uint16_t                r;
 
        r = bus_space_read_2(sc->iot, sc->ioh, ECU_INTSTAT_REG_W)
                & ~vsc->sc_intr_mask;
diff -r e360be5c0a8a -r a142b07c796e sys/dev/ic/i82365.c
--- a/sys/dev/ic/i82365.c       Mon Sep 14 12:43:46 2009 +0000
+++ b/sys/dev/ic/i82365.c       Mon Sep 14 12:49:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365.c,v 1.108 2009/08/05 13:29:16 jun Exp $ */
+/*     $NetBSD: i82365.c,v 1.109 2009/09/14 12:49:33 tsutsui Exp $     */
 
 /*
  * Copyright (c) 2004 Charles M. Hannum.  All rights reserved.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.108 2009/08/05 13:29:16 jun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.109 2009/09/14 12:49:33 tsutsui Exp $");
 
 #define        PCICDEBUG
 
@@ -108,8 +108,8 @@
 static int     pcic_wait_ready(struct pcic_handle *);
 static void    pcic_delay(struct pcic_handle *, int, const char *);
 
-static u_int8_t st_pcic_read(struct pcic_handle *, int);
-static void st_pcic_write(struct pcic_handle *, int, u_int8_t);
+static uint8_t st_pcic_read(struct pcic_handle *, int);
+static void st_pcic_write(struct pcic_handle *, int, uint8_t);
 
 int
 pcic_ident_ok(int ident)
@@ -1233,7 +1233,7 @@
 static int
 pcic_wait_ready(struct pcic_handle *h)
 {
-       u_int8_t stat;
+       uint8_t stat;
        int i;
 
        /* wait an initial 10ms for quick cards */
@@ -1286,7 +1286,7 @@
 {
        struct pcic_handle *h = (struct pcic_handle *) pch;
        int win;
-       u_int8_t power, intr;
+       uint8_t power, intr;
 #ifdef DIAGNOSTIC
        int reg;
 #endif
@@ -1391,7 +1391,7 @@
 pcic_chip_socket_disable(pcmcia_chipset_handle_t pch)
 {
        struct pcic_handle *h = (struct pcic_handle *) pch;
-       u_int8_t intr;
+       uint8_t intr;
 
        DPRINTF(("pcic_chip_socket_disable\n"));
 
@@ -1434,7 +1434,7 @@
            ((type == PCMCIA_IFTYPE_IO) ? "io" : "mem"), intr));
 }
 
-static u_int8_t
+static uint8_t
 st_pcic_read(struct pcic_handle *h, int idx)
 {
 
@@ -1445,7 +1445,7 @@
 }
 
 static void
-st_pcic_write(struct pcic_handle *h, int idx, u_int8_t data)
+st_pcic_write(struct pcic_handle *h, int idx, uint8_t data)
 {
 
        if (idx != -1)
diff -r e360be5c0a8a -r a142b07c796e sys/dev/ic/i82365var.h
--- a/sys/dev/ic/i82365var.h    Mon Sep 14 12:43:46 2009 +0000
+++ b/sys/dev/ic/i82365var.h    Mon Sep 14 12:49:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365var.h,v 1.29 2009/05/12 14:25:17 cegger Exp $    */
+/*     $NetBSD: i82365var.h,v 1.30 2009/09/14 12:49:34 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -53,8 +53,8 @@
        device_t ph_parent;
        bus_space_tag_t ph_bus_t;       /* I/O or MEM?  I don't mind */
        bus_space_handle_t ph_bus_h;
-       u_int8_t (*ph_read)(struct pcic_handle *, int);
-       void (*ph_write)(struct pcic_handle *, int, u_int8_t);
+       uint8_t (*ph_read)(struct pcic_handle *, int);
+       void (*ph_write)(struct pcic_handle *, int, uint8_t);
 
        int     vendor;         /* vendor of chip */
        int     chip;           /* chip index 0 or 1 */
@@ -170,7 +170,7 @@
 
 /*
 static __inline int pcic_read(struct pcic_handle *, int);
-static __inline void pcic_write(struct pcic_handle *, int, u_int8_t);
+static __inline void pcic_write(struct pcic_handle *, int, uint8_t);
 */
 
 int    pcic_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t,
diff -r e360be5c0a8a -r a142b07c796e sys/dev/isa/i82365_isavar.h
--- a/sys/dev/isa/i82365_isavar.h       Mon Sep 14 12:43:46 2009 +0000
+++ b/sys/dev/isa/i82365_isavar.h       Mon Sep 14 12:49:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365_isavar.h,v 1.7 2009/05/12 09:10:15 cegger Exp $ */
+/*     $NetBSD: i82365_isavar.h,v 1.8 2009/09/14 12:49:34 tsutsui Exp $        */
 
 /*
  * Copyright (c) 1998 Bill Sommerfeld.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 void pcic_isa_bus_width_probe(struct pcic_softc *, bus_space_tag_t,
-                                  bus_space_handle_t, bus_addr_t, u_int32_t);
+                                  bus_space_handle_t, bus_addr_t, uint32_t);
 void   pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
 void   pcic_isa_config_interrupts(device_t);
 void   *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t,