summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-09-21 08:17:57 +0000
committerdelphij <delphij@FreeBSD.org>2009-09-21 08:17:57 +0000
commitfc497a4fc2accacc07b81af1bd635da98ff3dde8 (patch)
treecb7019657600dfa7d0c10d79abcf3cb3b894cfb6 /sys/modules
parentedc53d153b5637fe9db281e1172dc6fd3b12b7a7 (diff)
downloadFreeBSD-src-fc497a4fc2accacc07b81af1bd635da98ff3dde8.zip
FreeBSD-src-fc497a4fc2accacc07b81af1bd635da98ff3dde8.tar.gz
Collapase interrupt supporting functions to a new module, and switch from
x86emu to this new module. This changeset also brings a fix for bugs introduced with the initial x86emu commit, which prevents the user from using some display mode or cause instant reboots during mode switch. Submitted by: paradox <ddkprog yahoo com>
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/x86bios/Makefile10
-rw-r--r--sys/modules/x86emu/Makefile8
3 files changed, 11 insertions, 9 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index c07dea8..b54314e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -298,7 +298,7 @@ SUBDIR= ${_3dfx} \
wlan_xauth \
${_wpi} \
${_wpifw} \
- x86emu \
+ x86bios \
${_xe} \
xfs \
xl \
diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile
new file mode 100644
index 0000000..5dc3811
--- /dev/null
+++ b/sys/modules/x86bios/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+KMOD= x86bios
+SRCS= opt_x86bios.h
+
+.PATH: ${.CURDIR}/../../contrib/x86emu
+.PATH: ${.CURDIR}/../../dev/x86bios
+SRCS+= x86bios.c x86bios_alloc.c x86emu.c x86emu_util.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/x86emu/Makefile b/sys/modules/x86emu/Makefile
deleted file mode 100644
index 3991d6c..0000000
--- a/sys/modules/x86emu/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../contrib/x86emu
-
-KMOD= x86emu
-SRCS= x86emu.c x86emu_util.c
-
-.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud