Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 00:29:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Staging: xgifb: Remove use of LINUX_KERNEL define

Browse Source 
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:39 -04:00 committed by Greg Kroah-Hartman
parent 84c7603c38
commit f2f58e14ef
8 changed files with 3 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,6 @@ struct video_info xgi_video_info;
/* --------------- Hardware Access Routines -------------------------- */ /* --------------- Hardware Access Routines -------------------------- */
#ifdef LINUX_KERNEL
int int
XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,
unsigned char modeno, unsigned char rateindex) 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; return 1;
} }
#endif

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

@ -1,30 +1,9 @@
#ifndef _OSDEF_H_ #ifndef _OSDEF_H_
#define _OSDEF_H_ #define _OSDEF_H_
#define LINUX_KERNEL
/**********************************************************************/
#ifdef LINUX_KERNEL
//#include <linux/config.h>
#endif
/**********************************************************************/
#ifdef LINUX_KERNEL
#define LINUX
#endif
/**********************************************************************/
#ifdef LINUX_KERNEL
#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize) #define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
#endif
/**********************************************************************/
/**********************************************************************/
#ifdef LINUX_KERNEL
#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length) #define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
#endif
/**********************************************************************/ /**********************************************************************/
@ -52,33 +31,11 @@
#undef InPortLong #undef InPortLong
#endif /* InPortLong */ #endif /* InPortLong */
/**********************************************************************/
/* TC */
/**********************************************************************/
/**********************************************************************/
/* LINUX XF86 */
/**********************************************************************/
#ifdef LINUX_KERNEL
#define OutPortByte(p,v) outb((u8)(v),(p)) #define OutPortByte(p,v) outb((u8)(v),(p))
#define OutPortWord(p,v) outw((u16)(v),(p)) #define OutPortWord(p,v) outw((u16)(v),(p))
#define OutPortLong(p,v) outl((u32)(v),(p)) #define OutPortLong(p,v) outl((u32)(v),(p))
#define InPortByte(p) inb(p) #define InPortByte(p) inb(p)
#define InPortWord(p) inw(p) #define InPortWord(p) inw(p)
#define InPortLong(p) inl(p) #define InPortLong(p) inl(p)
#endif
/**********************************************************************/
/* WIN 2000 */
/**********************************************************************/
/**********************************************************************/
/* WIN CE */
/**********************************************************************/
#endif // _OSDEF_H_ #endif // _OSDEF_H_

4
drivers/staging/xgifb/vb_def.h
View File

@ -6,7 +6,7 @@
#define NewScratch #define NewScratch
#endif #endif
/* shampoo */ /* shampoo */
#ifdef LINUX_KERNEL
#define SEQ_ADDRESS_PORT 0x0014 #define SEQ_ADDRESS_PORT 0x0014
#define SEQ_DATA_PORT 0x0015 #define SEQ_DATA_PORT 0x0015
#define MISC_OUTPUT_REG_READ_PORT 0x001C #define MISC_OUTPUT_REG_READ_PORT 0x001C
@ -17,7 +17,7 @@
#define CRTC_ADDRESS_PORT_COLOR 0x0024 #define CRTC_ADDRESS_PORT_COLOR 0x0024
#define VIDEO_SUBSYSTEM_ENABLE_PORT 0x0013 #define VIDEO_SUBSYSTEM_ENABLE_PORT 0x0013
#define PCI_COMMAND 0x04 #define PCI_COMMAND 0x04
#endif
/* ~shampoo */ /* ~shampoo */

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

@ -1,18 +1,9 @@
#include "osdef.h" #include "osdef.h"
#ifdef LINUX_KERNEL
#include <linux/version.h> #include <linux/version.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>
#include "XGIfb.h" #include "XGIfb.h"
#endif
#include "vb_def.h" #include "vb_def.h"
#include "vgatypes.h" #include "vgatypes.h"

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

@ -1,19 +1,10 @@
#include "osdef.h" #include "osdef.h"
#include "vgatypes.h" #include "vgatypes.h"
#ifdef LINUX_KERNEL
#include <linux/version.h> #include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/delay.h> /* udelay */ #include <linux/delay.h> /* udelay */
#include "XGIfb.h" #include "XGIfb.h"
/*#if LINUX_VERSxION_CODE >= KERNEL_VERSION(2,5,0)
#include <video/XGIfb.h>
#else
#include <linux/XGIfb.h>
#endif */
#endif
#include "vb_def.h" #include "vb_def.h"
#include "vb_struct.h" #include "vb_struct.h"
@ -23,9 +14,7 @@
#include "vb_ext.h" #include "vb_ext.h"
#ifdef LINUX_KERNEL
#include <asm/io.h> #include <asm/io.h>
#endif
@ -120,13 +109,11 @@ UCHAR GetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ;
UCHAR GetXG27FPBits(PVB_DEVICE_INFO pVBInfo); UCHAR GetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
#ifdef LINUX_KERNEL
void DelayUS(ULONG MicroSeconds) void DelayUS(ULONG MicroSeconds)
{ {
udelay(MicroSeconds); udelay(MicroSeconds);
} }
#endif
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* Function : XGIInitNew */ /* Function : XGIInitNew */
@ -2667,8 +2654,6 @@ void SetPowerConsume ( PXGI_HW_DEVICE_INFO HwDeviceExtension , ULONG XGI_P3d4Por
} }
#if defined(LINUX_KERNEL)
void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
{ {
@ -2711,7 +2696,6 @@ void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO
} }
} }
#endif /* For Linux */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* Function : ReadVBIOSTablData */ /* Function : ReadVBIOSTablData */

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

@ -3,12 +3,10 @@
#ifdef LINUX_KERNEL
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/version.h> #include <linux/version.h>
#include "XGIfb.h" #include "XGIfb.h"
#endif
#include "vb_def.h" #include "vb_def.h"

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

@ -3,11 +3,9 @@
#include "vgatypes.h" #include "vgatypes.h"
#include "vb_struct.h" #include "vb_struct.h"
#ifdef LINUX_KERNEL
#include "XGIfb.h" #include "XGIfb.h"
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>
#endif
void XGINew_SetReg1( ULONG , USHORT , USHORT ) ; void XGINew_SetReg1( ULONG , USHORT , USHORT ) ;
void XGINew_SetReg2( ULONG , USHORT , USHORT ) ; void XGINew_SetReg2( ULONG , USHORT , USHORT ) ;
@ -188,8 +186,6 @@ void NewDelaySeconds( int seconds )
#ifdef LINUX_KERNEL
#endif
} }
} }

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

@ -4,10 +4,7 @@
#include "osdef.h" #include "osdef.h"
#ifdef LINUX_KERNEL /* We don't want the X driver to depend on kernel source */
#include <linux/ioctl.h> #include <linux/ioctl.h>
#endif
#ifndef FALSE #ifndef FALSE
#define FALSE 0 #define FALSE 0
@ -73,45 +70,13 @@ typedef UCHAR BOOLEAN;
typedef UCHAR bool; typedef UCHAR bool;
#endif #endif
*/ */
#ifdef LINUX_KERNEL
typedef unsigned long XGIIOADDRESS; typedef unsigned long XGIIOADDRESS;
#endif
#ifndef VBIOS_VER_MAX_LENGTH #ifndef VBIOS_VER_MAX_LENGTH
#define VBIOS_VER_MAX_LENGTH 4 #define VBIOS_VER_MAX_LENGTH 4
#endif #endif
#ifndef LINUX_KERNEL /* For the linux kernel, this is defined in xgifb.h */
#ifndef XGI_CHIP_TYPE
typedef enum _XGI_CHIP_TYPE {
XGI_VGALegacy = 0,
XGI_300,
XGI_630,
XGI_640,
XGI_315H,
XGI_315,
XGI_315PRO,
XGI_550,
XGI_650,
XGI_650M,
XGI_740,
XGI_330,
XGI_661,
XGI_660,
XGI_760,
XG40 = 32,
XG41,
XG42,
XG45,
XG20 = 48,
XG21,
XG27,
MAX_XGI_CHIP
} XGI_CHIP_TYPE;
#endif
#endif
#ifndef XGI_VB_CHIP_TYPE #ifndef XGI_VB_CHIP_TYPE
typedef enum _XGI_VB_CHIP_TYPE { typedef enum _XGI_VB_CHIP_TYPE {
VB_CHIP_Legacy = 0, VB_CHIP_Legacy = 0,