| /branches/dd/kernel/arch/ppc32/src/ppc32.c |
|---|
| 35,7 → 35,7 |
| #include <config.h> |
| #include <arch.h> |
| #include <arch/boot/boot.h> |
| #include <arch/drivers/cuda.h> |
| #include <genarch/drivers/via-cuda/cuda.h> |
| #include <arch/interrupt.h> |
| #include <genarch/fb/fb.h> |
| #include <genarch/fb/visuals.h> |
| 44,10 → 44,12 |
| #include <console/console.h> |
| #include <ddi/irq.h> |
| #include <arch/drivers/pic.h> |
| #include <align.h> |
| #include <macros.h> |
| #include <string.h> |
| #define IRQ_COUNT 64 |
| #define IRQ_CUDA 10 |
| bootinfo_t bootinfo; |
| 117,10 → 119,27 |
| if (bootinfo.macio.addr) { |
| /* Initialize PIC */ |
| pic_init(bootinfo.macio.addr, PAGE_SIZE); |
| cir_t cir; |
| void *cir_arg; |
| pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg); |
| #ifdef CONFIG_VIA_CUDA |
| uintptr_t pa = bootinfo.macio.addr + 0x16000; |
| uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); |
| size_t offset = pa - aligned_addr; |
| size_t size = 2 * PAGE_SIZE; |
| cuda_t *cuda = (cuda_t *) |
| (hw_map(aligned_addr, offset + size) + offset); |
| /* Initialize I/O controller */ |
| cuda_init(bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE); |
| cuda_instance_t *cuda_instance = |
| cuda_init(cuda, IRQ_CUDA, cir, cir_arg); |
| if (cuda_instance) { |
| indev_t *sink = stdin_wire(); |
| cuda_wire(cuda_instance, sink); |
| } |
| #endif |
| } |
| /* Merge all zones to 1 big zone */ |
| 186,5 → 205,11 |
| return addr; |
| } |
| void arch_reboot(void) |
| { |
| // TODO |
| while (1); |
| } |
| /** @} |
| */ |
| /branches/dd/kernel/arch/ppc32/src/dummy.s |
|---|
| 30,6 → 30,7 |
| .global asm_delay_loop |
| .global sys_tls_set |
| .global cpu_halt |
| sys_tls_set: |
| b sys_tls_set |
| 36,3 → 37,6 |
| asm_delay_loop: |
| blr |
| cpu_halt: |
| b cpu_halt |
| /branches/dd/kernel/arch/ppc32/src/interrupt.c |
|---|
| 60,7 → 60,6 |
| int inum; |
| while ((inum = pic_get_pending()) != -1) { |
| bool ack = false; |
| irq_t *irq = irq_dispatch_and_lock(inum); |
| if (irq) { |
| /* |
| 69,11 → 68,17 |
| if (irq->preack) { |
| /* Acknowledge the interrupt before processing */ |
| pic_ack_interrupt(inum); |
| ack = true; |
| if (irq->cir) |
| irq->cir(irq->cir_arg, irq->inr); |
| } |
| irq->handler(irq); |
| if (!irq->preack) { |
| if (irq->cir) |
| irq->cir(irq->cir_arg, irq->inr); |
| } |
| spinlock_unlock(&irq->lock); |
| } else { |
| /* |
| 83,9 → 88,6 |
| printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum); |
| #endif |
| } |
| if (!ack) |
| pic_ack_interrupt(inum); |
| } |
| } |
| /branches/dd/kernel/arch/ppc32/src/drivers/cuda.c |
|---|
| File deleted |
| /branches/dd/kernel/arch/ppc32/src/drivers/pic.c |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup ppc32 |
| /** @addtogroup ppc32 |
| * @{ |
| */ |
| /** @file |
| 40,12 → 40,14 |
| static volatile uint32_t *pic = NULL; |
| void pic_init(uintptr_t base, size_t size) |
| void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg) |
| { |
| pic = (uint32_t *) hw_map(base, size); |
| *cir = pic_ack_interrupt; |
| *cir_arg = NULL; |
| } |
| void pic_enable_interrupt(int intnum) |
| void pic_enable_interrupt(inr_t intnum) |
| { |
| if (pic) { |
| if (intnum < 32) |
| 56,7 → 58,7 |
| } |
| void pic_disable_interrupt(int intnum) |
| void pic_disable_interrupt(inr_t intnum) |
| { |
| if (pic) { |
| if (intnum < 32) |
| 66,7 → 68,7 |
| } |
| } |
| void pic_ack_interrupt(int intnum) |
| void pic_ack_interrupt(void *arg, inr_t intnum) |
| { |
| if (pic) { |
| if (intnum < 32) |