aboutsummaryrefslogtreecommitdiff
path: root/shared-core/drm_sarea.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-16 11:22:15 +1000
committerDave Airlie <airlied@linux.ie>2007-07-16 11:22:15 +1000
commitb95ac8b7b313ad3eadc9e8bb0ead155303b7fa92 (patch)
treea70d65cbafc2fb4b2fe172a606dc12a1f167dcce /shared-core/drm_sarea.h
parent4be9554fcdf27bce86d0d69068d284af2793b950 (diff)
drm: detypedef drm.h and fixup all problems
Diffstat (limited to 'shared-core/drm_sarea.h')
-rw-r--r--shared-core/drm_sarea.h26
1 files changed, 16 insertions, 10 deletions
diff --git a/shared-core/drm_sarea.h b/shared-core/drm_sarea.h
index 43d1114f..34050a6d 100644
--- a/shared-core/drm_sarea.h
+++ b/shared-core/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 */
- drm_hw_lock_t lock;
+ struct drm_hw_lock lock;
/** \todo Use readers/writer lock for drm_sarea::drawable_lock */
- drm_hw_lock_t drawable_lock;
- drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */
- drm_sarea_frame_t frame; /**< frame */
+ struct drm_hw_lock drawable_lock;
+ 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_ */