[src/netbsd-6]: src/sys/arch/hp700/hp700 Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/8ecc5b260194
branches:  netbsd-6
changeset: 773821:8ecc5b260194
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 24 16:57:35 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #47):
        sys/arch/hp700/hp700/machdep.c: revision 1.108
        sys/arch/hp700/hp700/mainbus.c: revision 1.81
        sys/arch/hp700/hp700/disksubr.c: revision 1.27
        sys/arch/hp700/hp700/machdep.h: revision 1.9
u_intXX_t -> uintXX_t
Same code before and after.

diffstat:

 sys/arch/hp700/hp700/disksubr.c |    6 +-
 sys/arch/hp700/hp700/machdep.c  |    8 +-
 sys/arch/hp700/hp700/machdep.h  |    4 +-
 sys/arch/hp700/hp700/mainbus.c  |  228 ++++++++++++++++++++--------------------
 4 files changed, 123 insertions(+), 123 deletions(-)

diffs (truncated from 565 to 300 lines):

diff -r d7528544fba7 -r 8ecc5b260194 sys/arch/hp700/hp700/disksubr.c
--- a/sys/arch/hp700/hp700/disksubr.c   Fri Feb 24 16:41:05 2012 +0000
+++ b/sys/arch/hp700/hp700/disksubr.c   Fri Feb 24 16:57:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.26 2009/05/08 09:33:58 skrll Exp $      */
+/*     $NetBSD: disksubr.c,v 1.26.18.1 2012/02/24 16:57:35 riz Exp $   */
 
 /*     $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $     */
 
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26 2009/05/08 09:33:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26.18.1 2012/02/24 16:57:35 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,7 +92,7 @@
 {
        struct disklabel *dlp;
        const char *msg = NULL;
-       u_int16_t cksum;
+       uint16_t cksum;
 
        /* don't read the on-disk label if we are in spoofed-only mode */
        if (spoofonly)
diff -r d7528544fba7 -r 8ecc5b260194 sys/arch/hp700/hp700/machdep.c
--- a/sys/arch/hp700/hp700/machdep.c    Fri Feb 24 16:41:05 2012 +0000
+++ b/sys/arch/hp700/hp700/machdep.c    Fri Feb 24 16:57:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.107 2012/02/05 08:24:43 skrll Exp $      */
+/*     $NetBSD: machdep.c,v 1.107.2.1 2012/02/24 16:57:35 riz Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2012/02/05 08:24:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107.2.1 2012/02/24 16:57:35 riz Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -152,7 +152,7 @@
 /*
  * things to not kill
  */
-volatile u_int8_t *machine_ledaddr;
+volatile uint8_t *machine_ledaddr;
 int machine_ledword, machine_leds;
 
 /*
@@ -1457,7 +1457,7 @@
        /* NOTREACHED */
 }
 
-u_int32_t dumpmag = 0x8fca0101;        /* magic number */
+uint32_t dumpmag = 0x8fca0101; /* magic number */
 int    dumpsize = 0;           /* pages */
 long   dumplo = 0;             /* blocks */
 
diff -r d7528544fba7 -r 8ecc5b260194 sys/arch/hp700/hp700/machdep.h
--- a/sys/arch/hp700/hp700/machdep.h    Fri Feb 24 16:41:05 2012 +0000
+++ b/sys/arch/hp700/hp700/machdep.h    Fri Feb 24 16:57:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.h,v 1.8 2009/11/03 05:07:25 snj Exp $  */
+/*     $NetBSD: machdep.h,v 1.8.18.1 2012/02/24 16:57:35 riz Exp $     */
 
 /*     $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $     */
 
@@ -95,7 +95,7 @@
 /* Blinking the LEDs. */
 #ifdef USELEDS
 #define        _HP700_LED_FREQ         (16)
-extern volatile u_int8_t *machine_ledaddr;
+extern volatile uint8_t *machine_ledaddr;
 extern int machine_ledword, machine_leds;
 extern int _hp700_led_on_cycles[];
 #define hp700_led_blink(i)                     \
diff -r d7528544fba7 -r 8ecc5b260194 sys/arch/hp700/hp700/mainbus.c
--- a/sys/arch/hp700/hp700/mainbus.c    Fri Feb 24 16:41:05 2012 +0000
+++ b/sys/arch/hp700/hp700/mainbus.c    Fri Feb 24 16:57:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.80 2012/01/09 15:15:40 martin Exp $      */
+/*     $NetBSD: mainbus.c,v 1.80.2.1 2012/02/24 16:57:35 riz Exp $     */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.80 2012/01/09 15:15:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.80.2.1 2012/02/24 16:57:35 riz Exp $");
 
 #include "locators.h"
 #include "power.h"
@@ -118,38 +118,38 @@
 /* from machdep.c */
 extern struct extent *hp700_io_extent;
 
-u_int8_t mbus_r1(void *, bus_space_handle_t, bus_size_t);
-u_int16_t mbus_r2(void *, bus_space_handle_t, bus_size_t);
-u_int32_t mbus_r4(void *, bus_space_handle_t, bus_size_t);
-u_int64_t mbus_r8(void *, bus_space_handle_t, bus_size_t);
-void mbus_w1(void *, bus_space_handle_t, bus_size_t, u_int8_t);
-void mbus_w2(void *, bus_space_handle_t, bus_size_t, u_int16_t);
-void mbus_w4(void *, bus_space_handle_t, bus_size_t, u_int32_t);
-void mbus_w8(void *, bus_space_handle_t, bus_size_t, u_int64_t);
-void mbus_rm_1(void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
-void mbus_rm_2(void *, bus_space_handle_t, bus_size_t, u_int16_t *, bus_size_t);
-void mbus_rm_4(void *, bus_space_handle_t, bus_size_t, u_int32_t *, bus_size_t);
-void mbus_rm_8(void *, bus_space_handle_t, bus_size_t, u_int64_t *, bus_size_t);
-void mbus_wm_1(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t);
-void mbus_wm_2(void *, bus_space_handle_t, bus_size_t, const u_int16_t *, bus_size_t);
-void mbus_wm_4(void *, bus_space_handle_t, bus_size_t, const u_int32_t *, bus_size_t);
-void mbus_wm_8(void *, bus_space_handle_t, bus_size_t, const u_int64_t *, bus_size_t);
-void mbus_rr_1(void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
-void mbus_rr_2(void *, bus_space_handle_t, bus_size_t, u_int16_t *, bus_size_t);
-void mbus_rr_4(void *, bus_space_handle_t, bus_size_t, u_int32_t *, bus_size_t);
-void mbus_rr_8(void *, bus_space_handle_t, bus_size_t, u_int64_t *, bus_size_t);
-void mbus_wr_1(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t);
-void mbus_wr_2(void *, bus_space_handle_t, bus_size_t, const u_int16_t *, bus_size_t);
-void mbus_wr_4(void *, bus_space_handle_t, bus_size_t, const u_int32_t *, bus_size_t);
-void mbus_wr_8(void *, bus_space_handle_t, bus_size_t, const u_int64_t *, bus_size_t);
-void mbus_sm_1(void *, bus_space_handle_t, bus_size_t, u_int8_t, bus_size_t);
-void mbus_sm_2(void *, bus_space_handle_t, bus_size_t, u_int16_t, bus_size_t);
-void mbus_sm_4(void *, bus_space_handle_t, bus_size_t, u_int32_t, bus_size_t);
-void mbus_sm_8(void *, bus_space_handle_t, bus_size_t, u_int64_t, bus_size_t);
-void mbus_sr_1(void *, bus_space_handle_t, bus_size_t, u_int8_t, bus_size_t);
-void mbus_sr_2(void *, bus_space_handle_t, bus_size_t, u_int16_t, bus_size_t);
-void mbus_sr_4(void *, bus_space_handle_t, bus_size_t, u_int32_t, bus_size_t);
-void mbus_sr_8(void *, bus_space_handle_t, bus_size_t, u_int64_t, bus_size_t);
+uint8_t mbus_r1(void *, bus_space_handle_t, bus_size_t);
+uint16_t mbus_r2(void *, bus_space_handle_t, bus_size_t);
+uint32_t mbus_r4(void *, bus_space_handle_t, bus_size_t);
+uint64_t mbus_r8(void *, bus_space_handle_t, bus_size_t);
+void mbus_w1(void *, bus_space_handle_t, bus_size_t, uint8_t);
+void mbus_w2(void *, bus_space_handle_t, bus_size_t, uint16_t);
+void mbus_w4(void *, bus_space_handle_t, bus_size_t, uint32_t);
+void mbus_w8(void *, bus_space_handle_t, bus_size_t, uint64_t);
+void mbus_rm_1(void *, bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
+void mbus_rm_2(void *, bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
+void mbus_rm_4(void *, bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
+void mbus_rm_8(void *, bus_space_handle_t, bus_size_t, uint64_t *, bus_size_t);
+void mbus_wm_1(void *, bus_space_handle_t, bus_size_t, const uint8_t *, bus_size_t);
+void mbus_wm_2(void *, bus_space_handle_t, bus_size_t, const uint16_t *, bus_size_t);
+void mbus_wm_4(void *, bus_space_handle_t, bus_size_t, const uint32_t *, bus_size_t);
+void mbus_wm_8(void *, bus_space_handle_t, bus_size_t, const uint64_t *, bus_size_t);
+void mbus_rr_1(void *, bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
+void mbus_rr_2(void *, bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
+void mbus_rr_4(void *, bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
+void mbus_rr_8(void *, bus_space_handle_t, bus_size_t, uint64_t *, bus_size_t);
+void mbus_wr_1(void *, bus_space_handle_t, bus_size_t, const uint8_t *, bus_size_t);
+void mbus_wr_2(void *, bus_space_handle_t, bus_size_t, const uint16_t *, bus_size_t);
+void mbus_wr_4(void *, bus_space_handle_t, bus_size_t, const uint32_t *, bus_size_t);
+void mbus_wr_8(void *, bus_space_handle_t, bus_size_t, const uint64_t *, bus_size_t);
+void mbus_sm_1(void *, bus_space_handle_t, bus_size_t, uint8_t, bus_size_t);
+void mbus_sm_2(void *, bus_space_handle_t, bus_size_t, uint16_t, bus_size_t);
+void mbus_sm_4(void *, bus_space_handle_t, bus_size_t, uint32_t, bus_size_t);
+void mbus_sm_8(void *, bus_space_handle_t, bus_size_t, uint64_t, bus_size_t);
+void mbus_sr_1(void *, bus_space_handle_t, bus_size_t, uint8_t, bus_size_t);
+void mbus_sr_2(void *, bus_space_handle_t, bus_size_t, uint16_t, bus_size_t);
+void mbus_sr_4(void *, bus_space_handle_t, bus_size_t, uint32_t, bus_size_t);
+void mbus_sr_8(void *, bus_space_handle_t, bus_size_t, uint64_t, bus_size_t);
 void mbus_cp_1(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 void mbus_cp_2(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 void mbus_cp_4(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
@@ -361,163 +361,163 @@
        return -1;
 }
 
-u_int8_t
+uint8_t
 mbus_r1(void *v, bus_space_handle_t h, bus_size_t o)
 {
-       return *((volatile u_int8_t *)(h + o));
+       return *((volatile uint8_t *)(h + o));
 }
 
-u_int16_t
+uint16_t
 mbus_r2(void *v, bus_space_handle_t h, bus_size_t o)
 {
-       return *((volatile u_int16_t *)(h + o));
+       return *((volatile uint16_t *)(h + o));
 }
 
-u_int32_t
+uint32_t
 mbus_r4(void *v, bus_space_handle_t h, bus_size_t o)
 {
-       return *((volatile u_int32_t *)(h + o));
+       return *((volatile uint32_t *)(h + o));
 }
 
-u_int64_t
+uint64_t
 mbus_r8(void *v, bus_space_handle_t h, bus_size_t o)
 {
-       return *((volatile u_int64_t *)(h + o));
+       return *((volatile uint64_t *)(h + o));
 }
 
 void
-mbus_w1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv)
+mbus_w1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t vv)
 {
-       *((volatile u_int8_t *)(h + o)) = vv;
+       *((volatile uint8_t *)(h + o)) = vv;
 }
 
 void
-mbus_w2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv)
+mbus_w2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t vv)
 {
-       *((volatile u_int16_t *)(h + o)) = vv;
+       *((volatile uint16_t *)(h + o)) = vv;
 }
 
 void
-mbus_w4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv)
+mbus_w4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t vv)
 {
-       *((volatile u_int32_t *)(h + o)) = vv;
+       *((volatile uint32_t *)(h + o)) = vv;
 }
 
 void
-mbus_w8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv)
+mbus_w8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t vv)
 {
-       *((volatile u_int64_t *)(h + o)) = vv;
+       *((volatile uint64_t *)(h + o)) = vv;
 }
 
 
 void
-mbus_rm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c)
+mbus_rm_1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(a++) = *(volatile u_int8_t *)h;
+               *(a++) = *(volatile uint8_t *)h;
 }
 
 void
-mbus_rm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, bus_size_t c)
+mbus_rm_2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(a++) = *(volatile u_int16_t *)h;
+               *(a++) = *(volatile uint16_t *)h;
 }
 
 void
-mbus_rm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, bus_size_t c)
+mbus_rm_4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(a++) = *(volatile u_int32_t *)h;
+               *(a++) = *(volatile uint32_t *)h;
 }
 
 void
-mbus_rm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, bus_size_t c)
+mbus_rm_8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(a++) = *(volatile u_int64_t *)h;
+               *(a++) = *(volatile uint64_t *)h;
 }
 
 void
-mbus_wm_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, bus_size_t c)
+mbus_wm_1(void *v, bus_space_handle_t h, bus_size_t o, const uint8_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(volatile u_int8_t *)h = *(a++);
+               *(volatile uint8_t *)h = *(a++);
 }
 
 void
-mbus_wm_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c)
+mbus_wm_2(void *v, bus_space_handle_t h, bus_size_t o, const uint16_t *a, bus_size_t c)
 {
        h += o;
        while (c--)
-               *(volatile u_int16_t *)h = *(a++);
+               *(volatile uint16_t *)h = *(a++);
 }
 
 void