Changeset 6ac14a70 in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2009-07-28T12:47:31Z (16 years ago)

Author:

Vineeth Pillai <vineethrp@…>

Branches:

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

Children:

5e73815

Parents:

7038f55

Message:

ARM port for development board integratorcp(ARM926EJ core module).

File:

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

kernel/arch/arm32/src/arm32.c

@@ -38 +38 @@
 #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 <console/console.h>
 #include <ddi/irq.h>
-#include <arch/drivers/gxemul.h>
+#include <arch/machine.h>
 #include <print.h>
 #include <config.h>
@@ -78 +75 @@
 void arch_post_mm_init(void)
 {
-        gxemul_init();
+        machine_init();
         
         /* Initialize exception dispatch table */
@@ -85 +82 @@
         
 #ifdef CONFIG_FB
-        fb_properties_t prop = {
-                .addr = GXEMUL_FB_ADDRESS,
-                .offset = 0,
-                .x = 640,
-                .y = 480,
-                .scan = 1920,
-                .visual = VISUAL_BGR_8_8_8,
-        };
-        fb_init(&prop);
+        machine_fb_init();
 #else
 #ifdef CONFIG_ARM_PRN
-        dsrlnout_init((ioport8_t *) gxemul_kbd);
+        machine_output_init();
 #endif /* CONFIG_ARM_PRN */
 #endif /* CONFIG_FB */
@@ -127 +116 @@
 void arch_post_smp_init(void)
 {
-#ifdef CONFIG_ARM_KBD
-        /*
-         * Initialize the GXemul keyboard port. Then initialize the serial line
-         * module and connect it to the GXemul keyboard.
-         */
-        dsrlnin_instance_t *dsrlnin_instance
-            = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ);
-        if (dsrlnin_instance) {
-                srln_instance_t *srln_instance = srln_init();
-                if (srln_instance) {
-                        indev_t *sink = stdin_wire();
-                        indev_t *srln = srln_wire(srln_instance, sink);
-                        dsrlnin_wire(dsrlnin_instance, srln);
-                }
-        }
-        
-        /*
-         * 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.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd);
-#endif
+        machine_input_init();
 }
 
@@ -157 +123 @@
 void before_task_runs_arch(void)
 {
-        tlb_invalidate_all();
 }
 
@@ -169 +134 @@
         uint8_t *stck;
         
+        tlb_invalidate_all();
         stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
         supervisor_sp = (uintptr_t) stck;
@@ -184 +150 @@
 void cpu_halt(void)
 {
-        *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET))
-                = 0;
+        machine_cpu_halt();
 }
 
@@ -212 +177 @@
 void arch_grab_console(void)
 {
+        machine_grab_console();
 #ifdef CONFIG_FB
         fb_redraw();
@@ -220 +186 @@
 void arch_release_console(void)
 {
+        machine_release_console();
 }