diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-11 20:35:02 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 20:35:02 -0400 |
commit | bd63cb52c05bbb154f539369cae4fb9c9b6277da (patch) | |
tree | 2917509be9cd5e651e3ceadb1d67f68d9cc63a77 /drivers/char/drm/drm_sarea.h | |
parent | e0be428e6645f2891fab6be92d1b0e9aad972e7d (diff) |
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.h | 22 |
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 @@ | |||
50 | #define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 | 50 | #define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 |
51 | 51 | ||
52 | /** SAREA drawable */ | 52 | /** SAREA drawable */ |
53 | typedef struct drm_sarea_drawable { | 53 | struct drm_sarea_drawable { |
54 | unsigned int stamp; | 54 | unsigned int stamp; |
55 | unsigned int flags; | 55 | unsigned int flags; |
56 | } drm_sarea_drawable_t; | 56 | }; |
57 | 57 | ||
58 | /** SAREA frame */ | 58 | /** SAREA frame */ |
59 | typedef struct drm_sarea_frame { | 59 | struct drm_sarea_frame { |
60 | unsigned int x; | 60 | unsigned int x; |
61 | unsigned int y; | 61 | unsigned int y; |
62 | unsigned int width; | 62 | unsigned int width; |
63 | unsigned int height; | 63 | unsigned int height; |
64 | unsigned int fullscreen; | 64 | unsigned int fullscreen; |
65 | } drm_sarea_frame_t; | 65 | }; |
66 | 66 | ||
67 | /** SAREA */ | 67 | /** SAREA */ |
68 | typedef struct drm_sarea { | 68 | struct drm_sarea { |
69 | /** first thing is always the DRM locking structure */ | 69 | /** first thing is always the DRM locking structure */ |
70 | struct drm_hw_lock lock; | 70 | struct drm_hw_lock lock; |
71 | /** \todo Use readers/writer lock for drm_sarea::drawable_lock */ | 71 | /** \todo Use readers/writer lock for drm_sarea::drawable_lock */ |
72 | struct drm_hw_lock drawable_lock; | 72 | struct drm_hw_lock drawable_lock; |
73 | drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */ | 73 | struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */ |
74 | drm_sarea_frame_t frame; /**< frame */ | 74 | struct drm_sarea_frame frame; /**< frame */ |
75 | drm_context_t dummy_context; | 75 | drm_context_t dummy_context; |
76 | } drm_sarea_t; | 76 | }; |
77 | |||
78 | #ifndef __KERNEL__ | ||
79 | typedef struct drm_sarea_drawable drm_sarea_drawable_t; | ||
80 | typedef struct drm_sarea_frame drm_sarea_frame_t; | ||
81 | typedef struct drm_sarea drm_sarea_t; | ||
82 | #endif | ||
77 | 83 | ||
78 | #endif /* _DRM_SAREA_H_ */ | 84 | #endif /* _DRM_SAREA_H_ */ |