Changeset 00287cc in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2009-03-12T23:26:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

648c9d9

Parents:

3b122e9

Message:

arm32: update for the new scheme of device drivers and keyboard/serial modules
streamline arm32 port (as GXemul is still the only machine supported), more cleanup is needed

File:

• kernel/arch/arm32/src/arm32.c (modified) (5 diffs)

kernel/arch/arm32/src/arm32.c

@@ -40 +40 @@
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
+#include <genarch/drivers/dsrln/dsrlnin.h>
+#include <genarch/drivers/dsrln/dsrlnout.h>
+#include <genarch/srln/srln.h>
+#include <sysinfo/sysinfo.h>
 #include <ddi/irq.h>
-#include <arch/debug/print.h>
+#include <arch/drivers/gxemul.h>
 #include <print.h>
 #include <config.h>
 #include <interrupt.h>
 #include <arch/regutils.h>
-#include <arch/machine.h>
 #include <userspace.h>
 #include <macros.h>
@@ -76 +79 @@
 void arch_post_mm_init(void)
 {
-        machine_hw_map_init();
-
+        gxemul_init();
+        
         /* Initialize exception dispatch table */
         exception_init();
-
         interrupt_init();
         
-        machine_console_init(device_assign_devno());
-
 #ifdef CONFIG_FB
         fb_properties_t prop = {
-                .addr = machine_get_fb_address(),
+                .addr = GXEMUL_FB_ADDRESS,
                 .offset = 0,
                 .x = 640,
@@ -95 +95 @@
         };
         fb_init(&prop);
-#endif
+#else
+#ifdef CONFIG_ARM_PRN
+        dsrlnout_init((ioport8_t *) gxemul_kbd);
+#endif /* CONFIG_ARM_PRN */
+#endif /* CONFIG_FB */
 }
 
@@ -124 +128 @@
 void arch_post_smp_init(void)
 {
+#ifdef CONFIG_ARM_KBD
+        devno_t devno = device_assign_devno();
+        
+        /*
+         * Initialize the msim/GXemul keyboard port. Then initialize the serial line
+         * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+         */
+        indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) gxemul_kbd, devno, GXEMUL_KBD_IRQ);
+        if (kbrdin)
+                srln_init(kbrdin);
+        
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.devno", NULL, devno);
+        sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd);
+#endif
 }
 
@@ -157 +181 @@
 void cpu_halt(void)
 {
-        machine_cpu_halt();
+        *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET))
+                = 0;
 }