Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2f58e14 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: Remove use of LINUX_KERNEL define 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 84c7603c

drivers/staging/xgifb/XGI_main_26.c

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/xgifb/osdef.h

+0 −43
Original line number Diff line number Diff line 
#ifndef _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)

#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_

drivers/staging/xgifb/vb_def.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/xgifb/vb_ext.c

+0 −9
Original line number Diff line number Diff line 
#include "osdef.h"













#ifdef LINUX_KERNEL

#include <linux/version.h>

#include <asm/io.h>

#include <linux/types.h>

#include "XGIfb.h"

#endif







#include "vb_def.h"

#include "vgatypes.h"

drivers/staging/xgifb/vb_init.c

+1 −17
Original line number Diff line number Diff line 
#include "osdef.h"

#include "vgatypes.h"





#ifdef LINUX_KERNEL

#include <linux/version.h>

#include <linux/types.h>

#include <linux/delay.h> /* udelay */

#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_struct.h"
@@ -23,9 +14,7 @@ 
#include "vb_ext.h"





#ifdef LINUX_KERNEL

#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) ;

UCHAR    GetXG27FPBits(PVB_DEVICE_INFO pVBInfo);





#ifdef LINUX_KERNEL

void DelayUS(ULONG MicroSeconds)

{

	udelay(MicroSeconds);

}

#endif





/* --------------------------------------------------------------------- */

/* 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)

{
@@ -2711,7 +2696,6 @@ void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO 
	}



}

#endif /* For Linux */



/* --------------------------------------------------------------------- */

/* Function : ReadVBIOSTablData */