[src/trunk]: src/sys/arch/arm/iomd u_int*_t -> uint*_t

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

details:   https://anonhg.NetBSD.org/src/rev/fa6e97e623bb
branches:  trunk
changeset: 779203:fa6e97e623bb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu May 10 09:56:27 2012 +0000

description:
u_int*_t -> uint*_t

diffstat:

 sys/arch/arm/iomd/iomd.c      |   8 ++++----
 sys/arch/arm/iomd/iomdvar.h   |   4 ++--
 sys/arch/arm/iomd/qms.c       |  10 +++++-----
 sys/arch/arm/iomd/vidcvideo.c |   8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (122 lines):

diff -r 5a8311aa0537 -r fa6e97e623bb sys/arch/arm/iomd/iomd.c
--- a/sys/arch/arm/iomd/iomd.c  Thu May 10 07:57:02 2012 +0000
+++ b/sys/arch/arm/iomd/iomd.c  Thu May 10 09:56:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $ */
+/*     $NetBSD: iomd.c,v 1.18 2012/05/10 09:56:27 skrll Exp $  */
 
 /*
  * Copyright (c) 1996-1997 Mark Brinicombe.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.18 2012/05/10 09:56:27 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,10 +92,10 @@
 extern struct bus_space iomd_bs_tag;
 
 int       iomd_found;
-u_int32_t iomd_base = IOMD_BASE;
+uint32_t iomd_base = IOMD_BASE;
 
 /* following flag is used in iomd_irq.s ... has to be cleaned up one day ! */
-u_int32_t arm7500_ioc_found = 0;
+uint32_t arm7500_ioc_found = 0;
 
 
 /* Declare prototypes */
diff -r 5a8311aa0537 -r fa6e97e623bb sys/arch/arm/iomd/iomdvar.h
--- a/sys/arch/arm/iomd/iomdvar.h       Thu May 10 07:57:02 2012 +0000
+++ b/sys/arch/arm/iomd/iomdvar.h       Thu May 10 09:56:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomdvar.h,v 1.3 2011/07/01 20:26:35 dyoung Exp $       */
+/*     $NetBSD: iomdvar.h,v 1.4 2012/05/10 09:56:27 skrll Exp $        */
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -119,6 +119,6 @@
 /*
  * IOMD_BASE register variable
  */
-extern u_int32_t iomd_base;
+extern uint32_t iomd_base;
 
 /* End of iomdvar.h */
diff -r 5a8311aa0537 -r fa6e97e623bb sys/arch/arm/iomd/qms.c
--- a/sys/arch/arm/iomd/qms.c   Thu May 10 07:57:02 2012 +0000
+++ b/sys/arch/arm/iomd/qms.c   Thu May 10 09:56:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $  */
+/*     $NetBSD: qms.c,v 1.17 2012/05/10 09:56:27 skrll Exp $   */
 
 /*-
  * Copyright (c) 2001 Reinoud Zandijk
@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.17 2012/05/10 09:56:27 skrll Exp $");
 
 #include <sys/callout.h>
 #include <sys/device.h>
@@ -74,8 +74,8 @@
 
        struct callout sc_callout;
 
-       u_int16_t lastx;
-       u_int16_t lasty;
+       uint16_t lastx;
+       uint16_t lasty;
        int lastb;
 };
 
@@ -184,7 +184,7 @@
 {
        struct qms_softc *sc = arg;
        int b;
-       u_int16_t x, y;
+       uint16_t x, y;
        int16_t dx, dy;
 
        x = bus_space_read_4(sc->sc_iot, sc->sc_ioh, QMS_MOUSEX);
diff -r 5a8311aa0537 -r fa6e97e623bb sys/arch/arm/iomd/vidcvideo.c
--- a/sys/arch/arm/iomd/vidcvideo.c     Thu May 10 07:57:02 2012 +0000
+++ b/sys/arch/arm/iomd/vidcvideo.c     Thu May 10 09:56:27 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.42 2012/05/10 09:56:27 skrll Exp $ */
 
 /*
  * Copyright (c) 2001 Reinoud Zandijk
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.42 2012/05/10 09:56:27 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -607,7 +607,7 @@
        struct rasops_info *ri = &dc->dc_console.scr_ri;
        const u_char *rgbdat;
        struct hwcmap256 *cm;
-       const u_int8_t *p;
+       const uint8_t *p;
        int index;
 
        /* Whatever we do later... just make sure we have a
@@ -718,7 +718,7 @@
                if (p->size.x > CURSOR_MAX_WIDTH ||
                    p->size.y > CURSOR_MAX_HEIGHT)
                        return EINVAL;
-               icount = sizeof(u_int32_t) * p->size.y;
+               icount = sizeof(uint32_t) * p->size.y;
                error = copyin(p->image, &image, icount);
                if (error)
                        return error;