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

Timestamp:

2009-04-21T12:46:26Z (17 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/drivers

Files:

• cuda.c (deleted)
• pic.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) {