diff options
author | jimharris <jimharris@FreeBSD.org> | 2012-12-13 21:27:20 +0000 |
---|---|---|
committer | jimharris <jimharris@FreeBSD.org> | 2012-12-13 21:27:20 +0000 |
commit | 5e7d94235a64f85da6072462c6458acd8210728f (patch) | |
tree | 7339db7b5a9de8265372d3727f1ba433c77ee7c4 /sys/x86 | |
parent | c032abecc8b5813f2f21c7db4c03bac389b65344 (diff) | |
download | FreeBSD-src-5e7d94235a64f85da6072462c6458acd8210728f.zip FreeBSD-src-5e7d94235a64f85da6072462c6458acd8210728f.tar.gz |
Revert r243960 based on feedback regarding keeping x86 headers unified
(mdf@, tijl@) and use of KASSERT/systm.h in bus.h (zeising@, bde@).
Alternate implementation will be made in a separate commit.
Diffstat (limited to 'sys/x86')
-rw-r--r-- | sys/x86/include/bus.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/sys/x86/include/bus.h b/sys/x86/include/bus.h index f4369d9..fb5babf 100644 --- a/sys/x86/include/bus.h +++ b/sys/x86/include/bus.h @@ -251,6 +251,10 @@ bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, return (*(volatile u_int32_t *)(handle + offset)); } +#if 0 /* Cause a link error for bus_space_read_8 */ +#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! +#endif + /* * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -333,6 +337,10 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, } } +#if 0 /* Cause a link error for bus_space_read_multi_8 */ +#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! +#endif + /* * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -450,6 +458,10 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, } } +#if 0 /* Cause a link error for bus_space_read_region_8 */ +#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! +#endif + /* * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -500,6 +512,10 @@ bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, *(volatile u_int32_t *)(bsh + offset) = value; } +#if 0 /* Cause a link error for bus_space_write_8 */ +#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! +#endif + /* * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -585,6 +601,11 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, } } +#if 0 /* Cause a link error for bus_space_write_multi_8 */ +#define bus_space_write_multi_8(t, h, o, a, c) \ + !!! bus_space_write_multi_8 unimplemented !!! +#endif + /* * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. @@ -702,6 +723,11 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, } } +#if 0 /* Cause a link error for bus_space_write_region_8 */ +#define bus_space_write_region_8 \ + !!! bus_space_write_region_8 unimplemented !!! +#endif + /* * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -762,6 +788,10 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, *(volatile u_int32_t *)(addr) = value; } +#if 0 /* Cause a link error for bus_space_set_multi_8 */ +#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! +#endif + /* * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. @@ -822,6 +852,10 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, *(volatile u_int32_t *)(addr) = value; } +#if 0 /* Cause a link error for bus_space_set_region_8 */ +#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! +#endif + /* * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. @@ -950,6 +984,10 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, } } +#if 0 /* Cause a link error for bus_space_copy_8 */ +#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!! +#endif + /* * Bus read/write barrier methods. * |