diff options
author | Eric Anholt <anholt@freebsd.org> | 2003-08-29 20:54:26 +0000 |
---|---|---|
committer | Eric Anholt <anholt@freebsd.org> | 2003-08-29 20:54:26 +0000 |
commit | f634f687592bca690a9bc045661005c77854647b (patch) | |
tree | c90cc4351941027802155c073652d0f3aac0903a | |
parent | fabc64dd573f01a2160be474b4abc65a3a9aa5ea (diff) |
These files were missed in the SiS DRM commit.
-rw-r--r-- | bsd-core/sis/Makefile | 23 | ||||
-rw-r--r-- | bsd-core/sis_drv.c | 59 | ||||
-rw-r--r-- | bsd/sis/Makefile | 23 | ||||
-rw-r--r-- | bsd/sis_drv.c | 59 |
4 files changed, 164 insertions, 0 deletions
diff --git a/bsd-core/sis/Makefile b/bsd-core/sis/Makefile new file mode 100644 index 00000000..e6439499 --- /dev/null +++ b/bsd-core/sis/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/.. +KMOD= sis +NOMAN= YES +SRCS= sis_drv.c sis_ds.c sis_mm.c +SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h +CFLAGS+= ${DEBUG_FLAGS} -I. -I.. + +.if defined(DRM_DEBUG) +DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" +.endif + +.if !defined(DRM_NOLINUX) +DRM_LINUX_OPT= "\#define DRM_LINUX 1" +.endif + +opt_drm.h: + touch opt_drm.h + echo $(DRM_DEBUG_OPT) >> opt_drm.h + echo $(DRM_LINUX_OPT) >> opt_drm.h + +.include <bsd.kmod.mk> diff --git a/bsd-core/sis_drv.c b/bsd-core/sis_drv.c new file mode 100644 index 00000000..13be07a2 --- /dev/null +++ b/bsd-core/sis_drv.c @@ -0,0 +1,59 @@ +/* sis.c -- sis driver -*- linux-c -*- + * + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#include "sis.h" +#include "drmP.h" +#include "sis_drm.h" +#include "sis_drv.h" + +drm_chipinfo_t DRM(devicelist)[] = { + {0x1039, 0x0300, 1, "SiS 300"}, + {0x1039, 0x5300, 1, "SiS 540"}, + {0x1039, 0x6300, 1, "SiS 630"}, + {0, 0, 0, NULL} +}; + +#include "drm_auth.h" +#include "drm_agpsupport.h" +#include "drm_bufs.h" +#include "drm_context.h" +#include "drm_dma.h" +#include "drm_drawable.h" +#include "drm_drv.h" +#include "drm_fops.h" +#include "drm_ioctl.h" +#include "drm_lock.h" +#include "drm_memory.h" +#include "drm_vm.h" +#include "drm_sysctl.h" + +#ifdef __FreeBSD__ +/* Avoid clash with sis ethernet */ +DRIVER_MODULE(sisdrm, pci, sis_driver, sis_devclass, 0, 0); +#elif defined(__NetBSD__) +CFDRIVER_DECL(sis, DV_TTY, NULL); +#endif /* __FreeBSD__ */ diff --git a/bsd/sis/Makefile b/bsd/sis/Makefile new file mode 100644 index 00000000..e6439499 --- /dev/null +++ b/bsd/sis/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/.. +KMOD= sis +NOMAN= YES +SRCS= sis_drv.c sis_ds.c sis_mm.c +SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h +CFLAGS+= ${DEBUG_FLAGS} -I. -I.. + +.if defined(DRM_DEBUG) +DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" +.endif + +.if !defined(DRM_NOLINUX) +DRM_LINUX_OPT= "\#define DRM_LINUX 1" +.endif + +opt_drm.h: + touch opt_drm.h + echo $(DRM_DEBUG_OPT) >> opt_drm.h + echo $(DRM_LINUX_OPT) >> opt_drm.h + +.include <bsd.kmod.mk> diff --git a/bsd/sis_drv.c b/bsd/sis_drv.c new file mode 100644 index 00000000..13be07a2 --- /dev/null +++ b/bsd/sis_drv.c @@ -0,0 +1,59 @@ +/* sis.c -- sis driver -*- linux-c -*- + * + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#include "sis.h" +#include "drmP.h" +#include "sis_drm.h" +#include "sis_drv.h" + +drm_chipinfo_t DRM(devicelist)[] = { + {0x1039, 0x0300, 1, "SiS 300"}, + {0x1039, 0x5300, 1, "SiS 540"}, + {0x1039, 0x6300, 1, "SiS 630"}, + {0, 0, 0, NULL} +}; + +#include "drm_auth.h" +#include "drm_agpsupport.h" +#include "drm_bufs.h" +#include "drm_context.h" +#include "drm_dma.h" +#include "drm_drawable.h" +#include "drm_drv.h" +#include "drm_fops.h" +#include "drm_ioctl.h" +#include "drm_lock.h" +#include "drm_memory.h" +#include "drm_vm.h" +#include "drm_sysctl.h" + +#ifdef __FreeBSD__ +/* Avoid clash with sis ethernet */ +DRIVER_MODULE(sisdrm, pci, sis_driver, sis_devclass, 0, 0); +#elif defined(__NetBSD__) +CFDRIVER_DECL(sis, DV_TTY, NULL); +#endif /* __FreeBSD__ */ |