diff options
Diffstat (limited to 'src/rdc.h')
| -rw-r--r-- | src/rdc.h | 65 |
1 files changed, 35 insertions, 30 deletions
@@ -19,6 +19,7 @@ */ + #if XSERVER_LIBPCIACCESS #include <pciaccess.h> #endif @@ -43,15 +44,15 @@ #define CHIP_REVISION(p) (p)->chipRev #endif -/* Compiler Options */ + #define Accel_2D #define Accel_2D_DEBUG 0 -/* #define MMIO_2D */ + #define HWC #define HWC_DEBUG 0 -/* Vendor & Device Info */ + #ifndef PCI_VENDOR_RDC #define PCI_VENDOR_RDC 0x17F3 #endif @@ -78,7 +79,7 @@ typedef enum _CHIP_ID { M2011 } CHIP_ID; -/* RDC REC Info */ + #define RDC_NAME "RDC" #define RDC_DRIVER_NAME "rdc" #define RDC_MAJOR_VERSION 0 @@ -87,7 +88,7 @@ typedef enum _CHIP_ID { #define RDC_VERSION \ ((RDC_MAJOR_VERSION << 20) | (RDC_MINOR_VERSION << 10) | RDC_PATCH_VERSION) -/* Customized Info */ + #define DEFAULT_VIDEOMEM_SIZE 0x00800000 #define DEFAULT_MMIO_SIZE 0x00020000 #define DEFAULT_CMDQ_SIZE 0x00100000 @@ -95,17 +96,17 @@ typedef enum _CHIP_ID { #define CMD_QUEUE_GUARD_BAND 0x00000020 #define DEFAULT_HWC_NUM 0x00000002 -/* Data Type Definition */ + typedef INT32 LONG; typedef CARD8 UCHAR; typedef CARD16 USHORT; typedef CARD32 ULONG; -/* Verberse level define */ -#define ErrorLevel 0 /* Report Error message */ -#define DefaultLevel 4 /* Driver entry function */ -#define InfoLevel 5 /* Report information */ -#define InternalLevel 6 /* Driver interanl function entry */ + +#define ErrorLevel 0 +#define DefaultLevel 4 +#define InfoLevel 5 +#define InternalLevel 6 #define BIT0 0x00000001 @@ -147,9 +148,9 @@ typedef CARD32 ULONG; -/* Data Structure Definition */ + typedef struct _RDCRegRec { -/* UCHAR ucScratch[0x1F];*/ + UCHAR ucPLLValue[3]; UCHAR ucCRA3; UCHAR ucSR58; @@ -184,7 +185,7 @@ typedef struct { ULONG ulWritePointer; ULONG ulReadPointer; - ULONG ulReadPointer_OK; /* for Eng_DBGChk */ + ULONG ulReadPointer_OK; } CMDQINFO, *PCMDQINFO; @@ -232,11 +233,12 @@ typedef struct { } SCALER; typedef struct { - UCHAR ucDeviceID; + UCHAR ucDeviceID; UCHAR ucDisplayPath; MONITORSIZE MonitorSize; SCALER ScalerConfig; - /* current mode: uce pScrn->currentMode */ + UCHAR ucNewDeviceID; + } DEVICEINFO; typedef struct { @@ -247,12 +249,15 @@ typedef struct { int iDstTop; int iDstWidth; int iDstHeight; + ULONG ulVidDispCtrl; + Bool bPanningOverlayEnable; } OVERLAY_STATUS; -typedef struct _RDCRec { - +typedef struct _RDCRec +{ + vbeInfoPtr pVbe; EntityInfoPtr pEnt; #if XSERVER_LIBPCIACCESS struct pci_device *PciInfo; @@ -263,11 +268,11 @@ typedef struct _RDCRec { OptionInfoPtr Options; - DisplayModePtr ModePtr; /* duplicate of pScrn->currentMode, delete this one */ + DisplayModePtr ModePtr; XAAInfoRecPtr AccelInfoPtr; xf86CursorInfoPtr HWCInfoPtr; - VIDEOMODE VideoModeInfo; /* duplicate of pScrn->currentMode, delete this one */ + VIDEOMODE VideoModeInfo; RDCRegRec SavedReg; CMDQINFO CMDQInfo; HWCINFO HWCInfo; @@ -276,25 +281,25 @@ typedef struct _RDCRec { ULONG ulCMDReg; Bool EnableClip; - /* adapter information */ + UCHAR jChipType; ULONG ENGCaps; - ULONG FBPhysAddr; /* Frame buffer physical address */ - UCHAR *FBVirtualAddr; /* Map of frame buffer */ + ULONG FBPhysAddr; + UCHAR *FBVirtualAddr; unsigned long FbMapSize; unsigned long AvailableFBsize; - ULONG MMIOPhysAddr; /* MMIO region physical address */ - UCHAR *MMIOVirtualAddr; /* Map of MMIO region */ + ULONG MMIOPhysAddr; + UCHAR *MMIOVirtualAddr; unsigned long MMIOMapSize; - UCHAR *BIOSVirtualAddr; /* BIOS virtual address */ - ULONG ulROMType; /* 0: no BIOS 1: VBIOS, 2: ROM file */ + UCHAR *BIOSVirtualAddr; + ULONG ulROMType; - ULONG MemoryBandwidth; /* The unit is MB*/ + ULONG MemoryBandwidth; - IOADDRESS IODBase; /* Base of PIO memory area */ + IOADDRESS IODBase; IOADDRESS PIOOffset; IOADDRESS RelocateIO; @@ -311,7 +316,7 @@ typedef struct _RDCRec { #define RDCPTR(p) ((RDCRecPtr)((p)->driverPrivate)) #define MODE_PRIVATE_PTR(p) ((MODE_PRIVATE*)(p->Private)) -/* Include Files */ + #include "rdc_mode.h" #include "rdc_vgatool.h" #include "rdc_2dtool.h" |