Changeset 24abb85d in mainline for kernel/generic/include

Timestamp:

2017-08-18T23:27:08Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4d76cfc

Parents:

e9d15d9

Message:

Remove SYS_DEVICE_ASSIGN_DEVNO

Location:

kernel/generic/include

Files:

• ddi/device.h (deleted)
• ddi/irq.h (modified) (3 diffs)
• ipc/irq.h (modified) (1 diff)
• ipc/sysipc.h (modified) (1 diff)
• typedefs.h (modified) (1 diff)

kernel/generic/include/ddi/irq.h

@@ -43 +43 @@
 #include <proc/task.h>
 #include <ipc/ipc.h>
+
+typedef enum {
+        IRQ_HT_KEY_INR,
+        IRQ_HT_KEY_MODE
+} irq_ht_key_t;
+
+typedef enum {
+        IRQ_HT_MODE_CLAIM,
+        IRQ_HT_MODE_NO_CLAIM
+} irq_ht_mode_t;
 
 typedef enum {
@@ -91 +101 @@
  *
  * If one device has multiple interrupts, there will be multiple irq_t
- * instantions with the same devno.
- *
+ * instantions.
  */
 typedef struct irq {
@@ -112 +121 @@
          */
         bool preack;
-        
-        /** Unique device number. -1 if not yet assigned. */
-        devno_t devno;
         
         /** Actual IRQ number. -1 if not yet assigned. */

kernel/generic/include/ipc/irq.h

@@ -47 +47 @@
 #include <adt/list.h>
 
-extern int ipc_irq_subscribe(answerbox_t *, inr_t, devno_t, sysarg_t,
-    irq_code_t *);
 
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);
 extern void ipc_irq_top_half_handler(irq_t *);
 
+extern int ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *);
 extern int ipc_irq_unsubscribe(answerbox_t *, int);
 extern void ipc_irq_cleanup(answerbox_t *);

kernel/generic/include/ipc/sysipc.h

@@ -56 +56 @@
 extern sysarg_t sys_ipc_hangup(sysarg_t);
 
-extern sysarg_t sys_ipc_irq_subscribe(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *);
 extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 

kernel/generic/include/typedefs.h

@@ -49 +49 @@
 
 typedef int32_t inr_t;
-typedef int32_t devno_t;
 
 typedef volatile uint8_t ioport8_t;