XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate redundant structure field Set_VGAType.

Browse Source 
Eliminates the redundant structure field Set_VGAType and the
surrounding infrastructure.  This includes the elimination of the old,
pre-XGI VGA types.  Instead of redundantly checking Set_VGAType and
HwDeviceExtension->jChipType, just check the later.
This commit is contained in:
Ian Romanick
2007-04-17 13:21:48 -07:00
parent 2c5a1fe3c4
commit 68d25d4b5e
3 changed files with 8 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vb_def.h
View File

@@ -452,18 +452,6 @@
#define DefThreshold 0x0100
#define ExtRegsSize (57+8+37+70+63+28+768+1)/64+1
#define VGA_XGI315 0x0001 /* VGA Type Info */
#define VGA_SNewis315e 0x0002 /* 315 series */
#define VGA_XGI550 0x0004
#define VGA_XGI640 0x0008
#define VGA_XGI740 0x0010
#define VGA_XGI650 0x0020
#define VGA_XGI650M 0x0040
#define VGA_XGI651 0x0080
#define VGA_XGI340 0x0001 /* 340 series */
#define VGA_XGI330 0x0001 /* 330 series */
#define VGA_XGI660 0x0001 /* 660 series */
#define VB_XGI301 0x0001 /* VB Type Info */
#define VB_XGI301B 0x0002 /* 301 series */
#define VB_XGI302B 0x0004

51
src/vb_setmode.c
View File

@@ -129,7 +129,6 @@ void XGI_GetLVDSData(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTabl
void XGI_ModCRT1Regs(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
void XGI_SetLVDSRegs(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo);
void XGI_UpdateModeInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
void XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo);
void XGI_GetVBInfo(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);
void XGI_GetTVInfo(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo);
@@ -387,9 +386,6 @@ BOOLEAN XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo )
XGI_SearchModeID(pVBInfo->SModeIDTable, pVBInfo->EModeIDTable, 0x11,
&temp_mode_no, &ModeIdIndex);
PDEBUG(ErrorF("XGI_GetVGAType \n"));
XGI_GetVGAType(HwDeviceExtension, pVBInfo) ;
if ( HwDeviceExtension->jChipType != XG20 ) /* kuku 2004/06/25 */
{
PDEBUG(ErrorF("XGI_GetVBInfo \n"));
@@ -2386,32 +2382,6 @@ void XGI_UpdateModeInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO
}
/* --------------------------------------------------------------------- */
/* Function : XGI_GetVGAType */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGI_GetVGAType( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
{
#ifndef LINUX_XF86
USHORT tempbx ,
tempah ;
#endif
if ( HwDeviceExtension->jChipType == XG20 )
{
pVBInfo->Set_VGAType = XG20;
}
else if ( HwDeviceExtension->jChipType >= XG40 )
{
pVBInfo->Set_VGAType = VGA_XGI340 ;
}
}
/* --------------------------------------------------------------------- */
/* Function : XGI_GetVBType */
/* Input : */
@@ -2509,8 +2479,6 @@ void XGI_GetVBInfo( USHORT ModeNo , USHORT ModeIdIndex , PXGI_HW_DEVICE_INFO HwD
if ( pVBInfo->IF_DEF_LCDA == 1 )
{
if ( ( pVBInfo->Set_VGAType == XG20 ) || ( pVBInfo->Set_VGAType >= XG40 ))
{
{
/* if ( ( pVBInfo->VBType & VB_XGI302B ) || ( pVBInfo->VBType & VB_XGI301LV ) || ( pVBInfo->VBType & VB_XGI302LV ) || ( pVBInfo->VBType & VB_XGI301C ) ) */
@@ -2649,18 +2617,13 @@ void XGI_GetVBInfo( USHORT ModeNo , USHORT ModeIdIndex , PXGI_HW_DEVICE_INFO HwD
tempbx |= ( SetInSlaveMode | SetSimuScanMode ) ;
}
if ( pVBInfo->IF_DEF_VideoCapture == 1 )
{
if ( ( ( HwDeviceExtension->jChipType == XG40 ) && ( pVBInfo->Set_VGAType == XG40 ) )
|| ( ( HwDeviceExtension->jChipType == XG41 ) && ( pVBInfo->Set_VGAType == XG41 ) )
|| ( ( HwDeviceExtension->jChipType == XG42 ) && ( pVBInfo->Set_VGAType == XG42 ) )
|| ( ( HwDeviceExtension->jChipType == XG45 ) && ( pVBInfo->Set_VGAType == XG45 ) ) )
{
if ( ModeNo <= 13 )
{
if ( !( tempbx & SetCRT2ToRAMDAC ) ) /*CRT2 not need to support*/
{
tempbx &= ( 0x00FF | ( ~SetInSlaveMode ) ) ;
if (pVBInfo->IF_DEF_VideoCapture == 1) {
if ((HwDeviceExtension->jChipType >= XG40)
&& (HwDeviceExtension->jChipType <= XG45)) {
if (ModeNo <= 13) {
/* CRT2 not need to support*/
if (!(tempbx & SetCRT2ToRAMDAC)) {
tempbx &= (0x00FF | (~SetInSlaveMode));
pVBInfo->SetFlag |= EnableVCMode ;
}
}

2
src/vb_struct.h
View File

@@ -399,7 +399,7 @@ struct _VB_DEVICE_INFO
USHORT IF_DEF_ExpLink;
USHORT IF_DEF_HiVision;
USHORT LCDResInfo,LCDTypeInfo, VBType;/*301b*/
USHORT VBInfo,TVInfo,LCDInfo, Set_VGAType;
USHORT VBInfo,TVInfo,LCDInfo;
USHORT VBExtInfo;/*301lv*/
USHORT SetFlag;
USHORT NewFlickerMode;