summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_sarea.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-12 02:35:02 +0200
committerDave Airlie <airlied@linux.ie>2007-07-12 02:35:02 +0200
commitbd63cb52c05bbb154f539369cae4fb9c9b6277da (patch)
tree2917509be9cd5e651e3ceadb1d67f68d9cc63a77 /drivers/char/drm/drm_sarea.h
parentdrm: detypedef the hashtab and more of sman (diff)
downloadlinux-bd63cb52c05bbb154f539369cae4fb9c9b6277da.tar.xz
linux-bd63cb52c05bbb154f539369cae4fb9c9b6277da.zip
drm: remove sarea typedefs
Leave the userspace typedefs in place Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_sarea.h')
-rw-r--r--drivers/char/drm/drm_sarea.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index 6964d1e9bb3a..f5466966081e 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -50,29 +50,35 @@
#define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000
/** SAREA drawable */
-typedef struct drm_sarea_drawable {
+struct drm_sarea_drawable {
unsigned int stamp;
unsigned int flags;
-} drm_sarea_drawable_t;
+};
/** SAREA frame */
-typedef struct drm_sarea_frame {
+struct drm_sarea_frame {
unsigned int x;
unsigned int y;
unsigned int width;
unsigned int height;
unsigned int fullscreen;
-} drm_sarea_frame_t;
+};
/** SAREA */
-typedef struct drm_sarea {
+struct drm_sarea {
/** first thing is always the DRM locking structure */
struct drm_hw_lock lock;
/** \todo Use readers/writer lock for drm_sarea::drawable_lock */
struct drm_hw_lock drawable_lock;
- drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */
- drm_sarea_frame_t frame; /**< frame */
+ struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */
+ struct drm_sarea_frame frame; /**< frame */
drm_context_t dummy_context;
-} drm_sarea_t;
+};
+
+#ifndef __KERNEL__
+typedef struct drm_sarea_drawable drm_sarea_drawable_t;
+typedef struct drm_sarea_frame drm_sarea_frame_t;
+typedef struct drm_sarea drm_sarea_t;
+#endif
#endif /* _DRM_SAREA_H_ */