svn commit: r197444 - in head/sys: compat/x86bios conf dev/atkbdc dev/dpms dev/fb dev/x86bios modules/x86bios

[Jung-uk Kim]

Author: jkim
Date: Wed Sep 23 20:49:14 2009
New Revision: 197444
URL: http://svn.freebsd.org/changeset/base/197444

Log:
  Move sys/dev/x86bios to sys/compat/x86bios.
  
  It may not be optimal but it is clearly better than the old place.
  
  OK'ed by:	delphij, paradox (ddkprog yahoo com)

Added:
  head/sys/compat/x86bios/
     - copied from r197442, head/sys/dev/x86bios/
Deleted:
  head/sys/dev/x86bios/
Modified:
  head/sys/compat/x86bios/x86bios.c
  head/sys/compat/x86bios/x86bios_alloc.c
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/dev/atkbdc/atkbd.c
  head/sys/dev/dpms/dpms.c
  head/sys/dev/fb/vesa.c
  head/sys/modules/x86bios/Makefile

Modified: head/sys/compat/x86bios/x86bios.c
==============================================================================
--- head/sys/dev/x86bios/x86bios.c	Wed Sep 23 20:13:36 2009	(r197442)
+++ head/sys/compat/x86bios/x86bios.c	Wed Sep 23 20:49:14 2009	(r197444)
@@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$");
 
 #include <contrib/x86emu/x86emu.h>
 #include <contrib/x86emu/x86emu_regs.h>
-#include <dev/x86bios/x86bios.h>
+#include <compat/x86bios/x86bios.h>
 
 u_char *pbiosMem = NULL;
 static u_char *pbiosStack = NULL;

Modified: head/sys/compat/x86bios/x86bios_alloc.c
==============================================================================
--- head/sys/dev/x86bios/x86bios_alloc.c	Wed Sep 23 20:13:36 2009	(r197442)
+++ head/sys/compat/x86bios/x86bios_alloc.c	Wed Sep 23 20:49:14 2009	(r197444)
@@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
-#include <dev/x86bios/x86bios.h>
+#include <compat/x86bios/x86bios.h>
 
 extern u_char *pbiosMem;
 extern int busySegMap[5];

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/conf/files.amd64	Wed Sep 23 20:49:14 2009	(r197444)
@@ -297,8 +297,7 @@ libkern/memset.c		standard
 #
 # x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
 #
-dev/x86bios/x86bios.c		optional x86bios | atkbd | dpms | vesa
-dev/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa
 contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
 contrib/x86emu/x86emu_util.c	optional x86bios | atkbd | dpms | vesa
-
+compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
+compat/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/conf/files.i386	Wed Sep 23 20:49:14 2009	(r197444)
@@ -381,7 +381,7 @@ i386/xbox/pic16l.s		optional xbox
 #
 # x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
 #
-dev/x86bios/x86bios.c		optional x86bios | atkbd | dpms | vesa
-dev/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa
 contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
 contrib/x86emu/x86emu_util.c	optional x86bios | atkbd | dpms | vesa
+compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
+compat/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa

Modified: head/sys/dev/atkbdc/atkbd.c
==============================================================================
--- head/sys/dev/atkbdc/atkbd.c	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/dev/atkbdc/atkbd.c	Wed Sep 23 20:49:14 2009	(r197444)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #if 0
 #include <machine/md_var.h>
 #include <machine/psl.h>
-#include <dev/x86bios/x86bios.h>
+#include <compat/x86bios/x86bios.h>
 #include <machine/pc/bios.h>
 
 #include <vm/vm.h>

Modified: head/sys/dev/dpms/dpms.c
==============================================================================
--- head/sys/dev/dpms/dpms.c	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/dev/dpms/dpms.c	Wed Sep 23 20:49:14 2009	(r197444)
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 #include <sys/module.h>
 
-#include <dev/x86bios/x86bios.h>
+#include <compat/x86bios/x86bios.h>
 
 /*
  * VESA DPMS States 

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/dev/fb/vesa.c	Wed Sep 23 20:49:14 2009	(r197444)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <isa/isareg.h>
 
-#include <dev/x86bios/x86bios.h>
+#include <compat/x86bios/x86bios.h>
 
 #define	VESA_VIA_CLE266		"VIA CLE266\r\n"
 

Modified: head/sys/modules/x86bios/Makefile
==============================================================================
--- head/sys/modules/x86bios/Makefile	Wed Sep 23 20:37:00 2009	(r197443)
+++ head/sys/modules/x86bios/Makefile	Wed Sep 23 20:49:14 2009	(r197444)
@@ -4,7 +4,7 @@ KMOD=	x86bios
 SRCS=	opt_x86bios.h
 
 .PATH:	${.CURDIR}/../../contrib/x86emu
-.PATH:	${.CURDIR}/../../dev/x86bios
+.PATH:	${.CURDIR}/../../compat/x86bios
 SRCS+=	x86bios.c x86bios_alloc.c x86emu.c x86emu_util.c
 
 .include <bsd.kmod.mk>