Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys u_intNN_t -> uintNN_t
details: https://anonhg.NetBSD.org/src/rev/cfd7810b66c8
branches: trunk
changeset: 572403:cfd7810b66c8
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sun Jan 02 12:03:12 2005 +0000
description:
u_intNN_t -> uintNN_t
diffstat:
sys/arch/hp300/dev/com_dio.c | 6 +-
sys/arch/hp300/dev/dio.c | 40 ++++++------
sys/arch/hp300/dev/dioreg.h | 10 +-
sys/arch/hp300/dev/diovar.h | 14 ++--
sys/arch/hp300/dev/frodo.c | 50 ++++++++--------
sys/arch/hp300/dev/grf_dv.c | 8 +-
sys/arch/hp300/dev/grf_gb.c | 8 +-
sys/arch/hp300/dev/grf_hy.c | 8 +-
sys/arch/hp300/dev/grf_rb.c | 8 +-
sys/arch/hp300/dev/grf_tc.c | 12 +-
sys/arch/hp300/dev/hpibvar.h | 4 +-
sys/arch/hp300/dev/if_le.c | 14 ++--
sys/arch/hp300/dev/intiovar.h | 10 +-
sys/arch/hp300/dev/rtc.c | 22 +++---
sys/arch/hp300/dev/spc.c | 14 ++--
sys/arch/hp300/hp300/leds.c | 10 +-
sys/arch/hp300/hp300/machdep.c | 10 +-
sys/arch/hp300/hp300/softintr.c | 8 +-
sys/arch/hp300/include/bus.h | 62 ++++++++++----------
sys/arch/hp300/include/intr.h | 4 +-
sys/arch/hp300/stand/inst/inst.c | 4 +-
sys/dev/pci/pcscp.c | 22 +++---
sys/dev/pci/trm.c | 118 +++++++++++++++++++-------------------
23 files changed, 233 insertions(+), 233 deletions(-)
diffs (truncated from 1536 to 300 lines):
diff -r 8c33aa3b1192 -r cfd7810b66c8 sys/arch/hp300/dev/com_dio.c
--- a/sys/arch/hp300/dev/com_dio.c Sun Jan 02 10:40:49 2005 +0000
+++ b/sys/arch/hp300/dev/com_dio.c Sun Jan 02 12:03:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_dio.c,v 1.2 2004/08/28 17:37:00 thorpej Exp $ */
+/* $NetBSD: com_dio.c,v 1.3 2005/01/02 12:03:12 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_dio.c,v 1.2 2004/08/28 17:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_dio.c,v 1.3 2005/01/02 12:03:12 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,7 +174,7 @@
{
bus_space_tag_t iot = &comcntag;
bus_space_handle_t iohdca;
- u_int8_t id;
+ uint8_t id;
memcpy(iot, bst, sizeof(struct bus_space_tag));
dio_set_bus_space_oddbyte(iot);
diff -r 8c33aa3b1192 -r cfd7810b66c8 sys/arch/hp300/dev/dio.c
--- a/sys/arch/hp300/dev/dio.c Sun Jan 02 10:40:49 2005 +0000
+++ b/sys/arch/hp300/dev/dio.c Sun Jan 02 12:03:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dio.c,v 1.27 2004/08/28 17:37:00 thorpej Exp $ */
+/* $NetBSD: dio.c,v 1.28 2005/01/02 12:03:12 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.27 2004/08/28 17:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.28 2005/01/02 12:03:12 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -315,26 +315,26 @@
/*
* DIO specific bus_space(9) support functions.
*/
-static u_int8_t dio_bus_space_read_oddbyte_1(bus_space_tag_t,
+static uint8_t dio_bus_space_read_oddbyte_1(bus_space_tag_t,
bus_space_handle_t, bus_size_t);
static void dio_bus_space_write_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, u_int8_t);
+ bus_space_handle_t, bus_size_t, uint8_t);
static void dio_bus_space_read_multi_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+ bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
static void dio_bus_space_write_multi_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t);
+ bus_space_handle_t, bus_size_t, const uint8_t *, bus_size_t);
static void dio_bus_space_read_region_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+ bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
static void dio_bus_space_write_region_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t);
+ bus_space_handle_t, bus_size_t, const uint8_t *, bus_size_t);
static void dio_bus_space_set_multi_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, u_int8_t, bus_size_t);
+ bus_space_handle_t, bus_size_t, uint8_t, bus_size_t);
static void dio_bus_space_set_region_oddbyte_1(bus_space_tag_t,
- bus_space_handle_t, bus_size_t, u_int8_t, bus_size_t);
+ bus_space_handle_t, bus_size_t, uint8_t, bus_size_t);
/*
* dio_set_bus_space_oddbyte():
@@ -360,25 +360,25 @@
bst->bssr1 = dio_bus_space_set_region_oddbyte_1;
}
-static u_int8_t
+static uint8_t
dio_bus_space_read_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
bus_size_t offset)
{
- return *(volatile u_int8_t *)(bsh + (offset << 1) + 1);
+ return *(volatile uint8_t *)(bsh + (offset << 1) + 1);
}
static void
dio_bus_space_write_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t val)
+ bus_size_t offset, uint8_t val)
{
- *(volatile u_int8_t *)(bsh + (offset << 1) + 1) = val;
+ *(volatile uint8_t *)(bsh + (offset << 1) + 1) = val;
}
static void
dio_bus_space_read_multi_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t *addr, bus_size_t len)
+ bus_size_t offset, uint8_t *addr, bus_size_t len)
{
__asm __volatile (
@@ -395,7 +395,7 @@
static void
dio_bus_space_write_multi_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, const u_int8_t *addr, bus_size_t len)
+ bus_size_t offset, const uint8_t *addr, bus_size_t len)
{
__asm __volatile (
@@ -412,7 +412,7 @@
static void
dio_bus_space_read_region_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t *addr, bus_size_t len)
+ bus_size_t offset, uint8_t *addr, bus_size_t len)
{
__asm __volatile (
" movl %0,%%a0 ;\n"
@@ -429,7 +429,7 @@
static void
dio_bus_space_write_region_oddbyte_1(bus_space_tag_t bst,
- bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr,
+ bus_space_handle_t bsh, bus_size_t offset, const uint8_t *addr,
bus_size_t len)
{
@@ -448,7 +448,7 @@
static void
dio_bus_space_set_multi_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t val, bus_size_t count)
+ bus_size_t offset, uint8_t val, bus_size_t count)
{
__asm __volatile (
" movl %0,%%a0 ;\n"
@@ -464,7 +464,7 @@
static void
dio_bus_space_set_region_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t val, bus_size_t count)
+ bus_size_t offset, uint8_t val, bus_size_t count)
{
__asm __volatile (
diff -r 8c33aa3b1192 -r cfd7810b66c8 sys/arch/hp300/dev/dioreg.h
--- a/sys/arch/hp300/dev/dioreg.h Sun Jan 02 10:40:49 2005 +0000
+++ b/sys/arch/hp300/dev/dioreg.h Sun Jan 02 12:03:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dioreg.h,v 1.4 1997/10/09 09:06:52 jtc Exp $ */
+/* $NetBSD: dioreg.h,v 1.5 2005/01/02 12:03:12 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -118,23 +118,23 @@
* the base address of the device.
*/
#define DIO_ID(base) \
- (*((u_int8_t *)((u_long)(base) + DIO_IDOFF)))
+ (*((uint8_t *)((u_long)(base) + DIO_IDOFF)))
#define DIO_SECID(base) \
- (*((u_int8_t *)((u_long)(base) + DIO_SECIDOFF)))
+ (*((uint8_t *)((u_long)(base) + DIO_SECIDOFF)))
/*
* Macro to extract the interrupt level, given the
* base address of the device.
*/
#define DIO_IPL(base) \
- ((((*((u_int8_t *)((u_long)(base) + DIO_IPLOFF))) >> 4) & 0x03) + 3)
+ ((((*((uint8_t *)((u_long)(base) + DIO_IPLOFF))) >> 4) & 0x03) + 3)
/*
* Macro to compute the size of a DIO-II device's address
* space, given the base address of the device.
*/
#define DIOII_SIZE(base) \
- ((int)((*((u_int8_t *)((u_long)(base) + DIOII_SIZEOFF)) + 1) \
+ ((int)((*((uint8_t *)((u_long)(base) + DIOII_SIZEOFF)) + 1) \
* 0x100000))
/*
diff -r 8c33aa3b1192 -r cfd7810b66c8 sys/arch/hp300/dev/diovar.h
--- a/sys/arch/hp300/dev/diovar.h Sun Jan 02 10:40:49 2005 +0000
+++ b/sys/arch/hp300/dev/diovar.h Sun Jan 02 12:03:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: diovar.h,v 1.10 2004/08/28 17:37:00 thorpej Exp $ */
+/* $NetBSD: diovar.h,v 1.11 2005/01/02 12:03:12 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -51,8 +51,8 @@
int da_addr; /* device address */
int da_size; /* size of address space */
int da_ipl; /* interrupt priority level */
- u_int8_t da_id; /* primary device id */
- u_int8_t da_secid; /* secondary device id */
+ uint8_t da_id; /* primary device id */
+ uint8_t da_secid; /* secondary device id */
};
/*
@@ -60,8 +60,8 @@
* the size of a DIO device (not all use one select code).
*/
struct dio_devdata {
- u_int8_t dd_id; /* primary device id */
- u_int8_t dd_secid; /* secondary device id */
+ uint8_t dd_id; /* primary device id */
+ uint8_t dd_secid; /* secondary device id */
int dd_nscode; /* number of select codes */
};
@@ -70,8 +70,8 @@
* a textual description of a device.
*/
struct dio_devdesc {
- u_int8_t dd_id; /* primary device id */
- u_int8_t dd_secid; /* secondary device id */
+ uint8_t dd_id; /* primary device id */
+ uint8_t dd_secid; /* secondary device id */
const char *dd_desc; /* description */
};
diff -r 8c33aa3b1192 -r cfd7810b66c8 sys/arch/hp300/dev/frodo.c
--- a/sys/arch/hp300/dev/frodo.c Sun Jan 02 10:40:49 2005 +0000
+++ b/sys/arch/hp300/dev/frodo.c Sun Jan 02 12:03:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frodo.c,v 1.18 2004/08/28 17:37:00 thorpej Exp $ */
+/* $NetBSD: frodo.c,v 1.19 2005/01/02 12:03:12 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.18 2004/08/28 17:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.19 2005/01/02 12:03:12 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -98,7 +98,7 @@
struct frodo_softc {
struct device sc_dev; /* generic device glue */
- volatile u_int8_t *sc_regs; /* register base */
+ volatile uint8_t *sc_regs; /* register base */
struct frodo_interhand sc_intr[FRODO_NINTR]; /* interrupt handlers */
int sc_ipl;
void *sc_ih; /* out interrupt cookie */
@@ -114,7 +114,7 @@
static int frodointr(void *);
-static void frodo_imask(struct frodo_softc *, u_int16_t, u_int16_t);
+static void frodo_imask(struct frodo_softc *, uint16_t, uint16_t);
CFATTACH_DECL(frodo, sizeof(struct frodo_softc),
frodomatch, frodoattach, NULL, NULL);
@@ -156,7 +156,7 @@
const struct frodo_device *fd;
struct frodo_attach_args fa;
- sc->sc_regs = (volatile u_int8_t *)ia->ia_addr;
+ sc->sc_regs = (volatile uint8_t *)ia->ia_addr;
sc->sc_ipl = ia->ia_ipl;
if ((FRODO_READ(sc, FRODO_IISR) & FRODO_IISR_SERVICE) == 0)
@@ -340,9 +340,9 @@
}
static void
-frodo_imask(struct frodo_softc *sc, u_int16_t set, u_int16_t clear)
+frodo_imask(struct frodo_softc *sc, uint16_t set, uint16_t clear)
{
- u_int16_t imask;
+ uint16_t imask;
imask = FRODO_GETMASK(sc);
@@ -355,26 +355,26 @@
/*
* frodo chip specific bus_space(9) support functions.
*/
-static u_int8_t frodo_bus_space_read_sparse_1(bus_space_tag_t,
+static uint8_t frodo_bus_space_read_sparse_1(bus_space_tag_t,
bus_space_handle_t, bus_size_t);
static void frodo_bus_space_write_sparse_1(bus_space_tag_t,
Home |
Main Index |
Thread Index |
Old Index