summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1999-11-26 17:35:00 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1999-11-26 17:35:00 +0000
commitf13d3d7960d196bd2233c2e4697d0681a9e0a6b2 (patch)
treed27a26dc198506cfc36bbdd5819dd76e4b065ccc /sys
parentb8c199762ffbd0be2c81425e9b86cf32d01516a1 (diff)
fix types for raw routines, also fix macros in bus.h for raw multi; 10x niklas@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hppa/hppa/mainbus.c86
-rw-r--r--sys/arch/hppa/include/bus.h86
2 files changed, 88 insertions, 84 deletions
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c
index 17fa8ca01e6..7e96506d759 100644
--- a/sys/arch/hppa/hppa/mainbus.c
+++ b/sys/arch/hppa/hppa/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.5 1999/11/25 18:25:31 mickey Exp $ */
+/* $OpenBSD: mainbus.c,v 1.6 1999/11/26 17:34:59 mickey Exp $ */
/*
* Copyright (c) 1998,1999 Michael Shalayeff
@@ -315,7 +315,7 @@ mbus_w8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv)
void
-mbus_rm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, size_t c)
+mbus_rm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -323,7 +323,7 @@ mbus_rm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, size_t c)
}
void
-mbus_rm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, size_t c)
+mbus_rm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -331,7 +331,7 @@ mbus_rm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, size_t c)
}
void
-mbus_rm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, size_t c)
+mbus_rm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -339,7 +339,7 @@ mbus_rm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, size_t c)
}
void
-mbus_rm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, size_t c)
+mbus_rm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -347,7 +347,7 @@ mbus_rm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, size_t c)
}
void
-mbus_wm_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, size_t c)
+mbus_wm_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -355,7 +355,7 @@ mbus_wm_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, size_t
}
void
-mbus_wm_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, size_t c)
+mbus_wm_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -363,7 +363,7 @@ mbus_wm_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, size_
}
void
-mbus_wm_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, size_t c)
+mbus_wm_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -371,7 +371,7 @@ mbus_wm_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, size_
}
void
-mbus_wm_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, size_t c)
+mbus_wm_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -379,7 +379,7 @@ mbus_wm_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, size_
}
void
-mbus_sm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, size_t c)
+mbus_sm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -387,7 +387,7 @@ mbus_sm_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, size_t c)
}
void
-mbus_sm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, size_t c)
+mbus_sm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -395,7 +395,7 @@ mbus_sm_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, size_t c)
}
void
-mbus_sm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, size_t c)
+mbus_sm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -403,7 +403,7 @@ mbus_sm_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, size_t c)
}
void
-mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, size_t c)
+mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -411,21 +411,21 @@ mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, size_t c)
}
void mbus_rrm_2 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t*a, size_t c));
+ bus_size_t o, u_int16_t*a, bus_size_t c));
void mbus_rrm_4 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t*a, size_t c));
+ bus_size_t o, u_int32_t*a, bus_size_t c));
void mbus_rrm_8 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t*a, size_t c));
+ bus_size_t o, u_int64_t*a, bus_size_t c));
void mbus_wrm_2 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, size_t c));
+ bus_size_t o, const u_int16_t *a, bus_size_t c));
void mbus_wrm_4 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, size_t c));
+ bus_size_t o, const u_int32_t *a, bus_size_t c));
void mbus_wrm_8 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, size_t c));
+ bus_size_t o, const u_int64_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, size_t c)
+mbus_rr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -433,7 +433,7 @@ mbus_rr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, size_t c)
}
void
-mbus_rr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, size_t c)
+mbus_rr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -441,7 +441,7 @@ mbus_rr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t *a, size_t c)
}
void
-mbus_rr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, size_t c)
+mbus_rr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -449,7 +449,7 @@ mbus_rr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t *a, size_t c)
}
void
-mbus_rr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, size_t c)
+mbus_rr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -457,7 +457,7 @@ mbus_rr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t *a, size_t c)
}
void
-mbus_wr_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, size_t c)
+mbus_wr_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -465,7 +465,7 @@ mbus_wr_1(void *v, bus_space_handle_t h, bus_size_t o, const u_int8_t *a, size_t
}
void
-mbus_wr_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, size_t c)
+mbus_wr_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -473,7 +473,7 @@ mbus_wr_2(void *v, bus_space_handle_t h, bus_size_t o, const u_int16_t *a, size_
}
void
-mbus_wr_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, size_t c)
+mbus_wr_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -481,7 +481,7 @@ mbus_wr_4(void *v, bus_space_handle_t h, bus_size_t o, const u_int32_t *a, size_
}
void
-mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, size_t c)
+mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_size_t c)
{
h += o;
while (c--)
@@ -489,21 +489,21 @@ mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, size_
}
void mbus_rrr_2 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, size_t c));
+ bus_size_t o, u_int16_t *a, bus_size_t c));
void mbus_rrr_4 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, size_t c));
+ bus_size_t o, u_int32_t *a, bus_size_t c));
void mbus_rrr_8 __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, size_t c));
+ bus_size_t o, u_int64_t *a, bus_size_t c));
void mbus_wrr_2 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, size_t c));
+ bus_size_t o, const u_int16_t *a, bus_size_t c));
void mbus_wrr_4 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, size_t c));
+ bus_size_t o, const u_int32_t *a, bus_size_t c));
void mbus_wrr_8 __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, size_t c));
+ bus_size_t o, const u_int64_t *a, bus_size_t c));
void
-mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, size_t c)
+mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -511,7 +511,7 @@ mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, size_t c)
}
void
-mbus_sr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, size_t c)
+mbus_sr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -519,7 +519,7 @@ mbus_sr_2(void *v, bus_space_handle_t h, bus_size_t o, u_int16_t vv, size_t c)
}
void
-mbus_sr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, size_t c)
+mbus_sr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -527,7 +527,7 @@ mbus_sr_4(void *v, bus_space_handle_t h, bus_size_t o, u_int32_t vv, size_t c)
}
void
-mbus_sr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, size_t c)
+mbus_sr_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, bus_size_t c)
{
h += o;
while (c--)
@@ -579,6 +579,10 @@ mbus_cp_8(void *v, bus_space_handle_t h1, bus_size_t o1,
}
+/* ugly typecast macro */
+#define crr(n) ((void (*) __P((void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)))(n))
+#define cwr(n) ((void (*) __P((void *, bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t)))(n))
+
const struct hppa_bus_space_tag hppa_bustag = {
NULL,
@@ -590,13 +594,13 @@ const struct hppa_bus_space_tag hppa_bustag = {
mbus_wm_1, mbus_wm_2, mbus_wm_4, mbus_wm_8,
mbus_sm_1, mbus_sm_2, mbus_sm_4, mbus_sm_8,
/* *_raw_* are the same as non-raw for native busses */
- mbus_rm_2, mbus_rm_4, mbus_rm_8,
- mbus_wm_2, mbus_wm_4, mbus_wm_8,
+ crr(mbus_rm_2), crr(mbus_rm_4), crr(mbus_rm_8),
+ cwr(mbus_wm_2), cwr(mbus_wm_4), cwr(mbus_wm_8),
mbus_rr_1, mbus_rr_2, mbus_rr_4, mbus_rr_8,
mbus_wr_1, mbus_wr_2, mbus_wr_4, mbus_wr_8,
/* *_raw_* are the same as non-raw for native busses */
- mbus_rr_2, mbus_rr_4, mbus_rr_8,
- mbus_wr_2, mbus_wr_4, mbus_wr_8,
+ crr(mbus_rr_2), crr(mbus_rr_4), crr(mbus_rr_8),
+ cwr(mbus_wr_2), cwr(mbus_wr_4), cwr(mbus_wr_8),
mbus_sr_1, mbus_sr_2, mbus_sr_4, mbus_sr_8,
mbus_cp_1, mbus_cp_2, mbus_cp_4, mbus_cp_8
};
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index 7bc26803133..6fd14c67cbe 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.9 1999/11/25 18:25:31 mickey Exp $ */
+/* $OpenBSD: bus.h,v 1.10 1999/11/26 17:34:59 mickey Exp $ */
/*
* Copyright (c) 1998,1999 Michael Shalayeff
@@ -73,86 +73,86 @@ struct hppa_bus_space_tag {
void (*hbt_w8)__P((void *, bus_space_handle_t, bus_size_t, u_int64_t));
void (*hbt_rm_1) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rm_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, size_t c));
+ bus_size_t o, u_int16_t *a, bus_size_t c));
void (*hbt_rm_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, size_t c));
+ bus_size_t o, u_int32_t *a, bus_size_t c));
void (*hbt_rm_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, size_t c));
+ bus_size_t o, u_int64_t *a, bus_size_t c));
void (*hbt_wm_1) __P((void *v, bus_space_handle_t h, bus_size_t o,
- const u_int8_t *a, size_t c));
+ const u_int8_t *a, bus_size_t c));
void (*hbt_wm_2) __P((void *v, bus_space_handle_t h, bus_size_t o,
- const u_int16_t *a, size_t c));
+ const u_int16_t *a, bus_size_t c));
void (*hbt_wm_4) __P((void *v, bus_space_handle_t h, bus_size_t o,
- const u_int32_t *a, size_t c));
+ const u_int32_t *a, bus_size_t c));
void (*hbt_wm_8) __P((void *v, bus_space_handle_t h, bus_size_t o,
- const u_int64_t *a, size_t c));
+ const u_int64_t *a, bus_size_t c));
void (*hbt_sm_1) __P((void *v, bus_space_handle_t h, bus_size_t o,
- u_int8_t vv, size_t c));
+ u_int8_t vv, bus_size_t c));
void (*hbt_sm_2) __P((void *v, bus_space_handle_t h, bus_size_t o,
- u_int16_t vv, size_t c));
+ u_int16_t vv, bus_size_t c));
void (*hbt_sm_4) __P((void *v, bus_space_handle_t h, bus_size_t o,
- u_int32_t vv, size_t c));
+ u_int32_t vv, bus_size_t c));
void (*hbt_sm_8) __P((void *v, bus_space_handle_t h, bus_size_t o,
- u_int64_t vv, size_t c));
+ u_int64_t vv, bus_size_t c));
void (*hbt_rrm_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t*a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rrm_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t*a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rrm_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t*a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_wrm_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_wrm_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_wrm_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_rr_1) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rr_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, size_t c));
+ bus_size_t o, u_int16_t *a, bus_size_t c));
void (*hbt_rr_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, size_t c));
+ bus_size_t o, u_int32_t *a, bus_size_t c));
void (*hbt_rr_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, size_t c));
+ bus_size_t o, u_int64_t *a, bus_size_t c));
void (*hbt_wr_1) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_wr_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, size_t c));
+ bus_size_t o, const u_int16_t *a, bus_size_t c));
void (*hbt_wr_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, size_t c));
+ bus_size_t o, const u_int32_t *a, bus_size_t c));
void (*hbt_wr_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, size_t c));
+ bus_size_t o, const u_int64_t *a, bus_size_t c));
void (*hbt_rrr_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rrr_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_rrr_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, size_t c));
+ bus_size_t o, u_int8_t *a, bus_size_t c));
void (*hbt_wrr_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_wrr_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_wrr_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, size_t c));
+ bus_size_t o, const u_int8_t *a, bus_size_t c));
void (*hbt_sr_1) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t vv, size_t c));
+ bus_size_t o, u_int8_t vv, bus_size_t c));
void (*hbt_sr_2) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t vv, size_t c));
+ bus_size_t o, u_int16_t vv, bus_size_t c));
void (*hbt_sr_4) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t vv, size_t c));
+ bus_size_t o, u_int32_t vv, bus_size_t c));
void (*hbt_sr_8) __P((void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t vv, size_t c));
+ bus_size_t o, u_int64_t vv, bus_size_t c));
void (*hbt_cp_1) __P((void *v, bus_space_handle_t h1, bus_size_t o1,
bus_space_handle_t h2, bus_size_t o2, bus_size_t c));
@@ -218,18 +218,18 @@ extern const struct hppa_bus_space_tag hppa_bustag;
(((t)->hbt_sm_8)((t)->hbt_cookie, (h), (o), (v), (c)))
#define bus_space_read_raw_multi_2(t, h, o, a, c) \
- (((t)->hbt_rm_2)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_rrm_2)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_read_raw_multi_4(t, h, o, a, c) \
- (((t)->hbt_rm_4)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_rrm_4)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_read_raw_multi_8(t, h, o, a, c) \
- (((t)->hbt_rm_8)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_rrm_8)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_write_raw_multi_2(t, h, o, a, c) \
- (((t)->hbt_wm_2)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_wrm_2)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_write_raw_multi_4(t, h, o, a, c) \
- (((t)->hbt_wm_4)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_wrm_4)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_write_raw_multi_8(t, h, o, a, c) \
- (((t)->hbt_wm_8)((t)->hbt_cookie, (h), (o), (a), (c)))
+ (((t)->hbt_wrm_8)((t)->hbt_cookie, (h), (o), (a), (c)))
#define bus_space_read_region_1(t, h, o, a, c) \
(((t)->hbt_rr_1)((t)->hbt_cookie, (h), (o), (a), (c)))