Index: boot/arch/ppc32/loader/main.c =================================================================== --- boot/arch/ppc32/loader/main.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ boot/arch/ppc32/loader/main.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -90,5 +90,5 @@ static void version_print(void) { - printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp); + printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n\n", release, revision, timestamp); } @@ -108,22 +108,26 @@ if (!ofw_memmap(&bootinfo.memmap)) { - printf("Error: unable to get memory map, halting.\n"); + printf("Error: Unable to get memory map, halting.\n"); halt(); } if (bootinfo.memmap.total == 0) { - printf("Error: no memory detected, halting.\n"); + printf("Error: No memory detected, halting.\n"); halt(); } if (!ofw_screen(&bootinfo.screen)) - printf("Warning: unable to get screen properties.\n"); + printf("Warning: Unable to get screen properties.\n"); - if (!ofw_keyboard(&bootinfo.keyboard)) - printf("Warning: unable to get keyboard properties.\n"); + if (!ofw_macio(&bootinfo.macio)) + printf("Warning: Unable to get macio properties.\n"); - printf("\nDevice statistics\n"); - printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); - printf(" keyboard at %L (size %d bytes)\n", bootinfo.keyboard.addr, bootinfo.keyboard.size); + printf("Device statistics\n"); + + if (bootinfo.screen.addr) + printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); + + if (bootinfo.macio.addr) + printf(" macio at %L (size %d bytes)\n", bootinfo.macio.addr, bootinfo.macio.size); void *real_mode_pa = ofw_translate(&real_mode); Index: boot/arch/ppc32/loader/main.h =================================================================== --- boot/arch/ppc32/loader/main.h (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ boot/arch/ppc32/loader/main.h (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -48,5 +48,5 @@ taskmap_t taskmap; screen_t screen; - keyboard_t keyboard; + macio_t macio; } bootinfo_t; Index: boot/arch/ppc32/loader/ofwarch.c =================================================================== --- boot/arch/ppc32/loader/ofwarch.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ boot/arch/ppc32/loader/ofwarch.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -49,5 +49,5 @@ } -int ofw_keyboard(keyboard_t *keyboard) +int ofw_macio(macio_t *macio) { char device_name[BUF_SIZE]; @@ -55,14 +55,15 @@ if (ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0) return false; - + phandle device = ofw_find_device(device_name); if (device == -1) return false; - - pci_reg_t macio; - if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0) + + pci_reg_t pci_reg; + if (ofw_get_property(device, "assigned-addresses", &pci_reg, sizeof(pci_reg)) <= 0) return false; - keyboard->addr = (void *) macio.addr.addr_lo; - keyboard->size = macio.size_lo; + + macio->addr = (void *) pci_reg.addr.addr_lo; + macio->size = pci_reg.size_lo; return true; Index: boot/genarch/ofw.h =================================================================== --- boot/genarch/ofw.h (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ boot/genarch/ofw.h (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -75,5 +75,5 @@ void *addr; uint32_t size; -} keyboard_t; +} macio_t; typedef struct { @@ -123,5 +123,5 @@ extern int ofw_memmap(memmap_t *map); extern int ofw_screen(screen_t *screen); -extern int ofw_keyboard(keyboard_t *keyboard); +extern int ofw_macio(macio_t *macio); extern int setup_palette(void); extern void ofw_quiesce(void); Index: kernel/arch/ppc32/include/boot/boot.h =================================================================== --- kernel/arch/ppc32/include/boot/boot.h (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ kernel/arch/ppc32/include/boot/boot.h (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -80,5 +80,5 @@ uintptr_t addr; unsigned int size; -} keyboard_t; +} macio_t; typedef struct { @@ -86,5 +86,5 @@ taskmap_t taskmap; screen_t screen; - keyboard_t keyboard; + macio_t macio; } bootinfo_t; Index: kernel/arch/ppc32/src/drivers/cuda.c =================================================================== --- kernel/arch/ppc32/src/drivers/cuda.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ kernel/arch/ppc32/src/drivers/cuda.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -237,11 +237,13 @@ int cuda_get_scancode(void) { - uint8_t kind; - uint8_t data[4]; - - receive_packet(&kind, 4, data); - - if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c)) - return data[2]; + if (cuda) { + uint8_t kind; + uint8_t data[4]; + + receive_packet(&kind, 4, data); + + if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c)) + return data[2]; + } return -1; @@ -272,9 +274,11 @@ void cuda_grab(void) { - ipl_t ipl = interrupts_disable(); - spinlock_lock(&cuda_irq.lock); - cuda_irq.notif_cfg.notify = false; - spinlock_unlock(&cuda_irq.lock); - interrupts_restore(ipl); + if (cuda) { + ipl_t ipl = interrupts_disable(); + spinlock_lock(&cuda_irq.lock); + cuda_irq.notif_cfg.notify = false; + spinlock_unlock(&cuda_irq.lock); + interrupts_restore(ipl); + } } @@ -283,10 +287,12 @@ void cuda_release(void) { - ipl_t ipl = interrupts_disable(); - spinlock_lock(&cuda_irq.lock); - if (cuda_irq.notif_cfg.answerbox) - cuda_irq.notif_cfg.notify = true; - spinlock_unlock(&cuda_irq.unlock); - interrupts_restore(ipl); + if (cuda) { + ipl_t ipl = interrupts_disable(); + spinlock_lock(&cuda_irq.lock); + if (cuda_irq.notif_cfg.answerbox) + cuda_irq.notif_cfg.notify = true; + spinlock_unlock(&cuda_irq.unlock); + interrupts_restore(ipl); + } } @@ -294,5 +300,5 @@ void cuda_init(devno_t devno, uintptr_t base, size_t size) { - cuda = (uint8_t *) hw_map(base, size); + cuda = (uint8_t *) hw_map(base, size); chardev_initialize("cuda_kbd", &kbrd, &ops); @@ -307,5 +313,5 @@ pic_enable_interrupt(CUDA_IRQ); - + sysinfo_set_item_val("kbd", NULL, true); sysinfo_set_item_val("kbd.devno", NULL, devno); @@ -346,5 +352,7 @@ void arch_reboot(void) { - send_packet(PACKET_CUDA, 1, CUDA_RESET); + if (cuda) + send_packet(PACKET_CUDA, 1, CUDA_RESET); + asm volatile ( "b 0\n" Index: kernel/arch/ppc32/src/drivers/pic.c =================================================================== --- kernel/arch/ppc32/src/drivers/pic.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ kernel/arch/ppc32/src/drivers/pic.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -39,5 +39,5 @@ #include -static volatile uint32_t *pic; +static volatile uint32_t *pic = NULL; void pic_init(uintptr_t base, size_t size) @@ -48,8 +48,9 @@ void pic_enable_interrupt(int intnum) { - if (intnum < 32) { - pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum); - } else { - pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32)); + if (pic) { + if (intnum < 32) + pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum); + else + pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32)); } @@ -58,8 +59,9 @@ void pic_disable_interrupt(int intnum) { - if (intnum < 32) { - pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum)); - } else { - pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32))); + if (pic) { + if (intnum < 32) + pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum)); + else + pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32))); } } @@ -67,8 +69,10 @@ void pic_ack_interrupt(int intnum) { - if (intnum < 32) - pic[PIC_ACK_LOW] = 1 << intnum; - else - pic[PIC_ACK_HIGH] = 1 << (intnum - 32); + if (pic) { + if (intnum < 32) + pic[PIC_ACK_LOW] = 1 << intnum; + else + pic[PIC_ACK_HIGH] = 1 << (intnum - 32); + } } @@ -76,13 +80,15 @@ int pic_get_pending(void) { - int pending; - - pending = pic[PIC_PENDING_LOW]; - if (pending) - return fnzb32(pending); - - pending = pic[PIC_PENDING_HIGH]; - if (pending) - return fnzb32(pending) + 32; + if (pic) { + int pending; + + pending = pic[PIC_PENDING_LOW]; + if (pending) + return fnzb32(pending); + + pending = pic[PIC_PENDING_HIGH]; + if (pending) + return fnzb32(pending) + 32; + } return -1; Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ kernel/arch/ppc32/src/ppc32.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -77,41 +77,45 @@ 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_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); /* 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 */ Index: uspace/srv/kbd/arch/ppc32/src/kbd.c =================================================================== --- uspace/srv/kbd/arch/ppc32/src/kbd.c (revision 26c67a8eb4ba0b76cf13eb995623acde141cafa1) +++ uspace/srv/kbd/arch/ppc32/src/kbd.c (revision f817d3a500d65d74090358c680483a7a8c72924e) @@ -184,4 +184,7 @@ int kbd_arch_init(void) { + if (!sysinfo_value("kdb")) + return 0; + return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &cuda_kbd); }