From f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 17 Jun 2010 13:10:39 -0400 Subject: [PATCH 144/524] Staging: xgifb: Remove use of LINUX_KERNEL define Signed-off-by: Bill Pemberton Cc: Arnaud Patard Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_main_26.c | 2 - drivers/staging/xgifb/osdef.h | 43 ----------------------------------- drivers/staging/xgifb/vb_def.h | 4 +- drivers/staging/xgifb/vb_ext.c | 9 ------- drivers/staging/xgifb/vb_init.c | 18 +------------- drivers/staging/xgifb/vb_setmode.c | 2 - drivers/staging/xgifb/vb_util.c | 4 --- drivers/staging/xgifb/vgatypes.h | 35 ---------------------------- 8 files changed, 3 insertions(+), 114 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index f2658c4..e9551d3 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -163,7 +163,6 @@ struct video_info xgi_video_info; /* --------------- Hardware Access Routines -------------------------- */ -#ifdef LINUX_KERNEL int XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned char modeno, unsigned char rateindex) @@ -389,7 +388,6 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExt return 1; } -#endif diff --git a/drivers/staging/xgifb/osdef.h b/drivers/staging/xgifb/osdef.h index ffb6838..fb1d411 100644 --- a/drivers/staging/xgifb/osdef.h +++ b/drivers/staging/xgifb/osdef.h @@ -1,30 +1,9 @@ #ifndef _OSDEF_H_ #define _OSDEF_H_ -#define LINUX_KERNEL - -/**********************************************************************/ -#ifdef LINUX_KERNEL -//#include -#endif - - -/**********************************************************************/ -#ifdef LINUX_KERNEL -#define LINUX -#endif - -/**********************************************************************/ -#ifdef LINUX_KERNEL #define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize) -#endif -/**********************************************************************/ - -/**********************************************************************/ -#ifdef LINUX_KERNEL #define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length) -#endif /**********************************************************************/ @@ -52,33 +31,11 @@ #undef InPortLong #endif /* InPortLong */ -/**********************************************************************/ -/* TC */ -/**********************************************************************/ - - -/**********************************************************************/ -/* LINUX XF86 */ -/**********************************************************************/ - - -#ifdef LINUX_KERNEL #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 - -/**********************************************************************/ -/* WIN 2000 */ -/**********************************************************************/ - - - -/**********************************************************************/ -/* WIN CE */ -/**********************************************************************/ #endif // _OSDEF_H_ diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index 17a7ada..4de182b 100644 --- a/drivers/staging/xgifb/vb_def.h +++ b/drivers/staging/xgifb/vb_def.h @@ -6,7 +6,7 @@ #define NewScratch #endif /* shampoo */ -#ifdef LINUX_KERNEL + #define SEQ_ADDRESS_PORT 0x0014 #define SEQ_DATA_PORT 0x0015 #define MISC_OUTPUT_REG_READ_PORT 0x001C @@ -17,7 +17,7 @@ #define CRTC_ADDRESS_PORT_COLOR 0x0024 #define VIDEO_SUBSYSTEM_ENABLE_PORT 0x0013 #define PCI_COMMAND 0x04 -#endif + /* ~shampoo */ diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c index 6835585..f4969c2 100644 --- a/drivers/staging/xgifb/vb_ext.c +++ b/drivers/staging/xgifb/vb_ext.c @@ -1,18 +1,9 @@ #include "osdef.h" - - - - - -#ifdef LINUX_KERNEL #include #include #include #include "XGIfb.h" -#endif - - #include "vb_def.h" #include "vgatypes.h" diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index d3201d2..94fa48b 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -1,19 +1,10 @@ #include "osdef.h" #include "vgatypes.h" - -#ifdef LINUX_KERNEL #include #include #include /* udelay */ #include "XGIfb.h" -/*#if LINUX_VERSxION_CODE >= KERNEL_VERSION(2,5,0) -#include