Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/riastradh-drm2]: src/sys Add drm2 module ioconf glue.



details:   https://anonhg.NetBSD.org/src/rev/c95678901040
branches:  riastradh-drm2
changeset: 788208:c95678901040
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:43:09 2013 +0000

description:
Add drm2 module ioconf glue.

diffstat:

 sys/external/bsd/drm2/drm/drm_module.c |  94 ++++++++++++++++++++++++++++++++++
 sys/modules/drm2/Makefile              |   4 +-
 sys/modules/drm2/drm.ioconf            |  10 +++
 3 files changed, 107 insertions(+), 1 deletions(-)

diffs (137 lines):

diff -r 723d38bbf969 -r c95678901040 sys/external/bsd/drm2/drm/drm_module.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Wed Jul 24 02:43:09 2013 +0000
@@ -0,0 +1,94 @@
+/*     $NetBSD: drm_module.c,v 1.1.2.1 2013/07/24 02:43:09 riastradh Exp $     */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.1.2.1 2013/07/24 02:43:09 riastradh Exp $");
+
+#include <sys/types.h>
+#include <sys/device.h>
+#include <sys/module.h>
+#include <sys/systm.h>
+
+MODULE(MODULE_CLASS_MISC, drm, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+extern const struct cdevsw drm_cdevsw; /* XXX Put this in a header file?  */
+
+static int
+drm_modcmd(modcmd_t cmd, void *arg __unused)
+{
+#ifdef _MODULE
+       devmajor_t bmajor = NODEVMAJOR, cmajor = NODEVMAJOR;
+       int error;
+#endif
+
+       switch (cmd) {
+       case MODULE_CMD_INIT:
+#ifdef _MODULE
+               error = config_init_component(cfdriver_ioconf_drm,
+                   cfattach_ioconf_drm, cfdata_ioconf_drm);
+               if (error) {
+                       aprint_error("drm: unable to init component: %d\n",
+                           error);
+                       return error;
+               }
+               error = devsw_attach("drm", NULL, &bmajor,
+                   &drm_cdevsw, &cmajor);
+               if (error) {
+                       aprint_error("drm: unable to attach devsw: %d\n",
+                           error);
+                       (void)config_fini_component(cfdriver_ioconf_drm,
+                           cfattach_ioconf_drm, cfdata_ioconf_drm);
+                       return error;
+               }
+#endif
+               return 0;
+
+       case MODULE_CMD_FINI:
+#ifdef _MODULE
+               error = devsw_detach(NULL, &drm_cdevsw);
+               if (error)
+                       return error;
+               error = config_fini_component(cfdriver_ioconf_drm,
+                   cfattach_ioconf_drm, cfdata_ioconf_drm);
+               if (error)
+                       /* XXX Now what?  Reattach the devsw?  */
+                       return error;
+#endif
+               return 0;
+
+       default:
+               return ENOTTY;
+       }
+}
diff -r 723d38bbf969 -r c95678901040 sys/modules/drm2/Makefile
--- a/sys/modules/drm2/Makefile Wed Jul 24 02:42:40 2013 +0000
+++ b/sys/modules/drm2/Makefile Wed Jul 24 02:43:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.24 2013/07/24 02:42:19 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.25 2013/07/24 02:43:09 riastradh Exp $
 
 .include "../Makefile.inc"
 .include "Makefile.inc"
@@ -8,6 +8,7 @@
 .PATH: ${S}/external/bsd/drm2/dist/drm
 
 KMOD=  drm2
+IOCONF=        drm.ioconf
 
 #SRCS+=        ati_pcigart.c           # XXX Restore for ATI support.
 SRCS+= drm_agpsupport.c
@@ -44,6 +45,7 @@
 SRCS+= drm_stub.c
 #SRCS+=        drm_vm.c                # XXX Rewrite for uvm.
 
+SRCS+= drm_module.c
 SRCS+= linux_idr.c
 
 .include <bsd.kmodule.mk>
diff -r 723d38bbf969 -r c95678901040 sys/modules/drm2/drm.ioconf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/drm2/drm.ioconf       Wed Jul 24 02:43:09 2013 +0000
@@ -0,0 +1,10 @@
+#       $NetBSD: drm.ioconf,v 1.1.2.1 2013/07/24 02:43:09 riastradh Exp $
+
+ioconf drm
+
+include "conf/files"
+include "external/bsd/drm2/conf/files.drm2"
+
+pseudo-root    drmbus*
+
+drm*           at drmbus?



Home | Main Index | Thread Index | Old Index