Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / drivers / video / sis / sis.h

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 7c5710e..eac7a01 100644 (file)
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -24,7 +24,6 @@
 #ifndef _SIS_H_
 #define _SIS_H_
 
-#include "osdef.h"
 #include <video/sisfb.h>
 
 #include "vgatypes.h"
@@ -308,58 +307,19 @@
 #define VB2_LCDOVER1600BRIDGE  (VB2_307T  | VB2_307LV)
 #define VB2_RAMDAC202MHZBRIDGE (VB2_301C  | VB2_307T)
 
-/* I/O port access macros */
-#define inSISREG(base)         inb(base)
-
-#define outSISREG(base,val)    outb(val,base)
-
-#define orSISREG(base,val)                             \
-               do {                                    \
-                       u8 __Temp = inSISREG(base);     \
-                       outSISREG(base, __Temp | (val));\
-               } while (0)
-
-#define andSISREG(base,val)                            \
-               do {                                    \
-                       u8 __Temp = inSISREG(base);     \
-                       outSISREG(base, __Temp & (val));\
-               } while (0)
-
-#define inSISIDXREG(base,idx,var)                      \
-               do {                                    \
-                       outSISREG(base, idx);           \
-                       var = inSISREG((base)+1);       \
-               } while (0)
-
-#define outSISIDXREG(base,idx,val)                     \
-               do {                                    \
-                       outSISREG(base, idx);           \
-                       outSISREG((base)+1, val);       \
-               } while (0)
-
-#define orSISIDXREG(base,idx,val)                              \
-               do {                                            \
-                       u8 __Temp;                              \
-                       outSISREG(base, idx);                   \
-                       __Temp = inSISREG((base)+1) | (val);    \
-                       outSISREG((base)+1, __Temp);            \
-               } while (0)
-
-#define andSISIDXREG(base,idx,and)                             \
-               do {                                            \
-                       u8 __Temp;                              \
-                       outSISREG(base, idx);                   \
-                       __Temp = inSISREG((base)+1) & (and);    \
-                       outSISREG((base)+1, __Temp);            \
-               } while (0)
-
-#define setSISIDXREG(base,idx,and,or)                                  \
-               do {                                                    \
-                       u8 __Temp;                                      \
-                       outSISREG(base, idx);                           \
-                       __Temp = (inSISREG((base)+1) & (and)) | (or);   \
-                       outSISREG((base)+1, __Temp);                    \
-               } while (0)
+/* I/O port access functions */
+
+void SiS_SetReg(SISIOADDRESS, u8, u8);
+void SiS_SetRegByte(SISIOADDRESS, u8);
+void SiS_SetRegShort(SISIOADDRESS, u16);
+void SiS_SetRegLong(SISIOADDRESS, u32);
+void SiS_SetRegANDOR(SISIOADDRESS, u8, u8, u8);
+void SiS_SetRegAND(SISIOADDRESS, u8, u8);
+void SiS_SetRegOR(SISIOADDRESS, u8, u8);
+u8 SiS_GetReg(SISIOADDRESS, u8);
+u8 SiS_GetRegByte(SISIOADDRESS);
+u16 SiS_GetRegShort(SISIOADDRESS);
+u32 SiS_GetRegLong(SISIOADDRESS);
 
 /* MMIO access macros */
 #define MMIO_IN8(base, offset)  readb((base+offset))