diff options
Diffstat (limited to 'src/ast.h')
| -rw-r--r-- | src/ast.h | 62 |
1 files changed, 57 insertions, 5 deletions
@@ -29,6 +29,7 @@ #define Accel_2D /* #define MMIO_2D */ #define HWC +#define AstVideo /* #define PATCH_ABI_VERSION */ /* Vendor & Device Info */ @@ -44,6 +45,10 @@ #define PCI_CHIP_AST2100 0x2010 #endif +#ifndef PCI_CHIP_AST1180 +#define PCI_CHIP_AST1180 0x1180 +#endif + typedef enum _CHIP_ID { VGALegacy, AST2000, @@ -51,7 +56,8 @@ typedef enum _CHIP_ID { AST1100, AST2200, AST2150, - AST2300 + AST2300, + AST1180 } CHIP_ID; /* AST REC Info */ @@ -83,7 +89,7 @@ typedef CARD32 ULONG; /* Data Structure Definition */ typedef struct _ASTRegRec { UCHAR ExtCRTC[0x50]; - + ULONG GFX[12]; } ASTRegRec, *ASTRegPtr; typedef struct _VIDEOMODE { @@ -138,6 +144,41 @@ typedef struct { } HWCINFO, *PHWCINFO; +typedef struct _ASTPortPrivRec{ + FBLinearPtr linear; + FBAreaPtr fbAreaPtr; + int fbSize; + CARD32 bufAddr[2]; + + unsigned char currentBuf; + + short drw_x, drw_y, drw_w, drw_h; + short src_x, src_y, src_w, src_h; + int id; + short srcPitch, height; + + INT32 brightness; + INT32 contrast; + INT32 saturation; + INT32 hue; + + INT32 gammaR; + INT32 gammaG; + INT32 gammaB; + + RegionRec clip; + CARD32 colorKey; + + CARD32 videoStatus; + Time offTime; + Time freeTime; + + CARD32 displayMode; + + int pitch; + int offset; +} ASTPortPrivRec, *ASTPortPrivPtr; + typedef struct _ASTRec { EntityInfoPtr pEnt; @@ -160,6 +201,11 @@ typedef struct _ASTRec { UCHAR jChipType; UCHAR jDRAMType; + ULONG ulDRAMBusWidth ; + ULONG ulDRAMSize; + ULONG ulVRAMSize; + ULONG ulVRAMBase; + ULONG ulMCLK; Bool noAccel; Bool noHWC; @@ -193,9 +239,15 @@ typedef struct _ASTRec { int clip_top; int clip_right; int clip_bottom; - -} ASTRec, *ASTRecPtr; - + +#ifdef AstVideo + XF86VideoAdaptorPtr adaptor; + Atom xvBrightness, xvContrast, xvColorKey, xvHue, xvSaturation; + Atom xvGammaRed, xvGammaGreen, xvGammaBlue; +#endif + +} ASTRec, *ASTRecPtr, *ASTPtr; + #define ASTPTR(p) ((ASTRecPtr)((p)->driverPrivate)) /* Include Files */ |