Module Name: src
Committed By: skrll
Date: Thu Feb 23 21:38:53 UTC 2012
Modified Files:
src/sys/arch/hp700/hp700: disksubr.c machdep.c machdep.h mainbus.c
Log Message:
u_intXX_t -> uintXX_t
Same code before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hp700/hp700/disksubr.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp700/hp700/machdep.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/hp700/hp700/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/disksubr.c
diff -u src/sys/arch/hp700/hp700/disksubr.c:1.26 src/sys/arch/hp700/hp700/disksubr.c:1.27
--- src/sys/arch/hp700/hp700/disksubr.c:1.26 Fri May 8 09:33:58 2009
+++ src/sys/arch/hp700/hp700/disksubr.c Thu Feb 23 21:38:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.26 2009/05/08 09:33:58 skrll Exp $ */
+/* $NetBSD: disksubr.c,v 1.27 2012/02/23 21:38:53 skrll 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.27 2012/02/23 21:38:53 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ readbsdlabel(struct buf *bp, void (*stra
{
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)
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.107 src/sys/arch/hp700/hp700/machdep.c:1.108
--- src/sys/arch/hp700/hp700/machdep.c:1.107 Sun Feb 5 08:24:43 2012
+++ src/sys/arch/hp700/hp700/machdep.c Thu Feb 23 21:38:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.107 2012/02/05 08:24:43 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.108 2012/02/23 21:38:53 skrll 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.108 2012/02/23 21:38:53 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -152,7 +152,7 @@ int dcache_stride, dcache_line_mask;
/*
* things to not kill
*/
-volatile u_int8_t *machine_ledaddr;
+volatile uint8_t *machine_ledaddr;
int machine_ledword, machine_leds;
/*
@@ -1457,7 +1457,7 @@ cpu_reboot(int howto, char *user_boot_st
/* NOTREACHED */
}
-u_int32_t dumpmag = 0x8fca0101; /* magic number */
+uint32_t dumpmag = 0x8fca0101; /* magic number */
int dumpsize = 0; /* pages */
long dumplo = 0; /* blocks */
Index: src/sys/arch/hp700/hp700/machdep.h
diff -u src/sys/arch/hp700/hp700/machdep.h:1.8 src/sys/arch/hp700/hp700/machdep.h:1.9
--- src/sys/arch/hp700/hp700/machdep.h:1.8 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/hp700/machdep.h Thu Feb 23 21:38:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.8 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: machdep.h,v 1.9 2012/02/23 21:38:53 skrll Exp $ */
/* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */
@@ -95,7 +95,7 @@ void hp700_pagezero_unmap(int);
/* 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) \
Index: src/sys/arch/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.80 src/sys/arch/hp700/hp700/mainbus.c:1.81
--- src/sys/arch/hp700/hp700/mainbus.c:1.80 Mon Jan 9 15:15:40 2012
+++ src/sys/arch/hp700/hp700/mainbus.c Thu Feb 23 21:38:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.80 2012/01/09 15:15:40 martin Exp $ */
+/* $NetBSD: mainbus.c,v 1.81 2012/02/23 21:38:53 skrll 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.81 2012/02/23 21:38:53 skrll Exp $");
#include "locators.h"
#include "power.h"
@@ -118,38 +118,38 @@ static int mb_attached;
/* 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 @@ mbus_mmap(void *v, bus_addr_t addr, off_
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
-mbus_wm_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c)
+mbus_wm_4(void *v, bus_space_handle_t h, bus_size_t o, const uint32_t *a, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int32_t *)h = *(a++);
+ *(volatile uint32_t *)h = *(a++);
}
void
-mbus_wm_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c)
+mbus_wm_8(void *v, bus_space_handle_t h, bus_size_t o, const uint64_t *a, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int64_t *)h = *(a++);
+ *(volatile uint64_t *)h = *(a++);
}
void
-mbus_sm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, bus_size_t c)
+mbus_sm_1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t vv, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int8_t *)h = vv;
+ *(volatile uint8_t *)h = vv;
}
void
-mbus_sm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, bus_size_t c)
+mbus_sm_2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t vv, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int16_t *)h = vv;
+ *(volatile uint16_t *)h = vv;
}
void
-mbus_sm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, bus_size_t c)
+mbus_sm_4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t vv, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int32_t *)h = vv;
+ *(volatile uint32_t *)h = vv;
}
void
-mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, bus_size_t c)
+mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t vv, bus_size_t c)
{
h += o;
while (c--)
- *(volatile u_int64_t *)h = vv;
+ *(volatile uint64_t *)h = vv;
}
-void mbus_rrm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t*a, bus_size_t c);
-void mbus_rrm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t*a, bus_size_t c);
-void mbus_rrm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t*a, bus_size_t c);
+void mbus_rrm_2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t*a, bus_size_t c);
+void mbus_rrm_4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t*a, bus_size_t c);
+void mbus_rrm_8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t*a, bus_size_t c);
-void mbus_wrm_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c);
-void mbus_wrm_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c);
-void mbus_wrm_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c);
+void mbus_wrm_2(void *v, bus_space_handle_t h, bus_size_t o, const uint16_t *a, bus_size_t c);
+void mbus_wrm_4(void *v, bus_space_handle_t h, bus_size_t o, const uint32_t *a, bus_size_t c);
+void mbus_wrm_8(void *v, bus_space_handle_t h, bus_size_t o, const uint64_t *a, bus_size_t c);
void
-mbus_rr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c)
+mbus_rr_1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t *a, bus_size_t c)
{
- volatile u_int8_t *p;
+ volatile uint8_t *p;
h += o;
p = (void *)h;
@@ -526,9 +526,9 @@ mbus_rr_1(void *v, bus_space_handle_t h,
}
void
-mbus_rr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, bus_size_t c)
+mbus_rr_2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t *a, bus_size_t c)
{
- volatile u_int16_t *p;
+ volatile uint16_t *p;
h += o;
p = (void *)h;
@@ -537,9 +537,9 @@ mbus_rr_2(void *v, bus_space_handle_t h,
}
void
-mbus_rr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, bus_size_t c)
+mbus_rr_4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t *a, bus_size_t c)
{
- volatile u_int32_t *p;
+ volatile uint32_t *p;
h += o;
p = (void *)h;
@@ -548,9 +548,9 @@ mbus_rr_4(void *v, bus_space_handle_t h,
}
void
-mbus_rr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, bus_size_t c)
+mbus_rr_8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t *a, bus_size_t c)
{
- volatile u_int64_t *p;
+ volatile uint64_t *p;
h += o;
p = (void *)h;
@@ -559,9 +559,9 @@ mbus_rr_8(void *v, bus_space_handle_t h,
}
void
-mbus_wr_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, bus_size_t c)
+mbus_wr_1(void *v, bus_space_handle_t h, bus_size_t o, const uint8_t *a, bus_size_t c)
{
- volatile u_int8_t *p;
+ volatile uint8_t *p;
h += o;
p = (void *)h;
@@ -570,9 +570,9 @@ mbus_wr_1(void *v, bus_space_handle_t h,
}
void
-mbus_wr_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c)
+mbus_wr_2(void *v, bus_space_handle_t h, bus_size_t o, const uint16_t *a, bus_size_t c)
{
- volatile u_int16_t *p;
+ volatile uint16_t *p;
h += o;
p = (void *)h;
@@ -581,9 +581,9 @@ mbus_wr_2(void *v, bus_space_handle_t h,
}
void
-mbus_wr_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c)
+mbus_wr_4(void *v, bus_space_handle_t h, bus_size_t o, const uint32_t *a, bus_size_t c)
{
- volatile u_int32_t *p;
+ volatile uint32_t *p;
h += o;
p = (void *)h;
@@ -592,9 +592,9 @@ mbus_wr_4(void *v, bus_space_handle_t h,
}
void
-mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c)
+mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const uint64_t *a, bus_size_t c)
{
- volatile u_int64_t *p;
+ volatile uint64_t *p;
h += o;
p = (void *)h;
@@ -602,18 +602,18 @@ mbus_wr_8(void *v, bus_space_handle_t h,
*p++ = *a++;
}
-void mbus_rrr_2(void *, bus_space_handle_t, bus_size_t, u_int16_t *, bus_size_t);
-void mbus_rrr_4(void *, bus_space_handle_t, bus_size_t, u_int32_t *, bus_size_t);
-void mbus_rrr_8(void *, bus_space_handle_t, bus_size_t, u_int64_t *, bus_size_t);
+void mbus_rrr_2(void *, bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
+void mbus_rrr_4(void *, bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
+void mbus_rrr_8(void *, bus_space_handle_t, bus_size_t, uint64_t *, bus_size_t);
-void mbus_wrr_2(void *, bus_space_handle_t, bus_size_t, const u_int16_t *, bus_size_t);
-void mbus_wrr_4(void *, bus_space_handle_t, bus_size_t, const u_int32_t *, bus_size_t);
-void mbus_wrr_8(void *, bus_space_handle_t, bus_size_t, const u_int64_t *, bus_size_t);
+void mbus_wrr_2(void *, bus_space_handle_t, bus_size_t, const uint16_t *, bus_size_t);
+void mbus_wrr_4(void *, bus_space_handle_t, bus_size_t, const uint32_t *, bus_size_t);
+void mbus_wrr_8(void *, bus_space_handle_t, bus_size_t, const uint64_t *, bus_size_t);
void
-mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, bus_size_t c)
+mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t vv, bus_size_t c)
{
- volatile u_int8_t *p;
+ volatile uint8_t *p;
h += o;
p = (void *)h;
@@ -622,9 +622,9 @@ mbus_sr_1(void *v, bus_space_handle_t h,
}
void
-mbus_sr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, bus_size_t c)
+mbus_sr_2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t vv, bus_size_t c)
{
- volatile u_int16_t *p;
+ volatile uint16_t *p;
h += o;
p = (void *)h;
@@ -633,9 +633,9 @@ mbus_sr_2(void *v, bus_space_handle_t h,
}
void
-mbus_sr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, bus_size_t c)
+mbus_sr_4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t vv, bus_size_t c)
{
- volatile u_int32_t *p;
+ volatile uint32_t *p;
h += o;
p = (void *)h;
@@ -644,9 +644,9 @@ mbus_sr_4(void *v, bus_space_handle_t h,
}
void
-mbus_sr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, bus_size_t c)
+mbus_sr_8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t vv, bus_size_t c)
{
- volatile u_int64_t *p;
+ volatile uint64_t *p;
h += o;
p = (void *)h;
@@ -658,7 +658,7 @@ void
mbus_cp_1(void *v, bus_space_handle_t h1, bus_size_t o1,
bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
{
- volatile u_int8_t *p1, *p2;
+ volatile uint8_t *p1, *p2;
h1 += o1;
h2 += o2;
@@ -672,7 +672,7 @@ void
mbus_cp_2(void *v, bus_space_handle_t h1, bus_size_t o1,
bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
{
- volatile u_int16_t *p1, *p2;
+ volatile uint16_t *p1, *p2;
h1 += o1;
h2 += o2;
@@ -686,7 +686,7 @@ void
mbus_cp_4(void *v, bus_space_handle_t h1, bus_size_t o1,
bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
{
- volatile u_int32_t *p1, *p2;
+ volatile uint32_t *p1, *p2;
h1 += o1;
h2 += o2;
@@ -700,7 +700,7 @@ void
mbus_cp_8(void *v, bus_space_handle_t h1, bus_size_t o1,
bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
{
- volatile u_int64_t *p1, *p2;
+ volatile uint64_t *p1, *p2;
h1 += o1;
h2 += o2;
