| 76,6 → 76,7 |
|---|
| { |
| if (config.cpu_active == 1) { |
| /* Initialize framebuffer */ |
| if (bootinfo.screen.addr) { |
| unsigned int visual; |
| |
| switch (bootinfo.screen.bpp) { |
| 103,16 → 104,19 |
|---|
| .visual = visual, |
| }; |
| fb_init(&prop); |
| } |
| |
| /* Initialize IRQ routing */ |
| irq_init(IRQ_COUNT, IRQ_COUNT); |
| |
| if (bootinfo.macio.addr) { |
| /* Initialize PIC */ |
| pic_init(bootinfo.keyboard.addr, PAGE_SIZE); |
| pic_init(bootinfo.macio.addr, PAGE_SIZE); |
| |
| /* Initialize I/O controller */ |
| cuda_init(device_assign_devno(), |
| bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE); |
| bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE); |
| } |
| |
| /* Merge all zones to 1 big zone */ |
| zone_merge_all(); |
| 143,8 → 147,7 |
|---|
| (uintptr_t) kernel_uarg->uspace_entry); |
| |
| /* Unreachable */ |
| for (;;) |
| ; |
| while (true); |
| } |
| |
| /** Acquire console back for kernel |