Module Name: src
Committed By: jmcneill
Date: Sun Oct 24 16:31:36 UTC 2010
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Added Files:
src/sys/modules/wmidell: Makefile
src/sys/modules/wmihp: Makefile
src/sys/modules/wmimsi: Makefile
Log Message:
build wmi drivers as modules on x86
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.49 -r1.50 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmidell/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmihp/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmimsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.3 src/distrib/sets/lists/modules/md.amd64:1.4
--- src/distrib/sets/lists/modules/md.amd64:1.3 Mon May 31 20:32:28 2010
+++ src/distrib/sets/lists/modules/md.amd64 Sun Oct 24 16:31:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.3 2010/05/31 20:32:28 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.4 2010/10/24 16:31:35 jmcneill Exp $
./@MODULEDIR@/acpiverbose base-kernel-modules kmod
./@MODULEDIR@/acpiverbose/acpiverbose.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
@@ -21,3 +21,9 @@
./@MODULEDIR@/pad/pad.kmod base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmidell base-kernel-modules kmod
+./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmihp base-kernel-modules kmod
+./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmimsi base-kernel-modules kmod
+./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.4 src/distrib/sets/lists/modules/md.i386:1.5
--- src/distrib/sets/lists/modules/md.i386:1.4 Mon May 31 20:32:28 2010
+++ src/distrib/sets/lists/modules/md.i386 Sun Oct 24 16:31:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.4 2010/05/31 20:32:28 pgoyette Exp $
+# $NetBSD: md.i386,v 1.5 2010/10/24 16:31:35 jmcneill Exp $
./@MODULEDIR@/acpiverbose base-kernel-modules kmod
./@MODULEDIR@/acpiverbose/acpiverbose.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
@@ -27,3 +27,9 @@
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
./@MODULEDIR@/viadrm base-kernel-modules kmod
./@MODULEDIR@/viadrm/viadrm.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmidell base-kernel-modules kmod
+./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmihp base-kernel-modules kmod
+./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmimsi base-kernel-modules kmod
+./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.49 src/sys/modules/Makefile:1.50
--- src/sys/modules/Makefile:1.49 Wed Oct 20 14:50:22 2010
+++ src/sys/modules/Makefile Sun Oct 24 16:31:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/10/20 14:50:22 tsutsui Exp $
+# $NetBSD: Makefile,v 1.50 2010/10/24 16:31:35 jmcneill Exp $
.include <bsd.own.mk>
@@ -95,6 +95,13 @@
SUBDIR+= acpiverbose
.endif
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= wmidell
+SUBDIR+= wmihp
+SUBDIR+= wmimsi
+.endif
+
.if ${MACHINE_ARCH} == "x86_64"
SUBDIR+= azalia
SUBDIR+= compat_linux
Added files:
Index: src/sys/modules/wmidell/Makefile
diff -u /dev/null src/sys/modules/wmidell/Makefile:1.1
--- /dev/null Sun Oct 24 16:31:36 2010
+++ src/sys/modules/wmidell/Makefile Sun Oct 24 16:31:36 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/10/24 16:31:36 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/acpi/wmi
+
+KMOD= wmidell
+SRCS= wmi_dell.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/wmihp/Makefile
diff -u /dev/null src/sys/modules/wmihp/Makefile:1.1
--- /dev/null Sun Oct 24 16:31:36 2010
+++ src/sys/modules/wmihp/Makefile Sun Oct 24 16:31:36 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/10/24 16:31:36 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/acpi/wmi
+
+KMOD= wmihp
+SRCS= wmi_hp.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/wmimsi/Makefile
diff -u /dev/null src/sys/modules/wmimsi/Makefile:1.1
--- /dev/null Sun Oct 24 16:31:36 2010
+++ src/sys/modules/wmimsi/Makefile Sun Oct 24 16:31:36 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/10/24 16:31:36 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/acpi/wmi
+
+KMOD= wmimsi
+SRCS= wmi_msi.c
+
+.include <bsd.kmodule.mk>
