comparison vidix/drivers/mach64_vid.c @ 16819:9545bda5e951

sync amd64 fixes from vidix.sf.net
author faust3
date Thu, 20 Oct 2005 17:56:28 +0000
parents 972d1998bde9
children 4d38f0b33f80
comparison
equal deleted inserted replaced
16818:67ce689b5764 16819:9545bda5e951
126 126
127 /* MMIO space*/ 127 /* MMIO space*/
128 #define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ)))) 128 #define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ))))
129 #define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL 129 #define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL
130 130
131 #define INREG8(addr) GETREG(uint8_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2) 131 #define INREG8(addr) GETREG(uint8_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2)
132 #define OUTREG8(addr,val) SETREG(uint8_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2,val) 132 #define OUTREG8(addr,val) SETREG(uint8_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2,val)
133 133
134 static inline uint32_t INREG (uint32_t addr) { 134 static inline uint32_t INREG (uint32_t addr) {
135 uint32_t tmp = GETREG(uint32_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2); 135 uint32_t tmp = GETREG(uint32_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2);
136 return le2me_32(tmp); 136 return le2me_32(tmp);
137 } 137 }
138 #define OUTREG(addr,val) SETREG(uint32_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2,le2me_32(val)) 138 #define OUTREG(addr,val) SETREG(uint32_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2,le2me_32(val))
139 139
140 #define OUTREGP(addr,val,mask) \ 140 #define OUTREGP(addr,val,mask) \
141 do { \ 141 do { \
142 unsigned int _tmp = INREG(addr); \ 142 unsigned int _tmp = INREG(addr); \
143 _tmp &= (mask); \ 143 _tmp &= (mask); \