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

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

Staging: xgifb: Remove use of LINUX_XF86 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 784cfe1d

drivers/staging/xgifb/osdef.h

+0 −18
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _OSDEF_H_



#define LINUX_KERNEL

/* #define LINUX_XF86 */



/**********************************************************************/

#ifdef LINUX_KERNEL
@@ -11,17 +10,11 @@ 




/**********************************************************************/

#ifdef LINUX_XF86

#define LINUX

#endif

#ifdef LINUX_KERNEL

#define LINUX

#endif



/**********************************************************************/

#ifdef LINUX_XF86

#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)

#endif

#ifdef LINUX_KERNEL

#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)

#endif
@@ -29,9 +22,6 @@ 


/**********************************************************************/



#ifdef LINUX_XF86

#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)

#endif

#ifdef LINUX_KERNEL

#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)

#endif
@@ -71,14 +61,6 @@ 
/*  LINUX XF86                                                        */

/**********************************************************************/



#ifdef LINUX_XF86

#define OutPortByte(p,v) outb((CARD16)(p),(CARD8)(v))

#define OutPortWord(p,v) outw((CARD16)(p),(CARD16)(v))

#define OutPortLong(p,v) outl((CARD16)(p),(CARD32)(v))

#define InPortByte(p)    inb((CARD16)(p))

#define InPortWord(p)    inw((CARD16)(p))

#define InPortLong(p)    inl((CARD16)(p))

#endif



#ifdef LINUX_KERNEL

#define OutPortByte(p,v) outb((u8)(v),(p))

drivers/staging/xgifb/vb_ext.c

+0 −6
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 






#ifdef LINUX_XF86

#include "xf86.h"

#include "xf86PciInfo.h"

#include "xgi.h"

#include "xgi_regs.h"

#endif



#ifdef LINUX_KERNEL

#include <linux/version.h>

drivers/staging/xgifb/vb_init.c

+2 −9
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ 
#include "vb_init.h"

#include "vb_ext.h"



#ifdef LINUX_XF86

#include "xf86.h"

#include "xf86PciInfo.h"

#include "xgi.h"

#include "xgi_regs.h"

#endif



#ifdef LINUX_KERNEL

#include <asm/io.h>
@@ -2674,7 +2668,7 @@ void SetPowerConsume ( PXGI_HW_DEVICE_INFO HwDeviceExtension , ULONG XGI_P3d4Por 






#if defined(LINUX_XF86)||defined(LINUX_KERNEL)

#if defined(LINUX_KERNEL)

void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)

{
@@ -3103,9 +3097,8 @@ void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) 
/*

void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension )

{

#ifndef LINUX_XF86



    UCHAR data ;

#endif

    VB_DEVICE_INFO VBINF;

    PVB_DEVICE_INFO pVBInfo = &VBINF;

    pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ;

drivers/staging/xgifb/vb_setmode.c

+0 −11
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ 






#ifdef LINUX_XF86

#include "xf86.h"

#include "xf86PciInfo.h"

#include "xgi.h"

#include "xgi_regs.h"

#endif



#ifdef LINUX_KERNEL

#include <asm/io.h>
@@ -2609,9 +2603,7 @@ void XGI_ClearBuffer( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo, PVB 
    PVOID VideoMemoryAddress = ( PVOID )HwDeviceExtension->pjVideoMemoryAddress ;

    ULONG AdapterMemorySize  = ( ULONG )HwDeviceExtension->ulVideoMemorySize ;

    PUSHORT pBuffer ;

#ifndef LINUX_XF86

    int i ;

#endif



    if ( pVBInfo->ModeType >= ModeEGA )

    {
@@ -4901,10 +4893,7 @@ UCHAR XGI_GetVCLKPtr(USHORT RefreshRateTableIndex,USHORT ModeNo,USHORT ModeIdInd 


    USHORT index ,

           modeflag ;

#ifndef LINUX_XF86

    USHORT tempbx ;

#endif



    UCHAR tempal ;

    UCHAR *CHTVVCLKPtr = NULL ;

drivers/staging/xgifb/vb_util.c

+0 −22
Original line number Diff line number Diff line
@@ -9,18 +9,6 @@ 
#include <linux/types.h>

#endif







#ifdef LINUX_XF86

#include "xf86.h"

#include "xf86PciInfo.h"

#include "xgi.h"

#include "xgi_regs.h"

#endif









void XGINew_SetReg1( ULONG , USHORT , USHORT ) ;

void XGINew_SetReg2( ULONG , USHORT , USHORT ) ;

void XGINew_SetReg3( ULONG , USHORT ) ;
@@ -42,13 +30,8 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND); 
/* --------------------------------------------------------------------- */

void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )

{

#ifdef LINUX_XF86

    OutPortByte( ( PUCHAR )(ULONG)port , index ) ;

    OutPortByte( ( PUCHAR )(ULONG)port + 1 , data ) ;

#else

    OutPortByte( port , index ) ;

    OutPortByte( port + 1 , data ) ;

#endif

}
@@ -101,13 +84,8 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index ) 
{

    UCHAR data ;



#ifdef LINUX_XF86

    OutPortByte( ( PUCHAR )(ULONG)port , index ) ;

    data = InPortByte( ( PUCHAR )(ULONG)port + 1 ) ;

#else

    OutPortByte( port , index ) ;

    data = InPortByte( port + 1 ) ;

#endif



    return( data ) ;

}