Move most platform code away from multiboot

include/kernel/platform.h

@@ -8,7 +8,12 @@
 # define UKERNEL_KERNEL_PLATFORM_H
 
 
-/* constants */
+/* functions */
 void platform_init(void);
 
+
+/* accessors */
+void platform_set_console(char const * bus, char const * name);
+void platform_set_display(char const * bus, char const * name);
+
 #endif /* !UKERNEL_KERNEL_PLATFORM_H */

src/kernel/multiboot.c

@@ -11,6 +11,7 @@
 # include <kernel/drivers/console.h>
 # include <kernel/drivers/display.h>
 # include <kernel/drivers/pic.h>
+# include <kernel/platform.h>
 # include "arch/amd64/gdt.h"
 # include "arch/i386/gdt.h"
 # include "arch/i386/idt.h"
@@ -45,19 +46,11 @@ static const IDT _idt[] =
 /* multiboot */
 int multiboot(ukMultibootInfo * mi)
 {
-	ukBus * ioportbus;
-	ukBus * vgabus;
-	ukBus * cmosbus;
 	char const * console = KERNEL_CONSOLE;
 	char const * display = KERNEL_DISPLAY;
 	size_t i;
 	ukMultibootMod * mod;
 
-	/* initialize the buses */
-	ioportbus = bus_init(NULL, "ioport");
-	vgabus = bus_init(ioportbus, "vga");
-	cmosbus = bus_init(ioportbus, "cmos");
-
 #ifdef notyet
 	/* detect the video driver to use */
 	if(mi->flags & BOOT_MULTIBOOT_INFO_HAS_VBE)
@@ -65,16 +58,13 @@ int multiboot(ukMultibootInfo * mi)
 #endif
 
 	/* initialize the display */
-	display_init(vgabus, display);
+	platform_set_display("vgaport", display);
 
 	/* initialize the console */
-	console_init(ioportbus, console);
+	platform_set_console("ioport", console);
 
-	/* initialize the PIC */
+	/* initialize the platform */
-	pic_init(ioportbus, "i8259a");
+	platform_init();
-
-	/* initialize the clock */
-	clock_init(cmosbus, "cmos");
 
 	/* report information on the boot process */
 	puts("DeforaOS Multiboot");

src/kernel/platform.c

@@ -1,3 +1,63 @@
 /* $Id$ */
 /* Copyright (c) 2018 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS uKernel */
+
+
+
+#include <kernel/drivers/console.h>
+#include <kernel/drivers/display.h>
+#include <kernel/platform.h>
+
+
+/* private */
+/* variables */
+static char const * _consolebus = NULL;
+static char const * _console = NULL;
+static char const * _displaybus = NULL;
+static char const * _display = NULL;
+
+
+/* prototypes */
+static ukBus * _platform_get_bus(char const * bus);
+
+
+/* public */
+/* functions */
+/* platform_init */
+void platform_init(void)
+{
+	ukBus * bus;
+
+	_platform_init_arch();
+	bus = (_displaybus != NULL) ? _platform_get_bus(_displaybus) : NULL;
+	display_init(bus, _display);
+	bus = (_consolebus != NULL) ? _platform_get_bus(_consolebus) : NULL;
+	console_init(bus, _console);
+}
+
+
+/* accessors */
+/* platform_set_console */
+void platform_set_console(char const * bus, char const * name)
+{
+	_consolebus = bus;
+	_console = name;
+}
+
+
+/* platform_set_display */
+void platform_set_display(char const * bus, char const * name)
+{
+	_displaybus = bus;
+	_display = name;
+}
+
+
+/* private */
+/* functions */
+/* platform_get_bus */
+static ukBus * _platform_get_bus(char const * bus)
+{
+	/* FIXME implement */
+	return NULL;
+}

src/kernel/platform.sh

@@ -108,10 +108,14 @@ $name $type $busname $args"
 	#begin the function
 	echo "
 	
-/* public */
+/* private */
+/* prototypes */
+static void _platform_init_arch(void);
+
+
 /* functions */
 /* platform_init */
-void platform_init(void)
+static void _platform_init_arch(void)
 {"
 
 	#list the buses

tools/platform.c

@@ -1,3 +1,10 @@
 /* $Id$ */
 /* Copyright (c) 2018 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS uKernel */
+
+
+/* platform_init */
+void platform_init(void)
+{
+	_platform_init_arch();
+}