Commit 51f984bc authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman

staging/xgifb: Use SiS structs

This patch replaces some of the XGI internal structs by their
counterparts in the SiS driver.
XGI330_LVDSDataStruct -> SiS_LVDSData
XGI330_LCDDataStruct -> SiS_LCDData
XGI330_CHTVDataStruct -> SiS_LVDSData
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03f76fc6
...@@ -1980,12 +1980,12 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1980,12 +1980,12 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short tempbx; unsigned short tempbx;
struct XGI330_LVDSDataStruct *LCDPtr = NULL; struct SiS_LVDSData *LCDPtr = NULL;
tempbx = 2; tempbx = 2;
if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
LCDPtr = (struct XGI330_LVDSDataStruct *) XGI_GetLcdPtr(tempbx, LCDPtr = (struct SiS_LVDSData *)XGI_GetLcdPtr(tempbx,
ModeNo, ModeIdIndex, RefreshRateTableIndex, ModeNo, ModeIdIndex, RefreshRateTableIndex,
pVBInfo); pVBInfo);
pVBInfo->VGAHT = LCDPtr->VGAHT; pVBInfo->VGAHT = LCDPtr->VGAHT;
......
...@@ -51,13 +51,6 @@ struct XGI_LCDDataTablStruct { ...@@ -51,13 +51,6 @@ struct XGI_LCDDataTablStruct {
unsigned short DATAPTR; unsigned short DATAPTR;
}; };
struct XGI330_LVDSDataStruct {
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short LCDHT;
unsigned short LCDVT;
};
struct XGI330_LCDDataDesStruct2 { struct XGI330_LCDDataDesStruct2 {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
...@@ -67,15 +60,6 @@ struct XGI330_LCDDataDesStruct2 { ...@@ -67,15 +60,6 @@ struct XGI330_LCDDataDesStruct2 {
unsigned short LCDVSync; unsigned short LCDVSync;
}; };
struct XGI330_LCDDataStruct {
unsigned short RVBHCMAX;
unsigned short RVBHCFACT;
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short LCDHT;
unsigned short LCDVT;
};
struct XGI330_TVDataStruct { struct XGI330_TVDataStruct {
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
...@@ -103,13 +87,6 @@ struct XGI330_TVDataTablStruct { ...@@ -103,13 +87,6 @@ struct XGI330_TVDataTablStruct {
}; };
struct XGI330_CHTVDataStruct {
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short LCDHT;
unsigned short LCDVT;
};
struct XGI_TimingHStruct { struct XGI_TimingHStruct {
unsigned char data[8]; unsigned char data[8];
}; };
...@@ -173,11 +150,6 @@ struct XGI_CRT1TableStruct { ...@@ -173,11 +150,6 @@ struct XGI_CRT1TableStruct {
}; };
struct XGI330_VCLKDataStruct {
unsigned char SR2B, SR2C;
unsigned short CLOCK;
};
struct XGI301C_Tap4TimingStruct { struct XGI301C_Tap4TimingStruct {
unsigned short DE; unsigned short DE;
unsigned char Reg[64]; /* C0-FF */ unsigned char Reg[64]; /* C0-FF */
......
This diff is collapsed.
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