diff options
author | imp <imp@FreeBSD.org> | 2005-04-19 03:19:19 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-04-19 03:19:19 +0000 |
commit | 8c509864f2dd0cdcc6116de38bf9137583c4ab2f (patch) | |
tree | da29bbf3a4a1e481ac6e39319606ab20109b8c60 | |
parent | 66c4f5f8b414fbca63ef16731ea472b513900788 (diff) | |
download | FreeBSD-src-8c509864f2dd0cdcc6116de38bf9137583c4ab2f.zip FreeBSD-src-8c509864f2dd0cdcc6116de38bf9137583c4ab2f.tar.gz |
Unbreak the pc98 build by including enough information in the _bus.h
for _bus.h to compile.
Pointy hat to: imp
Breakage noted by: nyan-san
-rw-r--r-- | sys/pc98/include/_bus.h | 51 | ||||
-rw-r--r-- | sys/pc98/include/bus.h | 51 |
2 files changed, 51 insertions, 51 deletions
diff --git a/sys/pc98/include/_bus.h b/sys/pc98/include/_bus.h index 5b8084b..2e8e148 100644 --- a/sys/pc98/include/_bus.h +++ b/sys/pc98/include/_bus.h @@ -37,6 +37,57 @@ typedef u_int bus_addr_t; typedef u_int bus_size_t; +#define BUS_SPACE_IAT_MAXSIZE 33 + +/* + * bus space tag + */ +#define _PASCAL_CALL (void) + +#define _BUS_SPACE_CALL_FUNCS_TAB(NAME,TYPE,BWN) \ + NAME##_space_read_##BWN, \ + NAME##_space_read_multi_##BWN, \ + NAME##_space_read_region_##BWN, \ + NAME##_space_write_##BWN, \ + NAME##_space_write_multi_##BWN, \ + NAME##_space_write_region_##BWN, \ + NAME##_space_set_multi_##BWN, \ + NAME##_space_set_region_##BWN, \ + NAME##_space_copy_region_##BWN + +#define _BUS_SPACE_CALL_FUNCS_PROTO(NAME,TYPE,BWN) \ + TYPE NAME##_space_read_##BWN _PASCAL_CALL; \ + void NAME##_space_read_multi_##BWN _PASCAL_CALL; \ + void NAME##_space_read_region_##BWN _PASCAL_CALL; \ + void NAME##_space_write_##BWN _PASCAL_CALL; \ + void NAME##_space_write_multi_##BWN _PASCAL_CALL; \ + void NAME##_space_write_region_##BWN _PASCAL_CALL; \ + void NAME##_space_set_multi_##BWN _PASCAL_CALL; \ + void NAME##_space_set_region_##BWN _PASCAL_CALL; \ + void NAME##_space_copy_region_##BWN _PASCAL_CALL; + +#define _BUS_SPACE_CALL_FUNCS(NAME,TYPE,BWN) \ + TYPE (* NAME##_read_##BWN) _PASCAL_CALL; \ + void (* NAME##_read_multi_##BWN) _PASCAL_CALL; \ + void (* NAME##_read_region_##BWN) _PASCAL_CALL; \ + void (* NAME##_write_##BWN) _PASCAL_CALL; \ + void (* NAME##_write_multi_##BWN) _PASCAL_CALL; \ + void (* NAME##_write_region_##BWN) _PASCAL_CALL; \ + void (* NAME##_set_multi_##BWN) _PASCAL_CALL; \ + void (* NAME##_set_region_##BWN) _PASCAL_CALL; \ + void (* NAME##_copy_region_##BWN) _PASCAL_CALL; + +struct bus_space_access_methods { + /* 8 bits access methods */ + _BUS_SPACE_CALL_FUNCS(bs,u_int8_t,1) + + /* 16 bits access methods */ + _BUS_SPACE_CALL_FUNCS(bs,u_int16_t,2) + + /* 32 bits access methods */ + _BUS_SPACE_CALL_FUNCS(bs,u_int32_t,4) +}; + /* * Access methods for bus resources and address space. */ diff --git a/sys/pc98/include/bus.h b/sys/pc98/include/bus.h index c344886..d73647c 100644 --- a/sys/pc98/include/bus.h +++ b/sys/pc98/include/bus.h @@ -92,63 +92,12 @@ #define BUS_SPACE_UNRESTRICTED (~0) -#define BUS_SPACE_IAT_MAXSIZE 33 - /* * Access methods for bus resources and address space. */ struct resource; /* - * bus space tag - */ -#define _PASCAL_CALL (void) - -#define _BUS_SPACE_CALL_FUNCS_TAB(NAME,TYPE,BWN) \ - NAME##_space_read_##BWN, \ - NAME##_space_read_multi_##BWN, \ - NAME##_space_read_region_##BWN, \ - NAME##_space_write_##BWN, \ - NAME##_space_write_multi_##BWN, \ - NAME##_space_write_region_##BWN, \ - NAME##_space_set_multi_##BWN, \ - NAME##_space_set_region_##BWN, \ - NAME##_space_copy_region_##BWN - -#define _BUS_SPACE_CALL_FUNCS_PROTO(NAME,TYPE,BWN) \ - TYPE NAME##_space_read_##BWN _PASCAL_CALL; \ - void NAME##_space_read_multi_##BWN _PASCAL_CALL; \ - void NAME##_space_read_region_##BWN _PASCAL_CALL; \ - void NAME##_space_write_##BWN _PASCAL_CALL; \ - void NAME##_space_write_multi_##BWN _PASCAL_CALL; \ - void NAME##_space_write_region_##BWN _PASCAL_CALL; \ - void NAME##_space_set_multi_##BWN _PASCAL_CALL; \ - void NAME##_space_set_region_##BWN _PASCAL_CALL; \ - void NAME##_space_copy_region_##BWN _PASCAL_CALL; - -#define _BUS_SPACE_CALL_FUNCS(NAME,TYPE,BWN) \ - TYPE (* NAME##_read_##BWN) _PASCAL_CALL; \ - void (* NAME##_read_multi_##BWN) _PASCAL_CALL; \ - void (* NAME##_read_region_##BWN) _PASCAL_CALL; \ - void (* NAME##_write_##BWN) _PASCAL_CALL; \ - void (* NAME##_write_multi_##BWN) _PASCAL_CALL; \ - void (* NAME##_write_region_##BWN) _PASCAL_CALL; \ - void (* NAME##_set_multi_##BWN) _PASCAL_CALL; \ - void (* NAME##_set_region_##BWN) _PASCAL_CALL; \ - void (* NAME##_copy_region_##BWN) _PASCAL_CALL; - -struct bus_space_access_methods { - /* 8 bits access methods */ - _BUS_SPACE_CALL_FUNCS(bs,u_int8_t,1) - - /* 16 bits access methods */ - _BUS_SPACE_CALL_FUNCS(bs,u_int16_t,2) - - /* 32 bits access methods */ - _BUS_SPACE_CALL_FUNCS(bs,u_int32_t,4) -}; - -/* * Values for the i386 bus space tag, not to be used directly by MI code. */ extern struct bus_space_tag SBUS_io_space_tag; |