| 94,15 → 94,7 |
|---|
| 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); |
| 111,8 → 103,7 |
|---|
| pic_init(bootinfo.keyboard.addr, PAGE_SIZE); |
| |
| /* Initialize I/O controller */ |
| cuda_init(device_assign_devno(), |
| bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE); |
| cuda_init(device_assign_devno(), bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE); |
| |
| /* Merge all zones to 1 big zone */ |
| zone_merge_all(); |
| 137,10 → 128,7 |
|---|
| |
| 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 (;;) |