diff options
Diffstat (limited to 'drivers/staging/xgifb/vb_struct.h')
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 97 |
1 files changed, 8 insertions, 89 deletions
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 377d27c..f9ade6f 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -1,16 +1,6 @@ #ifndef _VB_STRUCT_ #define _VB_STRUCT_ -#ifdef _INITNEW_ -#define EXTERN -#else -#define EXTERN extern -#endif - -struct XGI_PanelDelayTblStruct { - unsigned char timer[2]; -}; - struct XGI_LCDDataStruct { unsigned short RVBHCMAX; unsigned short RVBHCFACT; @@ -45,24 +35,6 @@ struct XGI_TVDataStruct { unsigned char RY4COE; }; -struct XGI_LVDSDataStruct { - unsigned short VGAHT; - unsigned short VGAVT; - unsigned short LCDHT; - unsigned short LCDVT; -}; - -struct XGI_LVDSDesStruct { - unsigned short LCDHDES; - unsigned short LCDVDES; -}; - -struct XGI_LVDSCRT1DataStruct { - unsigned char CR[15]; -}; - -/*add for LCDA*/ - struct XGI_StStruct { unsigned char St_ModeID; unsigned short St_ModeFlag; @@ -146,10 +118,6 @@ struct XGI_ModeResInfoStruct { unsigned char YChar; }; -struct XGI_LCDNBDesStruct { - unsigned char NB[12]; -}; - /*add for new UNIVGABIOS*/ struct XGI_LCDDesStruct { unsigned short LCDHDES; @@ -165,12 +133,6 @@ struct XGI_LCDDataTablStruct { unsigned short DATAPTR; }; -struct XGI_TVTablDataStruct { - unsigned short MASK; - unsigned short CAP; - unsigned short DATAPTR; -}; - struct XGI330_LCDDataDesStruct { unsigned short LCDHDES; unsigned short LCDHRS; @@ -246,22 +208,10 @@ struct XGI_TimingVStruct { unsigned char data[7]; }; -struct XGI_CH7007TV_TimingHStruct { - unsigned char data[10]; -}; - -struct XGI_CH7007TV_TimingVStruct { - unsigned char data[10]; -}; - struct XGI_XG21CRT1Struct { unsigned char ModeID, CR02, CR03, CR15, CR16; }; -struct XGI330_CHTVRegDataStruct { - unsigned char Reg[16]; -}; - struct XGI330_LCDCapStruct { unsigned char LCD_ID; unsigned short LCD_Capability; @@ -324,18 +274,6 @@ struct XGI301C_Tap4TimingStruct { unsigned char Reg[64]; /* C0-FF */ }; -struct XGI_New_StandTableStruct { - unsigned char CRT_COLS; - unsigned char ROWS; - unsigned char CHAR_HEIGHT; - unsigned short CRT_LEN; - unsigned char SR[4]; - unsigned char MISC; - unsigned char CRTC[0x19]; - unsigned char ATTR[0x14]; - unsigned char GRC[9]; -}; - struct vb_device_info { unsigned char ISXPDOS; unsigned long P3c4, P3d4, P3c0, P3ce, P3c2, P3cc; @@ -350,12 +288,10 @@ struct vb_device_info { unsigned short ModeType; /* ,IF_DEF_FSTN; add for dstn */ unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN; - unsigned short IF_DEF_CRT2Monitor, IF_DEF_VideoCapture; - unsigned short IF_DEF_LCDA, IF_DEF_CH7017, IF_DEF_YPbPr, - IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD; + unsigned short IF_DEF_CRT2Monitor; + unsigned short IF_DEF_LCDA, IF_DEF_YPbPr; unsigned short IF_DEF_ExpLink; - unsigned short IF_DEF_CH7005, IF_DEF_HiVision; - unsigned short IF_DEF_CH7007; /* Billy 2007/05/03 */ + unsigned short IF_DEF_HiVision; unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/ unsigned short VBInfo, TVInfo, LCDInfo, Set_VGAType; unsigned short VBExtInfo;/*301lv*/ @@ -364,7 +300,7 @@ struct vb_device_info { unsigned short SelectCRT2Rate; unsigned char *ROMAddr; - unsigned char *FBAddr; + void __iomem *FBAddr; unsigned long BaseAddr; unsigned long RelIO; @@ -420,10 +356,6 @@ struct vb_device_info { unsigned char *XGI_TVDelayList; unsigned char *XGI_TVDelayList2; - unsigned char *CHTVVCLKUNTSC; - unsigned char *CHTVVCLKONTSC; - unsigned char *CHTVVCLKUPAL; - unsigned char *CHTVVCLKOPAL; unsigned char *NTSCTiming; unsigned char *PALTiming; unsigned char *HiTVExtTiming; @@ -460,23 +392,10 @@ struct vb_device_info { struct XGI_StResInfoStruct *StResInfo; struct XGI_ModeResInfoStruct *ModeResInfo; struct XGI_XG21CRT1Struct *UpdateCRT1; -}; /* _struct vb_device_info */ + int ram_type; + int ram_channel; + int ram_bus; +}; /* _struct vb_device_info */ -struct TimingInfo { - unsigned short Horizontal_ACTIVE; - unsigned short Horizontal_FP; - unsigned short Horizontal_SYNC; - unsigned short Horizontal_BP; - unsigned short Vertical_ACTIVE; - unsigned short Vertical_FP; - unsigned short Vertical_SYNC; - unsigned short Vertical_BP; - double DCLK; - unsigned char FrameRate; - unsigned char Interlace; - unsigned short Margin; -}; - -#define _VB_STRUCT_ #endif /* _VB_STRUCT_ */ |