Modify the way that the drivers dir works. We now only build dev.c and

do everything from there. I'd liek to move this into the main kernel
once we figure out how to make the rest of our devices load at
run time without needing to have small headers to include their init
routines.

This is a step along the way, but at present the console modules
can't be loaded that way.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@174 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kernel/drivers/Jamfile

@@ -2,15 +2,14 @@ SubDir OBOS_TOP src kernel drivers ;
 
 KernelStaticLibrary libdrivers : 
 	<$(SOURCE_GRIST)>dev.c 
-	<$(SOURCE_GRIST)>devs.c
+#	<$(SOURCE_GRIST)>devs.c
+
 	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/console/console.c
-	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/keyboard/keyboard.c
-	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/ps2mouse/ps2mouse.c
 
 	<$(SOURCE_GRIST)>fb_console/fb_console.c
 	:
 	-fno-pic -Wno-unused
 	;
 
-#SubInclude OBOS_TOP src kernel drivers arch ;
+SubInclude OBOS_TOP src kernel drivers arch ;
 #SubInclude OBOS_TOP src kernel drivers common ;

src/kernel/drivers/arch/x86/Jamfile

@@ -1,5 +1,3 @@
 SubDir OBOS_TOP src kernel drivers arch x86 ;
 
 SubInclude OBOS_TOP src kernel drivers arch x86 console ;
-SubInclude OBOS_TOP src kernel drivers arch x86 keyboard ;
-SubInclude OBOS_TOP src kernel drivers arch x86 ps2mouse ;

src/kernel/drivers/arch/x86/console/console.c

@@ -9,7 +9,7 @@
 #include <int.h>
 #include <vm.h>
 #include <lock.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <Errors.h>
 #include <devfs.h>
 

src/kernel/drivers/dev.c

@@ -12,9 +12,15 @@
 #include <elf.h>
 #include <Errors.h>
 #include <devfs.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <memheap.h>
 
+#ifdef ARCH_x86
+#include <arch/x86/console_dev.h>
+#endif
+
+#include <fb_console.h>
+
 #include <stdio.h>
 
 /* These are mainly here to allow testing and this needs to be revisited */
@@ -48,6 +54,14 @@ int dev_init(kernel_args *ka)
 		}
 	}
 
+	/* now run the oddballs we have, consoles at present */
+	/* XXX - these are x86 and may not be applicable to all platforms */
+#ifdef ARCH_x86
+	console_dev_init(ka);
+#endif
+
+	fb_console_dev_init(ka);
+
 	return 0;
 }
 

src/kernel/drivers/devs.c

@@ -6,9 +6,6 @@
 #include <devs.h>
 
 #ifdef ARCH_x86
-#include <arch/x86/console_dev.h>
-#include <arch/x86/keyboard.h>
-#include <arch/x86/ps2mouse.h>
 #endif
 #ifdef ARCH_sh4
 #include <kernel/dev/arch/sh4/maple/maple_bus.h>
@@ -22,8 +19,8 @@ int devs_init(kernel_args *ka)
 {
 
 #ifdef ARCH_x86
-	keyboard_dev_init(ka);
-	console_dev_init(ka);
+//	keyboard_dev_init(ka);
+//	console_dev_init(ka);
 #endif
 
 #ifdef ARCH_sh4

src/kernel/drivers/fb_console/fb_console.c

@@ -10,7 +10,7 @@
 #include <vm.h>
 #include <lock.h>
 #include <devfs.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <Errors.h>
 
 #include <arch/cpu.h>