diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index 3adef4221cf0..627fec6cdc9d 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.5 1996/10/22 18:06:54 cgd Exp $ */ +/* $NetBSD: bus.h,v 1.6 1996/10/22 21:23:49 cgd Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -44,82 +44,82 @@ typedef u_long bus_space_handle_t; struct alpha_bus_space { /* cookie */ - void *bs_cookie; + void *abs_cookie; /* mapping/unmapping */ - int (*bs_map) __P((void *, bus_addr_t, bus_size_t, + int (*abs_map) __P((void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *)); - void (*bs_unmap) __P((void *, bus_space_handle_t, + void (*abs_unmap) __P((void *, bus_space_handle_t, bus_size_t)); - int (*bs_subregion) __P((void *, bus_space_handle_t, + int (*abs_subregion) __P((void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *)); /* allocation/deallocation */ - int (*bs_alloc) __P((void *, bus_addr_t, bus_addr_t, - bus_size_t, bus_size_t, bus_addr_t, int, + int (*abs_alloc) __P((void *, bus_addr_t, bus_addr_t, + bus_size_t, bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *)); - void (*bs_free) __P((void *, bus_space_handle_t, + void (*abs_free) __P((void *, bus_space_handle_t, bus_size_t)); /* read (single) */ - u_int8_t (*bs_r_1) __P((void *, bus_space_handle_t, + u_int8_t (*abs_r_1) __P((void *, bus_space_handle_t, bus_size_t)); - u_int16_t (*bs_r_2) __P((void *, bus_space_handle_t, + u_int16_t (*abs_r_2) __P((void *, bus_space_handle_t, bus_size_t)); - u_int32_t (*bs_r_4) __P((void *, bus_space_handle_t, + u_int32_t (*abs_r_4) __P((void *, bus_space_handle_t, bus_size_t)); - u_int64_t (*bs_r_8) __P((void *, bus_space_handle_t, + u_int64_t (*abs_r_8) __P((void *, bus_space_handle_t, bus_size_t)); /* read multi */ - void (*bs_rm_1) __P((void *, bus_space_handle_t, bus_size_t, - u_int8_t *, size_t)); - void (*bs_rm_2) __P((void *, bus_space_handle_t, bus_size_t, - u_int16_t *, size_t)); - void (*bs_rm_4) __P((void *, bus_space_handle_t, bus_size_t, - u_int32_t *, size_t)); - void (*bs_rm_8) __P((void *, bus_space_handle_t, bus_size_t, - u_int64_t *, size_t)); + void (*abs_rm_1) __P((void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t)); + void (*abs_rm_2) __P((void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t)); + void (*abs_rm_4) __P((void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t)); + void (*abs_rm_8) __P((void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t)); /* read region */ - void (*bs_rr_1) __P((void *, bus_space_handle_t, bus_size_t, - u_int8_t *, size_t)); - void (*bs_rr_2) __P((void *, bus_space_handle_t, bus_size_t, - u_int16_t *, size_t)); - void (*bs_rr_4) __P((void *, bus_space_handle_t, bus_size_t, - u_int32_t *, size_t)); - void (*bs_rr_8) __P((void *, bus_space_handle_t, bus_size_t, - u_int64_t *, size_t)); + void (*abs_rr_1) __P((void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t)); + void (*abs_rr_2) __P((void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t)); + void (*abs_rr_4) __P((void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t)); + void (*abs_rr_8) __P((void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t)); /* write (single) */ - void (*bs_w_1) __P((void *, bus_space_handle_t, bus_size_t, - u_int8_t)); - void (*bs_w_2) __P((void *, bus_space_handle_t, bus_size_t, - u_int16_t)); - void (*bs_w_4) __P((void *, bus_space_handle_t, bus_size_t, - u_int32_t)); - void (*bs_w_8) __P((void *, bus_space_handle_t, bus_size_t, - u_int64_t)); + void (*abs_w_1) __P((void *, bus_space_handle_t, + bus_size_t, u_int8_t)); + void (*abs_w_2) __P((void *, bus_space_handle_t, + bus_size_t, u_int16_t)); + void (*abs_w_4) __P((void *, bus_space_handle_t, + bus_size_t, u_int32_t)); + void (*abs_w_8) __P((void *, bus_space_handle_t, + bus_size_t, u_int64_t)); /* write multi */ - void (*bs_wm_1) __P((void *, bus_space_handle_t, bus_size_t, - const u_int8_t *, size_t)); - void (*bs_wm_2) __P((void *, bus_space_handle_t, bus_size_t, - const u_int16_t *, size_t)); - void (*bs_wm_4) __P((void *, bus_space_handle_t, bus_size_t, - const u_int32_t *, size_t)); - void (*bs_wm_8) __P((void *, bus_space_handle_t, bus_size_t, - const u_int64_t *, size_t)); + void (*abs_wm_1) __P((void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t)); + void (*abs_wm_2) __P((void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t)); + void (*abs_wm_4) __P((void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t)); + void (*abs_wm_8) __P((void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t)); /* write region */ - void (*bs_wr_1) __P((void *, bus_space_handle_t, bus_size_t, - const u_int8_t *, size_t)); - void (*bs_wr_2) __P((void *, bus_space_handle_t, bus_size_t, - const u_int16_t *, size_t)); - void (*bs_wr_4) __P((void *, bus_space_handle_t, bus_size_t, - const u_int32_t *, size_t)); - void (*bs_wr_8) __P((void *, bus_space_handle_t, bus_size_t, - const u_int64_t *, size_t)); + void (*abs_wr_1) __P((void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t)); + void (*abs_wr_2) __P((void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t)); + void (*abs_wr_4) __P((void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t)); + void (*abs_wr_8) __P((void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t)); /* set multi */ /* XXX IMPLEMENT */ @@ -131,7 +131,7 @@ struct alpha_bus_space { /* XXX IMPLEMENT */ /* barrier */ - void (*bs_barrier) __P((void *, bus_space_handle_t, + void (*abs_barrier) __P((void *, bus_space_handle_t, bus_size_t, bus_size_t, int)); }; @@ -139,106 +139,106 @@ struct alpha_bus_space { /* * Utility macros; INTERNAL USE ONLY. */ -#define __bs_c(a,b) __CONCAT(a,b) -#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size) +#define __abs_c(a,b) __CONCAT(a,b) +#define __abs_opname(op,size) __abs_c(__abs_c(__abs_c(abs_,op),_),size) -#define __bs_rs(sz, t, h, o) \ - (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o) -#define __bs_ws(sz, t, h, o, v) \ - (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v) -#define __bs_nonsingle(type, sz, t, h, o, a, c) \ - (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c) +#define __abs_rs(sz, t, h, o) \ + (*(t)->__abs_opname(r,sz))((t)->abs_cookie, h, o) +#define __abs_ws(sz, t, h, o, v) \ + (*(t)->__abs_opname(w,sz))((t)->abs_cookie, h, o, v) +#define __abs_nonsingle(type, sz, t, h, o, a, c) \ + (*(t)->__abs_opname(type,sz))((t)->abs_cookie, h, o, a, c) /* * Mapping and unmapping operations. */ #define bus_space_map(t, a, s, c, hp) \ - (*(t)->bs_map)((t)->bs_cookie, (a), (s), (c), (hp)) + (*(t)->abs_map)((t)->abs_cookie, (a), (s), (c), (hp)) #define bus_space_unmap(t, h, s) \ - (*(t)->bs_unmap)((t)->bs_cookie, (h), (s)) + (*(t)->abs_unmap)((t)->abs_cookie, (h), (s)) #define bus_space_subregion(t, h, o, s, hp) \ - (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) + (*(t)->abs_subregion)((t)->abs_cookie, (h), (o), (s), (hp)) /* * Allocation and deallocation operations. */ #define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) \ - (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \ + (*(t)->abs_alloc)((t)->abs_cookie, (rs), (re), (s), (a), (b), \ (c), (ap), (hp)) #define bus_space_free(t, h, s) \ - (*(t)->bs_free)((t)->bs_cookie, (h), (s)) + (*(t)->abs_free)((t)->abs_cookie, (h), (s)) /* * Bus read (single) operations. */ -#define bus_space_read_1(t, h, o) __bs_rs(1,(t),(h),(o)) -#define bus_space_read_2(t, h, o) __bs_rs(2,(t),(h),(o)) -#define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o)) -#define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o)) +#define bus_space_read_1(t, h, o) __abs_rs(1,(t),(h),(o)) +#define bus_space_read_2(t, h, o) __abs_rs(2,(t),(h),(o)) +#define bus_space_read_4(t, h, o) __abs_rs(4,(t),(h),(o)) +#define bus_space_read_8(t, h, o) __abs_rs(8,(t),(h),(o)) /* * Bus read multiple operations. */ #define bus_space_read_multi_1(t, h, o, a, c) \ - __bs_nonsingle(rm,1,(t),(h),(o),(a),(c)) + __abs_nonsingle(rm,1,(t),(h),(o),(a),(c)) #define bus_space_read_multi_2(t, h, o, a, c) \ - __bs_nonsingle(rm,2,(t),(h),(o),(a),(c)) + __abs_nonsingle(rm,2,(t),(h),(o),(a),(c)) #define bus_space_read_multi_4(t, h, o, a, c) \ - __bs_nonsingle(rm,4,(t),(h),(o),(a),(c)) + __abs_nonsingle(rm,4,(t),(h),(o),(a),(c)) #define bus_space_read_multi_8(t, h, o, a, c) \ - __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) + __abs_nonsingle(rm,8,(t),(h),(o),(a),(c)) /* * Bus read region operations. */ #define bus_space_read_region_1(t, h, o, a, c) \ - __bs_nonsingle(rr,1,(t),(h),(o),(a),(c)) + __abs_nonsingle(rr,1,(t),(h),(o),(a),(c)) #define bus_space_read_region_2(t, h, o, a, c) \ - __bs_nonsingle(rr,2,(t),(h),(o),(a),(c)) + __abs_nonsingle(rr,2,(t),(h),(o),(a),(c)) #define bus_space_read_region_4(t, h, o, a, c) \ - __bs_nonsingle(rr,4,(t),(h),(o),(a),(c)) + __abs_nonsingle(rr,4,(t),(h),(o),(a),(c)) #define bus_space_read_region_8(t, h, o, a, c) \ - __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) + __abs_nonsingle(rr,8,(t),(h),(o),(a),(c)) /* * Bus write (single) operations. */ -#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v)) -#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v)) -#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) -#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) +#define bus_space_write_1(t, h, o, v) __abs_ws(1,(t),(h),(o),(v)) +#define bus_space_write_2(t, h, o, v) __abs_ws(2,(t),(h),(o),(v)) +#define bus_space_write_4(t, h, o, v) __abs_ws(4,(t),(h),(o),(v)) +#define bus_space_write_8(t, h, o, v) __abs_ws(8,(t),(h),(o),(v)) /* * Bus write multiple operations. */ #define bus_space_write_multi_1(t, h, o, a, c) \ - __bs_nonsingle(wm,1,(t),(h),(o),(a),(c)) + __abs_nonsingle(wm,1,(t),(h),(o),(a),(c)) #define bus_space_write_multi_2(t, h, o, a, c) \ - __bs_nonsingle(wm,2,(t),(h),(o),(a),(c)) + __abs_nonsingle(wm,2,(t),(h),(o),(a),(c)) #define bus_space_write_multi_4(t, h, o, a, c) \ - __bs_nonsingle(wm,4,(t),(h),(o),(a),(c)) + __abs_nonsingle(wm,4,(t),(h),(o),(a),(c)) #define bus_space_write_multi_8(t, h, o, a, c) \ - __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) + __abs_nonsingle(wm,8,(t),(h),(o),(a),(c)) /* * Bus write region operations. */ #define bus_space_write_region_1(t, h, o, a, c) \ - __bs_nonsingle(wr,1,(t),(h),(o),(a),(c)) + __abs_nonsingle(wr,1,(t),(h),(o),(a),(c)) #define bus_space_write_region_2(t, h, o, a, c) \ - __bs_nonsingle(wr,2,(t),(h),(o),(a),(c)) + __abs_nonsingle(wr,2,(t),(h),(o),(a),(c)) #define bus_space_write_region_4(t, h, o, a, c) \ - __bs_nonsingle(wr,4,(t),(h),(o),(a),(c)) + __abs_nonsingle(wr,4,(t),(h),(o),(a),(c)) #define bus_space_write_region_8(t, h, o, a, c) \ - __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) + __abs_nonsingle(wr,8,(t),(h),(o),(a),(c)) /* @@ -263,7 +263,7 @@ struct alpha_bus_space { * Bus barrier operations. */ #define bus_space_barrier(t, h, o, l, f) \ - (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) + (*(t)->abs_barrier)((t)->abs_cookie, (h), (o), (l), (f)) #define BUS_BARRIER_READ 0x01 #define BUS_BARRIER_WRITE 0x02