Skip to content

L
linux
Commit e4147abe authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: xgifb: Remove XGI_HW_DEVICE_INFO and PXGI_HW_DEVICE_INFO typedefs 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1d9f9a9b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 186 deletions
drivers/staging/xgifb/XGI_main.h
View file @ e4147abe
...@@ -248,9 +248,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); ...@@ -248,9 +248,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
#define BRI_DRAM_SIZE_32MB 0x04 #define BRI_DRAM_SIZE_32MB 0x04
#define BRI_DRAM_SIZE_64MB 0x05 #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 SR_BUFFER_SIZE 5
#define CR_BUFFER_SIZE 5 #define CR_BUFFER_SIZE 5
...@@ -376,7 +373,7 @@ unsigned char XGIfb_detectedlcda = 0xff; ...@@ -376,7 +373,7 @@ unsigned char XGIfb_detectedlcda = 0xff;
/* XGIfb_info XGIfbinfo; */ /* XGIfb_info XGIfbinfo; */
/* TW: Hardware extension; contains data on hardware */ /* TW: Hardware extension; contains data on hardware */
HW_DEVICE_EXTENSION XGIhw_ext; struct xgi_hw_device_info XGIhw_ext;
/* TW: XGI private structure */ /* TW: XGI private structure */
VB_DEVICE_INFO XGI_Pr; VB_DEVICE_INFO XGI_Pr;
...@@ -812,9 +809,9 @@ static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd, ...@@ -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, 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); 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 char modeno, unsigned char rateindex,
unsigned int *left_margin, unsigned int *right_margin, unsigned int *left_margin, unsigned int *right_margin,
unsigned int *upper_margin, unsigned int *lower_margin, unsigned int *upper_margin, unsigned int *lower_margin,
...@@ -881,20 +878,22 @@ static XGI_OH *XGIfb_poh_free(unsigned long base); ...@@ -881,20 +878,22 @@ static XGI_OH *XGIfb_poh_free(unsigned long base);
static void XGIfb_free_node(XGI_OH *poh); static void XGIfb_free_node(XGI_OH *poh);
/* Internal routines to access PCI configuration space */ /* Internal routines to access PCI configuration space */
unsigned char XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext,
unsigned long offset, unsigned long set, unsigned long *value); unsigned long offset,
unsigned long set,
unsigned long *value);
//BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, //BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
// unsigned long offset, unsigned long set, unsigned long *value); // unsigned long offset, unsigned long set, unsigned long *value);
/* Routines from init.c/init301.c */ /* Routines from init.c/init301.c */
extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo); extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo);
extern unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension); extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension);
extern unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
unsigned short ModeNo); unsigned short ModeNo);
//extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr); //extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr);
extern void XGI_LongWait(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 ModeNo,
unsigned short ModeIdIndex, unsigned short ModeIdIndex,
PVB_DEVICE_INFO pVBInfo); PVB_DEVICE_INFO pVBInfo);
......
drivers/staging/xgifb/XGI_main_26.c
View file @ e4147abe
...@@ -162,7 +162,7 @@ struct video_info xgi_video_info; ...@@ -162,7 +162,7 @@ struct video_info xgi_video_info;
/* --------------- Hardware Access Routines -------------------------- */ /* --------------- Hardware Access Routines -------------------------- */
int 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 char modeno, unsigned char rateindex)
{ {
unsigned short ModeNo = modeno; unsigned short ModeNo = modeno;
...@@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceEx ...@@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceEx
} }
int 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, unsigned char modeno, unsigned char rateindex,
u32 *left_margin, u32 *right_margin, u32 *left_margin, u32 *right_margin,
u32 *upper_margin, u32 *lower_margin, u32 *upper_margin, u32 *lower_margin,
...@@ -416,7 +416,7 @@ u32 XGIfb_get_reg3(u16 port) ...@@ -416,7 +416,7 @@ u32 XGIfb_get_reg3(u16 port)
/* ------------ Interface for init & mode switching code ------------- */ /* ------------ Interface for init & mode switching code ------------- */
unsigned char 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) unsigned long offset, unsigned long set, unsigned long *value)
{ {
static struct pci_dev *pdev = NULL; static struct pci_dev *pdev = NULL;
...@@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, ...@@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
return 1; 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) unsigned long offset, unsigned long set, unsigned long *value)
{ {
static struct pci_dev *pdev = NULL; static struct pci_dev *pdev = NULL;
...@@ -2881,7 +2881,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2881,7 +2881,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
XGIfb_registered = 0; 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); fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
if(!fb_info) return -ENOMEM; if(!fb_info) return -ENOMEM;
......
drivers/staging/xgifb/vb_ext.c
View file @ e4147abe
...@@ -14,18 +14,18 @@ extern unsigned char XGI330_OutputSelect; ...@@ -14,18 +14,18 @@ extern unsigned char XGI330_OutputSelect;
extern unsigned short XGI330_RGBSenseData2; extern unsigned short XGI330_RGBSenseData2;
extern unsigned short XGI330_YCSenseData2; extern unsigned short XGI330_YCSenseData2;
extern unsigned short XGI330_VideoSenseData2; 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 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); 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); 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 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, unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx,
PVB_DEVICE_INFO pVBInfo); 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); PVB_DEVICE_INFO pVBInfo);
/************************************************************** /**************************************************************
...@@ -135,7 +135,7 @@ unsigned char XGINew_Sense(unsigned short tempbx, ...@@ -135,7 +135,7 @@ unsigned char XGINew_Sense(unsigned short tempbx,
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,
unsigned long VESA_POWER_STATE) unsigned long VESA_POWER_STATE)
{ {
unsigned short ModeNo, ModeIdIndex; unsigned short ModeNo, ModeIdIndex;
...@@ -359,7 +359,7 @@ void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, ...@@ -359,7 +359,7 @@ void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE,
/* Output : */ /* Output : */
/* Description : */ /* 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 , unsigned short tempax = 0 , tempbx , tempcx , temp ,
P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect , P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect ,
...@@ -558,7 +558,7 @@ void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO ...@@ -558,7 +558,7 @@ void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension, unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,
PVB_DEVICE_INFO pVBInfo) PVB_DEVICE_INFO pVBInfo)
{ {
/* unsigned short SoftSetting ; */ /* unsigned short SoftSetting ; */
...@@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension, ...@@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension,
/* Output : */ /* Output : */
/* Description : */ /* 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 ; unsigned short temp ;
...@@ -708,7 +708,7 @@ unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) ...@@ -708,7 +708,7 @@ unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo )
/* Output : */ /* Output : */
/* Description : */ /* 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 ; unsigned short flag ;
...@@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_ ...@@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_
/* Output : */ /* Output : */
/* Description : */ /* 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; unsigned short tempbx , tempcx , temp , i , tempch;
...@@ -998,7 +998,7 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ...@@ -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; VB_DEVICE_INFO VBINF;
PVB_DEVICE_INFO pVBInfo = &VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF;
......
drivers/staging/xgifb/vb_ext.h
View file @ e4147abe
...@@ -21,14 +21,14 @@ typedef union _X86_REGS { ...@@ -21,14 +21,14 @@ typedef union _X86_REGS {
struct BYTEREGS h; struct BYTEREGS h;
} X86_REGS, *PX86_REGS; } X86_REGS, *PX86_REGS;
extern void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments); extern void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments);
extern void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE, extern void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,
unsigned long VESA_POWER_STATE); unsigned long VESA_POWER_STATE);
extern void XGI_GetSenseStatus( 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 ( PXGI_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, extern void ReadVBIOSTablData(unsigned char ChipType,
PVB_DEVICE_INFO pVBInfo); 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); PVB_DEVICE_INFO pVBInfo);
#endif #endif
drivers/staging/xgifb/vb_init.c
View file @ e4147abe
This diff is collapsed.
drivers/staging/xgifb/vb_init.h
View file @ e4147abe
#ifndef _VBINIT_ #ifndef _VBINIT_
#define _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]; extern XGI21_LVDSCapStruct XGI21_LCDCapList[13];
#endif #endif
......
drivers/staging/xgifb/vb_setmode.c
View file @ e4147abe
This diff is collapsed.
drivers/staging/xgifb/vb_setmode.h
View file @ e4147abe
...@@ -2,31 +2,33 @@ ...@@ -2,31 +2,33 @@
#define _VBSETMODE_ #define _VBSETMODE_
extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO); extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO);
extern void XGI_UnLockCRT2(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(PXGI_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_LongWait( PVB_DEVICE_INFO );
extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
extern void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); struct xgi_hw_device_info *,
extern void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); PVB_DEVICE_INFO);
extern void XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO);
extern void XGI_DisplayOn( PXGI_HW_DEVICE_INFO, 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_GetVBType(PVB_DEVICE_INFO);
extern void XGI_SenseCRT1(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_GetVGAType(struct xgi_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_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_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_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,PXGI_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 void XGI_WaitDisply( PVB_DEVICE_INFO );
extern unsigned short XGI_GetResInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); 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_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_GetLCDInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PVB_DEVICE_INFO );
extern unsigned char XGI_BridgeIsOn( 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 char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_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 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_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
......
drivers/staging/xgifb/vgatypes.h
View file @ e4147abe
...@@ -58,14 +58,7 @@ struct XGI_DSReg ...@@ -58,14 +58,7 @@ struct XGI_DSReg
unsigned char jVal; unsigned char jVal;
}; };
struct xgi_hw_device_info
#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
{ {
unsigned long ulExternalChip; /* NO VB or other video bridge*/ unsigned long ulExternalChip; /* NO VB or other video bridge*/
/* if ujVBChipID = VB_CHIP_UNKNOWN, */ /* if ujVBChipID = VB_CHIP_UNKNOWN, */
...@@ -124,18 +117,18 @@ struct _XGI_HW_DEVICE_INFO ...@@ -124,18 +117,18 @@ struct _XGI_HW_DEVICE_INFO
/* end data :(idx, val) = (FF, FF) */ /* end data :(idx, val) = (FF, FF) */
/* Note : restore cR registers if */ /* Note : restore cR registers if */
/* bSkipDramSizing = 1 */ /* 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]; unsigned char szVBIOSVer[VBIOS_VER_MAX_LENGTH];
}; };
#endif
/* Addtional IOCTL for communication xgifb <> X driver */ /* Addtional IOCTL for communication xgifb <> X driver */
/* If changing this, xgifb.h must also be changed (for xgifb) */ /* If changing this, xgifb.h must also be changed (for xgifb) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7