From e4147abe8b4bcc46811fc9d01ba79e850decb998 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 17 Jun 2010 13:10:50 -0400 Subject: [PATCH 155/524] Staging: xgifb: Remove XGI_HW_DEVICE_INFO and PXGI_HW_DEVICE_INFO typedefs Signed-off-by: Bill Pemberton Cc: Arnaud Patard Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_main.h | 23 +++--- drivers/staging/xgifb/XGI_main_26.c | 10 +- drivers/staging/xgifb/vb_ext.c | 26 +++--- drivers/staging/xgifb/vb_ext.h | 10 +- drivers/staging/xgifb/vb_init.c | 88 ++++++++++---------- drivers/staging/xgifb/vb_init.h | 2 +- drivers/staging/xgifb/vb_setmode.c | 160 ++++++++++++++++++----------------- drivers/staging/xgifb/vb_setmode.h | 30 ++++--- drivers/staging/xgifb/vgatypes.h | 21 ++--- 9 files changed, 184 insertions(+), 186 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 472d124..b628582 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -248,9 +248,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); #define BRI_DRAM_SIZE_32MB 0x04 #define BRI_DRAM_SIZE_64MB 0x05 -#define HW_DEVICE_EXTENSION XGI_HW_DEVICE_INFO -#define PHW_DEVICE_EXTENSION PXGI_HW_DEVICE_INFO - #define SR_BUFFER_SIZE 5 #define CR_BUFFER_SIZE 5 @@ -376,7 +373,7 @@ unsigned char XGIfb_detectedlcda = 0xff; /* XGIfb_info XGIfbinfo; */ /* TW: Hardware extension; contains data on hardware */ -HW_DEVICE_EXTENSION XGIhw_ext; +struct xgi_hw_device_info XGIhw_ext; /* TW: XGI private structure */ VB_DEVICE_INFO XGI_Pr; @@ -812,9 +809,9 @@ static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd, /* extern int XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex); -extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, +extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex, unsigned int *left_margin, unsigned int *right_margin, unsigned int *upper_margin, unsigned int *lower_margin, @@ -881,20 +878,22 @@ static XGI_OH *XGIfb_poh_free(unsigned long base); static void XGIfb_free_node(XGI_OH *poh); /* Internal routines to access PCI configuration space */ -unsigned char XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, - unsigned long offset, unsigned long set, unsigned long *value); +unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext, + unsigned long offset, + unsigned long set, + unsigned long *value); //BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, // unsigned long offset, unsigned long set, unsigned long *value); /* Routines from init.c/init301.c */ extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo); -extern unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension); -extern unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, - unsigned short ModeNo); +extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); +extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, + unsigned short ModeNo); //extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr); extern void XGI_LongWait(VB_DEVICE_INFO *XGI_Pr); -extern unsigned short XGI_GetRatePtrCRT2(PXGI_HW_DEVICE_INFO pXGIHWDE, +extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 5139204..b3454a9 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -162,7 +162,7 @@ struct video_info xgi_video_info; /* --------------- Hardware Access Routines -------------------------- */ int -XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, +XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex) { unsigned short ModeNo = modeno; @@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceEx } int -XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, +XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex, u32 *left_margin, u32 *right_margin, u32 *upper_margin, u32 *lower_margin, @@ -416,7 +416,7 @@ u32 XGIfb_get_reg3(u16 port) /* ------------ Interface for init & mode switching code ------------- */ unsigned char -XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, +XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext, unsigned long offset, unsigned long set, unsigned long *value) { static struct pci_dev *pdev = NULL; @@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, return 1; } -/*unsigned char XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, +/*unsigned char XGIfb_query_north_bridge_space(struct xgi_hw_device_info *pXGIhw_ext, unsigned long offset, unsigned long set, unsigned long *value) { static struct pci_dev *pdev = NULL; @@ -2881,7 +2881,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) XGIfb_registered = 0; - memset(&XGIhw_ext, 0, sizeof(HW_DEVICE_EXTENSION)); + memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info)); fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev); if(!fb_info) return -ENOMEM; diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c index f156638..712af83 100644 --- a/drivers/staging/xgifb/vb_ext.c +++ b/drivers/staging/xgifb/vb_ext.c @@ -14,18 +14,18 @@ extern unsigned char XGI330_OutputSelect; extern unsigned short XGI330_RGBSenseData2; extern unsigned short XGI330_YCSenseData2; extern unsigned short XGI330_VideoSenseData2; -void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ); +void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo); -unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO, +unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -unsigned char XGINew_GetLCDDDCInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, +void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, unsigned long VESA_POWER_STATE); -unsigned char XGINew_BridgeIsEnable(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); +unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx, PVB_DEVICE_INFO pVBInfo); -unsigned char XGINew_SenseHiTV(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); /************************************************************** @@ -135,7 +135,7 @@ unsigned char XGINew_Sense(unsigned short tempbx, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, +void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, unsigned long VESA_POWER_STATE) { unsigned short ModeNo, ModeIdIndex; @@ -359,7 +359,7 @@ void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempax = 0 , tempbx , tempcx , temp , P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect , @@ -558,7 +558,7 @@ void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { /* unsigned short SoftSetting ; */ @@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short temp ; @@ -708,7 +708,7 @@ unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short flag ; @@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_ /* Output : */ /* Description : */ /* ------------------------------------------------------ */ -unsigned char XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) +unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx , tempcx , temp , i , tempch; @@ -998,7 +998,7 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) } -void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments) +void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments) { VB_DEVICE_INFO VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF; diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h index 768aebe..2933b16 100644 --- a/drivers/staging/xgifb/vb_ext.h +++ b/drivers/staging/xgifb/vb_ext.h @@ -21,14 +21,14 @@ typedef union _X86_REGS { struct BYTEREGS h; } X86_REGS, *PX86_REGS; -extern void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments); -extern void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, +extern void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments); +extern void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, unsigned long VESA_POWER_STATE); -extern void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ); -extern void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ; +extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; extern void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo); -extern unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO, +extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); #endif diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 06e229c..254c368 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -72,38 +72,38 @@ unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { { 2, 12, 9, 8, 0x35}, { 2, 12, 8, 4, 0x31} }; -void XGINew_SetDRAMSize_340(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); -void XGINew_SetDRAMSize_310(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); -void XGINew_SetMemoryClock(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); +void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, PVB_DEVICE_INFO); +void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *, PVB_DEVICE_INFO); +void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); void XGINew_SetDRAMModeRegister(PVB_DEVICE_INFO ); -void XGINew_SetDRAMModeRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ); -void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_SetDRAMModeRegister340(struct xgi_hw_device_info *HwDeviceExtension); +void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, unsigned long, PVB_DEVICE_INFO); -unsigned char XGINew_GetXG20DRAMType(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension); +unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); -int XGINew_DDRSizing340( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); -void XGINew_DisableRefresh( PXGI_HW_DEVICE_INFO ,PVB_DEVICE_INFO) ; +int XGINew_DDRSizing340(struct xgi_hw_device_info *, PVB_DEVICE_INFO); +void XGINew_DisableRefresh(struct xgi_hw_device_info *, PVB_DEVICE_INFO) ; void XGINew_CheckBusWidth_310( PVB_DEVICE_INFO) ; int XGINew_SDRSizing(PVB_DEVICE_INFO); int XGINew_DDRSizing( PVB_DEVICE_INFO ); -void XGINew_EnableRefresh( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); +void XGINew_EnableRefresh(struct xgi_hw_device_info *, PVB_DEVICE_INFO); int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/ unsigned long UNIROM; /* UNIROM */ unsigned char ChkLFB(PVB_DEVICE_INFO); void XGINew_Delay15us(unsigned long); -void SetPowerConsume(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, unsigned long XGI_P3d4Port); void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo); void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, PVB_DEVICE_INFO pVBInfo); -void XGINew_SetDRAMModeRegister_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension ); -void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ); -void XGINew_ChkSenseStatus ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ; -void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ; -void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; +void XGINew_SetDRAMModeRegister_XG20(struct xgi_hw_device_info *HwDeviceExtension); +void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtension); +void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; +void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; +void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; unsigned char GetXG21FPBits(PVB_DEVICE_INFO pVBInfo); -void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; +void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; unsigned char GetXG27FPBits(PVB_DEVICE_INFO pVBInfo); void DelayUS(unsigned long MicroSeconds) @@ -118,7 +118,7 @@ void DelayUS(unsigned long MicroSeconds) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension) +unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) { VB_DEVICE_INFO VBINF; @@ -546,7 +546,7 @@ return 1; /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_GetXG20DRAMType(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char data, temp; @@ -740,7 +740,7 @@ void XGINew_DDR2x_MRS_340(unsigned long P3c4 , PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDRII_Bootup_XG27(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDRII_Bootup_XG27(struct xgi_hw_device_info *HwDeviceExtension, unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -819,7 +819,7 @@ void XGINew_DDRII_Bootup_XG27(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_MRS_XG20(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -872,7 +872,7 @@ void XGINew_DDR2_MRS_XG20(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_MRS_XG27(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -951,7 +951,7 @@ void XGINew_DDR2_MRS_XG27(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR1x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDR1x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, unsigned long Port, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = Port , @@ -1012,7 +1012,7 @@ void XGINew_DDR1x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, unsigned long Port, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = Port , @@ -1064,7 +1064,7 @@ void XGINew_DDR2x_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_DDR2_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, unsigned long Port, PVB_DEVICE_INFO pVBInfo) { unsigned long P3d4 = Port , @@ -1103,7 +1103,7 @@ void XGINew_DDR2_DefaultRegister(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, unsigned long Port, PVB_DEVICE_INFO pVBInfo) { unsigned char temp, temp1, temp2, temp3 , @@ -1315,7 +1315,7 @@ void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_VerifyMclk( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char *pVideoMemory = pVBInfo->FBAddr ; unsigned char i, j ; @@ -1361,7 +1361,7 @@ void XGINew_VerifyMclk( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMSize_340( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short data ; @@ -1390,7 +1390,7 @@ void XGINew_SetDRAMSize_340( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMSize_310( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short data ; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase , @@ -1454,7 +1454,7 @@ void XGINew_SetDRAMSize_310( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMModeRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ) +void XGINew_SetDRAMModeRegister340(struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data ; VB_DEVICE_INFO VBINF; @@ -1528,7 +1528,7 @@ void XGINew_SetDRAMModeRegister( PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DisableRefresh( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_DisableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short data ; @@ -1546,7 +1546,7 @@ void XGINew_DisableRefresh( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_I /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_EnableRefresh( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_EnableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , pVBInfo->SR15[ 3 ][ XGINew_RAMType ] ) ; /* SR1B */ @@ -2228,7 +2228,7 @@ unsigned char XGINew_CheckFrequence(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_CheckChannel( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char data; @@ -2509,7 +2509,7 @@ void XGINew_CheckChannel( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_DDRSizing340( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { int i ; unsigned short memsize , addr ; @@ -2595,7 +2595,7 @@ int XGINew_DDRSizing(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetMemoryClock( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { @@ -2644,7 +2644,7 @@ unsigned char ChkLFB(PVB_DEVICE_INFO pVBInfo) /* in second chip, assume CR A1 D[6]="1" in this case */ /* output : none */ /* --------------------------------------------------------------------- */ -void SetPowerConsume(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, unsigned long XGI_P3d4Port) { unsigned long lTemp ; @@ -2673,7 +2673,7 @@ void SetPowerConsume(PXGI_HW_DEVICE_INFO HwDeviceExtension, } -void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { /* unsigned long ROMAddr = (unsigned long)HwDeviceExtension->pjVirtualRomBase; */ @@ -2828,7 +2828,7 @@ void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMModeRegister_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension ) +void XGINew_SetDRAMModeRegister_XG20(struct xgi_hw_device_info *HwDeviceExtension) { VB_DEVICE_INFO VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF; @@ -2867,7 +2867,7 @@ void XGINew_SetDRAMModeRegister_XG20( PXGI_HW_DEVICE_INFO HwDeviceExtension ) XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , 0x03 ) ; } -void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) +void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtension) { VB_DEVICE_INFO VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF; @@ -2909,7 +2909,7 @@ void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) } /* -void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) +void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data ; @@ -2956,7 +2956,7 @@ void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_ChkSenseStatus ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx = 0, temp, tempcx, CR3CData; @@ -3017,7 +3017,7 @@ void XGINew_ChkSenseStatus ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_ /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) +void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short temp , tempcl = 0 , tempch = 0 , CR31Data , CR38Data; @@ -3114,7 +3114,7 @@ void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_ /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char Temp; volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr; @@ -3156,7 +3156,7 @@ void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char Temp, bCR4A; diff --git a/drivers/staging/xgifb/vb_init.h b/drivers/staging/xgifb/vb_init.h index ab6939f..8803253 100644 --- a/drivers/staging/xgifb/vb_init.h +++ b/drivers/staging/xgifb/vb_init.h @@ -1,6 +1,6 @@ #ifndef _VBINIT_ #define _VBINIT_ -extern unsigned char XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension ) ; +extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ; extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; #endif diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 5a74c59..158789c 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -22,7 +22,7 @@ unsigned char XGI_IsLCDDualLink(PVB_DEVICE_INFO pVBInfo); unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); unsigned char XGI_BacklightByDrv(PVB_DEVICE_INFO pVBInfo); @@ -39,7 +39,7 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo); unsigned char XGI_BridgeIsOn(PVB_DEVICE_INFO pVBInfo); unsigned char XGI_GetModePtr(unsigned short ModeNo, @@ -48,9 +48,9 @@ unsigned char XGI_GetModePtr(unsigned short ModeNo, unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -unsigned short XGI_GetRatePtrCRT2(PXGI_HW_DEVICE_INFO pXGIHWDE, +unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); @@ -64,25 +64,25 @@ unsigned short XGI_GetVGAHT2(PVB_DEVICE_INFO pVBInfo); unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_VBLongWait(PVB_DEVICE_INFO pVBInfo); void XGI_SaveCRT2Info(unsigned short ModeNo, PVB_DEVICE_INFO pVBInfo); void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_GetCRT2ResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo); -void XGI_EnableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_DisableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); void XGI_EnablePWD( PVB_DEVICE_INFO pVBInfo); @@ -90,9 +90,9 @@ void XGI_DisablePWD( PVB_DEVICE_INFO pVBInfo); void XGI_AutoThreshold( PVB_DEVICE_INFO pVBInfo); void XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo); -void XGI_DisplayOn(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); -void XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo ); -void XGI_SetCRT1Group(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); +void XGI_DisplayOn(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +void XGI_DisplayOff(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo); void XGI_SetXG27CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); @@ -102,39 +102,39 @@ void XGI_WaitDisply(PVB_DEVICE_INFO pVBInfo); void XGI_SenseCRT1(PVB_DEVICE_INFO pVBInfo); void XGI_SetSeqRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); void XGI_SetMiscRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRTCRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo ); void XGI_SetGRCRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo); void XGI_SetSync(unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo,PXGI_HW_DEVICE_INFO HwDeviceExtension); -void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo,PXGI_HW_DEVICE_INFO HwDeviceExtension); +void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); +void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, unsigned short ModeNo,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1DE(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1FIFO(unsigned short ModeNo,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1ModeRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetVCLKState(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT1FIFO(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); +void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al, unsigned short dh, PVB_DEVICE_INFO pVBInfo); -/*void XGI_ClearBuffer(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo,PVB_DEVICE_INFO pVBInfo);*/ -void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo); +/*void XGI_ClearBuffer(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, PVB_DEVICE_INFO pVBInfo);*/ +void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_GetLVDSResInfo(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo); +void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short 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_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo); -void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo); +void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); void XGI_SetCRT2ECLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo); void XGI_GetLCDSync(unsigned short *HSyncWidth, unsigned short *VSyncWidth, PVB_DEVICE_INFO pVBInfo); -void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); +void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_SetCRT2VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); void XGI_OEM310Setting(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); void XGI_SetDelayComp(PVB_DEVICE_INFO pVBInfo); @@ -149,16 +149,16 @@ void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_D void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char* tempcl, unsigned char *tempch, PVB_DEVICE_INFO pVBInfo); unsigned short XGI_GetTVPtrIndex(PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT2ModeRegs(unsigned short ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo ); -void XGI_CloseCRTC(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); -void XGI_OpenCRTC(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); +void XGI_SetCRT2ModeRegs(unsigned short ModeNo, struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +void XGI_CloseCRTC(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +void XGI_OpenCRTC(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); void XGI_GetRAMDAC2DATA(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); -void XGI_LockCRT2(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo); +void XGI_UnLockCRT2(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +void XGI_LockCRT2(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); void XGINew_EnableCRT2(PVB_DEVICE_INFO pVBInfo); void XGINew_LCD_Wait_Time(unsigned char DelayTime, PVB_DEVICE_INFO pVBInfo); void XGI_LongWait(PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1Offset(unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo ); +void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, PVB_DEVICE_INFO pVBInfo); unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, @@ -391,7 +391,7 @@ void InitTo330Pointer(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo) { unsigned short ModeIdIndex ; @@ -615,7 +615,7 @@ unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT1Group(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) { @@ -858,7 +858,7 @@ void XGI_SetMiscRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRTCRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo) { unsigned char CRTCdata ; @@ -1007,7 +1007,7 @@ unsigned char XGI_SetDefaultVCLK(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetRatePtrCRT2(PXGI_HW_DEVICE_INFO pXGIHWDE, +unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) @@ -1342,7 +1342,7 @@ void XGI_SetSync(unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo, - PXGI_HW_DEVICE_INFO HwDeviceExtension) + struct xgi_hw_device_info *HwDeviceExtension) { unsigned char index, data; unsigned short i; @@ -1378,7 +1378,7 @@ void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT1Timing_H( PVB_DEVICE_INFO pVBInfo, PXGI_HW_DEVICE_INFO HwDeviceExtension ) +void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data, data1, pushax; unsigned short i, j; @@ -1935,7 +1935,7 @@ void XGI_UpdateXG21CRTC(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT1DE(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, @@ -2048,7 +2048,7 @@ unsigned short XGI_GetResInfo(unsigned short ModeNo, void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short temp , @@ -2143,7 +2143,7 @@ void XGI_SetCRT1Offset(unsigned short ModeNo, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { @@ -2206,7 +2206,7 @@ void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetCRT1FIFO(unsigned short ModeNo, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short data ; @@ -2256,7 +2256,7 @@ void XGI_SetCRT1FIFO(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT1ModeRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) @@ -2396,7 +2396,7 @@ void XGI_SetCRT1ModeRegs(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetVCLKState(PXGI_HW_DEVICE_INFO HwDeviceExtension, +void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) @@ -2657,7 +2657,7 @@ void XGI_WriteDAC(unsigned short dl, unsigned short ah, /* --------------------------------------------------------------------- */ void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short RefreshRateTableIndex ; @@ -2819,7 +2819,7 @@ void XGI_GetLVDSData(unsigned short ModeNo, /* --------------------------------------------------------------------- */ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned char index; @@ -3224,7 +3224,7 @@ void XGI_SetCRT2ECLK(unsigned short ModeNo , unsigned short ModeIdIndex , unsign /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_UpdateModeInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo ) +void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempcl , tempch , @@ -3332,7 +3332,7 @@ void XGI_UpdateModeInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetVGAType( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { /* if ( HwDeviceExtension->jChipType >= XG20 ) @@ -3417,7 +3417,7 @@ void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetVBInfo(unsigned short ModeNo , unsigned short ModeIdIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) +void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempax , push , @@ -4060,7 +4060,7 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension, +unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) @@ -4145,7 +4145,7 @@ unsigned char XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -/*void XGINew_IsLowResolution(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned char XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo) +/*void XGINew_IsLowResolution(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) { unsigned short data ; unsigned short ModeFlag ; @@ -4177,7 +4177,7 @@ unsigned char XGINew_CheckMemorySize(PXGI_HW_DEVICE_INFO HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisplayOn( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo ) +void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo) { XGINew_SetRegANDOR(pVBInfo->P3c4,0x01,0xDF,0x00); @@ -4241,7 +4241,7 @@ void XGI_DisplayOn( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisplayOff( PXGI_HW_DEVICE_INFO pXGIHWDE , PVB_DEVICE_INFO pVBInfo ) +void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo) { if ( pXGIHWDE->jChipType == XG21 ) @@ -4442,7 +4442,7 @@ void XGI_WaitDisplay( PVB_DEVICE_INFO pVBInfo ) /* Description : */ /* --------------------------------------------------------------------- */ unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx , @@ -5138,7 +5138,7 @@ void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0, void XGI_SetCRT2Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short offset ; @@ -5165,7 +5165,7 @@ void XGI_SetCRT2Offset(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short temp , colordepth , @@ -5228,7 +5228,7 @@ void XGI_SetCRT2FIFO( PVB_DEVICE_INFO pVBInfo) /* Description : */ /* --------------------------------------------------------------------- */ void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { @@ -5264,7 +5264,7 @@ void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { @@ -5442,7 +5442,7 @@ void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { @@ -5891,7 +5891,7 @@ void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short i , j , @@ -6409,7 +6409,7 @@ void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned s /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) +void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) { unsigned short push1 , push2 , @@ -6849,7 +6849,7 @@ void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempax , tempcx , @@ -7842,7 +7842,7 @@ void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_EnableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x40 ) ; } @@ -7854,7 +7854,7 @@ void XGI_EnableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisableGatingCRT(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x00 ) ; @@ -8749,7 +8749,7 @@ void XGI_GetLCDSync(unsigned short *HSyncWidth , unsigned short *VSyncWidth, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_EnableBridge( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) +void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbl , tempah ; @@ -8962,7 +8962,7 @@ void XGI_EnableBridge( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO p /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempax , tempbx , @@ -9653,7 +9653,7 @@ void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char *tempcl, /* Description : Origin code for crt2group */ /* --------------------------------------------------------------------- */ void XGI_SetCRT2ModeRegs(unsigned short ModeNo, - PXGI_HW_DEVICE_INFO HwDeviceExtension, + struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbl ; @@ -9883,7 +9883,7 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_CloseCRTC( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) +void XGI_CloseCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx ; @@ -9902,7 +9902,7 @@ void XGI_CloseCRTC( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBIn /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_OpenCRTC( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) +void XGI_OpenCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx ; @@ -10014,7 +10014,7 @@ unsigned short XGI_GetColorDepth(unsigned short ModeNo , unsigned short ModeIdIn /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_UnLockCRT2( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) +void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2f , 0xFF , 0x01 ) ; @@ -10028,7 +10028,7 @@ void XGI_UnLockCRT2( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVB /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_LockCRT2( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo ) +void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2F , 0xFE , 0x00 ) ; @@ -10226,7 +10226,11 @@ unsigned short XGI_GetVGAHT2( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex , PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, + unsigned short ModeIdIndex, + unsigned short RefreshRateTableIndex, + struct xgi_hw_device_info *HwDeviceExtension, + PVB_DEVICE_INFO pVBInfo) { unsigned short tempbx ; diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h index 1c37f80..0d061d7 100644 --- a/drivers/staging/xgifb/vb_setmode.h +++ b/drivers/staging/xgifb/vb_setmode.h @@ -2,31 +2,33 @@ #define _VBSETMODE_ extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO); -extern void XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); -extern void XGI_LockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); +extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_LongWait( PVB_DEVICE_INFO ); -extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); -extern void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); -extern void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); -extern void XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); -extern void XGI_DisplayOn( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); +extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo, + struct xgi_hw_device_info *, + PVB_DEVICE_INFO); +extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern void XGI_DisplayOff(struct xgi_hw_device_info *, PVB_DEVICE_INFO); +extern void XGI_DisplayOn(struct xgi_hw_device_info *, PVB_DEVICE_INFO); extern void XGI_GetVBType(PVB_DEVICE_INFO); extern void XGI_SenseCRT1(PVB_DEVICE_INFO ); -extern void XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); -extern void XGI_GetVBInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); +extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_GetTVInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO ); -extern void XGI_SetCRT1Offset(unsigned short ModeNo,unsigned short ModeIdIndex,unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); -extern void XGI_SetLCDAGroup(unsigned short ModeNo,unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); +extern void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_WaitDisply( PVB_DEVICE_INFO ); extern unsigned short XGI_GetResInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -extern unsigned char XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , unsigned short ModeNo ) ; +extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo) ; extern unsigned char XGI_SearchModeID( unsigned short ModeNo,unsigned short *ModeIdIndex, PVB_DEVICE_INFO ); extern unsigned char XGI_GetLCDInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PVB_DEVICE_INFO ); extern unsigned char XGI_BridgeIsOn( PVB_DEVICE_INFO ); -extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO); -extern unsigned short XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO ); +extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); +extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO); extern void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index bf9058d..8702a7a 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -58,14 +58,7 @@ struct XGI_DSReg unsigned char jVal; }; - -#ifndef XGI_HW_DEVICE_INFO - -typedef struct _XGI_HW_DEVICE_INFO XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO; - -typedef unsigned char (*PXGI_QUERYSPACE) (PXGI_HW_DEVICE_INFO, unsigned long, unsigned long, unsigned long *); - -struct _XGI_HW_DEVICE_INFO +struct xgi_hw_device_info { unsigned long ulExternalChip; /* NO VB or other video bridge*/ /* if ujVBChipID = VB_CHIP_UNKNOWN, */ @@ -124,18 +117,18 @@ struct _XGI_HW_DEVICE_INFO /* end data :(idx, val) = (FF, FF) */ /* Note : restore cR registers if */ /* bSkipDramSizing = 1 */ -/* -#endif -*/ - PXGI_QUERYSPACE pQueryVGAConfigSpace; + unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *, + unsigned long, unsigned long, + unsigned long *); - PXGI_QUERYSPACE pQueryNorthBridgeSpace; + unsigned char(*pQueryNorthBridgeSpace)(struct xgi_hw_device_info *, + unsigned long, unsigned long, + unsigned long *); unsigned char szVBIOSVer[VBIOS_VER_MAX_LENGTH]; }; -#endif /* Addtional IOCTL for communication xgifb <> X driver */ /* If changing this, xgifb.h must also be changed (for xgifb) */ -- 1.7.1