summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authoruwe <uwe@NetBSD.org>2006-03-04 02:56:21 +0000
committeruwe <uwe@NetBSD.org>2006-03-04 02:56:21 +0000
commit6e4f5eb548f8ddf924fa729bccb41b153e7003ee (patch)
tree3e4037dc0c062a563e30de1f3849c514383489fc /sys
parentd1f918faef5b44313126c38afdc08ce1ec0b0333 (diff)
s/u_intN_t/uintN_t/
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/cgfourteen.c10
-rw-r--r--sys/arch/sparc/dev/ts102.c8
-rw-r--r--sys/arch/sparc/dev/ts102reg.h14
-rw-r--r--sys/arch/sparc/include/autoconf.h22
-rw-r--r--sys/arch/sparc/include/bus.h254
-rw-r--r--sys/arch/sparc/include/frame.h10
-rw-r--r--sys/arch/sparc/include/openfirm.h6
-rw-r--r--sys/arch/sparc/include/pci_machdep.h12
-rw-r--r--sys/arch/sparc/include/tctrl.h14
-rw-r--r--sys/arch/sparc/stand/bootxx/promlib.c8
10 files changed, 179 insertions, 179 deletions
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 252437581b2..5d35bfac698 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.44 2006/01/19 15:09:57 he Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.45 2006/03/04 02:59:29 uwe Exp $ */
/*
* Copyright (c) 1996
@@ -522,8 +522,8 @@ cgfourteenpoll(dev_t dev, int events, struct lwp *l)
static void
cg14_init(struct cgfourteen_softc *sc)
{
- volatile u_int32_t *clut;
- volatile u_int8_t *xlut;
+ volatile uint32_t *clut;
+ volatile uint8_t *xlut;
int i;
/*
@@ -537,8 +537,8 @@ cg14_init(struct cgfourteen_softc *sc)
sc->sc_savectl = sc->sc_ctl->ctl_mctl;
sc->sc_savehwc = sc->sc_hwc->curs_ctl;
- clut = (volatile u_int32_t *) sc->sc_clut1->clut_lut;
- xlut = (volatile u_int8_t *) sc->sc_xlut->xlut_lut;
+ clut = (volatile uint32_t *) sc->sc_clut1->clut_lut;
+ xlut = (volatile uint8_t *) sc->sc_xlut->xlut_lut;
for (i = 0; i < CG14_CLUT_SIZE; i++) {
sc->sc_saveclut.cm_chip[i] = clut[i];
sc->sc_savexlut[i] = xlut[i];
diff --git a/sys/arch/sparc/dev/ts102.c b/sys/arch/sparc/dev/ts102.c
index ef1cf3ba494..b006fc87a63 100644
--- a/sys/arch/sparc/dev/ts102.c
+++ b/sys/arch/sparc/dev/ts102.c
@@ -1,5 +1,5 @@
/* $OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $ */
-/* $NetBSD: ts102.c,v 1.5 2005/11/16 04:25:28 macallan Exp $ */
+/* $NetBSD: ts102.c,v 1.6 2006/03/04 02:59:29 uwe Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
*
@@ -286,9 +286,9 @@ ts102_write_8(bus_space_tag_t space, bus_space_handle_t handle,
#define TSLOT_READ(slot, offset) \
- *(volatile u_int16_t *)((slot)->td_regs + (offset))
+ *(volatile uint16_t *)((slot)->td_regs + (offset))
#define TSLOT_WRITE(slot, offset, value) \
- *(volatile u_int16_t *)((slot)->td_regs + (offset)) = (value)
+ *(volatile uint16_t *)((slot)->td_regs + (offset)) = (value)
/*
* Attachment and initialization
@@ -308,7 +308,7 @@ tslot_attach(struct device *parent, struct device *self, void *args)
struct sbus_attach_args *sa = args;
struct tslot_softc *sc = (struct tslot_softc *)self;
struct tslot_data *td;
- volatile u_int8_t *regs;
+ volatile uint8_t *regs;
int node, slot, rnum, base, size;
uint32_t ranges[30];
void *rptr = ranges;
diff --git a/sys/arch/sparc/dev/ts102reg.h b/sys/arch/sparc/dev/ts102reg.h
index 1b012eafb76..3b9a1cc6b5a 100644
--- a/sys/arch/sparc/dev/ts102reg.h
+++ b/sys/arch/sparc/dev/ts102reg.h
@@ -1,5 +1,5 @@
/* $OpenBSD: ts102reg.h,v 1.3 2003/06/18 17:50:23 miod Exp $ */
-/* $NetBSD: ts102reg.h,v 1.9 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: ts102reg.h,v 1.10 2006/03/04 02:59:29 uwe Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,12 +67,12 @@
#define TS102_REG_UCTRL_STS 0x0028 /* Microcontroller Status Register */
struct uctrl_regs {
- volatile u_int8_t intr; /* Microcontroller Interrupt Reg */
- volatile u_int8_t filler0[3];
- volatile u_int8_t data; /* Microcontroller Data Reg */
- volatile u_int8_t filler1[3];
- volatile u_int8_t stat; /* Microcontroller Status Reg */
- volatile u_int8_t filler2[3];
+ volatile uint8_t intr; /* Microcontroller Interrupt Reg */
+ volatile uint8_t filler0[3];
+ volatile uint8_t data; /* Microcontroller Data Reg */
+ volatile uint8_t filler1[3];
+ volatile uint8_t stat; /* Microcontroller Status Reg */
+ volatile uint8_t filler2[3];
};
/* TS102 Card Interrupt Register definitions.
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index fa9eb3d3e72..96abd20cbed 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.42 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: autoconf.h,v 1.43 2006/03/04 02:56:21 uwe Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -96,24 +96,24 @@
/* Device register space description */
struct rom_reg {
- u_int32_t rr_iospace; /* register space (obio, etc) */
- u_int32_t rr_paddr; /* register physical address */
- u_int32_t rr_len; /* register length */
+ uint32_t rr_iospace; /* register space (obio, etc) */
+ uint32_t rr_paddr; /* register physical address */
+ uint32_t rr_len; /* register length */
};
/* Interrupt information */
struct rom_intr {
- u_int32_t int_pri; /* priority (IPL) */
- u_int32_t int_vec; /* vector (always 0?) */
+ uint32_t int_pri; /* priority (IPL) */
+ uint32_t int_vec; /* vector (always 0?) */
};
/* Address translation accross busses */
struct rom_range { /* Only used on v3 PROMs */
- u_int32_t cspace; /* Client space */
- u_int32_t coffset; /* Client offset */
- u_int32_t pspace; /* Parent space */
- u_int32_t poffset; /* Parent offset */
- u_int32_t size; /* Size in bytes of this range */
+ uint32_t cspace; /* Client space */
+ uint32_t coffset; /* Client offset */
+ uint32_t pspace; /* Parent space */
+ uint32_t poffset; /* Parent offset */
+ uint32_t size; /* Size in bytes of this range */
};
/* Attach arguments presented by mainbus_attach() */
diff --git a/sys/arch/sparc/include/bus.h b/sys/arch/sparc/include/bus.h
index 9f078f2485d..e65b68ac854 100644
--- a/sys/arch/sparc/include/bus.h
+++ b/sys/arch/sparc/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.49 2006/02/16 20:17:15 perry Exp $ */
+/* $NetBSD: bus.h,v 1.50 2006/03/04 02:56:21 uwe Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -77,14 +77,14 @@
* Bus address and size types
*/
typedef u_long bus_space_handle_t;
-typedef u_int64_t bus_addr_t;
+typedef uint64_t bus_addr_t;
typedef u_long bus_size_t;
/* bus_addr_t is extended to 64-bits and has the iospace encoded in it */
#define BUS_ADDR_IOSPACE(x) ((x)>>32)
#define BUS_ADDR_PADDR(x) ((x)&0xffffffff)
#define BUS_ADDR(io, pa) \
- ((((u_int64_t)(u_int32_t)(io))<<32) | (u_int32_t)(pa))
+ ((((uint64_t)(uint32_t)(io))<<32) | (uint32_t)(pa))
#define __BUS_SPACE_HAS_STREAM_METHODS 1
@@ -146,22 +146,22 @@ struct sparc_bus_space_tag {
void *, /*handler arg*/
void (*)(void))); /*optional fast vector*/
- u_int8_t (*sparc_read_1) __P((
+ uint8_t (*sparc_read_1) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset));
- u_int16_t (*sparc_read_2) __P((
+ uint16_t (*sparc_read_2) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset));
- u_int32_t (*sparc_read_4) __P((
+ uint32_t (*sparc_read_4) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset));
- u_int64_t (*sparc_read_8) __P((
+ uint64_t (*sparc_read_8) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset));
@@ -170,25 +170,25 @@ struct sparc_bus_space_tag {
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset,
- u_int8_t value));
+ uint8_t value));
void (*sparc_write_2) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset,
- u_int16_t value));
+ uint16_t value));
void (*sparc_write_4) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset,
- u_int32_t value));
+ uint32_t value));
void (*sparc_write_8) __P((
bus_space_tag_t space,
bus_space_handle_t handle,
bus_size_t offset,
- u_int64_t value));
+ uint64_t value));
};
bus_space_tag_t bus_space_tag_alloc(bus_space_tag_t, void *);
@@ -391,33 +391,33 @@ int bus_space_probe __P((
*/
#define bus_space_read_1_real(t, h, o) \
- ((void)(t), *(volatile u_int8_t *)((h) + (o)))
+ ((void)(t), *(volatile uint8_t *)((h) + (o)))
#define bus_space_read_2_real(t, h, o) \
- ((void)(t), *(volatile u_int16_t *)((h) + (o)))
+ ((void)(t), *(volatile uint16_t *)((h) + (o)))
#define bus_space_read_4_real(t, h, o) \
- ((void)(t), *(volatile u_int32_t *)((h) + (o)))
+ ((void)(t), *(volatile uint32_t *)((h) + (o)))
#define bus_space_read_8_real(t, h, o) \
- ((void)(t), *(volatile u_int64_t *)((h) + (o)))
+ ((void)(t), *(volatile uint64_t *)((h) + (o)))
-static u_int8_t bus_space_read_1 __P((bus_space_tag_t,
+static uint8_t bus_space_read_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t));
-static u_int16_t bus_space_read_2 __P((bus_space_tag_t,
+static uint16_t bus_space_read_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t));
-static u_int32_t bus_space_read_4 __P((bus_space_tag_t,
+static uint32_t bus_space_read_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t));
-static u_int64_t bus_space_read_8 __P((bus_space_tag_t,
+static uint64_t bus_space_read_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t));
-static __inline u_int8_t
+static __inline uint8_t
bus_space_read_1(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -426,7 +426,7 @@ bus_space_read_1(t, h, o)
return (*t->sparc_read_1)(t, h, o);
}
-static __inline u_int16_t
+static __inline uint16_t
bus_space_read_2(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -435,7 +435,7 @@ bus_space_read_2(t, h, o)
return (*t->sparc_read_2)(t, h, o);
}
-static __inline u_int32_t
+static __inline uint32_t
bus_space_read_4(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -444,7 +444,7 @@ bus_space_read_4(t, h, o)
return (*t->sparc_read_4)(t, h, o);
}
-static __inline u_int64_t
+static __inline uint64_t
bus_space_read_8(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -454,7 +454,7 @@ bus_space_read_8(t, h, o)
}
#if __SLIM_SPARC_BUS_SPACE
-static __inline u_int8_t
+static __inline uint8_t
bus_space_read_1(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -464,7 +464,7 @@ bus_space_read_1(t, h, o)
return bus_space_read_1_real(t, h, o);
}
-static __inline u_int16_t
+static __inline uint16_t
bus_space_read_2(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -474,7 +474,7 @@ bus_space_read_2(t, h, o)
return bus_space_read_2_real(t, h, o);
}
-static __inline u_int32_t
+static __inline uint32_t
bus_space_read_4(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -484,7 +484,7 @@ bus_space_read_4(t, h, o)
return bus_space_read_4_real(t, h, o);
}
-static __inline u_int64_t
+static __inline uint64_t
bus_space_read_8(t, h, o)
bus_space_tag_t t;
bus_space_handle_t h;
@@ -512,19 +512,19 @@ bus_space_read_8(t, h, o)
*/
#define bus_space_write_1_real(t, h, o, v) do { \
- ((void)(t), (void)(*(volatile u_int8_t *)((h) + (o)) = (v))); \
+ ((void)(t), (void)(*(volatile uint8_t *)((h) + (o)) = (v))); \
} while (/* CONSTCOND */ 0)
#define bus_space_write_2_real(t, h, o, v) do { \
- ((void)(t), (void)(*(volatile u_int16_t *)((h) + (o)) = (v))); \
+ ((void)(t), (void)(*(volatile uint16_t *)((h) + (o)) = (v))); \
} while (/* CONSTCOND */ 0)
#define bus_space_write_4_real(t, h, o, v) do { \
- ((void)(t), (void)(*(volatile u_int32_t *)((h) + (o)) = (v))); \
+ ((void)(t), (void)(*(volatile uint32_t *)((h) + (o)) = (v))); \
} while (/* CONSTCOND */ 0)
#define bus_space_write_8_real(t, h, o, v) do { \
- ((void)(t), (void)(*(volatile u_int64_t *)((h) + (o)) = (v))); \
+ ((void)(t), (void)(*(volatile uint64_t *)((h) + (o)) = (v))); \
} while (/* CONSTCOND */ 0)
@@ -532,26 +532,26 @@ bus_space_read_8(t, h, o)
static void bus_space_write_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t));
+ const uint8_t));
static void bus_space_write_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t));
+ const uint16_t));
static void bus_space_write_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t));
+ const uint32_t));
static void bus_space_write_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t));
+ const uint64_t));
static __inline void
bus_space_write_1(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int8_t v;
+ uint8_t v;
{
(*t->sparc_write_1)(t, h, o, v);
}
@@ -561,7 +561,7 @@ bus_space_write_2(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int16_t v;
+ uint16_t v;
{
(*t->sparc_write_2)(t, h, o, v);
}
@@ -571,7 +571,7 @@ bus_space_write_4(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int32_t v;
+ uint32_t v;
{
(*t->sparc_write_4)(t, h, o, v);
}
@@ -581,7 +581,7 @@ bus_space_write_8(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int64_t v;
+ uint64_t v;
{
(*t->sparc_write_8)(t, h, o, v);
}
@@ -593,7 +593,7 @@ bus_space_write_1(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int8_t v;
+ uint8_t v;
{
__insn_barrier();
bus_space_write_1_real(t, h, o, v);
@@ -604,7 +604,7 @@ bus_space_write_2(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int16_t v;
+ uint16_t v;
{
__insn_barrier();
bus_space_write_2_real(t, h, o, v);
@@ -615,7 +615,7 @@ bus_space_write_4(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int32_t v;
+ uint32_t v;
{
__insn_barrier();
bus_space_write_4_real(t, h, o, v);
@@ -626,7 +626,7 @@ bus_space_write_8(t, h, o, v)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o;
- u_int64_t v;
+ uint64_t v;
{
__insn_barrier();
bus_space_write_8_real(t, h, o, v);
@@ -652,25 +652,25 @@ bus_space_write_8(t, h, o, v)
static void bus_space_read_multi_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int8_t *,
+ uint8_t *,
bus_size_t));
static void bus_space_read_multi_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int16_t *,
+ uint16_t *,
bus_size_t));
static void bus_space_read_multi_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int32_t *,
+ uint32_t *,
bus_size_t));
static void bus_space_read_multi_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int64_t *,
+ uint64_t *,
bus_size_t));
static __inline void
@@ -678,7 +678,7 @@ bus_space_read_multi_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int8_t *a;
+ uint8_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_1(t, h, o);
@@ -689,7 +689,7 @@ bus_space_read_multi_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int16_t *a;
+ uint16_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_2(t, h, o);
@@ -700,7 +700,7 @@ bus_space_read_multi_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int32_t *a;
+ uint32_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_4(t, h, o);
@@ -711,7 +711,7 @@ bus_space_read_multi_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int64_t *a;
+ uint64_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_8(t, h, o);
@@ -722,19 +722,19 @@ bus_space_read_multi_8(t, h, o, a, c)
static void bus_space_read_multi_stream_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int16_t *,
+ uint16_t *,
bus_size_t));
static void bus_space_read_multi_stream_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int32_t *,
+ uint32_t *,
bus_size_t));
static void bus_space_read_multi_stream_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int64_t *,
+ uint64_t *,
bus_size_t));
static __inline void
@@ -742,7 +742,7 @@ bus_space_read_multi_stream_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int16_t *a;
+ uint16_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_2_real(t, h, o);
@@ -753,7 +753,7 @@ bus_space_read_multi_stream_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int32_t *a;
+ uint32_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_4_real(t, h, o);
@@ -764,7 +764,7 @@ bus_space_read_multi_stream_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int64_t *a;
+ uint64_t *a;
{
while (c-- > 0)
*a++ = bus_space_read_8_real(t, h, o);
@@ -781,29 +781,29 @@ bus_space_read_multi_stream_8(t, h, o, a, c)
static void bus_space_write_multi_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t *,
+ const uint8_t *,
bus_size_t));
static void bus_space_write_multi_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t *,
+ const uint16_t *,
bus_size_t));
static void bus_space_write_multi_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t *,
+ const uint32_t *,
bus_size_t));
static void bus_space_write_multi_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t *,
+ const uint64_t *,
bus_size_t));
static __inline void
bus_space_write_multi_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t *a;
+ const uint8_t *a;
{
while (c-- > 0)
bus_space_write_1(t, h, o, *a++);
@@ -814,7 +814,7 @@ bus_space_write_multi_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t *a;
+ const uint16_t *a;
{
while (c-- > 0)
bus_space_write_2(t, h, o, *a++);
@@ -825,7 +825,7 @@ bus_space_write_multi_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t *a;
+ const uint32_t *a;
{
while (c-- > 0)
bus_space_write_4(t, h, o, *a++);
@@ -836,7 +836,7 @@ bus_space_write_multi_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t *a;
+ const uint64_t *a;
{
while (c-- > 0)
bus_space_write_8(t, h, o, *a++);
@@ -847,17 +847,17 @@ bus_space_write_multi_8(t, h, o, a, c)
static void bus_space_write_multi_stream_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t *,
+ const uint16_t *,
bus_size_t));
static void bus_space_write_multi_stream_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t *,
+ const uint32_t *,
bus_size_t));
static void bus_space_write_multi_stream_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t *,
+ const uint64_t *,
bus_size_t));
static __inline void
@@ -865,7 +865,7 @@ bus_space_write_multi_stream_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t *a;
+ const uint16_t *a;
{
while (c-- > 0)
bus_space_write_2_real(t, h, o, *a++);
@@ -876,7 +876,7 @@ bus_space_write_multi_stream_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t *a;
+ const uint32_t *a;
{
while (c-- > 0)
bus_space_write_4_real(t, h, o, *a++);
@@ -887,7 +887,7 @@ bus_space_write_multi_stream_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t *a;
+ const uint64_t *a;
{
while (c-- > 0)
bus_space_write_8_real(t, h, o, *a++);
@@ -905,22 +905,22 @@ bus_space_write_multi_stream_8(t, h, o, a, c)
static void bus_space_set_multi_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t,
+ const uint8_t,
bus_size_t));
static void bus_space_set_multi_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t,
+ const uint16_t,
bus_size_t));
static void bus_space_set_multi_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t,
+ const uint32_t,
bus_size_t));
static void bus_space_set_multi_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t,
+ const uint64_t,
bus_size_t));
static __inline void
@@ -928,7 +928,7 @@ bus_space_set_multi_1(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t v;
+ const uint8_t v;
{
while (c-- > 0)
bus_space_write_1(t, h, o, v);
@@ -939,7 +939,7 @@ bus_space_set_multi_2(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t v;
+ const uint16_t v;
{
while (c-- > 0)
bus_space_write_2(t, h, o, v);
@@ -950,7 +950,7 @@ bus_space_set_multi_4(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t v;
+ const uint32_t v;
{
while (c-- > 0)
bus_space_write_4(t, h, o, v);
@@ -961,7 +961,7 @@ bus_space_set_multi_8(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t v;
+ const uint64_t v;
{
while (c-- > 0)
bus_space_write_8(t, h, o, v);
@@ -977,22 +977,22 @@ bus_space_set_multi_8(t, h, o, v, c)
static void bus_space_read_region_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int8_t *,
+ uint8_t *,
bus_size_t));
static void bus_space_read_region_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int16_t *,
+ uint16_t *,
bus_size_t));
static void bus_space_read_region_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int32_t *,
+ uint32_t *,
bus_size_t));
static void bus_space_read_region_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int64_t *,
+ uint64_t *,
bus_size_t));
static __inline void
@@ -1000,7 +1000,7 @@ bus_space_read_region_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int8_t *a;
+ uint8_t *a;
{
for (; c; a++, c--, o++)
*a = bus_space_read_1(t, h, o);
@@ -1011,7 +1011,7 @@ bus_space_read_region_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int16_t *a;
+ uint16_t *a;
{
for (; c; a++, c--, o+=2)
*a = bus_space_read_2(t, h, o);
@@ -1022,7 +1022,7 @@ bus_space_read_region_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int32_t *a;
+ uint32_t *a;
{
for (; c; a++, c--, o+=4)
*a = bus_space_read_4(t, h, o);
@@ -1033,7 +1033,7 @@ bus_space_read_region_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int64_t *a;
+ uint64_t *a;
{
for (; c; a++, c--, o+=8)
*a = bus_space_read_8(t, h, o);
@@ -1048,29 +1048,29 @@ bus_space_read_region_8(t, h, o, a, c)
static void bus_space_write_region_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t *,
+ const uint8_t *,
bus_size_t));
static void bus_space_write_region_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t *,
+ const uint16_t *,
bus_size_t));
static void bus_space_write_region_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t *,
+ const uint32_t *,
bus_size_t));
static void bus_space_write_region_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t *,
+ const uint64_t *,
bus_size_t));
static __inline void
bus_space_write_region_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t *a;
+ const uint8_t *a;
{
for (; c; a++, c--, o++)
bus_space_write_1(t, h, o, *a);
@@ -1081,7 +1081,7 @@ bus_space_write_region_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t *a;
+ const uint16_t *a;
{
for (; c; a++, c--, o+=2)
bus_space_write_2(t, h, o, *a);
@@ -1092,7 +1092,7 @@ bus_space_write_region_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t *a;
+ const uint32_t *a;
{
for (; c; a++, c--, o+=4)
bus_space_write_4(t, h, o, *a);
@@ -1103,7 +1103,7 @@ bus_space_write_region_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t *a;
+ const uint64_t *a;
{
for (; c; a++, c--, o+=8)
bus_space_write_8(t, h, o, *a);
@@ -1119,22 +1119,22 @@ bus_space_write_region_8(t, h, o, a, c)
static void bus_space_set_region_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t,
+ const uint8_t,
bus_size_t));
static void bus_space_set_region_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t,
+ const uint16_t,
bus_size_t));
static void bus_space_set_region_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t,
+ const uint32_t,
bus_size_t));
static void bus_space_set_region_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t,
+ const uint64_t,
bus_size_t));
static __inline void
@@ -1142,7 +1142,7 @@ bus_space_set_region_1(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t v;
+ const uint8_t v;
{
for (; c; c--, o++)
bus_space_write_1(t, h, o, v);
@@ -1153,7 +1153,7 @@ bus_space_set_region_2(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t v;
+ const uint16_t v;
{
for (; c; c--, o+=2)
bus_space_write_2(t, h, o, v);
@@ -1164,7 +1164,7 @@ bus_space_set_region_4(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t v;
+ const uint32_t v;
{
for (; c; c--, o+=4)
bus_space_write_4(t, h, o, v);
@@ -1175,7 +1175,7 @@ bus_space_set_region_8(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t v;
+ const uint64_t v;
{
for (; c; c--, o+=8)
bus_space_write_8(t, h, o, v);
@@ -1270,22 +1270,22 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
static void bus_space_read_region_stream_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int8_t *,
+ uint8_t *,
bus_size_t));
static void bus_space_read_region_stream_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int16_t *,
+ uint16_t *,
bus_size_t));
static void bus_space_read_region_stream_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int32_t *,
+ uint32_t *,
bus_size_t));
static void bus_space_read_region_stream_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int64_t *,
+ uint64_t *,
bus_size_t));
static __inline void
@@ -1293,7 +1293,7 @@ bus_space_read_region_stream_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int8_t *a;
+ uint8_t *a;
{
for (; c; a++, c--, o++)
*a = bus_space_read_stream_1(t, h, o);
@@ -1303,7 +1303,7 @@ bus_space_read_region_stream_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int16_t *a;
+ uint16_t *a;
{
for (; c; a++, c--, o+=2)
*a = bus_space_read_stream_2(t, h, o);
@@ -1313,7 +1313,7 @@ bus_space_read_region_stream_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int32_t *a;
+ uint32_t *a;
{
for (; c; a++, c--, o+=4)
*a = bus_space_read_stream_4(t, h, o);
@@ -1323,7 +1323,7 @@ bus_space_read_region_stream_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- u_int64_t *a;
+ uint64_t *a;
{
for (; c; a++, c--, o+=8)
*a = bus_space_read_stream_8(t, h, o);
@@ -1338,29 +1338,29 @@ bus_space_read_region_stream_8(t, h, o, a, c)
static void bus_space_write_region_stream_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t *,
+ const uint8_t *,
bus_size_t));
static void bus_space_write_region_stream_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t *,
+ const uint16_t *,
bus_size_t));
static void bus_space_write_region_stream_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t *,
+ const uint32_t *,
bus_size_t));
static void bus_space_write_region_stream_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t *,
+ const uint64_t *,
bus_size_t));
static __inline void
bus_space_write_region_stream_1(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t *a;
+ const uint8_t *a;
{
for (; c; a++, c--, o++)
bus_space_write_stream_1(t, h, o, *a);
@@ -1371,7 +1371,7 @@ bus_space_write_region_stream_2(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t *a;
+ const uint16_t *a;
{
for (; c; a++, c--, o+=2)
bus_space_write_stream_2(t, h, o, *a);
@@ -1382,7 +1382,7 @@ bus_space_write_region_stream_4(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t *a;
+ const uint32_t *a;
{
for (; c; a++, c--, o+=4)
bus_space_write_stream_4(t, h, o, *a);
@@ -1393,7 +1393,7 @@ bus_space_write_region_stream_8(t, h, o, a, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t *a;
+ const uint64_t *a;
{
for (; c; a++, c--, o+=8)
bus_space_write_stream_8(t, h, o, *a);
@@ -1409,22 +1409,22 @@ bus_space_write_region_stream_8(t, h, o, a, c)
static void bus_space_set_region_stream_1 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int8_t,
+ const uint8_t,
bus_size_t));
static void bus_space_set_region_stream_2 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int16_t,
+ const uint16_t,
bus_size_t));
static void bus_space_set_region_stream_4 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int32_t,
+ const uint32_t,
bus_size_t));
static void bus_space_set_region_stream_8 __P((bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- const u_int64_t,
+ const uint64_t,
bus_size_t));
static __inline void
@@ -1432,7 +1432,7 @@ bus_space_set_region_stream_1(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int8_t v;
+ const uint8_t v;
{
for (; c; c--, o++)
bus_space_write_stream_1(t, h, o, v);
@@ -1443,7 +1443,7 @@ bus_space_set_region_stream_2(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int16_t v;
+ const uint16_t v;
{
for (; c; c--, o+=2)
bus_space_write_stream_2(t, h, o, v);
@@ -1454,7 +1454,7 @@ bus_space_set_region_stream_4(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int32_t v;
+ const uint32_t v;
{
for (; c; c--, o+=4)
bus_space_write_stream_4(t, h, o, v);
@@ -1465,7 +1465,7 @@ bus_space_set_region_stream_8(t, h, o, v, c)
bus_space_tag_t t;
bus_space_handle_t h;
bus_size_t o, c;
- const u_int64_t v;
+ const uint64_t v;
{
for (; c; c--, o+=8)
bus_space_write_stream_8(t, h, o, v);
diff --git a/sys/arch/sparc/include/frame.h b/sys/arch/sparc/include/frame.h
index 4bdab1ebc15..b477faf8a21 100644
--- a/sys/arch/sparc/include/frame.h
+++ b/sys/arch/sparc/include/frame.h
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: frame.h,v 1.7 2006/03/04 02:56:21 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -71,8 +71,8 @@ struct frame {
struct frame32 {
int32_t fr_local[8]; /* space to save locals (%l0..%l7) */
int32_t fr_arg[6]; /* space to save arguments (%i0..%i5) */
- u_int32_t fr_fp; /* space to save frame pointer (%i6) */
- u_int32_t fr_pc; /* space to save return pc (%i7) */
+ uint32_t fr_fp; /* space to save frame pointer (%i6) */
+ uint32_t fr_pc; /* space to save return pc (%i7) */
/*
* SunOS reserves another 8 words here; this is pointless
* but we do it for compatibility.
@@ -108,8 +108,8 @@ struct frame32 {
struct frame64 {
int64_t fr_local[8]; /* space to save locals (%l0..%l7) */
int64_t fr_arg[6]; /* space to save arguments (%i0..%i5) */
- u_int64_t fr_fp; /* space to save frame pointer (%i6) */
- u_int64_t fr_pc; /* space to save return pc (%i7) */
+ uint64_t fr_fp; /* space to save frame pointer (%i6) */
+ uint64_t fr_pc; /* space to save return pc (%i7) */
/*
* SVR4 reserves a bunch of extra stuff.
*/
diff --git a/sys/arch/sparc/include/openfirm.h b/sys/arch/sparc/include/openfirm.h
index 935ea70711b..d8a895f9a8c 100644
--- a/sys/arch/sparc/include/openfirm.h
+++ b/sys/arch/sparc/include/openfirm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.h,v 1.5 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: openfirm.h,v 1.6 2006/03/04 02:56:21 uwe Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -41,7 +41,7 @@
#ifdef SUN4U
/* All cells are 8 byte slots */
-typedef u_int64_t cell_t;
+typedef uint64_t cell_t;
#ifdef __arch64__
#define HDL2CELL(x) (cell_t)(u_int)(int)(x)
#define ADR2CELL(x) (cell_t)(x)
@@ -51,7 +51,7 @@ typedef u_int64_t cell_t;
#endif
#else /* SUN4U */
/* All cells are 4 byte slots */
-typedef u_int32_t cell_t;
+typedef uint32_t cell_t;
#define HDL2CELL(x) (cell_t)(x)
#define ADR2CELL(x) (cell_t)(x)
#endif /* SUN4U */
diff --git a/sys/arch/sparc/include/pci_machdep.h b/sys/arch/sparc/include/pci_machdep.h
index f771fe548ce..89ff84d0ae6 100644
--- a/sys/arch/sparc/include/pci_machdep.h
+++ b/sys/arch/sparc/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.5 2005/12/11 12:19:06 christos Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.6 2006/03/04 02:56:21 uwe Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -40,7 +40,7 @@
*/
typedef struct sparc_pci_chipset *pci_chipset_tag_t;
typedef u_int pci_intr_handle_t;
-typedef u_int64_t pcitag_t;
+typedef uint64_t pcitag_t;
/*
@@ -60,15 +60,15 @@ struct sparc_pci_chipset {
/*
* The MI PCI code expects pcitag_t to be a scalar type. But besides
* the bus/device/function we need to store the OFW node as well. We
- * can squeeze them into a u_int64_t with a little help from some
+ * can squeeze them into a uint64_t with a little help from some
* macros. And while we are at it mangle bus/device/function into a
* form directly suitable for pci mode1 configuration address port.
*/
#define PCITAG_CREATE(n,b,d,f) \
- (((u_int64_t)(n)<<32)|0x80000000U|((b)<<16)|((d)<<11)|((f)<<8))
+ (((uint64_t)(n)<<32)|0x80000000U|((b)<<16)|((d)<<11)|((f)<<8))
-#define PCITAG_NODE(t) ((u_int32_t)(((t)>>32)&0xffffffff))
-#define PCITAG_OFFSET(t) ((u_int32_t)((t)&0xffffffff))
+#define PCITAG_NODE(t) ((uint32_t)(((t)>>32)&0xffffffff))
+#define PCITAG_OFFSET(t) ((uint32_t)((t)&0xffffffff))
#define PCITAG_BUS(t) ((PCITAG_OFFSET(t)>>16)&0xFF)
#define PCITAG_DEV(t) ((PCITAG_OFFSET(t)>>11)&0x1F)
#define PCITAG_FUN(t) ((PCITAG_OFFSET(t)>>8)&0x7)
diff --git a/sys/arch/sparc/include/tctrl.h b/sys/arch/sparc/include/tctrl.h
index 75d749b2b4b..e3eab3cc32e 100644
--- a/sys/arch/sparc/include/tctrl.h
+++ b/sys/arch/sparc/include/tctrl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.h,v 1.2 2000/03/14 21:23:45 jdc Exp $ */
+/* $NetBSD: tctrl.h,v 1.3 2006/03/04 02:56:21 uwe Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,13 +39,13 @@
#define _MACHINE_TCTRL_H
struct tctrl_req {
- u_int8_t cmdbuf[16];
- u_int8_t cmdlen;
- u_int8_t cmdoff;
+ uint8_t cmdbuf[16];
+ uint8_t cmdlen;
+ uint8_t cmdoff;
struct proc *p;
- u_int8_t rspbuf[16];
- u_int8_t rspoff;
- u_int8_t rsplen;
+ uint8_t rspbuf[16];
+ uint8_t rspoff;
+ uint8_t rsplen;
};
typedef struct tctrl_req tctrl_req_t;
diff --git a/sys/arch/sparc/stand/bootxx/promlib.c b/sys/arch/sparc/stand/bootxx/promlib.c
index 312c8615e30..fa0917cf230 100644
--- a/sys/arch/sparc/stand/bootxx/promlib.c
+++ b/sys/arch/sparc/stand/bootxx/promlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: promlib.c,v 1.6 2005/12/24 23:24:06 perry Exp $ */
+/* $NetBSD: promlib.c,v 1.7 2006/03/04 03:01:18 uwe Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -99,10 +99,10 @@ obp_v2_seek(handle, offset)
int handle;
u_quad_t offset;
{
- u_int32_t hi, lo;
+ uint32_t hi, lo;
- lo = offset & ((u_int32_t)-1);
- hi = (offset >> 32) & ((u_int32_t)-1);
+ lo = offset & ((uint32_t)-1);
+ hi = (offset >> 32) & ((uint32_t)-1);
(*obpvec->pv_v2devops.v2_seek)(handle, hi, lo);
return (0);
}