diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-02-12 22:53:29 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-02-12 22:53:29 +0000 |
| commit | 86c0484e0fbe328cde0d7c53ee4dd155cf71035f (patch) | |
| tree | 065d769803df748afa18a6f77f32836805a6d168 | |
| parent | 2b56c96e70ca4f418105826c440132c7187617e9 (diff) | |
Remove references to dead i810_vertex2 ioctl
| -rw-r--r-- | linux-core/i810_drv.c | 8 | ||||
| -rw-r--r-- | linux-core/i810_drv.h | 8 | ||||
| -rw-r--r-- | linux/drm.h | 1 | ||||
| -rw-r--r-- | linux/i810_drv.c | 8 | ||||
| -rw-r--r-- | linux/i810_drv.h | 8 | ||||
| -rw-r--r-- | shared-core/drm.h | 1 | ||||
| -rw-r--r-- | shared/drm.h | 1 |
7 files changed, 6 insertions, 29 deletions
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c index 3b66059d..733e5850 100644 --- a/linux-core/i810_drv.c +++ b/linux-core/i810_drv.c @@ -44,12 +44,10 @@ /* Interface history * * 1.1 - XFree86 4.1 - * 1.2 - Disable copying code (leave stub ioctls for backwards compatibility) - * - Remove requirement for interrupt (leave stubs again) - * - XvMC interfaces + * 1.2 - XvMC interfaces * - XFree86 4.2 - * 1.3 - Add VERTEX2 ioctl. (?) - * + * 1.3 - Disable copying code (leave stub ioctls for backwards compatibility) + * - Remove requirement for interrupt (leave stubs again) */ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 3 diff --git a/linux-core/i810_drv.h b/linux-core/i810_drv.h index 7e3b3d09..99165cf8 100644 --- a/linux-core/i810_drv.h +++ b/linux-core/i810_drv.h @@ -114,17 +114,9 @@ extern int i810_dma_mc(struct inode *inode, struct file *filp, extern void i810_dma_quiescent(drm_device_t *dev); -/* Obsolete - */ int i810_dma_vertex(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); -/* Handles multiple prims/ioctl, does any necessary copying in this - * ioctl: - */ -int i810_dma_vertex2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - int i810_swap_bufs(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); diff --git a/linux/drm.h b/linux/drm.h index c36a832b..79dd5814 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -454,7 +454,6 @@ typedef struct drm_scatter_gather { #define DRM_IOCTL_I810_OV0FLIP DRM_IO ( 0x4b) #define DRM_IOCTL_I810_MC DRM_IOW( 0x4c, drm_i810_mc_t) #define DRM_IOCTL_I810_RSTATUS DRM_IO ( 0x4d ) -#define DRM_IOCTL_I810_VERTEX2 DRM_IOW( 0x4e, drm_i810_vertex2_t) /* Rage 128 specific ioctls */ diff --git a/linux/i810_drv.c b/linux/i810_drv.c index 3b66059d..733e5850 100644 --- a/linux/i810_drv.c +++ b/linux/i810_drv.c @@ -44,12 +44,10 @@ /* Interface history * * 1.1 - XFree86 4.1 - * 1.2 - Disable copying code (leave stub ioctls for backwards compatibility) - * - Remove requirement for interrupt (leave stubs again) - * - XvMC interfaces + * 1.2 - XvMC interfaces * - XFree86 4.2 - * 1.3 - Add VERTEX2 ioctl. (?) - * + * 1.3 - Disable copying code (leave stub ioctls for backwards compatibility) + * - Remove requirement for interrupt (leave stubs again) */ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 3 diff --git a/linux/i810_drv.h b/linux/i810_drv.h index 7e3b3d09..99165cf8 100644 --- a/linux/i810_drv.h +++ b/linux/i810_drv.h @@ -114,17 +114,9 @@ extern int i810_dma_mc(struct inode *inode, struct file *filp, extern void i810_dma_quiescent(drm_device_t *dev); -/* Obsolete - */ int i810_dma_vertex(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); -/* Handles multiple prims/ioctl, does any necessary copying in this - * ioctl: - */ -int i810_dma_vertex2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - int i810_swap_bufs(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); diff --git a/shared-core/drm.h b/shared-core/drm.h index c36a832b..79dd5814 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -454,7 +454,6 @@ typedef struct drm_scatter_gather { #define DRM_IOCTL_I810_OV0FLIP DRM_IO ( 0x4b) #define DRM_IOCTL_I810_MC DRM_IOW( 0x4c, drm_i810_mc_t) #define DRM_IOCTL_I810_RSTATUS DRM_IO ( 0x4d ) -#define DRM_IOCTL_I810_VERTEX2 DRM_IOW( 0x4e, drm_i810_vertex2_t) /* Rage 128 specific ioctls */ diff --git a/shared/drm.h b/shared/drm.h index c36a832b..79dd5814 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -454,7 +454,6 @@ typedef struct drm_scatter_gather { #define DRM_IOCTL_I810_OV0FLIP DRM_IO ( 0x4b) #define DRM_IOCTL_I810_MC DRM_IOW( 0x4c, drm_i810_mc_t) #define DRM_IOCTL_I810_RSTATUS DRM_IO ( 0x4d ) -#define DRM_IOCTL_I810_VERTEX2 DRM_IOW( 0x4e, drm_i810_vertex2_t) /* Rage 128 specific ioctls */ |