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

Staging: xgifb: Remove code for WIN2000 

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:35 -04:00 committed by Greg Kroah-Hartman
parent 23aada9cc3
commit bf4fc6ac01
7 changed files with 0 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
#define _OSDEF_H_
/* #define WINCE_HEADER*/
/*#define WIN2000*/
/* #define TC */
#define LINUX_KERNEL
/* #define LINUX_XF86 */
@ -16,8 +15,6 @@
/**********************************************************************/
#ifdef TC
#endif
#ifdef WIN2000
#endif
#ifdef WINCE_HEADER
#endif
#ifdef LINUX_XF86
@ -31,9 +28,6 @@
#ifdef TC
#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
#endif
#ifdef WIN2000
#define XGI_SetMemory(MemoryAddress,MemorySize,value) MemFill((PVOID) MemoryAddress,(ULONG) MemorySize,(UCHAR) value);
#endif
#ifdef WINCE_HEADER
#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
#endif
@ -50,9 +44,6 @@
#ifdef TC
#define XGI_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
#endif
#ifdef WIN2000
#define XGI_MemoryCopy(Destination,Soruce,Length) /*VideoPortMoveMemory((PUCHAR)Destination , Soruce,length);*/
#endif
#ifdef WINCE_HEADER
#define XGI_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
#endif
@ -128,14 +119,6 @@
/* WIN 2000 */
/**********************************************************************/
#ifdef WIN2000
#define OutPortByte(p,v) VideoPortWritePortUchar ((PUCHAR) (p), (UCHAR) (v))
#define OutPortWord(p,v) VideoPortWritePortUshort((PUSHORT) (p), (USHORT) (v))
#define OutPortLong(p,v) VideoPortWritePortUlong ((PULONG) (p), (ULONG) (v))
#define InPortByte(p) VideoPortReadPortUchar ((PUCHAR) (p))
#define InPortWord(p) VideoPortReadPortUshort ((PUSHORT) (p))
#define InPortLong(p) VideoPortReadPortUlong ((PULONG) (p))
#endif
/**********************************************************************/

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

@ -3,17 +3,6 @@
#ifdef WIN2000
#include <dderror.h>
#include <devioctl.h>
#include <miniport.h>
#include <ntddvdeo.h>
#include <video.h>
#include "xgiv.h"
#include "dd_i2c.h"
#include "tools.h"
#endif /* WIN2000 */
#ifdef LINUX_XF86
#include "xf86.h"
@ -42,9 +31,6 @@ extern UCHAR XGI330_OutputSelect;
extern USHORT XGI330_RGBSenseData2;
extern USHORT XGI330_YCSenseData2;
extern USHORT XGI330_VideoSenseData2;
#ifdef WIN2000
extern UCHAR SenseCHTV(PHW_DEVICE_EXTENSION pHWDE); /* 2007/05/17 Billy */
#endif
void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo );
BOOLEAN XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo);
USHORT XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo);
@ -62,18 +48,6 @@ void XGI_WaitDisplay(void);
BOOLEAN XGI_Is301C(PVB_DEVICE_INFO);
BOOLEAN XGI_Is301LV(PVB_DEVICE_INFO);
#ifdef WIN2000
UCHAR XGI_SenseLCD(PHW_DEVICE_EXTENSION, PVB_DEVICE_INFO);
UCHAR XGI_GetLCDDDCInfo(PHW_DEVICE_EXTENSION,PVB_DEVICE_INFO);
extern BOOL bGetDdcInfo(
PHW_DEVICE_EXTENSION pHWDE,
ULONG ulWhichOne,
PUCHAR pjQueryBuffer,
ULONG ulBufferSize
);
#endif
/* --------------------------------------------------------------------- */
@ -164,284 +138,6 @@ BOOLEAN XGINew_Sense( USHORT tempbx , USHORT tempcx, PVB_DEVICE_INFO pVBInfo )
return( 0 ) ;
}
#ifdef WIN2000
/* --------------------------------------------------------------------- */
/* Function : XGI_SenseLCD */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
UCHAR XGI_SenseLCD( PHW_DEVICE_EXTENSION pHWDE, PVB_DEVICE_INFO pVBInfo)
{
USHORT tempax , tempbx , tempcx ;
UCHAR SoftSetting = XGI330_SoftSetting ;
if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV ) )
return( 1 ) ;
if ( SoftSetting & HotPlugFunction ) /* Hot Plug Detection */
{
XGINew_SetRegAND( pVBInfo->Part4Port , 0x0F , 0x3F ) ;
tempbx = 0 ;
tempcx = 0x9010 ;
if ( XGINew_Sense( tempbx , tempcx, pVBInfo ) )
return( 1 ) ;
return( 0 ) ;
}
else /* Get LCD Info from EDID */
return(XGI_GetLCDDDCInfo(pHWDE, pVBInfo));
}
/* --------------------------------------------------------------------- */
/* Function : XGI_GetLCDDDCInfo */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
UCHAR XGI_GetLCDDDCInfo( PHW_DEVICE_EXTENSION pHWDE , PVB_DEVICE_INFO pVBInfo)
{
UCHAR tempah , tempbl , tempbh ;
USHORT tempbx , temp ;
UCHAR pjEDIDBuf[ 256 ] ;
ULONG ulBufferSize = 256 ;
UCHAR bMASK_OUTPUTSTATE_CRT2LCD = 2 ; /* 0423 shampoo */
bGetDdcInfo( pHWDE , MASK_OUTPUTSTATE_CRT2LCD , pjEDIDBuf , ulBufferSize ) ;
if ( ( *( ( PULONG )pjEDIDBuf ) == 0xFFFFFF00 ) && ( *( ( PULONG )( pjEDIDBuf + 4 ) ) == 0x00FFFFFF ) )
{
tempah = Panel1024x768 ;
tempbl=( *( pjEDIDBuf + 0x3A ) ) & 0xf0 ;
if ( tempbl != 0x40 )
{
tempah = Panel1600x1200 ;
if ( tempbl != 0x60 )
{
tempah = Panel1280x1024 ;
tempbh = ( *( pjEDIDBuf + 0x3B ) ) ;
if ( tempbh != 0x00 )
{
tempah = Panel1280x960 ;
if ( tempbh != 0x0C0 )
{
tempbx = ( ( *( pjEDIDBuf + 0x24 ) ) << 8 ) | ( *( pjEDIDBuf + 0x23 ) ) ;
tempah = Panel1280x1024 ;
if ( !( tempbx & 0x0100 ) )
{
tempah = Panel1024x768 ;
if ( !( tempbx & 0x0E00 ) )
{
tempah = Panel1280x1024 ;
}
}
}
if ( tempbx & 0x00FF )
{
temp = ScalingLCD ;
XGINew_SetRegOR( pVBInfo->P3d4 , 0x37 , temp ) ;
}
}
}
}
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x36 , ( ~0x07 ) , tempah ) ;
tempah = ( ( *( pjEDIDBuf + 0x47 ) ) & 0x06 ) ; /* Polarity */
tempah = ( tempah ^ 0x06 ) << 4 ;
tempah |= LCDSync ;
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x37 , ( ~LCDSyncBit ) , tempah ) ;
tempbh= XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ;
tempbh &= 0x07 ;
if ( tempbh == Panel1280x960 )
XGINew_SetRegAND( pVBInfo->P3d4 , 0x37 , 0x0E ) ;
}
else if ( *pjEDIDBuf == 0x20 )
{
tempah = Panel1024x768 ;
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x36 , ( ~0x07 ) , tempah ) ;
}
else
{
return( 0 ) ;
}
return( 1 ) ;
}
/* --------------------------------------------------------------------- */
/* Function : XGI_DySense */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
BOOLEAN XGI_DySense( PHW_DEVICE_EXTENSION pHWDE , PUCHAR ujConnectStatus)
{
UCHAR pre_CRD,pre_SR1E , pre_Part2_0 , pre_Part4_D ;
USHORT tempax , tempbx , tempcx , pushax , temp ;
VB_DEVICE_INFO VBINF;
PVB_DEVICE_INFO pVBInfo = &VBINF;
UCHAR OutputSelect = XGI330_OutputSelect ;
PXGI_HW_DEVICE_INFO HwDeviceExtension= pHWDE->pXGIHWDE ;
UCHAR bConnectStatus = 0 ;
pVBInfo->BaseAddr = HwDeviceExtension->pjIOAddress ;
pVBInfo->ROMAddr = pHWDE->pjVirtualRomBase ;
pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12 ;
pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14 ;
pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24 ;
pVBInfo->Part2Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_10 ;
pVBInfo->Part4Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_14 ;
pushax = XGINew_GetReg1( pVBInfo->P3d4 , 0x17 ) ; /* 0512 Fix Dysense hanged */
temp = ( pushax & 0x00FF ) | 0x80 ;
XGINew_SetRegOR( pVBInfo->P3d4 , 0x17 , temp ) ;
XGINew_SetReg1( pVBInfo->P3c4 , 0x05 , 0x86 ) ;
/* beginning of dynamic sense CRT1 */
pVBInfo->IF_DEF_CH7007 = 0;
if (pHWDE->bCH7007)
{
InitTo330Pointer( pHWDE->pXGIHWDE->jChipType, pVBInfo ) ;
HwDeviceExtension->pDevice = (PVOID)pHWDE;
pVBInfo->IF_DEF_CH7007 = 1;
/* [Billy] 2007/05/14 For CH7007 */
if ( pVBInfo->IF_DEF_CH7007 == 1 )
{
bConnectStatus = SenseCHTV(HwDeviceExtension->pDevice) ; /* 07/05/28 */
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~0x03 , (UCHAR)bConnectStatus ) ;
}
}
if(( pHWDE->jChipID >= XG40 ) || ( pHWDE->jChipID >= XG20 ))
{
if ( pHWDE->jChipID >= XG40 )
XGINew_SetReg1( pVBInfo->P3d4 , 0x57 , 0x4A ) ; /* write sense pattern 30->4a */
else
XGINew_SetReg1( pVBInfo->P3d4 , 0x57 , 0x5F ) ; /* write sense pattern */
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x53 , 0xFF , 0x02 ) ; /* enable sense DAC */
XGI_WaitDisply(pVBInfo) ;
if(XGINew_GetReg2( pVBInfo->P3c2 ) & 0x10 )
bConnectStatus |= Monitor1Sense ;
XGINew_SetRegAND( pVBInfo->P3d4 , 0x53 , 0xFD ) ; /* disable sense DAC */
XGINew_SetRegAND( pVBInfo->P3d4 , 0x57 , 0x00 ) ; /* clear sense pattern */
/* ---------- End of dynamic sense CRT1 ----------- */
/* ---------- beginning of dynamic sense VB ------------ */
pre_SR1E = XGINew_GetReg1( pVBInfo->P3c4 , 0x1E ) ;
XGINew_SetRegOR( pVBInfo->P3c4 , 0x1E , 0x20 ) ; /* Enable CRT2,work-a-round for 301B/301LV/302LV */
pre_Part2_0 = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
pre_Part4_D = XGINew_GetReg1( pVBInfo->Part4Port , 0x0D ) ;
if ( XGI_Is301C( pVBInfo ) ) /* 301C only */
XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x0D , ~0x07 , 0x01 ) ; /* Set Part4 0x0D D[2:0] to 001b */
/* tempax = 0 ; */
if ( !XGI_Is301LV( pVBInfo ) )
{
tempbx = XGI330_RGBSenseData2 ;
tempcx = 0x0E08 ;
if(XGINew_Sense( tempbx , tempcx, pVBInfo ) )
{
bConnectStatus |= Monitor2Sense ;
if ( OutputSelect & SetSCARTOutput )
{
bConnectStatus ^= ( Monitor2Sense | SCARTSense ) ;
}
}
}
if ( XGI_Is301C( pVBInfo ) ) /* 301C only */
XGINew_SetRegOR( pVBInfo->Part4Port , 0x0D , 0x04 ) ; /* Set Part4 0x0D D[2]=1 for dynamic sense */
if ( ( XGINew_Is301B( pVBInfo ) ) )
XGINew_SetRegOR( pVBInfo->Part2Port , 0x00 , 0x0C ) ; /* ????????? */
if ( XGINew_SenseHiTV( HwDeviceExtension , pVBInfo) ) /* add by kuku for Dysense HiTV //start */
{
bConnectStatus|= YPbPrSense ;
}
else
{
tempbx = XGI330_YCSenseData2 ; /* Y/C Sense Data Ptr */
tempcx = 0x0604 ;
if ( XGINew_Sense( tempbx , tempcx , pVBInfo) )
bConnectStatus |= SVIDEOSense ;
if ( OutputSelect & BoardTVType )
{
tempbx = XGI330_VideoSenseData2 ;
tempcx = 0x0804 ;
if ( XGINew_Sense(tempbx , tempcx, pVBInfo) )
bConnectStatus|= AVIDEOSense ;
}
else
{
if ( !( bConnectStatus & SVIDEOSense ) )
{
tempbx = XGI330_VideoSenseData2 ;
tempcx = 0x0804 ;
if ( XGINew_Sense( tempbx , tempcx, pVBInfo ) )
bConnectStatus |= AVIDEOSense ;
}
}
} /* end */
/* DySenseVBCnt */
tempbx = 0 ;
tempcx = 0 ;
XGINew_Sense(tempbx , tempcx, pVBInfo ) ;
if ( !( bConnectStatus & Monitor2Sense ) )
{
if ( XGI_SenseLCD( pHWDE , pVBInfo ) )
bConnectStatus |= LCDSense ;
}
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x32 , ~( AVIDEOSense | SVIDEOSense | LCDSense | Monitor2Sense | Monitor1Sense ) , bConnectStatus ) ;
XGINew_SetReg1( pVBInfo->Part4Port , 0x0D , pre_Part4_D ) ;
XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , pre_Part2_0 ) ;
XGINew_SetReg1( pVBInfo->P3c4 , 0x1E , pre_SR1E ) ;
if ( XGI_Is301C( pVBInfo ) ) /* 301C only */
{
tempax = XGINew_GetReg1( pVBInfo->Part2Port , 0x00 ) ;
if ( tempax & 0x20 )
{
/* Reset VBPro */
for( tempcx = 2 ; tempcx > 0 ; tempcx-- )
{
tempax ^= 0x20 ;
XGINew_SetReg1( pVBInfo->Part2Port , 0x00 , tempax ) ;
}
}
}
/* End of dynamic sense VB */
}
else
{
XGI_SenseCRT1(pVBInfo) ;
XGI_GetSenseStatus( HwDeviceExtension, pVBInfo ) ; /* sense CRT2 */
bConnectStatus = XGINew_GetReg1( pVBInfo->P3d4 , 0x32 ) ;
}
temp = pushax & 0x00FF ; /* 0512 Fix Dysense hanged */
XGINew_SetReg1( pVBInfo->P3d4 , 0x17 , temp ) ;
if ( bConnectStatus )
{
*ujConnectStatus = bConnectStatus ;
return( 1 ) ;
}
else
return( 0 ) ;
}
#endif /* WIN2000 */
/* --------------------------------------------------------------------- */
/* Function : XGISetDPMS */

3
drivers/staging/xgifb/vb_ext.h
View File

@ -25,8 +25,5 @@ extern void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PV
extern void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
extern void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
extern USHORT XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo);
#ifdef WIN2000
extern BOOLEAN XGI_DySense( PHW_DEVICE_EXTENSION pHWDE , PUCHAR ujConnectStatus );
#endif /* WIN2000 */
#endif

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

@ -14,16 +14,6 @@
#endif */
#endif
#ifdef WIN2000
#include <dderror.h>
#include <devioctl.h>
#include <miniport.h>
#include <ntddvdeo.h>
#include <video.h>
#include "xgiv.h"
#include "dd_i2c.h"
#include "tools.h"
#endif
#include "vb_def.h"
#include "vb_struct.h"
@ -136,11 +126,6 @@ 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 WIN2000
/* [Billy] 2007/05/20 For CH7007 */
extern UCHAR CH7007TVReg_UNTSC[][8],CH7007TVReg_ONTSC[][8],CH7007TVReg_UPAL[][8],CH7007TVReg_OPAL[][8];
extern UCHAR XGI7007_CHTVVCLKUNTSC[],XGI7007_CHTVVCLKONTSC[],XGI7007_CHTVVCLKUPAL[],XGI7007_CHTVVCLKOPAL[];
#endif
#ifdef LINUX_KERNEL
void DelayUS(ULONG MicroSeconds)
@ -1878,9 +1863,6 @@ int XGINew_CheckColumn( int index , USHORT DRAMTYPE_TABLE[][ 5 ], PVB_DEVICE_INF
Position += Increment ;
}
#ifdef WIN2000 /* chiawen for linux solution */
DelayUS( 100 ) ;
#endif
for( i = 0 , Position = 0 ; i < 2 ; i++ )
{
@ -3332,16 +3314,6 @@ void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO
pVBInfo->IF_DEF_LVDS = 0 ;
#ifdef WIN2000
pVBInfo->IF_DEF_CH7007 = 0 ;
if ( ( pVideoMemory[ 0x65 ] & 0x02 ) ) /* For XG21 CH7007 */
{
/* VideoDebugPrint((0, "ReadVBIOSTablData: pVideoMemory[ 0x65 ] =%x\n",pVideoMemory[ 0x65 ])); */
pVBInfo->IF_DEF_CH7007 = 1 ; /* [Billy] 07/05/03 */
XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x38 , ~0xE0 , 0x60 ) ; /* CH7007 on chip */
}
else
#endif
#if 1
if (( pVideoMemory[ 0x65 ] & 0x01 ) ) /* For XG21 LVDS */
{

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

@ -22,17 +22,6 @@
#include "XGIfb.h"
#endif
#ifdef WIN2000
#include <dderror.h>
#include <devioctl.h>
#include <miniport.h>
#include <ntddvdeo.h>
#include <video.h>
#include "xgiv.h"
#include "dd_i2c.h"
#include "tools.h"
#endif
#include "vb_def.h"
#include "vgatypes.h"
@ -179,19 +168,6 @@ void XGI_SetXG27LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO p
UCHAR XGI_SetDefaultVCLK( PVB_DEVICE_INFO pVBInfo );
extern void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
#ifdef WIN2000
/* [Billy] 2007/05/17 For CH7007 */
extern UCHAR CH7007TVReg_UNTSC[][8],CH7007TVReg_ONTSC[][8],CH7007TVReg_UPAL[][8],CH7007TVReg_OPAL[][8];
extern UCHAR CH7007TVCRT1UNTSC_H[][10],CH7007TVCRT1ONTSC_H[][10],CH7007TVCRT1UPAL_H[][10],CH7007TVCRT1OPAL_H[][10] ;
extern UCHAR CH7007TVCRT1UNTSC_V[][10],CH7007TVCRT1ONTSC_V[][10],CH7007TVCRT1UPAL_V[][10],CH7007TVCRT1OPAL_V[][10] ;
extern UCHAR XGI7007_CHTVVCLKUNTSC[],XGI7007_CHTVVCLKONTSC[],XGI7007_CHTVVCLKUPAL[],XGI7007_CHTVVCLKOPAL[];
extern BOOLEAN XGI_XG21CheckCH7007TVMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo ) ;
extern void SetCH7007Regs(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) ;
extern VP_STATUS TurnOnCH7007(PHW_DEVICE_EXTENSION pHWDE) ;
extern VP_STATUS TurnOffCH7007(PHW_DEVICE_EXTENSION pHWDE) ;
extern BOOLEAN IsCH7007TVMode(PVB_DEVICE_INFO pVBInfo) ;
#endif
/* USHORT XGINew_flag_clearbuffer; 0: no clear frame buffer 1:clear frame buffer */
@ -480,9 +456,6 @@ BOOLEAN XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo )
XGI_GetVBType( pVBInfo ) ;
InitTo330Pointer( HwDeviceExtension->jChipType, pVBInfo ) ;
#ifdef WIN2000
ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ;
#endif
if ( ModeNo & 0x80 )
{
ModeNo = ModeNo & 0x7F ;
@ -555,21 +528,6 @@ BOOLEAN XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo )
} /* !XG20 */
else
{
#ifdef WIN2000
if ( pVBInfo->IF_DEF_CH7007 == 1 )
{
VideoDebugPrint((0, "XGISetModeNew: pVBIfo->IF_DEF_CH7007==1\n"));
pVBInfo->VBType = VB_CH7007 ;
XGI_GetVBInfo(ModeNo , ModeIdIndex , HwDeviceExtension, pVBInfo ) ;
XGI_GetTVInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
XGI_GetLCDInfo(ModeNo , ModeIdIndex, pVBInfo ) ;
if( !(XGI_XG21CheckCH7007TVMode(ModeNo, ModeIdIndex, pVBInfo )) )
{
return FALSE;
}
}
#endif
if ( pVBInfo->IF_DEF_LVDS == 1 )
@ -758,13 +716,6 @@ void XGI_SetCRT1Group( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo , U
XGI_LoadDAC( ModeNo , ModeIdIndex, pVBInfo ) ;
/* XGI_ClearBuffer( HwDeviceExtension , ModeNo, pVBInfo ) ; */
#ifdef WIN2000
if ( pVBInfo->IF_DEF_CH7007 == 1 ) /* [Billy] 2007/05/14 */
{
VideoDebugPrint((0, "XGI_SetCRT1Group: VBInfo->IF_DEF_CH7007==1\n"));
SetCH7007Regs(HwDeviceExtension, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo ) ; /* 07/05/28 */
}
#endif
}
@ -4097,41 +4048,6 @@ BOOLEAN XGI_SearchModeID( USHORT ModeNo , USHORT *ModeIdIndex, PVB_DEVICE_INFO p
#endif
#ifdef WIN2000
if ( ModeNo <= 5 )
ModeNo |= 1 ;
if ( ModeNo <= 0x13 )
{
/* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->SModeIDTable)/sizeof(XGI_StStruct);(*ModeIdIndex)++) */
for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
{
if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == ModeNo )
break ;
if ( pVBInfo->SModeIDTable[ *ModeIdIndex ].St_ModeID == 0xFF )
return( FALSE ) ;
}
if ( ModeNo == 0x07 )
( *ModeIdIndex )++ ; /* 400 lines */
if ( ModeNo <=3 )
( *ModeIdIndex ) += 2 ; /* 400 lines */
/* else 350 lines */
}
else
{
/* for (*ModeIdIndex=0;*ModeIdIndex<sizeof(pVBInfo->EModeIDTable)/sizeof(XGI_ExtStruct);(*ModeIdIndex)++) */
for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ )
{
if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == ModeNo )
break ;
if ( pVBInfo->EModeIDTable[ *ModeIdIndex ].Ext_ModeID == 0xFF )
return( FALSE ) ;
}
}
#endif
#ifdef LINUX /* chiawen for linux solution */
@ -4326,12 +4242,6 @@ void XGI_DisplayOn( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo )
if (pVBInfo->IF_DEF_CH7007 == 1) /* [Billy] 07/05/23 For CH7007 */
{
#ifdef WIN2000
if ( IsCH7007TVMode( pVBInfo ) )
{
TurnOnCH7007(pXGIHWDE->pDevice) ; /* 07/05/28 */
}
#endif
}
@ -4387,9 +4297,6 @@ void XGI_DisplayOff( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo )
{
/* if( IsCH7007TVMode( pVBInfo ) == 0 ) */
{
#ifdef WIN2000
TurnOffCH7007(pXGIHWDE->pDevice) ; /* 07/05/28 */
#endif
}
}
@ -7950,53 +7857,9 @@ void* XGI_GetTVPtr (USHORT BX,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRat
if ( table == 0x00 ) /* 07/05/22 */
{
#ifdef WIN2000
if ( pVBInfo->IF_DEF_CH7007 == 1 )
{
switch( tempdi[ i ].DATAPTR )
{
case 0:
return &CH7007TVCRT1UNTSC_H[ tempal ] ;
break ;
case 1:
return &CH7007TVCRT1ONTSC_H[ tempal ] ;
break ;
case 2:
return &CH7007TVCRT1UPAL_H[ tempal ] ;
break ;
case 3:
return &CH7007TVCRT1OPAL_H[ tempal ] ;
break ;
default:
break ;
}
}
#endif
}
else if ( table == 0x01 )
{
#ifdef WIN2000
if ( pVBInfo->IF_DEF_CH7007 == 1 )
{
switch( tempdi[ i ].DATAPTR )
{
case 0:
return &CH7007TVCRT1UNTSC_V[ tempal ] ;
break ;
case 1:
return &CH7007TVCRT1ONTSC_V[ tempal ] ;
break ;
case 2:
return &CH7007TVCRT1UPAL_V[ tempal ] ;
break ;
case 3:
return &CH7007TVCRT1OPAL_V[ tempal ] ;
break ;
default:
break ;
}
}
#endif
}
else if ( table == 0x04 )
{
@ -8070,49 +7933,6 @@ void* XGI_GetTVPtr (USHORT BX,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRat
}
else if( table == 0x06 )
{
#ifdef WIN2000
if ( pVBInfo->IF_DEF_CH7007 == 1 )
{
/* VideoDebugPrint((0, "XGI_GetTVPtr: pVBInfo->IF_DEF_CH7007==1\n")); */
switch( tempdi[ i ].DATAPTR )
{
case 0:
return &CH7007TVReg_UNTSC[ tempal ] ;
break ;
case 1:
return &CH7007TVReg_ONTSC[ tempal ] ;
break ;
case 2:
return &CH7007TVReg_UPAL[ tempal ] ;
break ;
case 3:
return &CH7007TVReg_OPAL[ tempal ] ;
break ;
default:
break ;
}
}
else
{
switch( tempdi[ i ].DATAPTR )
{
case 0:
return &XGI_CHTVRegUNTSC[ tempal ] ;
break ;
case 1:
return &XGI_CHTVRegONTSC[ tempal ] ;
break ;
case 2:
return &XGI_CHTVRegUPAL[ tempal ] ;
break ;
case 3:
return &XGI_CHTVRegOPAL[ tempal ] ;
break ;
default:
break ;
}
}
#endif
}
return( 0 ) ;
}

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

@ -16,17 +16,6 @@
#include <dos.h>
#endif
#ifdef WIN2000
#include <dderror.h>
#include <devioctl.h>
#include <miniport.h>
#include <ntddvdeo.h>
#include <video.h>
#include "xgiv.h"
#include "dd_i2c.h"
#include "tools.h"
#endif
#ifdef LINUX_XF86
#include "xf86.h"
@ -219,9 +208,6 @@ void XGINew_SetRegOR( ULONG Port , USHORT Index , USHORT DataOR )
/* --------------------------------------------------------------------- */
void NewDelaySeconds( int seconds )
{
#ifdef WIN2000
int j ;
#endif
int i ;
@ -231,11 +217,6 @@ void NewDelaySeconds( int seconds )
delay( 1000 ) ;
#endif
#ifdef WIN2000
for ( j = 0 ; j < 20000 ; j++ )
VideoPortStallExecution( 50 ) ;
#endif
#ifdef WINCE_HEADER
#endif

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

@ -94,8 +94,6 @@ typedef IOADDRESS XGIIOADDRESS;
#define VBIOS_VER_MAX_LENGTH 4
#endif
#ifndef WIN2000
#ifndef LINUX_KERNEL /* For the linux kernel, this is defined in xgifb.h */
#ifndef XGI_CHIP_TYPE
typedef enum _XGI_CHIP_TYPE {
@ -174,8 +172,6 @@ typedef enum _XGI_LCD_TYPE {
} XGI_LCD_TYPE;
#endif
#endif /* not WIN2000 */
#ifndef PXGI_DSReg
typedef struct _XGI_DSReg
{
@ -217,9 +213,6 @@ struct _XGI_HW_DEVICE_INFO
ULONG ul2ndVideoMemorySize;
PUCHAR pj2ndIOAddress;
/*#ifndef WIN2000
XGIIOADDRESS pjIOAddress; // base I/O address of VGA ports (0x3B0)
#endif */
UCHAR jChipType; /* Used to Identify Graphics Chip */
/* defined in the data structure type */
/* "XGI_CHIP_TYPE" */