From c2a6d01cc9b7e306c199e0356ed3e14bfd1fb256 Mon Sep 17 00:00:00 2001 From: marcel Date: Sat, 23 Aug 2003 08:52:52 +0000 Subject: o Explicitly cast the second argument to bus_space_set_region_#() to intptr_t. This fixes a compiler warning (integer from pointer without cast) in scvgarndr.c when SC_PIXEL_MODE is defined. o Define readb() and writeb(). Both are used in scvgarndr.c when, guess what, SC_PIXEL_MODE is defined. Both changes are ia64 specific. Found by: LINT --- sys/dev/fb/fbreg.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index 082b93d..cf9116f 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -59,17 +59,16 @@ void generic_bzero(void *d, size_t 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, d, 0, 0, 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, d, 0, p, 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, d, 0, p, c) -#define readw(a) \ - bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0) -#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) + 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) static __inline void fillw(int val, uint16_t *buf, size_t size) { -- cgit v1.1