diff options
Diffstat (limited to 'src/geode.h')
| -rw-r--r-- | src/geode.h | 63 |
1 files changed, 27 insertions, 36 deletions
diff --git a/src/geode.h b/src/geode.h index ebf8abb..4a86b38 100644 --- a/src/geode.h +++ b/src/geode.h @@ -74,7 +74,7 @@ #ifdef HAVE_GX #define GX_FILL_RECT_SUPPORT 1 #define GX_BRES_LINE_SUPPORT 1 -#define GX_DASH_LINE_SUPPORT 0 /* does not do dashed lines */ +#define GX_DASH_LINE_SUPPORT 0 /* does not do dashed lines */ #define GX_MONO_8X8_PAT_SUPPORT 1 #define GX_CLREXP_8X8_PAT_SUPPORT 1 #define GX_SCR2SCREXP_SUPPORT 1 @@ -116,8 +116,7 @@ extern void cim_outd(unsigned short port, unsigned long data); #include "cim_rtns.h" -typedef struct _CIM_DISPLAYTIMING -{ +typedef struct _CIM_DISPLAYTIMING { unsigned short wPitch; unsigned short wBpp; VG_DISPLAY_MODE vgDisplayMode; @@ -145,8 +144,7 @@ extern void gfx_outd(unsigned short port, unsigned long data); #undef Q_WORD #include "panel.h" -typedef struct tag_GFX_DISPLAYTIMING -{ +typedef struct tag_GFX_DISPLAYTIMING { unsigned int dwDotClock; unsigned short wPitch; unsigned short wBpp; @@ -167,13 +165,11 @@ typedef struct tag_GFX_DISPLAYTIMING #endif -typedef struct _VESARec -{ +typedef struct _VESARec { xf86Int10InfoPtr pInt; } VESARec; -typedef struct _GeodeMemRec -{ +typedef struct _GeodeMemRec { struct _GeodeMemRec *next; struct _GeodeMemRec *prev; unsigned int offset; @@ -186,14 +182,13 @@ typedef struct _GeodeMemRec #define OUTPUT_VOP 0x08 #define OUTPUT_DCON 0x10 -typedef struct _geodeRec -{ +typedef struct _geodeRec { /* Common for both GX and LX */ - int Output; /* Bitmask indicating the valid output options */ + int Output; /* Bitmask indicating the valid output options */ Bool HWCursor; Bool NoAccel; Bool useVGA; - Bool VGAActive; /* Flag indicating if LX VGA is active */ + Bool VGAActive; /* Flag indicating if LX VGA is active */ Bool Compression; Bool useEXA; @@ -203,12 +198,12 @@ typedef struct _geodeRec Bool tryCompression; Bool tryHWCursor; - int mm_width, mm_height; /* physical display size */ + int mm_width, mm_height; /* physical display size */ unsigned long CursorStartOffset; - int Pitch; /* display FB pitch */ - int displaySize; /* The size of the visibile area */ + int Pitch; /* display FB pitch */ + int displaySize; /* The size of the visibile area */ ExaOffscreenArea *shadowArea; @@ -226,7 +221,7 @@ typedef struct _geodeRec /* Other structures */ EntityInfoPtr pEnt; - ScreenBlockHandlerProcPtr BlockHandler; /* needed for video */ + ScreenBlockHandlerProcPtr BlockHandler; /* needed for video */ XF86VideoAdaptorPtr adaptor; /* State save structures */ @@ -247,14 +242,14 @@ typedef struct _geodeRec void (*PointerMoved) (int index, int x, int y); CloseScreenProcPtr CloseScreen; - Bool(*CreateScreenResources) (ScreenPtr); + Bool (*CreateScreenResources) (ScreenPtr); /* ===== LX specific items ===== */ /* Flags */ Bool Scale; - DisplayModePtr panelMode; /* The mode for the panel (if attached) */ + DisplayModePtr panelMode; /* The mode for the panel (if attached) */ /* Command buffer information */ unsigned long CmdBfrOffset; @@ -278,8 +273,8 @@ typedef struct _geodeRec int PanelX; int PanelY; - int displayPitch; /* The pitch ofthe visible area */ - int displayOffset; /* The offset of the visible area */ + int displayPitch; /* The pitch ofthe visible area */ + int displayOffset; /* The offset of the visible area */ DisplayModePtr curMode; @@ -314,8 +309,8 @@ typedef struct _geodeRec /* Hooks */ void (*WritePixmap) (ScrnInfoPtr pScrni, int x, int y, int w, int h, - unsigned char *src, int srcwidth, int rop, - unsigned int planemask, int trans, int bpp, int depth); + unsigned char *src, int srcwidth, int rop, + unsigned int planemask, int trans, int bpp, int depth); /* Video information */ int video_x; @@ -330,13 +325,11 @@ typedef struct _geodeRec int video_offset; ScrnInfoPtr video_scrnptr; BOOL OverlayON; -} -GeodeRec, *GeodePtr; +} GeodeRec, *GeodePtr; /* option flags are self-explanatory */ #ifdef HAVE_LX -enum -{ +enum { LX_OPTION_SW_CURSOR, LX_OPTION_HW_CURSOR, LX_OPTION_NOCOMPRESSION, @@ -350,13 +343,11 @@ enum LX_OPTION_FBSIZE, LX_OPTION_PANEL_MODE, LX_OPTION_DONT_PROGRAM -} -LX_GeodeOpts; +} LX_GeodeOpts; #endif #ifdef HAVE_GX -enum -{ +enum { GX_OPTION_SW_CURSOR, GX_OPTION_HW_CURSOR, GX_OPTION_NOCOMPRESSION, @@ -373,8 +364,7 @@ enum GX_OPTION_FBSIZE, GX_OPTION_PANEL_GEOMETRY, GX_OPTION_DONT_PROGRAM -} -GX_GeodeOpts; +} GX_GeodeOpts; #endif /* geode_dcon.c */ @@ -384,7 +374,7 @@ extern int DCONDPMSSet(ScrnInfoPtr pScrni, int mode); /* geode_common.c */ void geode_memory_to_screen_blt(unsigned long, unsigned long, - unsigned long, unsigned long, long, long, int); + unsigned long, unsigned long, long, long, int); int GeodeGetRefreshRate(DisplayModePtr); void GeodeCopyGreyscale(unsigned char *, unsigned char *, int, int, int, int); int GeodeGetSizeFromFB(unsigned int *); @@ -392,8 +382,9 @@ int GeodeGetSizeFromFB(unsigned int *); /* gx_video.c */ int + GeodeQueryImageAttributes(ScrnInfoPtr, int id, unsigned short *w, - unsigned short *h, int *pitches, int *offsets); + unsigned short *h, int *pitches, int *offsets); Bool RegionsEqual(RegionPtr A, RegionPtr B); @@ -423,7 +414,7 @@ void GXShowCursor(ScrnInfoPtr pScrni); Rotation GXGetRotation(ScreenPtr pScreen); Bool GXRandRInit(ScreenPtr pScreen, int rotation); extern _X_EXPORT Bool GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation, - int rate, RRScreenSizePtr pSize); + int rate, RRScreenSizePtr pSize); /* gx_rotate.c */ Bool GXRotate(ScrnInfoPtr pScrni, DisplayModePtr mode); |