| 45,21 → 45,25 |
|---|
| #include <ddi/device.h> |
| #include <ddi/irq.h> |
| #include <arch/drivers/pic.h> |
| #include <macros.h> |
| #include <string.h> |
| |
| #define IRQ_COUNT 64 |
| #define IRQ_COUNT 64 |
| |
| bootinfo_t bootinfo; |
| |
| /** Performs ppc32-specific initialization before main_bsp() is called. */ |
| void arch_pre_main(void) |
| { |
| /* Setup usermode */ |
| init.cnt = bootinfo.taskmap.count; |
| |
| uint32_t i; |
| |
| for (i = 0; i < bootinfo.taskmap.count; i++) { |
| for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) { |
| init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr); |
| init.tasks[i].size = bootinfo.taskmap.tasks[i].size; |
| strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name, |
| CONFIG_TASK_NAME_BUFLEN); |
| } |
| } |
| |
| 76,34 → 80,47 |
|---|
| { |
| if (config.cpu_active == 1) { |
| /* Initialize framebuffer */ |
| unsigned int visual; |
| |
| switch (bootinfo.screen.bpp) { |
| case 8: |
| visual = VISUAL_INDIRECT_8; |
| break; |
| case 16: |
| visual = VISUAL_RGB_5_5_5; |
| break; |
| case 24: |
| visual = VISUAL_RGB_8_8_8; |
| break; |
| case 32: |
| visual = VISUAL_RGB_0_8_8_8; |
| break; |
| default: |
| panic("Unsupported bits per pixel"); |
| if (bootinfo.screen.addr) { |
| unsigned int visual; |
| |
| switch (bootinfo.screen.bpp) { |
| case 8: |
| visual = VISUAL_INDIRECT_8; |
| break; |
| case 16: |
| visual = VISUAL_RGB_5_5_5; |
| break; |
| case 24: |
| visual = VISUAL_RGB_8_8_8; |
| break; |
| case 32: |
| visual = VISUAL_RGB_0_8_8_8; |
| break; |
| default: |
| panic("Unsupported bits per pixel."); |
| } |
| fb_properties_t prop = { |
| .addr = bootinfo.screen.addr, |
| .offset = 0, |
| .x = bootinfo.screen.width, |
| .y = bootinfo.screen.height, |
| .scan = bootinfo.screen.scanline, |
| .visual = visual, |
| }; |
| fb_init(&prop); |
| } |
| fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.scanline, visual); |
| |
| /* Initialize IRQ routing */ |
| irq_init(IRQ_COUNT, IRQ_COUNT); |
| |
| /* Initialize PIC */ |
| pic_init(bootinfo.keyboard.addr, PAGE_SIZE); |
| |
| /* Initialize I/O controller */ |
| cuda_init(device_assign_devno(), bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE); |
| if (bootinfo.macio.addr) { |
| /* Initialize PIC */ |
| pic_init(bootinfo.macio.addr, PAGE_SIZE); |
| |
| /* Initialize I/O controller */ |
| cuda_init(device_assign_devno(), |
| bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE); |
| } |
| |
| /* Merge all zones to 1 big zone */ |
| zone_merge_all(); |
| 128,11 → 145,13 |
|---|
| |
| void userspace(uspace_arg_t *kernel_uarg) |
| { |
| userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry); |
| userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, |
| (uintptr_t) kernel_uarg->uspace_stack + |
| THREAD_STACK_SIZE - SP_DELTA, |
| (uintptr_t) kernel_uarg->uspace_entry); |
| |
| /* Unreachable */ |
| for (;;) |
| ; |
| while (true); |
| } |
| |
| /** Acquire console back for kernel |
| 140,7 → 159,7 |
|---|
| */ |
| void arch_grab_console(void) |
| { |
| cuda_grab(); |
| fb_redraw(); |
| } |
| |
| /** Return console to userspace |
| 148,8 → 167,21 |
|---|
| */ |
| void arch_release_console(void) |
| { |
| cuda_release(); |
| } |
| |
| /** 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; |
| } |
| |
| /** @} |
| */ |