diff options
Diffstat (limited to 'sys/dev/fb/fbreg.h')
-rw-r--r-- | sys/dev/fb/fbreg.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index e13408a..0ae2d54 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -49,27 +49,7 @@ copyw(uint16_t *src, uint16_t *dst, size_t size) #define bzero_io(d, c) bzero((void *)(d), (c)) #define fill_io(p, d, c) fill((p), (void *)(d), (c)) #define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) -#elif defined(__ia64__) || defined(__sparc64__) -#if defined(__ia64__) -#include <machine/bus.h> -#define bcopy_fromio(s, d, c) \ - bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c) -#define bcopy_io(s, d, c) \ - bus_space_copy_region_1(IA64_BUS_SPACE_MEM, s, 0, d, 0, c) -#define bcopy_toio(s, d, c) \ - bus_space_write_region_1(IA64_BUS_SPACE_MEM, d, 0, (void*)(s), c) -#define bzero_io(d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, 0, c) -#define fill_io(p, d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) -#define fillw_io(p, d, c) \ - bus_space_set_region_2(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) -#define readb(a) bus_space_read_1(IA64_BUS_SPACE_MEM, a, 0) -#define readw(a) bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0) -#define writeb(a, v) bus_space_write_1(IA64_BUS_SPACE_MEM, a, 0, v) -#define writew(a, v) bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v) -#define writel(a, v) bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v) -#endif /* __ia64__ */ +#elif defined(__sparc64__) static __inline void fillw(int val, uint16_t *buf, size_t size) { @@ -120,7 +100,7 @@ fillw(int val, uint16_t *buf, size_t size) #define writew(a, v) (*(uint16_t*)(a) = (v)) #endif -#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */ +#else /* !__i386__ && !__amd64__ && !__sparc64__ && !__powerpc__ */ #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) #define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c)) #define bcopy_fromio(s, d, c) memcpy_fromio((void *)(d), (s), (c)) |