WebSVN – HelenOS – Diff – /branches/tracing/kernel/arch/mips32/src/mips32.c

  */
 /** @file
  */
 #include <arch.h>
-#include <arch/boot.h>
 #include <arch/cp0.h>
 #include <arch/exception.h>
 #include <mm/as.h>
 #include <userspace.h>
-#include <arch/console.h>
 #include <memstr.h>
 #include <proc/thread.h>
 #include <proc/uarg.h>
 #include <print.h>
+#include <console/console.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/interrupt.h>
 #include <console/chardev.h>
 #include <arch/barrier.h>
 #include <arch/debugger.h>
 #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 <macros.h>
-#include <ddi/device.h>
+#include <config.h>
+#include <string.h>
+#include <arch/drivers/msim.h>
 #include <arch/asm/regname.h>
 /* Size of the code jumping to the exception handler code
  * - J+NOP
  */
-#define EXCEPTION_JUMP_SIZE    8
+#define EXCEPTION_JUMP_SIZE  8
-#define TLB_EXC ((char *) 0x80000000)
+#define TLB_EXC    ((char *) 0x80000000)
-#define NORM_EXC ((char *) 0x80000180)
+#define NORM_EXC   ((char *) 0x80000180)
-#define CACHE_EXC ((char *) 0x80000100)
+#define CACHE_EXC  ((char *) 0x80000100)
 /* Why the linker moves the variable 64K away in assembler
- * when not in .text section ????????
+ * when not in .text section?
  */
-uintptr_t supervisor_sp __attribute__ ((section (".text")));
 /* Stack pointer saved when entering user mode */
-/* TODO: How do we do it on SMP system???? */
-bootinfo_t bootinfo __attribute__ ((section (".text")));
+uintptr_t supervisor_sp __attribute__ ((section (".text")));
-void arch_pre_main(void)
+count_t cpu_count = 0;
+/** Performs mips32-specific initialization before main_bsp() is called. */
+void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
+{
     /* Setup usermode */
-    init.cnt = bootinfo.cnt;
+    init.cnt = bootinfo->cnt;
-    uint32_t i;
+    count_t i;
+    for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
+        init.tasks[i].addr = bootinfo->tasks[i].addr;
+        init.tasks[i].size = bootinfo->tasks[i].size;
+        str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
+            bootinfo->tasks[i].name);
+    }
-    for (i = 0; i < bootinfo.cnt; i++) {
+    for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
-        init.tasks[i].addr = bootinfo.tasks[i].addr;
+        if ((bootinfo->cpumap & (1 << i)) != 0)
-        init.tasks[i].size = bootinfo.tasks[i].size;
+            cpu_count++;
+    }
+}
 void arch_pre_mm_init(void)
+{
      * Switch to BEV normal level so that exception vectors point to the
      * kernel. Clear the error level.
      */
     cp0_status_write(cp0_status_read() &
         ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit));
     /*
      * Mask all interrupts
      */
     cp0_mask_all_int();
     debugger_init();
+}
 void arch_post_mm_init(void)
+{
     interrupt_init();
-    console_init(device_assign_devno());
 #ifdef CONFIG_FB
     /* GXemul framebuffer */
     fb_properties_t gxemul_prop = {
         .addr = 0x12000000,
         .offset = 0,
         .x = 640,
         .y = 480,
         .scan = 1920,
-        .visual = VISUAL_RGB_8_8_8,
+        .visual = VISUAL_BGR_8_8_8,
     };
     fb_init(&gxemul_prop);
-#endif
+#else
+#ifdef CONFIG_MIPS_PRN
-    sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
+    dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
+#endif /* CONFIG_MIPS_PRN */
+#endif /* CONFIG_FB */
+}
 void arch_post_cpu_init(void)
+{
+}
+{
+}
 void arch_post_smp_init(void)
+{
+#ifdef CONFIG_MIPS_KBD
+    /*
+     * Initialize the msim/GXemul keyboard port. Then initialize the serial line
+     * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+     */
+    dsrlnin_instance_t *dsrlnin_instance
+        = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_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);
+            cp0_unmask_int(MSIM_KBD_IRQ);
+        }
+    }
+    /*
+     * 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, MSIM_KBD_IRQ);
+    sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
+#endif
+}
+void calibrate_delay_loop(void)
+{
+}
 void userspace(uspace_arg_t *kernel_uarg)
+{
     /* EXL = 1, UM = 1, IE = 1 */
     cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
     userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + PAGE_SIZE),
         (uintptr_t) kernel_uarg->uspace_uarg,
         (uintptr_t) kernel_uarg->uspace_entry);
-    while (1)
+    while (1);
-        ;
+}
 /** Perform mips32 specific tasks needed before the new task is run. */
 void before_task_runs_arch(void)
+{
+}
 void arch_reboot(void)
+{
     ___halt();
+    while (1);
+}
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
+void arch_grab_console(void)
+{
+#ifdef CONFIG_FB
-    while (1)
+    fb_redraw();
+#endif
+}
+/** Return console to userspace
+ *
-        ;
+ */
+void arch_release_console(void)
+{
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/arch/mips32/src/mips32.c @ 4692 – Rev 3675 → 4377