summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2000-11-07 22:10:46 +0000
committerDavid Dawes <dawes@xfree86.org>2000-11-07 22:10:46 +0000
commit5745cb7fa70cf312d371aac44de3beae2a8d6e47 (patch)
tree479a76bff84b4a5b37a6aa01b8eaea1c642df680
parent37d6828fef51b3a113a11b54e7dbd9c92cd4a548 (diff)
Import of XFree86 4.0.1d
-rw-r--r--linux/r128_drm.h6
-rw-r--r--linux/sis_drm.h18
2 files changed, 6 insertions, 18 deletions
diff --git a/linux/r128_drm.h b/linux/r128_drm.h
index ac6f73bc..8a0cd196 100644
--- a/linux/r128_drm.h
+++ b/linux/r128_drm.h
@@ -57,9 +57,9 @@ typedef struct drm_r128_init {
} drm_r128_init_t;
typedef struct drm_r128_packet {
- unsigned long *buffer;
- int count;
- int flags;
+ void *buffer;
+ int count;
+ int flags;
} drm_r128_packet_t;
typedef enum drm_r128_prim {
diff --git a/linux/sis_drm.h b/linux/sis_drm.h
index 73807f31..f08e9ecc 100644
--- a/linux/sis_drm.h
+++ b/linux/sis_drm.h
@@ -1,12 +1,11 @@
-
-#ifndef _sis_drm_public_h_
-#define _sis_drm_public_h_
+#ifndef _sis_drm_h_
+#define _sis_drm_h_
typedef struct {
int context;
unsigned int offset;
unsigned int size;
- unsigned int free;
+ unsigned long free;
} drm_sis_mem_t;
typedef struct {
@@ -17,15 +16,4 @@ typedef struct {
unsigned int left, right;
} drm_sis_flip_t;
-#define SIS_IOCTL_FB_ALLOC DRM_IOWR( 0x44, drm_sis_mem_t)
-#define SIS_IOCTL_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t)
-
-#define SIS_IOCTL_AGP_INIT DRM_IOWR( 0x53, drm_sis_agp_t)
-#define SIS_IOCTL_AGP_ALLOC DRM_IOWR( 0x54, drm_sis_mem_t)
-#define SIS_IOCTL_AGP_FREE DRM_IOW( 0x55, drm_sis_mem_t)
-
-#define SIS_IOCTL_FLIP DRM_IOW( 0x48, drm_sis_flip_t)
-#define SIS_IOCTL_FLIP_INIT DRM_IO( 0x49)
-#define SIS_IOCTL_FLIP_FINAL DRM_IO( 0x50)
-
#endif