diff options
| author | Dave Airlie <airlied@linux.ie> | 2005-02-01 11:08:31 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-02-01 11:08:31 +0000 |
| commit | 0d6b7fcb79e9bf6f823b5802f8317056015faeec (patch) | |
| tree | e1b1ed4dfbc01fde9b61cab0be66678da75222dd /shared-core/sis_mm.c | |
| parent | 1dd948f280b52645b320ea0745ec48b8d98c9d9b (diff) | |
cleanup patch from Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'shared-core/sis_mm.c')
| -rw-r--r-- | shared-core/sis_mm.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/shared-core/sis_mm.c b/shared-core/sis_mm.c index 497f2026..611e5939 100644 --- a/shared-core/sis_mm.c +++ b/shared-core/sis_mm.c @@ -40,17 +40,6 @@ #include "sis_drv.h" #include "sis_ds.h" -drm_ioctl_desc_t sis_ioctls[] = { - [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)] = {sis_fb_alloc, 1, 0}, - [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_fb_free, 1, 0}, - [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] = {sis_ioctl_agp_init, 1, 1}, - [DRM_IOCTL_NR(DRM_SIS_AGP_ALLOC)] = {sis_ioctl_agp_alloc, 1, 0}, - [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)] = {sis_ioctl_agp_free, 1, 0}, - [DRM_IOCTL_NR(DRM_SIS_FB_INIT)] = {sis_fb_init, 1, 1} -}; - -int sis_max_ioctl = DRM_ARRAY_SIZE(sis_ioctls); - #define MAX_CONTEXT 100 #define VIDEO_TYPE 0 #define AGP_TYPE 1 @@ -92,12 +81,12 @@ static int del_alloc_set(int context, int type, unsigned int val) /* fb management via fb device */ #if defined(__linux__) && defined(CONFIG_FB_SIS) -int sis_fb_init(DRM_IOCTL_ARGS) +static int sis_fb_init(DRM_IOCTL_ARGS) { return 0; } -int sis_fb_alloc(DRM_IOCTL_ARGS) +static int sis_fb_alloc(DRM_IOCTL_ARGS) { drm_sis_mem_t fb; struct sis_memreq req; @@ -130,7 +119,7 @@ int sis_fb_alloc(DRM_IOCTL_ARGS) return retval; } -int sis_fb_free(DRM_IOCTL_ARGS) +static int sis_fb_free(DRM_IOCTL_ARGS) { drm_sis_mem_t fb; int retval = 0; @@ -161,7 +150,7 @@ int sis_fb_free(DRM_IOCTL_ARGS) * X driver/sisfb HW- Command- * framebuffer memory DRI heap Cursor queue */ -int sis_fb_init(DRM_IOCTL_ARGS) +static int sis_fb_init(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -187,7 +176,7 @@ int sis_fb_init(DRM_IOCTL_ARGS) return 0; } -int sis_fb_alloc(DRM_IOCTL_ARGS) +static int sis_fb_alloc(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -224,7 +213,7 @@ int sis_fb_alloc(DRM_IOCTL_ARGS) return retval; } -int sis_fb_free(DRM_IOCTL_ARGS) +static int sis_fb_free(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -251,7 +240,7 @@ int sis_fb_free(DRM_IOCTL_ARGS) /* agp memory management */ -int sis_ioctl_agp_init(DRM_IOCTL_ARGS) +static int sis_ioctl_agp_init(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -278,7 +267,7 @@ int sis_ioctl_agp_init(DRM_IOCTL_ARGS) return 0; } -int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS) +static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -315,7 +304,7 @@ int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS) return retval; } -int sis_ioctl_agp_free(DRM_IOCTL_ARGS) +static int sis_ioctl_agp_free(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; @@ -416,3 +405,14 @@ int sis_final_context(struct drm_device *dev, int context) return 1; } + +drm_ioctl_desc_t sis_ioctls[] = { + [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)] = {sis_fb_alloc, 1, 0}, + [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_fb_free, 1, 0}, + [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] = {sis_ioctl_agp_init, 1, 1}, + [DRM_IOCTL_NR(DRM_SIS_AGP_ALLOC)] = {sis_ioctl_agp_alloc, 1, 0}, + [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)] = {sis_ioctl_agp_free, 1, 0}, + [DRM_IOCTL_NR(DRM_SIS_FB_INIT)] = {sis_fb_init, 1, 1} +}; + +int sis_max_ioctl = DRM_ARRAY_SIZE(sis_ioctls); |