Changeset 46c20c8 in mainline for kernel/arch/ppc32/src/drivers/pic.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -32 +32 @@
 /** @file
  */
-
 
 #include <arch/drivers/pic.h>
@@ -79 +78 @@
 }
 
-/** Return number of pending interrupt */
-int pic_get_pending(void)
+/** Return number of pending interrupts
+ *
+ */
+uint8_t pic_get_pending(void)
 {
         if (pic) {
-                int pending;
+                uint32_t pending;
                 
                 pending = pic[PIC_PENDING_LOW];
-                if (pending)
+                if (pending != 0)
                         return fnzb32(pending);
                 
                 pending = pic[PIC_PENDING_HIGH];
-                if (pending)
+                if (pending != 0)
                         return fnzb32(pending) + 32;
         }
         
-        return -1;
+        return 255;
 }