From fb522f68ac7e8347a80b7ac3c40762fdce82d0bf Mon Sep 17 00:00:00 2001 From: marius Date: Thu, 18 Jan 2007 13:08:08 +0000 Subject: On sparc64 also use the fillw() this header provides for ia64 so the sparc64 MD code doesn't need to provide a memsetw() along with the ISA compat cruft. --- sys/dev/fb/fbreg.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index 684dfc1..30d341d 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -50,7 +50,8 @@ void generic_bzero(void *d, size_t c); #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__) +#elif defined(__ia64__) || defined(__sparc64__) +#if defined(__ia64__) #include #define bcopy_fromio(s, d, c) \ bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c) @@ -69,6 +70,7 @@ void generic_bzero(void *d, size_t c); #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__ */ static __inline void fillw(int val, uint16_t *buf, size_t size) { @@ -91,7 +93,7 @@ void ofwfb_fillw(int pat, void *base, size_t cnt); u_int16_t ofwfb_readw(u_int16_t *addr); void ofwfb_writew(u_int16_t *addr, u_int16_t val); -#else /* !__i386__ && !__ia64__ && !__amd64__ && !__powerpc__ */ +#else /* !__i386__ && !__amd64__ && !__ia64__ && !__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)) -- cgit v1.1