diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-24 16:42:41 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-24 16:42:41 +0200 |
| commit | 9e133647b69db1e17a6311aeb9fc04602170ff96 (patch) | |
| tree | 845e682a29e94d67aedae946bc6f01ea9b811794 | |
| parent | e1dc37b94aa1000569e85f319304a498e0c445fe (diff) | |
drop obsolete ifdef on LINUX_XF86
It's always enabled, so no need for the ifdefs and the disabled code pathes.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
| -rw-r--r-- | src/init.c | 6 | ||||
| -rw-r--r-- | src/init.h | 9 | ||||
| -rw-r--r-- | src/osdef.h | 6 | ||||
| -rw-r--r-- | src/vb_ext.c | 6 | ||||
| -rw-r--r-- | src/vb_i2c.c | 2 | ||||
| -rw-r--r-- | src/vb_init.c | 38 | ||||
| -rw-r--r-- | src/vb_setmode.c | 71 | ||||
| -rw-r--r-- | src/vgatypes.h | 9 |
8 files changed, 2 insertions, 145 deletions
@@ -844,10 +844,8 @@ XGI_New_SetCRT1Group(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, XGI_Pr->SetFlag &= (~ProgrammingCRT2); -#ifdef LINUX_XF86 xf86DrvMsgVerb(0, X_PROBED, 4, "(init: VBType=0x%04x, VBInfo=0x%04x)\n", XGI_Pr->VBType, XGI_Pr->VBInfo); -#endif if(XGI_Pr->VBInfo & SetSimuScanMode) { if(XGI_Pr->VBInfo & SetInSlaveMode) { @@ -880,7 +878,6 @@ XGI_New_SetCRT1Group(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, /* XFree86: SET SCREEN PITCH */ /*********************************************/ -#ifdef LINUX_XF86 static void XGI_SetPitchCRT1(VB_DEVICE_INFO *XGI_Pr, ScrnInfoPtr pScrn) { @@ -890,14 +887,12 @@ XGI_SetPitchCRT1(VB_DEVICE_INFO *XGI_Pr, ScrnInfoPtr pScrn) XGI_SetReg(XGI_Pr->P3d4,0x13,(HDisplay & 0xFF)); XGI_SetRegANDOR(XGI_Pr->P3c4,0x0E,0xF0,(HDisplay>>8)); } -#endif /*********************************************/ /* XFree86: XGIBIOSSetMode() */ /* for non-Dual-Head mode */ /*********************************************/ -#ifdef LINUX_XF86 BOOLEAN XGIBIOSSetMode(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, DisplayModePtr mode) @@ -1080,4 +1075,3 @@ XGIBIOSSetModeCRT1(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, return TRUE; } -#endif /* Linux_XF86 */ @@ -55,14 +55,11 @@ #include "vgatypes.h" #include "vb_struct.h" - -#ifdef LINUX_XF86 #include "xf86.h" #include "xf86Pci.h" #include "xf86_OSproc.h" #include "xgi.h" #include "xgi_regs.h" -#endif /* Mode numbers */ static const USHORT ModeIndex_320x200[] = {0x59, 0x41, 0x00, 0x4f}; @@ -106,20 +103,16 @@ USHORT XGI_GetMCLK(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo); USHORT XGI_New_GetOffset(VB_DEVICE_INFO *XGI_Pr,USHORT ModeNo,USHORT ModeIdIndex, USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwInfo); void XGI_New_LoadDAC(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, USHORT ModeNo, USHORT ModeIdIndex); -#ifdef LINUX_XF86 + BOOLEAN XGIBIOSSetMode(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, DisplayModePtr mode); BOOLEAN XGIBIOSSetModeCRT1(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, DisplayModePtr mode); -#endif -#ifdef LINUX_XF86 extern unsigned char XGI_GetSetBIOSScratch(ScrnInfoPtr pScrn, USHORT offset, unsigned char value); extern unsigned char XGI_GetSetModeID(ScrnInfoPtr pScrn, unsigned char id); extern USHORT XGI_CalcModeIndex(ScrnInfoPtr pScrn, DisplayModePtr mode, unsigned long VBFlags); -#endif #endif - diff --git a/src/osdef.h b/src/osdef.h index 71f1264..5bd0f82 100644 --- a/src/osdef.h +++ b/src/osdef.h @@ -49,11 +49,5 @@ * */ -/* The choices are: */ -#define LINUX_XF86 /* XFree86 */ - #define XGI_MemoryCopy(Destination,Source,Length) memcpy(Destination,Source,Length) - -#ifdef LINUX_XF86 #define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize) -#endif diff --git a/src/vb_ext.c b/src/vb_ext.c index 0487e1c..c33a6a3 100644 --- a/src/vb_ext.c +++ b/src/vb_ext.c @@ -29,12 +29,9 @@ #endif #include "osdef.h" -#ifdef LINUX_XF86 #include "xf86.h" #include "xgi.h" #include "xgi_regs.h" -#endif - #include "vb_def.h" #include "vgatypes.h" #include "vb_struct.h" @@ -371,9 +368,6 @@ BOOLEAN XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INF { USHORT tempbx , tempcx , temp , i , tempch; -#ifndef LINUX_XF86 - USHORT tempax ; -#endif tempbx = *pVBInfo->pYCSenseData2 ; tempcx = 0x0604 ; diff --git a/src/vb_i2c.c b/src/vb_i2c.c index 07dce6b..d87fbb9 100644 --- a/src/vb_i2c.c +++ b/src/vb_i2c.c @@ -9,12 +9,10 @@ /* #include "vb_util.h" */ /* Jong@08032009 */ #include "vb_def.h" -#ifdef LINUX_XF86 #include "xf86.h" #include "xgi.h" #include "xgi_regs.h" #include "vb_i2c.h" -#endif char vGetEDIDExtensionBlocks(PXGI_HW_DEVICE_INFO pHWDE, PI2CControl pI2C, PUCHAR pjBuffer, ULONG ulBufferSize); char vGetEnhancedEDIDBlock(PXGI_HW_DEVICE_INFO pHWDE, PI2CControl pI2C, ULONG ulBlockID, ULONG ulBlockTag, PUCHAR pjBuffer, ULONG ulBufferSize); diff --git a/src/vb_init.c b/src/vb_init.c index 8d92d7f..287fcde 100644 --- a/src/vb_init.c +++ b/src/vb_init.c @@ -34,12 +34,9 @@ #include "vb_setmode.h" #include "vb_init.h" #include "vb_ext.h" - -#ifdef LINUX_XF86 #include "xf86.h" #include "xgi.h" #include "xgi_regs.h" -#endif static UCHAR XGINew_ChannelAB; static UCHAR XGINew_DataBusWidth; @@ -202,13 +199,6 @@ static ULONG UNIROM; /* UNIROM */ BOOLEAN XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - USHORT Mclockdata[ 30 ] , Eclockdata[ 30 ] ; - UCHAR j , SR11 , SR17 = 0 , SR18 = 0 , SR19 = 0 ; - UCHAR CR37 = 0 , CR38 = 0 , CR79 = 0 , CR7A = 0 , - CR7B = 0 , CR36 = 0 , CR78 = 0 , CR3C = 0 , - CR3D = 0 , CR3E = 0 , CR3F = 0 , CR35 = 0 ; -#endif UCHAR i , temp = 0 , temp1 , VBIOSVersion[ 5 ] ; ULONG base,ChipsetID,VendorID,GraphicVendorID; @@ -628,11 +618,7 @@ BOOLEAN XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* --------------------------------------------------------------------- */ void DualChipInit( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo) { -#ifdef LINUX_XF86 USHORT BaseAddr2nd = (USHORT)(ULONG)HwDeviceExtension->pj2ndIOAddress ; -#else - USHORT BaseAddr2nd = (USHORT)HwDeviceExtension->pj2ndIOAddress ; -#endif USHORT XGINew_P3C3 = pVBInfo->BaseAddr + VIDEO_SUBSYSTEM_ENABLE_PORT ; USHORT XGINew_P3CC = pVBInfo->BaseAddr + MISC_OUTPUT_REG_READ_PORT ; USHORT XGINew_2ndP3C3 = BaseAddr2nd + VIDEO_SUBSYSTEM_ENABLE_PORT ; @@ -1229,9 +1215,6 @@ void XGINew_DDR1x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, { USHORT P3d4 = Port , P3c4 = Port - 0x10 ; -#ifndef LINUX_XF86 - UCHAR data ; -#endif if ( HwDeviceExtension->jChipType >= XG20 ) { XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ; @@ -1293,10 +1276,6 @@ void XGINew_DDR2x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT P3d4 = Port , P3c4 = Port - 0x10 ; -#ifndef LINUX_XF86 - UCHAR data ; -#endif - XGINew_SetMemoryClock( HwDeviceExtension , pVBInfo ) ; /* 20040906 Hsuan modify CR82, CR85, CR86 for XG42 */ @@ -2868,16 +2847,10 @@ int XGINew_DDRSizing(PVB_DEVICE_INFO pVBInfo) /* --------------------------------------------------------------------- */ void XGINew_SetMemoryClock( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - UCHAR tempal ; -#endif - XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x28 , pVBInfo->MCLKData[ XGINew_RAMType ].SR28 ) ; XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x29 , pVBInfo->MCLKData[ XGINew_RAMType ].SR29 ) ; XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x2A , pVBInfo->MCLKData[ XGINew_RAMType ].SR2A ) ; - - XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x2E , pVBInfo->ECLKData[ XGINew_RAMType ].SR2E ) ; XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x2F , pVBInfo->ECLKData[ XGINew_RAMType ].SR2F ) ; XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4 , 0x30 , pVBInfo->ECLKData[ XGINew_RAMType ].SR30 ) ; @@ -3012,10 +2985,6 @@ void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO /* --------------------------------------------------------------------- */ void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - ULONG ulOffset ; - UCHAR temp , index , l ; -#endif PUCHAR volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ; ULONG i ; UCHAR j , k ; @@ -3408,10 +3377,6 @@ void XGINew_DDR1x_MRS_XG20( USHORT P3c4 , PVB_DEVICE_INFO pVBInfo) void XGINew_SetDRAMModeRegister_XG20(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - UCHAR data ; -#endif - ReadVBIOSTablData( HwDeviceExtension->jChipType , pVBInfo) ; if ( XGINew_Get340DRAMType( HwDeviceExtension, pVBInfo) == 0 ) @@ -3424,9 +3389,6 @@ void XGINew_SetDRAMModeRegister_XG20(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 ; diff --git a/src/vb_setmode.c b/src/vb_setmode.c index e1fdfe9..682a653 100644 --- a/src/vb_setmode.c +++ b/src/vb_setmode.c @@ -29,12 +29,9 @@ #include "osdef.h" -#ifdef LINUX_XF86 #include "xf86.h" #include "xgi.h" #include "xgi_regs.h" -#endif - #include "vb_def.h" #include "vgatypes.h" #include "vb_struct.h" @@ -467,10 +464,6 @@ BOOLEAN XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo, USHORT ModeNo) { -#ifndef LINUX_XF86 - ULONG temp; - USHORT KeepLockReg; -#endif USHORT ModeIdIndex; /* PUCHAR pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; */ USHORT temp_mode_no; @@ -1083,9 +1076,6 @@ XGI_SetCRT1Group(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo, USHORT temp; USHORT XGINew_P3cc = pVBInfo->P3cc; -#ifndef LINUX_XF86 - USHORT XGINew_P3c2 = pVBInfo->P3c2; -#endif PDEBUG(ErrorF("XGI_SetCRT1Group()...begin\n")); @@ -1766,9 +1756,6 @@ XGI_SetCRT1CRTC(USHORT ModeNo, USHORT ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension) { UCHAR index, data; -#ifndef LINUX_XF86 - USHORT temp, tempah, j, modeflag, ResInfo, DisplayType; -#endif USHORT i; index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC; /* Get index */ @@ -4382,9 +4369,6 @@ XGI_SenseCRT1(PVB_DEVICE_INFO pVBInfo) UCHAR DAC_TEST_PARMS[3] = { 0x0F, 0x0F, 0x0F }; int i; -#ifndef LINUX_XF86 - int j; -#endif XGI_SetReg((XGIIOADDRESS) pVBInfo->P3c4, 0x05, 0x86); @@ -4509,11 +4493,7 @@ SetDualChipRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifdef LINUX_XF86 USHORT BaseAddr2nd = (USHORT) (ULONG) HwDeviceExtension->pj2ndIOAddress; -#else - USHORT BaseAddr2nd = (USHORT) HwDeviceExtension->pj2ndIOAddress; -#endif USHORT XGINew_P3CC = pVBInfo->BaseAddr + MISC_OUTPUT_REG_READ_PORT; USHORT XGINew_2ndP3CE = BaseAddr2nd + GRAPH_ADDRESS_PORT; USHORT XGINew_2ndP3C4 = BaseAddr2nd + SEQ_ADDRESS_PORT; @@ -4715,9 +4695,6 @@ XGI_GetCRT2Data(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { USHORT tempax = 0, tempbx, modeflag, resinfo; -#ifndef LINUX_XF86 - USHORT CRT2Index, ResIndex; -#endif XGI_LCDDataStruct *LCDPtr = NULL; XGI_TVDataStruct *TVPtr = NULL; @@ -5201,9 +5178,6 @@ XGI_PreSetGroup1(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { USHORT tempcx = 0, CRT1Index = 0, resinfo = 0; -#ifndef LINUX_XF86 - USHORT temp = 0, tempax = 0, tempbx = 0, pushbx = 0, modeflag; -#endif if (ModeNo > 0x13) { CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC; @@ -5788,21 +5762,6 @@ XGI_SetGroup2(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, j, tempax, tempbx, tempcx, temp, push1, push2, modeflag, resinfo, crt2crtc; -#ifndef LINUX_XF86 - USHORT temp1, temp3, resindex, xres; -#endif -/* XGINew_RY1COE = 0 , - XGINew_RY2COE = 0 , - XGINew_RY3COE = 0 , - XGINew_RY4COE = 0 , - XGINew_RY5COE = 0 , - XGINew_RY6COE = 0 , - XGINew_RY7COE = 0 ; -*/ - -#ifndef LINUX_XF86 - UCHAR *PhasePoint; -#endif const UCHAR *TimingPoint; ULONG longtemp, tempeax, tempebx, temp2, tempecx; @@ -6563,10 +6522,6 @@ XGI_GetTap4Ptr(USHORT tempcx, PVB_DEVICE_INFO pVBInfo) void XGI_SetTap4Regs(PVB_DEVICE_INFO pVBInfo) { - -#ifndef LINUX_XF86 - USHORT tempcx; -#endif USHORT i, j; const XGI301C_Tap4TimingStruct *Tap4TimingPtr; @@ -6684,13 +6639,8 @@ XGI_SetGroup4(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { USHORT tempax, tempcx, tempbx, modeflag, temp, temp2; -#ifndef LINUX_XF86 - USHORT push1; -#endif - ULONG tempebx, tempeax, templong; - if (ModeNo <= 0x13) { modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; /* si+St_ResInfo */ } @@ -7685,12 +7635,7 @@ XGI_DisableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, void XGI_SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo) { - USHORT index; -#ifndef LINUX_XF86 - USHORT temp; -#endif - - index = XGI_GetLCDCapPtr(pVBInfo); + USHORT index = XGI_GetLCDCapPtr(pVBInfo); if (tempbl == 1) XGINew_LCD_Wait_Time(pVBInfo->LCDCapList[index].PSC_S1, pVBInfo); @@ -8626,9 +8571,6 @@ void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - USHORT tempax; -#endif USHORT tempbl, tempah; if (pVBInfo->SetFlag == Win9xDOSMode) { @@ -9043,11 +8985,7 @@ void XGI_SetDelayComp(PVB_DEVICE_INFO pVBInfo) { USHORT index; - UCHAR tempah, tempbl, tempbh; -#ifndef LINUX_XF86 - UCHAR temp; -#endif if (pVBInfo-> VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV | VB_XGI302LV | @@ -9508,12 +9446,8 @@ void XGI_SetCRT2ModeRegs(USHORT ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { -#ifndef LINUX_XF86 - USHORT i, j; -#endif USHORT tempbl; SHORT tempcl; - UCHAR tempah; /* XGI_SetReg((XGIIOADDRESS) pVBInfo->Part1Port , 0x03 , 0x00 ) ; // fix write part1 index 0 BTDRAM bit Bug */ @@ -9739,9 +9673,6 @@ XGI_GetRAMDAC2DATA(USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { USHORT tempax, tempbx, temp1, temp2, modeflag = 0, tempcx, CRT1Index; -#ifndef LINUX_XF86 - USHORT temp, ResInfo, DisplayType; -#endif pVBInfo->RVBHCMAX = 1; pVBInfo->RVBHCFACT = 1; diff --git a/src/vgatypes.h b/src/vgatypes.h index 9ab31ee..51b3fa6 100644 --- a/src/vgatypes.h +++ b/src/vgatypes.h @@ -52,11 +52,8 @@ #define _VGATYPES_ #include "osdef.h" - -#ifdef LINUX_XF86 #include "xorgVersion.h" #include "xf86Pci.h" -#endif #ifndef FALSE #define FALSE 0 @@ -122,9 +119,7 @@ typedef UCHAR BOOLEAN; typedef UCHAR bool; #endif -#ifdef LINUX_XF86 typedef unsigned long XGIIOADDRESS; -#endif #ifndef VBIOS_VER_MAX_LENGTH #define VBIOS_VER_MAX_LENGTH 4 @@ -300,8 +295,6 @@ struct _XGI_HW_DEVICE_INFO /* Additional IOCTL for communication xgifb <> X driver */ /* If changing this, xgifb.h must also be changed (for xgifb) */ -#ifdef LINUX_XF86 /* We don't want the X driver to depend on the kernel source */ - /* ioctl for identifying and giving some info (esp. memory heap start) */ #define XGIFB_GET_INFO 0x80046ef8 /* Wow, what a terrible hack... */ @@ -348,7 +341,5 @@ struct _XGIFB_INFO { uint8_t reserved[212]; /* for future use */ }; -#endif #endif - |
