[src/trunk]: src/sys/arch/arm/sa11x0 s/u_intN_t/uintN_t/

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

details:   https://anonhg.NetBSD.org/src/rev/345042b76e19
branches:  trunk
changeset: 588816:345042b76e19
user:      peter <peter%NetBSD.org@localhost>
date:      Sat Mar 04 17:24:13 2006 +0000

description:
s/u_intN_t/uintN_t/

diffstat:

 sys/arch/arm/sa11x0/sa1111.c     |   8 ++++----
 sys/arch/arm/sa11x0/sa1111_var.h |   8 ++++----
 sys/arch/arm/sa11x0/sa11x0_ost.c |  18 +++++++++---------
 sys/arch/arm/sa11x0/sa11x0_var.h |   4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diffs (150 lines):

diff -r 79afb38b2985 -r 345042b76e19 sys/arch/arm/sa11x0/sa1111.c
--- a/sys/arch/arm/sa11x0/sa1111.c      Sat Mar 04 17:22:06 2006 +0000
+++ b/sys/arch/arm/sa11x0/sa1111.c      Sat Mar 04 17:24:13 2006 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sa1111.c,v 1.16 2006/03/04 17:22:06 peter Exp $       */
+/*      $NetBSD: sa1111.c,v 1.17 2006/03/04 17:24:13 peter Exp $       */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.16 2006/03/04 17:22:06 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.17 2006/03/04 17:24:13 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,7 +85,7 @@
 {
        struct sa11x0_attach_args *sa = aux;
        bus_space_handle_t ioh;
-       u_int32_t skid;
+       uint32_t skid;
 
        if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size, 0, &ioh))
                return (0);
@@ -218,7 +218,7 @@
 {
        struct sacc_softc *sc = (struct sacc_softc *)ic;
        int s;
-       u_int32_t pol, mask;
+       uint32_t pol, mask;
        int addr;
 
        if (irq >= 32) {
diff -r 79afb38b2985 -r 345042b76e19 sys/arch/arm/sa11x0/sa1111_var.h
--- a/sys/arch/arm/sa11x0/sa1111_var.h  Sat Mar 04 17:22:06 2006 +0000
+++ b/sys/arch/arm/sa11x0/sa1111_var.h  Sat Mar 04 17:24:13 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sa1111_var.h,v 1.8 2005/12/11 12:16:51 christos Exp $  */
+/*     $NetBSD: sa1111_var.h,v 1.9 2006/03/04 17:24:13 peter Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,8 +46,8 @@
 };
 
 struct sacc_intrvec {
-       u_int32_t lo;   /* bits 0..31 */
-       u_int32_t hi;   /* bits 32..54 */
+       uint32_t lo;    /* bits 0..31 */
+       uint32_t hi;    /* bits 32..54 */
 };
 
 struct sacc_softc {
@@ -57,7 +57,7 @@
        bus_space_tag_t sc_piot;        /* parent(SA1110)'s iot */
        bus_space_handle_t sc_gpioh;
 
-       u_int32_t sc_gpiomask;  /* SA1110 GPIO mask */
+       uint32_t sc_gpiomask;   /* SA1110 GPIO mask */
 
        struct sacc_intrvec sc_imask;
        struct sacc_intrhand *sc_intrhand[SACCIC_LEN];
diff -r 79afb38b2985 -r 345042b76e19 sys/arch/arm/sa11x0/sa11x0_ost.c
--- a/sys/arch/arm/sa11x0/sa11x0_ost.c  Sat Mar 04 17:22:06 2006 +0000
+++ b/sys/arch/arm/sa11x0/sa11x0_ost.c  Sat Mar 04 17:24:13 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sa11x0_ost.c,v 1.15 2006/03/04 17:22:06 peter Exp $    */
+/*     $NetBSD: sa11x0_ost.c,v 1.16 2006/03/04 17:24:13 peter Exp $    */
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.15 2006/03/04 17:22:06 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.16 2006/03/04 17:24:13 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -72,9 +72,9 @@
        bus_space_tag_t         sc_iot;
        bus_space_handle_t      sc_ioh;
 
-       u_int32_t       sc_clock_count;
-       u_int32_t       sc_statclock_count;
-       u_int32_t       sc_statclock_step;
+       uint32_t        sc_clock_count;
+       uint32_t        sc_statclock_count;
+       uint32_t        sc_statclock_step;
 };
 
 static struct saost_softc *saost_sc = NULL;
@@ -123,7 +123,7 @@
 clockintr(void *arg)
 {
        struct clockframe *frame = arg;
-       u_int32_t oscr, nextmatch, oldmatch;
+       uint32_t oscr, nextmatch, oldmatch;
        int s;
 
        bus_space_write_4(saost_sc->sc_iot, saost_sc->sc_ioh,
@@ -166,7 +166,7 @@
 statintr(void *arg)
 {
        struct clockframe *frame = arg;
-       u_int32_t oscr, nextmatch, oldmatch;
+       uint32_t oscr, nextmatch, oldmatch;
        int s;
 
        bus_space_write_4(saost_sc->sc_iot, saost_sc->sc_ioh,
@@ -209,7 +209,7 @@
 void
 setstatclockrate(int schz)
 {
-       u_int32_t count;
+       uint32_t count;
 
        saost_sc->sc_statclock_step = TIMER_FREQUENCY / schz;
        count = bus_space_read_4(saost_sc->sc_iot, saost_sc->sc_ioh, SAOST_CR);
@@ -305,7 +305,7 @@
 void
 delay(u_int usecs)
 {
-       u_int32_t xtick, otick, delta;
+       uint32_t xtick, otick, delta;
        int j, csec, usec;
 
        csec = usecs / 10000;
diff -r 79afb38b2985 -r 345042b76e19 sys/arch/arm/sa11x0/sa11x0_var.h
--- a/sys/arch/arm/sa11x0/sa11x0_var.h  Sat Mar 04 17:22:06 2006 +0000
+++ b/sys/arch/arm/sa11x0/sa11x0_var.h  Sat Mar 04 17:24:13 2006 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sa11x0_var.h,v 1.4 2003/04/14 14:18:41 rjs Exp $        */
+/*      $NetBSD: sa11x0_var.h,v 1.5 2006/03/04 17:24:13 peter Exp $        */
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -52,7 +52,7 @@
        bus_space_handle_t sc_ppch;
        bus_space_handle_t sc_dmach;
        bus_space_handle_t sc_reseth;
-       u_int32_t sc_intrmask;
+       uint32_t sc_intrmask;
 };
 
 /* Attach args all devices */