Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 80adad85 编写于 作者: B Bill Pemberton 提交者： Greg Kroah-Hartman
浏览文件
操作

Staging: xgifb: Remove typedefs in vb_struct.h 

This removes all the remaining typedefs in vb_struct.h
Signed-off-by: NBill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 e4147abe
展开全部 隐藏空白更改
内联 并排
Showing with 774 addition and 777 deletion
drivers/staging/xgifb/XGI_main.h
浏览文件 @ 80adad85
...@@ -376,7 +376,7 @@ unsigned char XGIfb_detectedlcda = 0xff; ...@@ -376,7 +376,7 @@ unsigned char XGIfb_detectedlcda = 0xff;
struct xgi_hw_device_info XGIhw_ext; struct xgi_hw_device_info XGIhw_ext;
/* TW: XGI private structure */ /* TW: XGI private structure */
VB_DEVICE_INFO XGI_Pr; struct vb_device_info XGI_Pr;
/* card parameters */ /* card parameters */
static unsigned long XGIfb_mmio_size = 0; static unsigned long XGIfb_mmio_size = 0;
...@@ -820,7 +820,7 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_d ...@@ -820,7 +820,7 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_d
*/ */
extern unsigned char XGI_SearchModeID(unsigned short ModeNo, extern unsigned char XGI_SearchModeID(unsigned short ModeNo,
unsigned short *ModeIdIndex, unsigned short *ModeIdIndex,
PVB_DEVICE_INFO); struct vb_device_info *);
static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
struct fb_info *info); struct fb_info *info);
...@@ -887,31 +887,31 @@ unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext ...@@ -887,31 +887,31 @@ unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext
/* 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, struct vb_device_info *pVBInfo);
extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension);
extern unsigned char XGISetModeNew(struct xgi_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(struct vb_device_info *XGI_Pr);
extern unsigned short XGI_GetRatePtrCRT2(struct xgi_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); struct vb_device_info *pVBInfo);
/* TW: Chrontel TV functions */ /* TW: Chrontel TV functions */
extern unsigned short XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr, extern unsigned short XGI_GetCH700x(struct vb_device_info *XGI_Pr,
unsigned short tempbx); unsigned short tempbx);
extern void XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx); extern void XGI_SetCH700x(struct vb_device_info *XGI_Pr, unsigned short tempbx);
extern unsigned short XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr, extern unsigned short XGI_GetCH701x(struct vb_device_info *XGI_Pr,
unsigned short tempbx); unsigned short tempbx);
extern void XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx); extern void XGI_SetCH701x(struct vb_device_info *XGI_Pr, unsigned short tempbx);
extern void XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr, extern void XGI_SetCH70xxANDOR(struct vb_device_info *XGI_Pr,
unsigned short tempax, unsigned short tempax,
unsigned short tempbh); unsigned short tempbh);
extern void XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, unsigned short delaytime); extern void XGI_DDC2Delay(struct vb_device_info *XGI_Pr, unsigned short delaytime);
/* TW: Sensing routines */ /* TW: Sensing routines */
void XGI_Sense30x(void); void XGI_Sense30x(void);
int XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch); int XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch);
extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13];
#endif #endif
drivers/staging/xgifb/XGI_main_26.c
浏览文件 @ 80adad85
...@@ -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, struct xgi_hw_device_info *HwDeviceExtension, XGIfb_mode_rate_to_dclock(struct 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, struct xgi_hw_device_info *HwD ...@@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwD
} }
int int
XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, XGIfb_mode_rate_to_ddata(struct 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,
...@@ -377,7 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDe ...@@ -377,7 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDe
void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, unsigned long BaseAddr) void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
{ {
XGI_Pr->RelIO = BaseAddr; XGI_Pr->RelIO = BaseAddr;
XGI_Pr->P3c4 = BaseAddr + 0x14; XGI_Pr->P3c4 = BaseAddr + 0x14;
...@@ -610,7 +610,8 @@ int XGIfb_GetXG21LVDSData(void) ...@@ -610,7 +610,8 @@ int XGIfb_GetXG21LVDSData(void)
i += 25; i += 25;
j--; j--;
k++; k++;
} while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) ); } while ((j > 0) &&
(k < (sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct))));
return 1; return 1;
} }
return 0; return 0;
...@@ -3132,7 +3133,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3132,7 +3133,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
xgi_video_info.disp_state = DISPTYPE_LCD; xgi_video_info.disp_state = DISPTYPE_LCD;
if (!XGIfb_GetXG21LVDSData()) { if (!XGIfb_GetXG21LVDSData()) {
int m; int m;
for (m=0; m < sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct); m++) { for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) {
if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) && if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&
(XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) { (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {
XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ; XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ;
......
drivers/staging/xgifb/vb_ext.c
浏览文件 @ 80adad85
...@@ -14,27 +14,27 @@ extern unsigned char XGI330_OutputSelect; ...@@ -14,27 +14,27 @@ 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(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);
unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo); unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo);
unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
PVB_DEVICE_INFO pVBInfo); struct vb_device_info *pVBInfo);
unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension,
PVB_DEVICE_INFO pVBInfo); struct vb_device_info *pVBInfo);
void XGISetDPMS(struct xgi_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(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, struct vb_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); struct vb_device_info *pVBInfo);
unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension,
PVB_DEVICE_INFO pVBInfo); struct vb_device_info *pVBInfo);
/************************************************************** /**************************************************************
Dynamic Sense Dynamic Sense
*************************************************************/ *************************************************************/
void XGI_WaitDisplay(void); void XGI_WaitDisplay(void);
unsigned char XGI_Is301C(PVB_DEVICE_INFO); unsigned char XGI_Is301C(struct vb_device_info *);
unsigned char XGI_Is301LV(PVB_DEVICE_INFO); unsigned char XGI_Is301LV(struct vb_device_info *);
...@@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO); ...@@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO);
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo) unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo)
{ {
unsigned short flag ; unsigned short flag ;
...@@ -62,7 +62,7 @@ unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo) ...@@ -62,7 +62,7 @@ unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo)
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo) unsigned char XGI_Is301C(struct vb_device_info *pVBInfo)
{ {
if ( ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) & 0xF0 ) == 0xC0 ) if ( ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) & 0xF0 ) == 0xC0 )
return( 1 ) ; return( 1 ) ;
...@@ -83,7 +83,7 @@ unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo) ...@@ -83,7 +83,7 @@ unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo)
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo) unsigned char XGI_Is301LV(struct vb_device_info *pVBInfo)
{ {
if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 ) if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 )
{ {
...@@ -104,7 +104,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo) ...@@ -104,7 +104,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGINew_Sense(unsigned short tempbx, unsigned char XGINew_Sense(unsigned short tempbx,
unsigned short tempcx, unsigned short tempcx,
PVB_DEVICE_INFO pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short temp, i, tempch; unsigned short temp, i, tempch;
...@@ -140,8 +140,8 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, ...@@ -140,8 +140,8 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,
{ {
unsigned short ModeNo, ModeIdIndex; unsigned short ModeNo, ModeIdIndex;
unsigned char temp; unsigned char temp;
VB_DEVICE_INFO VBINF; struct vb_device_info VBINF;
PVB_DEVICE_INFO pVBInfo = &VBINF; struct vb_device_info *pVBInfo = &VBINF;
pVBInfo->BaseAddr = (unsigned long)pXGIHWDE->pjIOAddress ; pVBInfo->BaseAddr = (unsigned long)pXGIHWDE->pjIOAddress ;
pVBInfo->ROMAddr = pXGIHWDE->pjVirtualRomBase ; pVBInfo->ROMAddr = pXGIHWDE->pjVirtualRomBase ;
...@@ -359,7 +359,7 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, ...@@ -359,7 +359,7 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_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 ,
...@@ -559,7 +559,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE ...@@ -559,7 +559,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,
PVB_DEVICE_INFO pVBInfo) struct vb_device_info *pVBInfo)
{ {
/* unsigned short SoftSetting ; */ /* unsigned short SoftSetting ; */
unsigned short temp ; unsigned short temp ;
...@@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)
{ {
unsigned short temp ; unsigned short temp ;
...@@ -635,7 +635,7 @@ unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -635,7 +635,7 @@ unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension,
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo)
{ {
unsigned short PanelTypeTable[16] = { unsigned short PanelTypeTable[16] = {
SyncNN | PanelRGB18Bit | Panel800x600 | _PanelType00, SyncNN | PanelRGB18Bit | Panel800x600 | _PanelType00,
...@@ -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(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)
{ {
unsigned short flag ; unsigned short flag ;
...@@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension ...@@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)
{ {
unsigned short tempbx , tempcx , temp , i , tempch; unsigned short tempbx , tempcx , temp , i , tempch;
...@@ -816,7 +816,7 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB ...@@ -816,7 +816,7 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB
; DX: PAnel V. resolution ; DX: PAnel V. resolution
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
*/ */
void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
{ {
unsigned short ModeIdIndex; unsigned short ModeIdIndex;
...@@ -859,7 +859,7 @@ void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ...@@ -859,7 +859,7 @@ void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
; ;
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
*/ */
void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
{ {
unsigned short EModeCount; unsigned short EModeCount;
...@@ -905,7 +905,7 @@ void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ...@@ -905,7 +905,7 @@ void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
; ;
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
*/ */
void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
{ {
unsigned short ModeIdIndex, resindex; unsigned short ModeIdIndex, resindex;
unsigned short ModeNo; unsigned short ModeNo;
...@@ -964,7 +964,7 @@ void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ...@@ -964,7 +964,7 @@ void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
; BX[6]: *Value1 D[6] Panel H. Polarity ; BX[6]: *Value1 D[6] Panel H. Polarity
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
*/ */
void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)
{ {
unsigned char Select; unsigned char Select;
...@@ -1000,8 +1000,8 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ...@@ -1000,8 +1000,8 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )
void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments) void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments)
{ {
VB_DEVICE_INFO VBINF; struct vb_device_info VBINF;
PVB_DEVICE_INFO pVBInfo = &VBINF; struct vb_device_info *pVBInfo = &VBINF;
pVBInfo->IF_DEF_LVDS = 0 ; pVBInfo->IF_DEF_LVDS = 0 ;
pVBInfo->IF_DEF_CH7005 = 0 ; pVBInfo->IF_DEF_CH7005 = 0 ;
......
drivers/staging/xgifb/vb_ext.h
浏览文件 @ 80adad85
...@@ -24,11 +24,11 @@ typedef union _X86_REGS { ...@@ -24,11 +24,11 @@ typedef union _X86_REGS {
extern void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments); extern void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments);
extern void XGISetDPMS(struct xgi_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(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);
extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
extern void ReadVBIOSTablData(unsigned char ChipType, extern void ReadVBIOSTablData(unsigned char ChipType,
PVB_DEVICE_INFO pVBInfo); struct vb_device_info *pVBInfo);
extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
PVB_DEVICE_INFO pVBInfo); struct vb_device_info *pVBInfo);
#endif #endif
drivers/staging/xgifb/vb_init.c
浏览文件 @ 80adad85
此差异已折叠。
drivers/staging/xgifb/vb_init.h
浏览文件 @ 80adad85
#ifndef _VBINIT_ #ifndef _VBINIT_
#define _VBINIT_ #define _VBINIT_
extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ; extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ;
extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13];
#endif #endif
drivers/staging/xgifb/vb_setmode.c
浏览文件 @ 80adad85
此差异已折叠。
drivers/staging/xgifb/vb_setmode.h
浏览文件 @ 80adad85
#ifndef _VBSETMODE_ #ifndef _VBSETMODE_
#define _VBSETMODE_ #define _VBSETMODE_
extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO); extern void InitTo330Pointer(unsigned char, struct vb_device_info *);
extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_LongWait( PVB_DEVICE_INFO ); extern void XGI_LongWait(struct vb_device_info *);
extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo, extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
struct xgi_hw_device_info *, struct xgi_hw_device_info *,
PVB_DEVICE_INFO); struct vb_device_info *);
extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_DisplayOff(struct xgi_hw_device_info *, PVB_DEVICE_INFO); extern void XGI_DisplayOff(struct xgi_hw_device_info *, struct vb_device_info *);
extern void XGI_DisplayOn(struct xgi_hw_device_info *, PVB_DEVICE_INFO); extern void XGI_DisplayOn(struct xgi_hw_device_info *, struct vb_device_info *);
extern void XGI_GetVBType(PVB_DEVICE_INFO); extern void XGI_GetVBType(struct vb_device_info *);
extern void XGI_SenseCRT1(PVB_DEVICE_INFO ); extern void XGI_SenseCRT1(struct vb_device_info *);
extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 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, struct vb_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, struct vb_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_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, 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, struct vb_device_info *);
extern void XGI_WaitDisply( PVB_DEVICE_INFO ); extern void XGI_WaitDisply(struct vb_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, struct vb_device_info *pVBInfo);
extern unsigned char XGISetModeNew(struct xgi_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, struct vb_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, struct vb_device_info *);
extern unsigned char XGI_BridgeIsOn( PVB_DEVICE_INFO ); extern unsigned char XGI_BridgeIsOn(struct vb_device_info *);
extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
extern unsigned short XGI_GetRatePtrCRT2(struct xgi_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, struct vb_device_info *);
extern void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo);
extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo);
extern void XGI_XG21BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo);
extern void XGI_XG27BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo);
extern void XGI_XG21SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG21SetPanelDelay(unsigned short tempbl, struct vb_device_info *pVBInfo);
extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo);
extern void XGI_SetXG21LVDSPara(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); extern void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo);
extern unsigned short XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo); extern unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo);
#endif #endif
drivers/staging/xgifb/vb_struct.h
浏览文件 @ 80adad85
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
typedef struct _XGI_PanelDelayTblStruct struct XGI_PanelDelayTblStruct
{ {
unsigned char timer[2]; unsigned char timer[2];
} XGI_PanelDelayTblStruct; };
typedef struct _XGI_LCDDataStruct struct XGI_LCDDataStruct
{ {
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
...@@ -23,20 +23,21 @@ typedef struct _XGI_LCDDataStruct ...@@ -23,20 +23,21 @@ typedef struct _XGI_LCDDataStruct
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
} XGI_LCDDataStruct; };
typedef struct _XGI_LVDSCRT1HDataStruct struct XGI_LVDSCRT1HDataStruct
{ {
unsigned char Reg[8]; unsigned char Reg[8];
} XGI_LVDSCRT1HDataStruct; };
typedef struct _XGI_LVDSCRT1VDataStruct
struct XGI_LVDSCRT1VDataStruct
{ {
unsigned char Reg[7]; unsigned char Reg[7];
} XGI_LVDSCRT1VDataStruct; };
typedef struct _XGI_TVDataStruct struct XGI_TVDataStruct
{ {
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
...@@ -51,31 +52,30 @@ typedef struct _XGI_TVDataStruct ...@@ -51,31 +52,30 @@ typedef struct _XGI_TVDataStruct
unsigned char RY2COE; unsigned char RY2COE;
unsigned char RY3COE; unsigned char RY3COE;
unsigned char RY4COE; unsigned char RY4COE;
} XGI_TVDataStruct; };
typedef struct _XGI_LVDSDataStruct struct XGI_LVDSDataStruct
{ {
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
} XGI_LVDSDataStruct; };
typedef struct _XGI_LVDSDesStruct struct XGI_LVDSDesStruct
{ {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDVDES; unsigned short LCDVDES;
} XGI_LVDSDesStruct; };
typedef struct _XGI_LVDSCRT1DataStruct struct XGI_LVDSCRT1DataStruct
{ {
unsigned char CR[15]; unsigned char CR[15];
} XGI_LVDSCRT1DataStruct; };
/*add for LCDA*/ /*add for LCDA*/
struct XGI_StStruct
typedef struct _XGI_StStruct
{ {
unsigned char St_ModeID; unsigned char St_ModeID;
unsigned short St_ModeFlag; unsigned short St_ModeFlag;
...@@ -86,9 +86,9 @@ typedef struct _XGI_StStruct ...@@ -86,9 +86,9 @@ typedef struct _XGI_StStruct
unsigned char VB_StTVFlickerIndex; unsigned char VB_StTVFlickerIndex;
unsigned char VB_StTVEdgeIndex; unsigned char VB_StTVEdgeIndex;
unsigned char VB_StTVYFilterIndex; unsigned char VB_StTVYFilterIndex;
} XGI_StStruct; };
typedef struct _XGI_StandTableStruct struct XGI_StandTableStruct
{ {
unsigned char CRT_COLS; unsigned char CRT_COLS;
unsigned char ROWS; unsigned char ROWS;
...@@ -99,9 +99,9 @@ typedef struct _XGI_StandTableStruct ...@@ -99,9 +99,9 @@ typedef struct _XGI_StandTableStruct
unsigned char CRTC[0x19]; unsigned char CRTC[0x19];
unsigned char ATTR[0x14]; unsigned char ATTR[0x14];
unsigned char GRC[9]; unsigned char GRC[9];
} XGI_StandTableStruct; };
typedef struct _XGI_ExtStruct struct XGI_ExtStruct
{ {
unsigned char Ext_ModeID; unsigned char Ext_ModeID;
unsigned short Ext_ModeFlag; unsigned short Ext_ModeFlag;
...@@ -114,9 +114,9 @@ typedef struct _XGI_ExtStruct ...@@ -114,9 +114,9 @@ typedef struct _XGI_ExtStruct
unsigned char VB_ExtTVEdgeIndex; unsigned char VB_ExtTVEdgeIndex;
unsigned char VB_ExtTVYFilterIndex; unsigned char VB_ExtTVYFilterIndex;
unsigned char REFindex; unsigned char REFindex;
} XGI_ExtStruct; };
typedef struct _XGI_Ext2Struct struct XGI_Ext2Struct
{ {
unsigned short Ext_InfoFlag; unsigned short Ext_InfoFlag;
unsigned char Ext_CRT1CRTC; unsigned char Ext_CRT1CRTC;
...@@ -127,93 +127,93 @@ typedef struct _XGI_Ext2Struct ...@@ -127,93 +127,93 @@ typedef struct _XGI_Ext2Struct
unsigned short XRes; unsigned short XRes;
unsigned short YRes; unsigned short YRes;
/* unsigned short ROM_OFFSET; */ /* unsigned short ROM_OFFSET; */
} XGI_Ext2Struct; };
typedef struct _XGI_MCLKDataStruct struct XGI_MCLKDataStruct
{ {
unsigned char SR28, SR29, SR2A; unsigned char SR28, SR29, SR2A;
unsigned short CLOCK; unsigned short CLOCK;
} XGI_MCLKDataStruct; };
typedef struct _XGI_ECLKDataStruct struct XGI_ECLKDataStruct
{ {
unsigned char SR2E, SR2F, SR30; unsigned char SR2E, SR2F, SR30;
unsigned short CLOCK; unsigned short CLOCK;
} XGI_ECLKDataStruct; };
typedef struct _XGI_VCLKDataStruct struct XGI_VCLKDataStruct
{ {
unsigned char SR2B, SR2C; unsigned char SR2B, SR2C;
unsigned short CLOCK; unsigned short CLOCK;
} XGI_VCLKDataStruct; };
typedef struct _XGI_VBVCLKDataStruct struct XGI_VBVCLKDataStruct
{ {
unsigned char Part4_A, Part4_B; unsigned char Part4_A, Part4_B;
unsigned short CLOCK; unsigned short CLOCK;
} XGI_VBVCLKDataStruct; };
typedef struct _XGI_StResInfoStruct struct XGI_StResInfoStruct
{ {
unsigned short HTotal; unsigned short HTotal;
unsigned short VTotal; unsigned short VTotal;
} XGI_StResInfoStruct; };
typedef struct _XGI_ModeResInfoStruct struct XGI_ModeResInfoStruct
{ {
unsigned short HTotal; unsigned short HTotal;
unsigned short VTotal; unsigned short VTotal;
unsigned char XChar; unsigned char XChar;
unsigned char YChar; unsigned char YChar;
} XGI_ModeResInfoStruct; };
typedef struct _XGI_LCDNBDesStruct struct XGI_LCDNBDesStruct
{ {
unsigned char NB[12]; unsigned char NB[12];
} XGI_LCDNBDesStruct; };
/*add for new UNIVGABIOS*/ /*add for new UNIVGABIOS*/
typedef struct _XGI_LCDDesStruct struct XGI_LCDDesStruct
{ {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
unsigned short LCDVDES; unsigned short LCDVDES;
unsigned short LCDVRS; unsigned short LCDVRS;
} XGI_LCDDesStruct; };
typedef struct _XGI_LCDDataTablStruct struct XGI_LCDDataTablStruct
{ {
unsigned char PANELID; unsigned char PANELID;
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
} XGI_LCDDataTablStruct; };
typedef struct _XGI_TVTablDataStruct struct XGI_TVTablDataStruct
{ {
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
} XGI_TVDataTablStruct; };
typedef struct _XGI330_LCDDesDataStruct struct XGI330_LCDDataDesStruct
{ {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
unsigned short LCDVDES; unsigned short LCDVDES;
unsigned short LCDVRS; unsigned short LCDVRS;
} XGI330_LCDDataDesStruct; };
typedef struct _XGI330_LVDSDataStruct struct XGI330_LVDSDataStruct
{ {
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
} XGI330_LVDSDataStruct; };
typedef struct _XGI330_LCDDesDataStruct2 struct XGI330_LCDDataDesStruct2
{ {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
...@@ -221,9 +221,9 @@ typedef struct _XGI330_LCDDesDataStruct2 ...@@ -221,9 +221,9 @@ typedef struct _XGI330_LCDDesDataStruct2
unsigned short LCDVRS; unsigned short LCDVRS;
unsigned short LCDHSync; unsigned short LCDHSync;
unsigned short LCDVSync; unsigned short LCDVSync;
} XGI330_LCDDataDesStruct2; };
typedef struct _XGI330_LCDDataStruct struct XGI330_LCDDataStruct
{ {
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
...@@ -231,10 +231,10 @@ typedef struct _XGI330_LCDDataStruct ...@@ -231,10 +231,10 @@ typedef struct _XGI330_LCDDataStruct
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
} XGI330_LCDDataStruct; };
typedef struct _XGI330_TVDataStruct struct XGI330_TVDataStruct
{ {
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
...@@ -245,63 +245,63 @@ typedef struct _XGI330_TVDataStruct ...@@ -245,63 +245,63 @@ typedef struct _XGI330_TVDataStruct
unsigned short RVBHRS; unsigned short RVBHRS;
unsigned char FlickerMode; unsigned char FlickerMode;
unsigned short HALFRVBHRS; unsigned short HALFRVBHRS;
} XGI330_TVDataStruct; };
typedef struct _XGI330_LCDDataTablStruct struct XGI330_LCDDataTablStruct
{ {
unsigned char PANELID; unsigned char PANELID;
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
} XGI330_LCDDataTablStruct; };
typedef struct _XGI330_TVDataTablStruct struct XGI330_TVDataTablStruct
{ {
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
} XGI330_TVDataTablStruct; };
typedef struct _XGI330_CHTVDataStruct struct XGI330_CHTVDataStruct
{ {
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
} XGI330_CHTVDataStruct; };
typedef struct _XGI_TimingHStruct struct XGI_TimingHStruct
{ {
unsigned char data[8]; unsigned char data[8];
} XGI_TimingHStruct; };
typedef struct _XGI_TimingVStruct struct XGI_TimingVStruct
{ {
unsigned char data[7]; unsigned char data[7];
} XGI_TimingVStruct; };
typedef struct _XGI_CH7007TV_TimingHStruct struct XGI_CH7007TV_TimingHStruct
{ {
unsigned char data[10]; unsigned char data[10];
} XGI_CH7007TV_TimingHStruct; };
typedef struct _XGI_CH7007TV_TimingVStruct struct XGI_CH7007TV_TimingVStruct
{ {
unsigned char data[10]; unsigned char data[10];
} XGI_CH7007TV_TimingVStruct; };
typedef struct _XGI_XG21CRT1Struct struct XGI_XG21CRT1Struct
{ {
unsigned char ModeID, CR02, CR03, CR15, CR16; unsigned char ModeID, CR02, CR03, CR15, CR16;
} XGI_XG21CRT1Struct; };
typedef struct _XGI330_CHTVRegDataStruct struct XGI330_CHTVRegDataStruct
{ {
unsigned char Reg[16]; unsigned char Reg[16];
} XGI330_CHTVRegDataStruct; };
typedef struct _XGI330_LCDCapStruct struct XGI330_LCDCapStruct
{ {
unsigned char LCD_ID; unsigned char LCD_ID;
unsigned short LCD_Capability; unsigned short LCD_Capability;
...@@ -328,9 +328,9 @@ typedef struct _XGI330_LCDCapStruct ...@@ -328,9 +328,9 @@ typedef struct _XGI330_LCDCapStruct
unsigned char Spectrum_32; unsigned char Spectrum_32;
unsigned char Spectrum_33; unsigned char Spectrum_33;
unsigned char Spectrum_34; unsigned char Spectrum_34;
} XGI330_LCDCapStruct; };
typedef struct _XGI21_LVDSCapStruct struct XGI21_LVDSCapStruct
{ {
unsigned short LVDS_Capability; unsigned short LVDS_Capability;
unsigned short LVDSHT; unsigned short LVDSHT;
...@@ -348,27 +348,27 @@ typedef struct _XGI21_LVDSCapStruct ...@@ -348,27 +348,27 @@ typedef struct _XGI21_LVDSCapStruct
unsigned char PSC_S3; unsigned char PSC_S3;
unsigned char PSC_S4; unsigned char PSC_S4;
unsigned char PSC_S5; unsigned char PSC_S5;
} XGI21_LVDSCapStruct; };
typedef struct _XGI_CRT1TableStruct struct XGI_CRT1TableStruct
{ {
unsigned char CR[16]; unsigned char CR[16];
} XGI_CRT1TableStruct; };
typedef struct _XGI330_VCLKDataStruct struct XGI330_VCLKDataStruct
{ {
unsigned char SR2B, SR2C; unsigned char SR2B, SR2C;
unsigned short CLOCK; unsigned short CLOCK;
} XGI330_VCLKDataStruct; };
typedef struct _XGI301C_Tap4TimingStruct struct XGI301C_Tap4TimingStruct
{ {
unsigned short DE; unsigned short DE;
unsigned char Reg[64]; /* C0-FF */ unsigned char Reg[64]; /* C0-FF */
} XGI301C_Tap4TimingStruct; };
typedef struct _XGI_New_StandTableStruct struct XGI_New_StandTableStruct
{ {
unsigned char CRT_COLS; unsigned char CRT_COLS;
unsigned char ROWS; unsigned char ROWS;
...@@ -379,17 +379,9 @@ typedef struct _XGI_New_StandTableStruct ...@@ -379,17 +379,9 @@ typedef struct _XGI_New_StandTableStruct
unsigned char CRTC[0x19]; unsigned char CRTC[0x19];
unsigned char ATTR[0x14]; unsigned char ATTR[0x14];
unsigned char GRC[9]; unsigned char GRC[9];
} XGI_New_StandTableStruct; };
typedef unsigned char DRAM8Type[8];
typedef unsigned char DRAM4Type[4];
typedef unsigned char DRAM32Type[32];
typedef unsigned char DRAM2Type[2];
typedef struct _VB_DEVICE_INFO VB_DEVICE_INFO; struct vb_device_info
typedef VB_DEVICE_INFO * PVB_DEVICE_INFO;
struct _VB_DEVICE_INFO
{ {
unsigned char ISXPDOS; unsigned char ISXPDOS;
unsigned long P3c4,P3d4,P3c0,P3ce,P3c2,P3cc; unsigned long P3c4,P3d4,P3c0,P3ce,P3c2,P3cc;
...@@ -420,13 +412,14 @@ struct _VB_DEVICE_INFO ...@@ -420,13 +412,14 @@ struct _VB_DEVICE_INFO
unsigned long BaseAddr; unsigned long BaseAddr;
unsigned long RelIO; unsigned long RelIO;
DRAM4Type *CR6B; unsigned char (*CR6B)[4];
DRAM4Type *CR6E; unsigned char (*CR6E)[4];
DRAM32Type *CR6F; unsigned char (*CR6F)[32];
DRAM2Type *CR89; unsigned char (*CR89)[2];
unsigned char (*SR15)[8];
unsigned char (*CR40)[8];
DRAM8Type *SR15; /* pointer : point to array */
DRAM8Type *CR40;
unsigned char *pSoftSetting; unsigned char *pSoftSetting;
unsigned char *pOutputSelect; unsigned char *pOutputSelect;
...@@ -466,8 +459,8 @@ struct _VB_DEVICE_INFO ...@@ -466,8 +459,8 @@ struct _VB_DEVICE_INFO
unsigned char *pCRT2Data_4_D; unsigned char *pCRT2Data_4_D;
unsigned char *pCRT2Data_4_E; unsigned char *pCRT2Data_4_E;
unsigned char *pCRT2Data_4_10; unsigned char *pCRT2Data_4_10;
XGI_MCLKDataStruct *MCLKData; struct XGI_MCLKDataStruct *MCLKData;
XGI_ECLKDataStruct *ECLKData; struct XGI_ECLKDataStruct *ECLKData;
unsigned char *XGI_TVDelayList; unsigned char *XGI_TVDelayList;
unsigned char *XGI_TVDelayList2; unsigned char *XGI_TVDelayList2;
...@@ -494,27 +487,27 @@ struct _VB_DEVICE_INFO ...@@ -494,27 +487,27 @@ struct _VB_DEVICE_INFO
unsigned char *pXGINew_I2CDefinition ; unsigned char *pXGINew_I2CDefinition ;
unsigned char *pXGINew_CR97 ; unsigned char *pXGINew_CR97 ;
XGI330_LCDCapStruct *LCDCapList; struct XGI330_LCDCapStruct *LCDCapList;
XGI21_LVDSCapStruct *XG21_LVDSCapList; struct XGI21_LVDSCapStruct *XG21_LVDSCapList;
XGI_TimingHStruct *TimingH; struct XGI_TimingHStruct *TimingH;
XGI_TimingVStruct *TimingV; struct XGI_TimingVStruct *TimingV;
XGI_StStruct *SModeIDTable; struct XGI_StStruct *SModeIDTable;
XGI_StandTableStruct *StandTable; struct XGI_StandTableStruct *StandTable;
XGI_ExtStruct *EModeIDTable; struct XGI_ExtStruct *EModeIDTable;
XGI_Ext2Struct *RefIndex; struct XGI_Ext2Struct *RefIndex;
/* XGINew_CRT1TableStruct *CRT1Table; */ /* XGINew_CRT1TableStruct *CRT1Table; */
XGI_CRT1TableStruct *XGINEWUB_CRT1Table; struct XGI_CRT1TableStruct *XGINEWUB_CRT1Table;
XGI_VCLKDataStruct *VCLKData; struct XGI_VCLKDataStruct *VCLKData;
XGI_VBVCLKDataStruct *VBVCLKData; struct XGI_VBVCLKDataStruct *VBVCLKData;
XGI_StResInfoStruct *StResInfo; struct XGI_StResInfoStruct *StResInfo;
XGI_ModeResInfoStruct *ModeResInfo; struct XGI_ModeResInfoStruct *ModeResInfo;
XGI_XG21CRT1Struct *UpdateCRT1; struct XGI_XG21CRT1Struct *UpdateCRT1;
}; /* _VB_DEVICE_INFO */ }; /* _struct vb_device_info */
typedef struct struct TimingInfo
{ {
unsigned short Horizontal_ACTIVE; unsigned short Horizontal_ACTIVE;
unsigned short Horizontal_FP; unsigned short Horizontal_FP;
...@@ -528,7 +521,7 @@ typedef struct ...@@ -528,7 +521,7 @@ typedef struct
unsigned char FrameRate; unsigned char FrameRate;
unsigned char Interlace; unsigned char Interlace;
unsigned short Margin; unsigned short Margin;
} TimingInfo; };
#define _VB_STRUCT_ #define _VB_STRUCT_
#endif /* _VB_STRUCT_ */ #endif /* _VB_STRUCT_ */
drivers/staging/xgifb/vb_table.h
浏览文件 @ 80adad85
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或