diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-06 16:30:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-06 17:10:31 -0700 |
| commit | 8ae0e44e42db645abe6d385f561260d2ae4a1960 (patch) | |
| tree | 2002c65e2d302a32ec5d0b19a8708c3c7264b7c6 /src/i830_hwmc.h | |
| parent | b9b159c49854d8d9d2207946bb583537bb0d48d6 (diff) | |
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.
Diffstat (limited to 'src/i830_hwmc.h')
| -rw-r--r-- | src/i830_hwmc.h | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/src/i830_hwmc.h b/src/i830_hwmc.h index 7db6a86a..0b512b4e 100644 --- a/src/i830_hwmc.h +++ b/src/i830_hwmc.h @@ -49,52 +49,51 @@ /* supported surface types */ enum { - SURFACE_TYPE_MPEG2_MPML = FOURCC_XVMC, /* mpeg2 MP@ML */ - SURFACE_TYPE_MPEG1_MPML, /* mpeg1 MP@ML */ - SURFACE_TYPE_MAX + SURFACE_TYPE_MPEG2_MPML = FOURCC_XVMC, /* mpeg2 MP@ML */ + SURFACE_TYPE_MPEG1_MPML, /* mpeg1 MP@ML */ + SURFACE_TYPE_MAX }; /* common header for context private */ -struct hwmc_buffer -{ - drm_handle_t handle; - unsigned long offset; - unsigned long size; - unsigned long bus_addr; +struct hwmc_buffer { + drm_handle_t handle; + unsigned long offset; + unsigned long size; + unsigned long bus_addr; }; struct _intel_xvmc_common { - unsigned int type; - struct hwmc_buffer batchbuffer; - unsigned int kernel_exec_fencing:1; + unsigned int type; + struct hwmc_buffer batchbuffer; + unsigned int kernel_exec_fencing:1; }; /* Intel private XvMC command to DDX driver */ struct intel_xvmc_command { - unsigned int command; - unsigned int ctxNo; - unsigned int srfNo; - unsigned int subPicNo; - unsigned int flags; - unsigned int real_id; - uint32_t handle; - unsigned int pad[5]; + unsigned int command; + unsigned int ctxNo; + unsigned int srfNo; + unsigned int subPicNo; + unsigned int flags; + unsigned int real_id; + uint32_t handle; + unsigned int pad[5]; }; #ifdef _INTEL_XVMC_SERVER_ #include <xf86xvmc.h> struct intel_xvmc_driver { - char *name; - XF86MCAdaptorPtr adaptor; - unsigned int flag; - i830_memory *batch; - drm_handle_t batch_handle; + char *name; + XF86MCAdaptorPtr adaptor; + unsigned int flag; + i830_memory *batch; + drm_handle_t batch_handle; - /* more items for xvmv surface manage? */ - Bool (*init)(ScrnInfoPtr, XF86VideoAdaptorPtr); - void (*fini)(ScrnInfoPtr); - void* devPrivate; + /* more items for xvmv surface manage? */ + Bool(*init) (ScrnInfoPtr, XF86VideoAdaptorPtr); + void (*fini) (ScrnInfoPtr); + void *devPrivate; }; extern struct intel_xvmc_driver *xvmc_driver; @@ -106,7 +105,7 @@ extern Bool intel_xvmc_probe(ScrnInfoPtr); extern Bool intel_xvmc_driver_init(ScreenPtr, XF86VideoAdaptorPtr); extern Bool intel_xvmc_screen_init(ScreenPtr); extern void intel_xvmc_finish(ScrnInfoPtr); -extern int intel_xvmc_put_image_size(ScrnInfoPtr); +extern int intel_xvmc_put_image_size(ScrnInfoPtr); extern Bool intel_xvmc_init_batch(ScrnInfoPtr); extern void intel_xvmc_fini_batch(ScrnInfoPtr); #endif |