Changeset 7dcf22a in mainline for kernel/arch/sparc64/src

Timestamp:

2006-10-14T11:36:29Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

63530c62

Parents:

0d107f31

Message:

Move the new IRQ redirector to ddi/.
Add function for assigning unique device numbers.
Change sparc64/drivers/kbd.c to assign devno to keyboard.

Location:

kernel/arch/sparc64/src

Files:

• drivers/kbd.c (modified) (3 diffs)
• sparc64.c (modified) (1 diff)
• trap/interrupt.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -41 +41 @@
 #include <genarch/kbd/ns16550.h>
 #endif
-#include <irq.h>
+#include <ddi/device.h>
+#include <ddi/irq.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -118 +119 @@
                 } else {
                         kbd_irq.inr = inr;
-                        kbd_irq.devno = 0;                      /* FIXME: assign unique devno */
+                        kbd_irq.devno = device_assign_devno();
                         kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
                         kbd_irq.claim = z8530_claim;
@@ -137 +138 @@
                 } else {
                         kbd_irq.inr = inr;
-                        kbd_irq.devno = 0;                      /* FIXME: assign unique devno */
+                        kbd_irq.devno = device_assign_devno();
                         kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
                         kbd_irq.claim = ns16550_claim;

kernel/arch/sparc64/src/sparc64.c

@@ -47 +47 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <userspace.h>
-#include <irq.h>
+#include <ddi/irq.h>
 
 bootinfo_t bootinfo;

kernel/arch/sparc64/src/trap/interrupt.c

@@ -36 +36 @@
 #include <arch/trap/interrupt.h>
 #include <interrupt.h>
-#include <irq.h>
+#include <ddi/irq.h>
 #include <typedefs.h>
 #include <arch/types.h>