diff options
Diffstat (limited to 'include/drm/savage_drm.h')
-rw-r--r-- | include/drm/savage_drm.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/include/drm/savage_drm.h b/include/drm/savage_drm.h index f7a75eff..1a91234e 100644 --- a/include/drm/savage_drm.h +++ b/include/drm/savage_drm.h | |||
@@ -26,10 +26,16 @@ | |||
26 | #ifndef __SAVAGE_DRM_H__ | 26 | #ifndef __SAVAGE_DRM_H__ |
27 | #define __SAVAGE_DRM_H__ | 27 | #define __SAVAGE_DRM_H__ |
28 | 28 | ||
29 | #include "drm.h" | ||
30 | |||
31 | #if defined(__cplusplus) | ||
32 | extern "C" { | ||
33 | #endif | ||
34 | |||
29 | #ifndef __SAVAGE_SAREA_DEFINES__ | 35 | #ifndef __SAVAGE_SAREA_DEFINES__ |
30 | #define __SAVAGE_SAREA_DEFINES__ | 36 | #define __SAVAGE_SAREA_DEFINES__ |
31 | 37 | ||
32 | /* 2 heaps (1 for card, 1 for agp), each divided into upto 128 | 38 | /* 2 heaps (1 for card, 1 for agp), each divided into up to 128 |
33 | * regions, subject to a minimum region size of (1<<16) == 64k. | 39 | * regions, subject to a minimum region size of (1<<16) == 64k. |
34 | * | 40 | * |
35 | * Clients may subdivide regions internally, but when sharing between | 41 | * Clients may subdivide regions internally, but when sharing between |
@@ -63,10 +69,10 @@ typedef struct _drm_savage_sarea { | |||
63 | #define DRM_SAVAGE_BCI_EVENT_EMIT 0x02 | 69 | #define DRM_SAVAGE_BCI_EVENT_EMIT 0x02 |
64 | #define DRM_SAVAGE_BCI_EVENT_WAIT 0x03 | 70 | #define DRM_SAVAGE_BCI_EVENT_WAIT 0x03 |
65 | 71 | ||
66 | #define DRM_IOCTL_SAVAGE_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t) | 72 | #define DRM_IOCTL_SAVAGE_BCI_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t) |
67 | #define DRM_IOCTL_SAVAGE_CMDBUF DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t) | 73 | #define DRM_IOCTL_SAVAGE_BCI_CMDBUF DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t) |
68 | #define DRM_IOCTL_SAVAGE_EVENT_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t) | 74 | #define DRM_IOCTL_SAVAGE_BCI_EVENT_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t) |
69 | #define DRM_IOCTL_SAVAGE_EVENT_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t) | 75 | #define DRM_IOCTL_SAVAGE_BCI_EVENT_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t) |
70 | 76 | ||
71 | #define SAVAGE_DMA_PCI 1 | 77 | #define SAVAGE_DMA_PCI 1 |
72 | #define SAVAGE_DMA_AGP 3 | 78 | #define SAVAGE_DMA_AGP 3 |
@@ -207,4 +213,8 @@ union drm_savage_cmd_header { | |||
207 | } clear1; /* SAVAGE_CMD_CLEAR data */ | 213 | } clear1; /* SAVAGE_CMD_CLEAR data */ |
208 | }; | 214 | }; |
209 | 215 | ||
216 | #if defined(__cplusplus) | ||
217 | } | ||
218 | #endif | ||
219 | |||
210 | #endif | 220 | #endif |