dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Bill Pemberton 2010-06-17 13:10:41 -04:00 committed by Greg Kroah-Hartman
parent cc75bb02db
commit 1e59f7119f
8 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/xgifb/XGI_accel.c
View File

@ -43,7 +43,6 @@
#include <asm/mtrr.h>
#endif
#include "osdef.h"
#include "vgatypes.h"
#include "vb_struct.h"
#include "XGIfb.h"

2
drivers/staging/xgifb/XGI_main_26.c
View File

@ -29,8 +29,6 @@
#include <linux/types.h>
#include <linux/proc_fs.h>
#include "osdef.h"
#ifndef XGIFB_PAN
#define XGIFB_PAN

37
drivers/staging/xgifb/osdef.h
View File

@ -1,37 +0,0 @@
#ifndef _OSDEF_H_
#define _OSDEF_H_
/**********************************************************************/
#ifdef OutPortByte
#undef OutPortByte
#endif /* OutPortByte */
#ifdef OutPortWord
#undef OutPortWord
#endif /* OutPortWord */
#ifdef OutPortLong
#undef OutPortLong
#endif /* OutPortLong */
#ifdef InPortByte
#undef InPortByte
#endif /* InPortByte */
#ifdef InPortWord
#undef InPortWord
#endif /* InPortWord */
#ifdef InPortLong
#undef InPortLong
#endif /* InPortLong */
#define OutPortByte(p,v) outb((u8)(v),(p))
#define OutPortWord(p,v) outw((u16)(v),(p))
#define OutPortLong(p,v) outl((u32)(v),(p))
#define InPortByte(p) inb(p)
#define InPortWord(p) inw(p)
#define InPortLong(p) inl(p)
#endif // _OSDEF_H_

2
drivers/staging/xgifb/vb_ext.c
View File

@ -1,5 +1,3 @@
#include "osdef.h"
#include <linux/version.h>
#include <asm/io.h>
#include <linux/types.h>

1
drivers/staging/xgifb/vb_init.c
View File

@ -1,4 +1,3 @@
#include "osdef.h"
#include "vgatypes.h"
#include <linux/version.h>

4
drivers/staging/xgifb/vb_setmode.c
View File

@ -1,7 +1,3 @@
#include "osdef.h"
#include <asm/io.h>
#include <linux/types.h>

18
drivers/staging/xgifb/vb_util.c
View File

@ -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 ) ;
}

2
drivers/staging/xgifb/vgatypes.h
View File

@ -2,8 +2,6 @@
#ifndef _VGATYPES_
#define _VGATYPES_
#include "osdef.h"
#include <linux/ioctl.h>
#ifndef FALSE