---

yaml --- r: 205689 b: refs/heads/master c: 1e59f71 h: refs/heads/master i: 205687: e248111 v: v3
git-mirror · Jun 22, 2010 · f9bcd6d · f9bcd6d
1 parent 75f73eb
commit f9bcd6d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 60 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc75bb02db530748515f0bf95039c4a15b3ef0be
+refs/heads/master: 1e59f7119f0a998e3d453614b3d074962b84bc83
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c
@@ -43,7 +43,6 @@
 #include <asm/mtrr.h>
 #endif
 
-#include "osdef.h"
 #include "vgatypes.h"
 #include "vb_struct.h"
 #include "XGIfb.h"

diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -29,8 +29,6 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 
-#include "osdef.h"
-
 
 #ifndef XGIFB_PAN
 #define XGIFB_PAN

diff --git a/trunk/drivers/staging/xgifb/osdef.h b/trunk/drivers/staging/xgifb/osdef.h
diff --git a/trunk/drivers/staging/xgifb/vb_ext.c b/trunk/drivers/staging/xgifb/vb_ext.c
@@ -1,5 +1,3 @@
-#include "osdef.h"
-
 #include <linux/version.h>
 #include <asm/io.h>
 #include <linux/types.h>

diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
@@ -1,4 +1,3 @@
-#include "osdef.h"
 #include "vgatypes.h"
 
 #include <linux/version.h>

diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -1,7 +1,3 @@
-#include "osdef.h"
-
-
-
 
 #include <asm/io.h>
 #include <linux/types.h>

diff --git a/trunk/drivers/staging/xgifb/vb_util.c b/trunk/drivers/staging/xgifb/vb_util.c
@@ -1,4 +1,3 @@
-#include "osdef.h"
 #include "vb_def.h"
 #include "vgatypes.h"
 #include "vb_struct.h"
@@ -28,8 +27,8 @@ void     XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
 /* --------------------------------------------------------------------- */
 void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
 {
-    OutPortByte( port , index ) ;
-    OutPortByte( port + 1 , data ) ;
+	outb(index, port);
+	outb(data, port + 1);
 }
 
 
@@ -56,7 +55,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
 /* --------------------------------------------------------------------- */
 void XGINew_SetReg3( ULONG port , USHORT data )
 {
-    OutPortByte( port , data ) ;
+	outb(data, port);
 }
 
 
@@ -68,7 +67,7 @@ void XGINew_SetReg3( ULONG port , USHORT data )
 /* --------------------------------------------------------------------- */
 void XGINew_SetReg4( ULONG port , ULONG data )
 {
-    OutPortLong( port , data ) ;
+	outl(data, port);
 }
 
 
@@ -82,9 +81,8 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index )
 {
     UCHAR data ;
 
-    OutPortByte( port , index ) ;
-    data = InPortByte( port + 1 ) ;
-
+    outb(index, port);
+    data = inb(port + 1) ;
     return( data ) ;
 }
 
@@ -99,7 +97,7 @@ UCHAR XGINew_GetReg2( ULONG port )
 {
     UCHAR data ;
 
-    data = InPortByte( port ) ;
+    data = inb(port) ;
 
     return( data ) ;
 }
@@ -115,7 +113,7 @@ ULONG XGINew_GetReg3( ULONG port )
 {
     ULONG data ;
 
-    data = InPortLong( port ) ;
+    data = inl(port) ;
 
     return( data ) ;
 }

diff --git a/trunk/drivers/staging/xgifb/vgatypes.h b/trunk/drivers/staging/xgifb/vgatypes.h
@@ -2,8 +2,6 @@
 #ifndef _VGATYPES_
 #define _VGATYPES_
 
-#include "osdef.h"
-
 #include <linux/ioctl.h>
 
 #ifndef FALSE