From 9a91674d453fab1fbddc6225f5aa4f7ff7484f91 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Fri, 11 Nov 2005 07:45:46 +0000
Subject: cleanup ioctl/max_ioctl to use header file for extern symbols

---
 shared-core/i915_drv.h   | 3 +++
 shared-core/mach64_drv.h | 3 +++
 shared-core/mga_drv.h    | 3 +++
 shared-core/r128_drv.h   | 3 +++
 shared-core/radeon_drv.h | 3 +++
 shared-core/savage_drv.h | 3 +++
 shared-core/sis_drv.h    | 3 +++
 shared-core/via_drv.c    | 3 ---
 shared-core/via_drv.h    | 3 +++
 9 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index f7dbfd29..600deabc 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -96,6 +96,9 @@ typedef struct drm_i915_private {
 	unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
 } drm_i915_private_t;
 
+extern drm_ioctl_desc_t i915_ioctls[];
+extern int i915_max_ioctl;
+
 				/* i915_dma.c */
 extern void i915_kernel_lost_context(drm_device_t * dev);
 extern int i915_driver_load(struct drm_device *, unsigned long flags);
diff --git a/shared-core/mach64_drv.h b/shared-core/mach64_drv.h
index 29c0aba4..e22827f4 100644
--- a/shared-core/mach64_drv.h
+++ b/shared-core/mach64_drv.h
@@ -108,6 +108,9 @@ typedef struct drm_mach64_private {
 	drm_local_map_t *agp_textures;
 } drm_mach64_private_t;
 
+extern drm_ioctl_desc_t mach64_ioctls[];
+extern int mach64_max_ioctl;
+
 				/* mach64_dma.c */
 extern int mach64_dma_init(DRM_IOCTL_ARGS);
 extern int mach64_dma_idle(DRM_IOCTL_ARGS);
diff --git a/shared-core/mga_drv.h b/shared-core/mga_drv.h
index 526dc4c9..e0a1bb6d 100644
--- a/shared-core/mga_drv.h
+++ b/shared-core/mga_drv.h
@@ -148,6 +148,9 @@ typedef struct drm_mga_private {
 	unsigned int agp_size;
 } drm_mga_private_t;
 
+extern drm_ioctl_desc_t mga_ioctls[];
+extern int mga_max_ioctl;
+
 				/* mga_dma.c */
 extern int mga_dma_bootstrap(DRM_IOCTL_ARGS);
 extern int mga_dma_init(DRM_IOCTL_ARGS);
diff --git a/shared-core/r128_drv.h b/shared-core/r128_drv.h
index 34724fde..9a779bad 100644
--- a/shared-core/r128_drv.h
+++ b/shared-core/r128_drv.h
@@ -128,6 +128,9 @@ typedef struct drm_r128_buf_priv {
 	drm_r128_freelist_t *list_entry;
 } drm_r128_buf_priv_t;
 
+extern drm_ioctl_desc_t r128_ioctls[];
+extern int r128_max_ioctl;
+
 				/* r128_cce.c */
 extern int r128_cce_init(DRM_IOCTL_ARGS);
 extern int r128_cce_start(DRM_IOCTL_ARGS);
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 8455d599..75d18481 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -276,6 +276,9 @@ typedef struct drm_radeon_buf_priv {
 } drm_radeon_buf_priv_t;
 
 extern int radeon_no_wb;
+extern drm_ioctl_desc_t radeon_ioctls[];
+extern int radeon_max_ioctl;
+
 				/* radeon_cp.c */
 extern int radeon_cp_init(DRM_IOCTL_ARGS);
 extern int radeon_cp_start(DRM_IOCTL_ARGS);
diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h
index 8ec604f0..01abb58d 100644
--- a/shared-core/savage_drv.h
+++ b/shared-core/savage_drv.h
@@ -104,6 +104,9 @@ enum savage_family {
 	S3_LAST
 };
 
+extern drm_ioctl_desc_t savage_ioctls[];
+extern int savage_max_ioctl;
+
 #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
 
 #define S3_SAVAGE4_SERIES(chip)  ((chip==S3_SAVAGE4)            \
diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h
index 4ef3d622..b1fddad8 100644
--- a/shared-core/sis_drv.h
+++ b/shared-core/sis_drv.h
@@ -49,4 +49,7 @@ typedef struct drm_sis_private {
 extern int sis_init_context(drm_device_t * dev, int context);
 extern int sis_final_context(drm_device_t * dev, int context);
 
+extern drm_ioctl_desc_t sis_ioctls[];
+extern int sis_max_ioctl;
+
 #endif
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 8291ae8e..58638162 100644
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -39,9 +39,6 @@ static struct pci_device_id pciidlist[] = {
 	viadrv_PCI_IDS
 };
 
-extern drm_ioctl_desc_t via_ioctls[];
-extern int via_max_ioctl;
-
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
 	.driver_features =
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index 0fa014aa..dcfaa63c 100644
--- a/shared-core/via_drv.h
+++ b/shared-core/via_drv.h
@@ -111,6 +111,9 @@ enum via_family {
 #define VIA_READ8(reg)		DRM_READ8(VIA_BASE, reg)
 #define VIA_WRITE8(reg,val)	DRM_WRITE8(VIA_BASE, reg, val)
 
+extern drm_ioctl_desc_t via_ioctls[];
+extern int via_max_ioctl;
+
 extern int via_fb_init(DRM_IOCTL_ARGS);
 extern int via_mem_alloc(DRM_IOCTL_ARGS);
 extern int via_mem_free(DRM_IOCTL_ARGS);
-- 
cgit v1.2.3