Changeset 7dcf22a in mainline

Timestamp:

2006-10-14T11:36:29Z (18 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

Files:

• Makefile (modified) (1 diff)
• arch/sparc64/src/drivers/kbd.c (modified) (3 diffs)
• arch/sparc64/src/sparc64.c (modified) (1 diff)
• arch/sparc64/src/trap/interrupt.c (modified) (1 diff)
• genarch/include/kbd/ns16550.h (modified) (1 diff)
• genarch/include/kbd/z8530.h (modified) (1 diff)
• genarch/src/kbd/ns16550.c (modified) (1 diff)
• genarch/src/kbd/z8530.c (modified) (1 diff)
• generic/include/ddi/device.h (added)
• generic/include/ddi/irq.h (moved) (moved from kernel/generic/include/irq.h ) (2 diffs)
• generic/include/typedefs.h (modified) (1 diff)
• generic/src/ddi/device.c (added)
• generic/src/ddi/irq.c (moved) (moved from kernel/generic/src/interrupt/irq.c ) (2 diffs)

kernel/Makefile

@@ -148 +148 @@
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \
+        generic/src/ddi/irq.c \
+        generic/src/ddi/device.c \
         generic/src/interrupt/interrupt.c \
-        generic/src/interrupt/irq.c \
         generic/src/main/main.c \
         generic/src/main/kinit.c \

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>

kernel/genarch/include/kbd/ns16550.h

@@ -39 +39 @@
 
 #include <typedefs.h>
-#include <irq.h>
+#include <ddi/irq.h>
 
 extern void ns16550_init(void);

kernel/genarch/include/kbd/z8530.h

@@ -38 +38 @@
 #define KERN_Z8530_H_
 
-#include <irq.h>
 #include <typedefs.h>
+#include <ddi/irq.h>
 
 extern bool z8530_belongs_to_kernel;

kernel/genarch/src/kbd/ns16550.c

@@ -40 +40 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/ns16550.h>
-#include <irq.h>
+#include <ddi/irq.h>
 #include <arch/interrupt.h>
 #include <cpu.h>

kernel/genarch/src/kbd/z8530.c

@@ -40 +40 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/z8530.h>
-#include <irq.h>
+#include <ddi/irq.h>
 #include <arch/interrupt.h>
 #include <arch/drivers/kbd.h>

kernel/generic/include/ddi/irq.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genericinterrupt
+/** @addtogroup genericddi
  * @{
  */
@@ -38 +38 @@
 #include <arch/types.h>
 #include <adt/list.h>
-
-typedef int32_t inr_t;
-typedef int32_t devno_t;
 
 typedef enum {

kernel/generic/include/typedefs.h

@@ -96 +96 @@
 typedef struct btree btree_t;
 
+typedef signed int inr_t;
+typedef signed int devno_t;
+
 #endif
 

kernel/generic/src/ddi/irq.c

@@ -27 +27 @@
  */
 
-/** @addtogroup genericinterrupt
+/** @addtogroup genericddi
  * @{
  */
@@ -59 +59 @@
  */
 
-#include <irq.h>
+#include <ddi/irq.h>
 #include <adt/hash_table.h>
 #include <arch/types.h>