diff options
| author | delphij <delphij@FreeBSD.org> | 2009-09-21 08:17:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-09-21 08:17:57 +0000 |
| commit | fc497a4fc2accacc07b81af1bd635da98ff3dde8 (patch) | |
| tree | cb7019657600dfa7d0c10d79abcf3cb3b894cfb6 /sys/conf | |
| parent | edc53d153b5637fe9db281e1172dc6fd3b12b7a7 (diff) | |
| download | FreeBSD-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/conf')
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/conf/options | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 69a80a5..eb027ea 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2758,4 +2758,4 @@ options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 # x86 real mode emulator -options X86EMU +options X86BIOS diff --git a/sys/conf/files b/sys/conf/files index 2b99879..bdd1854 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2828,6 +2828,8 @@ dev/xen/netfront/netfront.c optional xen | xenhvm dev/xen/xenpci/xenpci.c optional xenpci dev/xen/xenpci/evtchn.c optional xenpci dev/xen/xenpci/machine_reboot.c optional xenpci -contrib/x86emu/x86emu.c optional x86emu | dpms | vesa -contrib/x86emu/x86emu_util.c optional x86emu | dpms | vesa +dev/x86bios/x86bios.c optional x86bios | dpms | vesa +dev/x86bios/x86bios_alloc.c optional x86bios | dpms | vesa +contrib/x86emu/x86emu.c optional x86bios | dpms | vesa +contrib/x86emu/x86emu_util.c optional x86bios | dpms | vesa diff --git a/sys/conf/options b/sys/conf/options index 4752fb8..1df09d7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -838,4 +838,4 @@ SND_FEEDER_RATE_HP opt_snd.h SND_PCM_64 opt_snd.h SND_OLDSTEREO opt_snd.h -X86EMU +X86BIOS |
