diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /drivers/staging/xgifb/vb_util.h | |
parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/staging/xgifb/vb_util.h')
-rw-r--r-- | drivers/staging/xgifb/vb_util.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h index 156f644..9161de1 100644 --- a/drivers/staging/xgifb/vb_util.h +++ b/drivers/staging/xgifb/vb_util.h @@ -1,15 +1,9 @@ #ifndef _VBUTIL_ #define _VBUTIL_ -extern void NewDelaySeconds( int ); -extern void Newdebugcode(unsigned char); -extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short); -extern void XGINew_SetReg3(unsigned long, unsigned short); -extern unsigned char XGINew_GetReg1(unsigned long, unsigned short); -extern unsigned char XGINew_GetReg2(unsigned long); -extern void XGINew_SetReg4(unsigned long, unsigned long); -extern unsigned long XGINew_GetReg3(unsigned long); -extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR); -extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND); -extern void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,unsigned short DataAND,unsigned short DataOR); +extern void xgifb_reg_set(unsigned long, u8, u8); +extern u8 xgifb_reg_get(unsigned long, u8); +extern void xgifb_reg_or(unsigned long, u8, unsigned); +extern void xgifb_reg_and(unsigned long, u8, unsigned); +extern void xgifb_reg_and_or(unsigned long, u8, unsigned, unsigned); #endif |