Changes in kernel/arch/ppc32/src/drivers/pic.c [ebbc03c7:c5429fe] in mainline

File:

• kernel/arch/ppc32/src/drivers/pic.c (modified) (4 diffs)

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

@@ -37 +37 @@
 #include <byteorder.h>
 #include <bitops.h>
-#include <typedefs.h>
 
-static ioport32_t *pic = NULL;
+static volatile uint32_t *pic = NULL;
 
 void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg)
@@ -51 +50 @@
 void pic_enable_interrupt(inr_t intnum)
 {
-        if (!pic)
-                return;
+        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));
+        }
 
-        if (intnum < 32) {
-                pio_write_32(&pic[PIC_MASK_LOW],
-                    pio_read_32(&pic[PIC_MASK_LOW]) | (1 << intnum));
-        } else {
-                pio_write_32(&pic[PIC_MASK_HIGH],
-                    pio_read_32(&pic[PIC_MASK_HIGH]) | (1 << (intnum - 32)));
-        }
 }
 
 void pic_disable_interrupt(inr_t intnum)
 {
-        if (!pic)
-                return;
-
-        if (intnum < 32) {
-                pio_write_32(&pic[PIC_MASK_LOW],
-                    pio_read_32(&pic[PIC_MASK_LOW]) & (~(1 << intnum)));
-        } else {
-                pio_write_32(&pic[PIC_MASK_HIGH],
-                    pio_read_32(&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)));
         }
 }
@@ -79 +71 @@
 void pic_ack_interrupt(void *arg, inr_t intnum)
 {
-        if (!pic)
-                return;
-
-        if (intnum < 32) {
-                pio_write_32(&pic[PIC_ACK_LOW], 1 << intnum);
-        } else {
-                pio_write_32(&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);
         }
 }
@@ -97 +87 @@
                 uint32_t pending;
 
-                pending = pio_read_32(&pic[PIC_PENDING_LOW]);
+                pending = pic[PIC_PENDING_LOW];
                 if (pending != 0)
                         return fnzb32(pending);
 
-                pending = pio_read_32(&pic[PIC_PENDING_HIGH]);
+                pending = pic[PIC_PENDING_HIGH];
                 if (pending != 0)
                         return fnzb32(pending) + 32;