Changeset c2417bc in mainline for kernel/arch/ppc32/src

Timestamp:

2009-04-21T12:46:26Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

Location:

kernel/arch/ppc32/src

Files:

• drivers/cuda.c (deleted)
• drivers/pic.c (modified) (4 diffs)
• dummy.s (modified) (2 diffs)
• interrupt.c (modified) (3 diffs)
• ppc32.c (modified) (4 diffs)

kernel/arch/ppc32/src/drivers/pic.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -41 +41 @@
 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) {
@@ -57 +59 @@
 }
 
-void pic_disable_interrupt(int intnum)
+void pic_disable_interrupt(inr_t intnum)
 {
         if (pic) {
@@ -67 +69 @@
 }
 
-void pic_ack_interrupt(int intnum)
+void pic_ack_interrupt(void *arg, inr_t intnum)
 {
         if (pic) {

kernel/arch/ppc32/src/dummy.s

@@ -31 +31 @@
 .global asm_delay_loop
 .global sys_tls_set
+.global cpu_halt
 
 sys_tls_set:
@@ -37 +38 @@
 asm_delay_loop:
         blr
+
+cpu_halt:
+        b cpu_halt

kernel/arch/ppc32/src/interrupt.c

@@ -61 +61 @@
         
         while ((inum = pic_get_pending()) != -1) {
-                bool ack = false;
                 irq_t *irq = irq_dispatch_and_lock(inum);
                 if (irq) {
@@ -70 +69 @@
                         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 {
@@ -84 +89 @@
 #endif
                 }
-                
-                if (!ack)
-                        pic_ack_interrupt(inum);
         }
 }

kernel/arch/ppc32/src/ppc32.c

@@ -36 +36 @@
 #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>
@@ -45 +45 @@
 #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;
@@ -118 +120 @@
                 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
                 }
                 
@@ -187 +206 @@
 }
 
+void arch_reboot(void)
+{
+        // TODO
+        while (1);
+}
+
 /** @}
  */