Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 288995
b: refs/heads/master
c: 7ad6651
h: refs/heads/master
i:
  288993: 4854830
  288991: 4f21860
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Feb 9, 2012
1 parent 0f342ef commit 23786af
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 134 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc39dcb7fa8bb917484a5b229cf3751dd3aa7313
refs/heads/master: 7ad6651d78dbf269c76f6ca141c2a9629943bb49
77 changes: 10 additions & 67 deletions trunk/drivers/staging/xgifb/XGI_main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,27 @@

#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while (0)

#ifndef PCI_VENDOR_ID_XG
#define PCI_VENDOR_ID_XG 0x18CA
#ifndef PCI_DEVICE_ID_XGI_41
#define PCI_DEVICE_ID_XGI_41 0x041
#endif

#ifndef PCI_DEVICE_ID_XG_40
#define PCI_DEVICE_ID_XG_40 0x040
#endif
#ifndef PCI_DEVICE_ID_XG_41
#define PCI_DEVICE_ID_XG_41 0x041
#endif
#ifndef PCI_DEVICE_ID_XG_42
#define PCI_DEVICE_ID_XG_42 0x042
#ifndef PCI_DEVICE_ID_XGI_42
#define PCI_DEVICE_ID_XGI_42 0x042
#endif
#ifndef PCI_DEVICE_ID_XG_20
#define PCI_DEVICE_ID_XG_20 0x020
#endif
#ifndef PCI_DEVICE_ID_XG_27
#define PCI_DEVICE_ID_XG_27 0x027
#ifndef PCI_DEVICE_ID_XGI_27
#define PCI_DEVICE_ID_XGI_27 0x027
#endif

static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = {
{PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20)},
{PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_27)},
{PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_40)},
{PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_42)},
{PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_20)},
{PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_27)},
{PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_40)},
{PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_42)},
{0}
};

MODULE_DEVICE_TABLE(pci, xgifb_pci_table);

/* To be included in fb.h */
#ifndef FB_ACCEL_XGI_XABRE
#define FB_ACCEL_XGI_XABRE 41 /* XGI 330 ("Xabre") */
#endif

#define SEQ_DATA 0x15

#define XGISR (xgifb_info->dev_info.P3c4)
#define XGICR (xgifb_info->dev_info.P3d4)
#define XGIDACA (xgifb_info->dev_info.P3c8)
Expand All @@ -61,23 +45,13 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
#define XGIDAC2A XGIPART5
#define XGIDAC2D (XGIPART5 + 1)

#define IND_XGI_PASSWORD 0x05 /* SRs */
#define IND_XGI_RAMDAC_CONTROL 0x07
#define IND_XGI_DRAM_SIZE 0x14
#define IND_XGI_MODULE_ENABLE 0x1E
#define IND_XGI_PCI_ADDRESS_SET 0x20

#define IND_XGI_SCRATCH_REG_CR30 0x30 /* CRs */
#define IND_XGI_SCRATCH_REG_CR31 0x31
#define IND_XGI_SCRATCH_REG_CR32 0x32
#define IND_XGI_SCRATCH_REG_CR33 0x33
#define IND_XGI_LCD_PANEL 0x36
#define IND_XGI_SCRATCH_REG_CR37 0x37

#define IND_XGI_CRT2_WRITE_ENABLE_315 0x2F

#define XGI_PASSWORD 0x86 /* SR05 */

#define XGI_DRAM_SIZE_MASK 0xF0 /*SR14 */
#define XGI_DRAM_SIZE_1MB 0x00
#define XGI_DRAM_SIZE_2MB 0x01
Expand All @@ -89,37 +63,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
#define XGI_DRAM_SIZE_128MB 0x07
#define XGI_DRAM_SIZE_256MB 0x08

#define XGI_ENABLE_2D 0x40 /* SR1E */

#define XGI_MEM_MAP_IO_ENABLE 0x01 /* SR20 */
#define XGI_PCI_ADDR_ENABLE 0x80

#define XGI_SIMULTANEOUS_VIEW_ENABLE 0x01 /* CR30 */
#define XGI_VB_OUTPUT_COMPOSITE 0x04
#define XGI_VB_OUTPUT_SVIDEO 0x08
#define XGI_VB_OUTPUT_SCART 0x10
#define XGI_VB_OUTPUT_LCD 0x20
#define XGI_VB_OUTPUT_CRT2 0x40
#define XGI_VB_OUTPUT_HIVISION 0x80

#define XGI_VB_OUTPUT_DISABLE 0x20 /* CR31 */
#define XGI_DRIVER_MODE 0x40

#define XGI_VB_COMPOSITE 0x01 /* CR32 */
#define XGI_VB_SVIDEO 0x02
#define XGI_VB_SCART 0x04
#define XGI_VB_LCD 0x08
#define XGI_VB_CRT2 0x10
#define XGI_CRT1 0x20
#define XGI_VB_HIVISION 0x40
#define XGI_VB_YPBPR 0x80
#define XGI_VB_TV (XGI_VB_COMPOSITE | XGI_VB_SVIDEO | \
XGI_VB_SCART | XGI_VB_HIVISION|XGI_VB_YPBPR)

#define XGI_EXTERNAL_CHIP_MASK 0x0E /* CR37 */
#define XGI310_EXTERNAL_CHIP_LVDS 0x02 /* in CR37 << 1 ! */
#define XGI310_EXTERNAL_CHIP_LVDS_CHRONTEL 0x03 /* in CR37 << 1 ! */

/* ------------------- Global Variables ----------------------------- */

/* display status */
Expand Down
66 changes: 0 additions & 66 deletions trunk/drivers/staging/xgifb/vb_struct.h
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
#ifndef _VB_STRUCT_
#define _VB_STRUCT_

struct XGI_LCDDataStruct {
unsigned short RVBHCMAX;
unsigned short RVBHCFACT;
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short LCDHT;
unsigned short LCDVT;
};

#include "../../video/sis/vstruct.h"

struct XGI_LVDSCRT1HDataStruct {
Expand All @@ -20,22 +10,6 @@ struct XGI_LVDSCRT1VDataStruct {
unsigned char Reg[7];
};

struct XGI_TVDataStruct {
unsigned short RVBHCMAX;
unsigned short RVBHCFACT;
unsigned short VGAHT;
unsigned short VGAVT;
unsigned short TVHDE;
unsigned short TVVDE;
unsigned short RVBHRS;
unsigned char FlickerMode;
unsigned short HALFRVBHRS;
unsigned char RY1COE;
unsigned char RY2COE;
unsigned char RY3COE;
unsigned char RY4COE;
};

struct XGI_StStruct {
unsigned char St_ModeID;
unsigned short St_ModeFlag;
Expand All @@ -48,18 +22,6 @@ struct XGI_StStruct {
unsigned char VB_StTVYFilterIndex;
};

struct XGI_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 XGI_ExtStruct {
unsigned char Ext_ModeID;
unsigned short Ext_ModeFlag;
Expand All @@ -86,39 +48,11 @@ struct XGI_Ext2Struct {
/* unsigned short ROM_OFFSET; */
};


struct XGI_MCLKDataStruct {
unsigned char SR28, SR29, SR2A;
unsigned short CLOCK;
};

struct XGI_ECLKDataStruct {
unsigned char SR2E, SR2F, SR30;
unsigned short CLOCK;
};

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

struct XGI_VBVCLKDataStruct {
unsigned char Part4_A, Part4_B;
unsigned short CLOCK;
};

struct XGI_StResInfoStruct {
unsigned short HTotal;
unsigned short VTotal;
};

struct XGI_ModeResInfoStruct {
unsigned short HTotal;
unsigned short VTotal;
unsigned char XChar;
unsigned char YChar;
};

/*add for new UNIVGABIOS*/
struct XGI_LCDDesStruct {
unsigned short LCDHDES;
Expand Down

0 comments on commit 23786af

Please sign in to comment.