From 8ae0e44e42db645abe6d385f561260d2ae4a1960 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 6 Oct 2009 16:30:08 -0700 Subject: Move to kernel coding style. We've talked about doing this since the start of the project, putting it off until "some convenient time". Just after removing a third of the driver seems like a convenient time, when backporting's probably not happening much anyway. --- src/i830_video.h | 70 +++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'src/i830_video.h') diff --git a/src/i830_video.h b/src/i830_video.h index cdccd162..ac478018 100644 --- a/src/i830_video.h +++ b/src/i830_video.h @@ -28,41 +28,41 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xf86_OSproc.h" typedef struct { - uint32_t YBufOffset; - uint32_t UBufOffset; - uint32_t VBufOffset; - - int brightness; - int contrast; - int saturation; - xf86CrtcPtr current_crtc; - xf86CrtcPtr desired_crtc; - - RegionRec clip; - uint32_t colorKey; - - uint32_t gamma0; - uint32_t gamma1; - uint32_t gamma2; - uint32_t gamma3; - uint32_t gamma4; - uint32_t gamma5; - - uint32_t videoStatus; - Time offTime; - Time freeTime; + uint32_t YBufOffset; + uint32_t UBufOffset; + uint32_t VBufOffset; + + int brightness; + int contrast; + int saturation; + xf86CrtcPtr current_crtc; + xf86CrtcPtr desired_crtc; + + RegionRec clip; + uint32_t colorKey; + + uint32_t gamma0; + uint32_t gamma1; + uint32_t gamma2; + uint32_t gamma3; + uint32_t gamma4; + uint32_t gamma5; + + uint32_t videoStatus; + Time offTime; + Time freeTime; /** YUV data buffers */ - drm_intel_bo *buf; /* current buffer to draw into */ - drm_intel_bo *oldBuf; /* old buffer, may be in use by the overlay hw */ - Bool oldBuf_pinned; /* only actually pinned when in use by the overlay hw */ + drm_intel_bo *buf; /* current buffer to draw into */ + drm_intel_bo *oldBuf; /* old buffer, may be in use by the overlay hw */ + Bool oldBuf_pinned; /* only actually pinned when in use by the overlay hw */ - Bool overlayOK; - int oneLineMode; - int scaleRatio; - Bool textured; - Rotation rotation; /* should remove I830->rotation later*/ + Bool overlayOK; + int oneLineMode; + int scaleRatio; + Bool textured; + Rotation rotation; /* should remove I830->rotation later */ - int SyncToVblank; /* -1: auto, 0: off, 1: on */ + int SyncToVblank; /* -1: auto, 0: off, 1: on */ } I830PortPrivRec, *I830PortPrivPtr; #define GET_PORT_PRIVATE(pScrn) \ @@ -73,16 +73,14 @@ void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, short height, int video_pitch, int video_pitch2, int x1, int y1, int x2, int y2, short src_w, short src_h, - short drw_w, short drw_h, - PixmapPtr pPixmap); + short drw_w, short drw_h, PixmapPtr pPixmap); void I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, int x1, int y1, int x2, int y2, short src_w, short src_h, - short drw_w, short drw_h, - PixmapPtr pPixmap); + short drw_w, short drw_h, PixmapPtr pPixmap); void I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask); -- cgit v1.2.3