MFC x86emu/x86bios emulator and make previously i386 only dpms and vesa

framebuffer driver, etc. work on FreeBSD/amd64.

A significant amount of improvements were done by jkim@ during the recent
months to make vesa(4) work better, over the initial code import.  This
work is based on OpenBSD's x86emu implementation and contributed by
paradox <ddkprog yahoo com> and swell.k at gmail com.

Hopefully I have stolen all their work to 8-STABLE :)

All bugs in this commit are mine, as usual.

5 files changed, 38 insertions, 7 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 07e4bfb..9b7d550 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -300,6 +300,7 @@ SUBDIR=	${_3dfx} \
 	wlan_xauth \
 	${_wpi} \
 	${_wpifw} \
+	${_x86bios} \
 	${_xe} \
 	xfs \
 	xl \
@@ -463,6 +464,7 @@ _padlock=	padlock
 _s3=		s3
 _twa=		twa
 _vesa=		vesa
+_x86bios=	x86bios
 .elif ${MACHINE} == "pc98"
 _canbepm=	canbepm
 _canbus=	canbus
@@ -490,6 +492,7 @@ _cpufreq=	cpufreq
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
 .endif
+_dpms=		dpms
 _drm=		drm
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
@@ -538,14 +541,18 @@ _padlock=	padlock
 .endif
 _pccard=	pccard
 _rdma=		rdma	
+_s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
+_splash=	splash
 _sppp=		sppp
 _tmpfs=		tmpfs
 _twa=		twa
+_vesa=		vesa
+_x86bios=	x86bios
 _wi=		wi
 _wpi=		wpi
 _wpifw=		wpifw
diff --git a/sys/modules/dpms/Makefile b/sys/modules/dpms/Makefile
index a58072e..4eabf14 100644
--- a/sys/modules/dpms/Makefile
+++ b/sys/modules/dpms/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../i386/isa
-
 KMOD=	dpms
-SRCS=	dpms.c
-SRCS+=	bus_if.h device_if.h
+SRCS=	bus_if.h device_if.h pci_if.h
+
+.PATH:	${.CURDIR}/../../dev/dpms
+SRCS+=	dpms.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index eb49f93..69a0c33 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,8 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
-
 KMOD=	vesa
-SRCS=	vesa.c scvesactl.c opt_vga.h opt_vesa.h
+SRCS=	opt_vga.h opt_vesa.h
+SRCS+=	bus_if.h device_if.h pci_if.h
+
+.PATH:	${.CURDIR}/../../dev/fb
+SRCS+=	vesa.c
+
+.PATH:	${.CURDIR}/../../dev/syscons
+SRCS+=	scvesactl.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile
new file mode 100644
index 0000000..3cab285
--- /dev/null
+++ b/sys/modules/x86bios/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+KMOD=	x86bios
+SRCS=	opt_x86bios.h
+SRCS+=	bus_if.h device_if.h pci_if.h
+
+.PATH:	${.CURDIR}/../../contrib/x86emu
+.PATH:	${.CURDIR}/../../compat/x86bios
+SRCS+=	x86bios.c x86emu.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/x86emu/Makefile b/sys/modules/x86emu/Makefile
new file mode 100644
index 0000000..3991d6c
--- /dev/null
+++ b/sys/modules/x86emu/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/x86emu
+
+KMOD=	x86emu
+SRCS=	x86emu.c x86emu_util.c
+
+.include <bsd.kmod.mk>