From ac3c3571a714a38f7572f94c40fe143b43beb3b9 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Fri, 25 Aug 2000 12:45:53 +0000 Subject: Remove misleading authorship information from sis driver (author has been contacted and will provide improved information later) Rename sis_drm_public.h to sis_drm.h to be consistent with the other drivers. --- linux-core/sis_drv.c | 7 +------ linux/sis_drm.h | 32 ++++++++++++++++++++++++++++++++ linux/sis_drm_public.h | 32 -------------------------------- linux/sis_drv.c | 7 +------ linux/sis_drv.h | 5 ----- linux/sis_mm.c | 2 +- 6 files changed, 35 insertions(+), 50 deletions(-) create mode 100644 linux/sis_drm.h delete mode 100644 linux/sis_drm_public.h diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c index c04561ee..5dda149a 100644 --- a/linux-core/sis_drv.c +++ b/linux-core/sis_drv.c @@ -1,5 +1,4 @@ /* sis.c -- sis driver -*- linux-c -*- - * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com * * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. @@ -23,15 +22,11 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Authors: - * Rickard E. (Rik) Faith - * Daryll Strauss - * */ #include #include "drmP.h" -#include "sis_drm_public.h" +#include "sis_drm.h" #include "sis_drv.h" #define SIS_NAME "sis" diff --git a/linux/sis_drm.h b/linux/sis_drm.h new file mode 100644 index 00000000..dd14a5a5 --- /dev/null +++ b/linux/sis_drm.h @@ -0,0 +1,32 @@ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drm_public.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */ + +#ifndef _sis_drm_public_h_ +#define _sis_drm_public_h_ + +typedef struct { + int context; + unsigned int offset; + unsigned int size; + unsigned int free; +} drm_sis_mem_t; + +typedef struct { + unsigned int offset, size; +} drm_sis_agp_t; + +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 diff --git a/linux/sis_drm_public.h b/linux/sis_drm_public.h deleted file mode 100644 index dd14a5a5..00000000 --- a/linux/sis_drm_public.h +++ /dev/null @@ -1,32 +0,0 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drm_public.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */ - -#ifndef _sis_drm_public_h_ -#define _sis_drm_public_h_ - -typedef struct { - int context; - unsigned int offset; - unsigned int size; - unsigned int free; -} drm_sis_mem_t; - -typedef struct { - unsigned int offset, size; -} drm_sis_agp_t; - -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 diff --git a/linux/sis_drv.c b/linux/sis_drv.c index c04561ee..5dda149a 100644 --- a/linux/sis_drv.c +++ b/linux/sis_drv.c @@ -1,5 +1,4 @@ /* sis.c -- sis driver -*- linux-c -*- - * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com * * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. @@ -23,15 +22,11 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Authors: - * Rickard E. (Rik) Faith - * Daryll Strauss - * */ #include #include "drmP.h" -#include "sis_drm_public.h" +#include "sis_drm.h" #include "sis_drv.h" #define SIS_NAME "sis" diff --git a/linux/sis_drv.h b/linux/sis_drv.h index 50f6efad..24523b8f 100644 --- a/linux/sis_drv.h +++ b/linux/sis_drv.h @@ -1,5 +1,4 @@ /* sis_drv.h -- Private header for sis driver -*- linux-c -*- - * Created: Thu Oct 7 10:40:04 1999 by faith@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. @@ -23,10 +22,6 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Authors: - * Rickard E. (Rik) Faith - * Daryll Strauss - * */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */ diff --git a/linux/sis_mm.c b/linux/sis_mm.c index 1d6a2748..333b5196 100644 --- a/linux/sis_mm.c +++ b/linux/sis_mm.c @@ -2,7 +2,7 @@ #define __NO_VERSION__ #include "drmP.h" -#include "sis_drm_public.h" +#include "sis_drm.h" #include "sis_ds.h" #include "sis_drv.h" #include -- cgit v1.2.3