Skip to content

Commit

Permalink
staging/xgifb: Use SiS structs
Browse files Browse the repository at this point in the history
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: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Jun 14, 2012
1 parent 03f76fc commit 51f984b
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 78 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/xgifb/vb_setmode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1980,12 +1980,12 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo)
{
unsigned short tempbx;
struct XGI330_LVDSDataStruct *LCDPtr = NULL;
struct SiS_LVDSData *LCDPtr = NULL;

tempbx = 2;

if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
LCDPtr = (struct XGI330_LVDSDataStruct *) XGI_GetLcdPtr(tempbx,
LCDPtr = (struct SiS_LVDSData *)XGI_GetLcdPtr(tempbx,
ModeNo, ModeIdIndex, RefreshRateTableIndex,
pVBInfo);
pVBInfo->VGAHT = LCDPtr->VGAHT;
Expand Down
28 changes: 0 additions & 28 deletions drivers/staging/xgifb/vb_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ struct XGI_LCDDataTablStruct {
unsigned short DATAPTR;
};

struct XGI330_LVDSDataStruct {
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short LCDHT;
unsigned short LCDVT;
};

struct XGI330_LCDDataDesStruct2 {
unsigned short LCDHDES;
unsigned short LCDHRS;
Expand All @@ -67,15 +60,6 @@ struct XGI330_LCDDataDesStruct2 {
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 {
unsigned short RVBHCMAX;
Expand Down Expand Up @@ -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 {
unsigned char data[8];
};
Expand Down Expand Up @@ -173,11 +150,6 @@ struct XGI_CRT1TableStruct {
};


struct XGI330_VCLKDataStruct {
unsigned char SR2B, SR2C;
unsigned short CLOCK;
};

struct XGI301C_Tap4TimingStruct {
unsigned short DE;
unsigned char Reg[64]; /* C0-FF */
Expand Down
Loading

0 comments on commit 51f984b

Please sign in to comment.