WebSVN – HelenOS – Path Comparison – / – /branches/dynload/kernel/arch/ia64/src/ia64.c Rev 4337 and /branches/dynload/kernel/arch/ia64/src/ia64.c Rev 4338

Ignore whitespace Rev 4337 → Rev 4338

 /branches/dynload/kernel/arch/ia64/src/ia64.c
 ,8 → 51,9
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
+#include <arch/bootinfo.h>
 #include <arch/drivers/ega.h>
-#include <arch/bootinfo.h>
+#include <genarch/drivers/ega/ega.h>
 #include <genarch/kbd/i8042.h>
 #include <genarch/kbd/ns16550.h>
 #include <smp/smp.h>
 ,52 → 63,36
 #include <print.h>
 #include <sysinfo/sysinfo.h>
-/*NS16550 as a COM 1*/
-#define NS16550_IRQ (4+LAGACY_INTERRUPT_BASE)
-#define NS16550_PORT 0x3f8
+/* NS16550 as a COM 1 */
+#define NS16550_IRQ (4 + LEGACY_INTERRUPT_BASE)
+#define NS16550_PORT    0x3f8
 bootinfo_t *bootinfo;
-static uint64_t iosapic_base=0xfec00000;
+static uint64_t iosapic_base = 0xfec00000;
 void arch_pre_main(void)
 {
     /* Setup usermode init tasks. */
-//#ifdef I460GX
     unsigned int i;
     init.cnt = bootinfo->taskmap.count;
     for (i = 0; i < init.cnt; i++) {
-        init.tasks[i].addr = ((unsigned long) bootinfo->taskmap.tasks[i].addr) | VRN_MASK;
+        init.tasks[i].addr =
+            ((unsigned long) bootinfo->taskmap.tasks[i].addr) |
+            VRN_MASK;
         init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
     }
-/*
-#else
-    init.cnt = 8;
-    init.tasks[0].addr = INIT0_ADDRESS;
-    init.tasks[0].size = INIT0_SIZE;
-    init.tasks[1].addr = INIT0_ADDRESS + 0x400000;
-    init.tasks[1].size = INIT0_SIZE;
-    init.tasks[2].addr = INIT0_ADDRESS + 0x800000;
-    init.tasks[2].size = INIT0_SIZE;
-    init.tasks[3].addr = INIT0_ADDRESS + 0xc00000;
-    init.tasks[3].size = INIT0_SIZE;
-    init.tasks[4].addr = INIT0_ADDRESS + 0x1000000;
-    init.tasks[4].size = INIT0_SIZE;
-    init.tasks[5].addr = INIT0_ADDRESS + 0x1400000;
-    init.tasks[5].size = INIT0_SIZE;
-    init.tasks[6].addr = INIT0_ADDRESS + 0x1800000;
-    init.tasks[6].size = INIT0_SIZE;
-    init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000;
-    init.tasks[7].size = INIT0_SIZE;
-#endif*/
 }
 void arch_pre_mm_init(void)
 {
-    /* Set Interruption Vector Address (i.e. location of interruption vector table). */
+    /*
+     * Set Interruption Vector Address (i.e. location of interruption vector
+     * table).
+     */
     iva_write((uintptr_t) &ivt);
     srlz_d();
 ,26 → 100,25
 static void iosapic_init(void)
 {
-    uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base))|FW_OFFSET;
+    uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base)) | FW_OFFSET;
     int i;
-    int myid,myeid;
+    int myid, myeid;
-    myid=ia64_get_cpu_id();
-    myeid=ia64_get_cpu_eid();
+    myid = ia64_get_cpu_id();
+    myeid = ia64_get_cpu_eid();
-    for(i=0;i<16;i++)
-    {
-        if(i==2) continue;   //Disable Cascade interrupt
-        ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i;
+    for (i = 0; i < 16; i++) {
+        if (i == 2)
+            continue;    /* Disable Cascade interrupt */
+        ((uint32_t *)(IOSAPIC + 0x00))[0] = 0x10 + 2 * i;
         srlz_d();
-        ((uint32_t*)(IOSAPIC+0x10))[0]=LAGACY_INTERRUPT_BASE+i;
+        ((uint32_t *)(IOSAPIC + 0x10))[0] = LEGACY_INTERRUPT_BASE + i;
         srlz_d();
-        ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i+1;
+        ((uint32_t *)(IOSAPIC + 0x00))[0] = 0x10 + 2 * i + 1;
         srlz_d();
-        ((uint32_t*)(IOSAPIC+0x10))[0]=myid<<(56-32) | myeid<<(48-32);
+        ((uint32_t *)(IOSAPIC + 0x10))[0] = myid << (56 - 32) |
+            myeid << (48 - 32);
         srlz_d();
     }
 ,15 → 127,13
 void arch_post_mm_init(void)
 {
-    if(config.cpu_active==1)
-    {
+    if (config.cpu_active == 1) {
         iosapic_init();
         irq_init(INR_COUNT, INR_COUNT);
 #ifdef SKI
         ski_init_console();
 #else
-        ega_init();
+        ega_init(EGA_BASE, EGA_VIDEORAM);
 #endif
     }
     it_init();
 ,57 → 169,38
 }
 #endif
-void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)));
-void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)))
-{
-    return;
-}
 void arch_post_smp_init(void)
 {
+    thread_t *t;
-    {
-        /*
-         * Create thread that polls keyboard.
-         */
+    /*
+     * Create thread that polls keyboard.
+     */
 #ifdef SKI
-        thread_t *t;
-        t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-        if (!t)
-            panic("cannot create kkbdpoll\n");
-        thread_ready(t);
+    t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
+    if (!t)
+        panic("cannot create kkbdpoll\n");
+    thread_ready(t);
 #endif
 #ifdef I460GX
-        devno_t kbd = device_assign_devno();
-        /* keyboard controller */
+    devno_t kbd = device_assign_devno();
 #ifdef CONFIG_NS16550
-        ns16550_init(kbd, NS16550_PORT, NS16550_IRQ,end_of_irq_void,NULL); // as a COM 1
+    ns16550_init(kbd, NS16550_PORT, NS16550_IRQ, NULL, NULL);
 #else
-        devno_t mouse = device_assign_devno();
-        i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+    devno_t mouse = device_assign_devno();
+    i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 #endif
-        thread_t *t;
-        t = thread_create(i8042_kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-        if (!t)
-            panic("cannot create kkbdpoll\n");
-        thread_ready(t);
+    t = thread_create(i8042_kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
+    if (!t)
+        panic("cannot create kkbdpoll\n");
+    thread_ready(t);
 #endif
-    }
     sysinfo_set_item_val("ia64_iospace", NULL, true);
     sysinfo_set_item_val("ia64_iospace.address", NULL, true);
     sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET);
 }
 ,26 → 212,25
     psr.value = psr_read();
     psr.cpl = PL_USER;
-    psr.i = true;               /* start with interrupts enabled */
+    psr.i = true;           /* start with interrupts enabled */
     psr.ic = true;
-    psr.ri = 0;             /* start with instruction #0 */
-    psr.bn = 1;             /* start in bank 0 */
+    psr.ri = 0;         /* start with instruction #0 */
+    psr.bn = 1;         /* start in bank 0 */
     asm volatile ("mov %0 = ar.rsc\n" : "=r" (rsc.value));
     rsc.loadrs = 0;
     rsc.be = false;
     rsc.pl = PL_USER;
-    rsc.mode = 3;               /* eager mode */
+    rsc.mode = 3;           /* eager mode */
     switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-                ((uintptr_t) kernel_uarg->uspace_stack)+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-                ((uintptr_t) kernel_uarg->uspace_stack)+PAGE_SIZE,
-                (uintptr_t) kernel_uarg->uspace_uarg,
-                psr.value, rsc.value);
+        ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE -
+        ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
+        ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE,
+        (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
-    while (1) {
+    while (1)
         ;
-    }
 }
 /** Set thread-local-storage pointer.
 ,13 → 250,14
 #ifdef SKI
     ski_kbd_grab();
 #else
-    #ifdef CONFIG_NS16550
-        ns16550_grab();
-    #else
-        i8042_grab();
-    #endif
+#ifdef CONFIG_NS16550
+    ns16550_grab();
+#else
+    i8042_grab();
 #endif
+#endif
 }
 /** Return console to userspace
  *
  */
 ,19 → 266,19
 #ifdef SKI
     ski_kbd_release();
 #else
-    #ifdef CONFIG_NS16550
-        ns16550_release();
-    #else
-        i8042_release();
-    #endif
+#ifdef CONFIG_NS16550
+    ns16550_release();
+#else
+    i8042_release();
+#endif
 #endif
 }
 void arch_reboot(void)
 {
-    outb(0x64,0xfe);
-    while (1);
+    outb(0x64, 0xfe);
+    while (1)
+        ;
 }
 /** @}

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4337 → Rev 4338