| /trunk/kernel/arch/ppc32/include/boot/boot.h |
|---|
| 79,13 → 79,13 |
| typedef struct { |
| uintptr_t addr; |
| unsigned int size; |
| } keyboard_t; |
| } macio_t; |
| typedef struct { |
| memmap_t memmap; |
| taskmap_t taskmap; |
| screen_t screen; |
| keyboard_t keyboard; |
| macio_t macio; |
| } bootinfo_t; |
| extern bootinfo_t bootinfo; |
| /trunk/kernel/arch/ppc32/src/ppc32.c |
|---|
| 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(); |
| /trunk/kernel/arch/ppc32/src/drivers/pic.c |
|---|
| 38,7 → 38,7 |
| #include <byteorder.h> |
| #include <bitops.h> |
| static volatile uint32_t *pic; |
| static volatile uint32_t *pic = NULL; |
| void pic_init(uintptr_t base, size_t size) |
| { |
| 47,9 → 47,10 |
| void pic_enable_interrupt(int intnum) |
| { |
| if (intnum < 32) { |
| if (pic) { |
| if (intnum < 32) |
| pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum); |
| } else { |
| else |
| pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32)); |
| } |
| 57,9 → 58,10 |
| void pic_disable_interrupt(int intnum) |
| { |
| if (intnum < 32) { |
| if (pic) { |
| if (intnum < 32) |
| pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum)); |
| } else { |
| else |
| pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32))); |
| } |
| } |
| 66,15 → 68,18 |
| void pic_ack_interrupt(int intnum) |
| { |
| if (pic) { |
| if (intnum < 32) |
| pic[PIC_ACK_LOW] = 1 << intnum; |
| else |
| pic[PIC_ACK_HIGH] = 1 << (intnum - 32); |
| } |
| } |
| /** Return number of pending interrupt */ |
| int pic_get_pending(void) |
| { |
| if (pic) { |
| int pending; |
| pending = pic[PIC_PENDING_LOW]; |
| 84,6 → 89,7 |
| pending = pic[PIC_PENDING_HIGH]; |
| if (pending) |
| return fnzb32(pending) + 32; |
| } |
| return -1; |
| } |
| /trunk/kernel/arch/ppc32/src/drivers/cuda.c |
|---|
| 236,6 → 236,7 |
| int cuda_get_scancode(void) |
| { |
| if (cuda) { |
| uint8_t kind; |
| uint8_t data[4]; |
| 243,6 → 244,7 |
| if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c)) |
| return data[2]; |
| } |
| return -1; |
| } |
| 271,6 → 273,7 |
| /** Initialize keyboard and service interrupts using kernel routine */ |
| void cuda_grab(void) |
| { |
| if (cuda) { |
| ipl_t ipl = interrupts_disable(); |
| spinlock_lock(&cuda_irq.lock); |
| cuda_irq.notif_cfg.notify = false; |
| 277,11 → 280,13 |
| spinlock_unlock(&cuda_irq.lock); |
| interrupts_restore(ipl); |
| } |
| } |
| /** Resume the former interrupt vector */ |
| void cuda_release(void) |
| { |
| if (cuda) { |
| ipl_t ipl = interrupts_disable(); |
| spinlock_lock(&cuda_irq.lock); |
| if (cuda_irq.notif_cfg.answerbox) |
| 289,6 → 294,7 |
| spinlock_unlock(&cuda_irq.unlock); |
| interrupts_restore(ipl); |
| } |
| } |
| void cuda_init(devno_t devno, uintptr_t base, size_t size) |
| 345,7 → 351,9 |
| } |
| void arch_reboot(void) { |
| if (cuda) |
| send_packet(PACKET_CUDA, 1, CUDA_RESET); |
| asm volatile ( |
| "b 0\n" |
| ); |