diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:30:07 -0700 |
| commit | 1e59f7119f0a998e3d453614b3d074962b84bc83 (patch) | |
| tree | 2c6573106f6b0350b7c2e4fd3116fd922b01fe24 /drivers/staging/xgifb/vb_util.c | |
| parent | cc75bb02db530748515f0bf95039c4a15b3ef0be (diff) | |
Staging: xgifb: Remove port macros in osdef.h
The port related macros in osdef.h are replaced with calls to out?()
and in?(). This removes the last macros defined in osdef.h, so this
file is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_util.c')
| -rw-r--r-- | drivers/staging/xgifb/vb_util.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c index 753b1c550727..f83aee7ea90e 100644 --- a/drivers/staging/xgifb/vb_util.c +++ b/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 ) ; } |