diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 11:16:33 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 11:16:33 +0000 |
| commit | 23486f48a5034b3a25be6ced6cdba9a86131e1f0 (patch) | |
| tree | 3b07f204def7bd2f0c7139f4d04e2d65301a949b /vidix | |
| parent | 4ee359e3664ed23d50a59db84d8d180debe94bef (diff) | |
| download | mpv-23486f48a5034b3a25be6ced6cdba9a86131e1f0.tar.bz2 mpv-23486f48a5034b3a25be6ced6cdba9a86131e1f0.tar.xz | |
bunkus: Encapsulated arguments to #define in ( ... ) so that the #defines can be safely used like functions: mydef(flag ? val1 : val2)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8958 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/drivers/cyberblade_regs.h | 8 | ||||
| -rw-r--r-- | vidix/drivers/pm3_regs.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vidix/drivers/cyberblade_regs.h b/vidix/drivers/cyberblade_regs.h index 4b0c2b1b81..6d73692ac1 100644 --- a/vidix/drivers/cyberblade_regs.h +++ b/vidix/drivers/cyberblade_regs.h @@ -129,10 +129,10 @@ int HACKBUCKET12345678; /* Horrible hack to work around cache/speed issue */ -#define INB(addr) (HACKBUCKET12345678=*(cyberblade_reg_base+addr)) -#define INW(addr) (HACKBUCKET12345678=*(unsigned short *)(cyberblade_reg_base+addr)) -#define OUTB(addr,val) (*(cyberblade_reg_base+addr)=(val)) -#define OUTW(addr,val) (*(unsigned short *)(cyberblade_reg_base+addr)=(val)) +#define INB(addr) (HACKBUCKET12345678=*(cyberblade_reg_base+(addr))) +#define INW(addr) (HACKBUCKET12345678=*(unsigned short *)(cyberblade_reg_base+(addr))) +#define OUTB(addr,val) (*(cyberblade_reg_base+(addr))=(val)) +#define OUTW(addr,val) (*(unsigned short *)(cyberblade_reg_base+(addr))=(val)) #define SRINB(reg) (OUTB(0x3c4,reg), INB(0x3c5)) #define SROUTB(reg,val) (OUTW(0x3c4,((val)<<8)|(reg))) diff --git a/vidix/drivers/pm3_regs.h b/vidix/drivers/pm3_regs.h index c976c32107..30c717f44b 100644 --- a/vidix/drivers/pm3_regs.h +++ b/vidix/drivers/pm3_regs.h @@ -1060,10 +1060,10 @@ extern void *pm3_reg_base; #define WRITE_REG(offset,val) \ - *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + offset) = (val) + *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + (offset)) = (val) #define READ_REG(offset) \ - *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + offset) + *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + (offset)) #define UPDATE_SET_REG(offset,val) \ { \ @@ -1094,8 +1094,8 @@ do{ \ #define RAMDAC_SET_INDEX(index) \ { \ - SLOW_WRITE_REG (PM3RD_IndexHigh,(index>>8)&0xff); \ - SLOW_WRITE_REG (PM3RD_IndexLow,index&0xff); \ + SLOW_WRITE_REG (PM3RD_IndexHigh,((index)>>8)&0xff); \ + SLOW_WRITE_REG (PM3RD_IndexLow,(index)&0xff); \ } #define RAMDAC_SET_REG(index, data) \ |