Message type for SYS_IRQCTL

Change-Id: Idef5a1e49aea3eea690e2a9bf046348766a8b944

diff --git a/include/minix/com.h b/include/minix/com.h
index f6abc64e2d0d9bcae3f1e299f4dbcf62a0cc5036..4b3f5253b6f34f6de5a519b13d83f378be4c25db 100644 (file)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -301,18 +301,14 @@
 #define DIO_VALUE      m2_l2   /* single I/O value */
 
 /* Field names for SYS_IRQCTL. */
-#define IRQ_REQUEST     m5_s1  /* what to do? */
 #  define IRQ_SETPOLICY     1  /* manage a slot of the IRQ table */
 #  define IRQ_RMPOLICY      2  /* remove a slot of the IRQ table */
 #  define IRQ_ENABLE        3  /* enable interrupts */
 #  define IRQ_DISABLE       4  /* disable interrupts */
-#define IRQ_VECTOR     m5_s2   /* irq vector */
-#define IRQ_POLICY     m5_i1   /* options for IRQCTL request */
 #  define IRQ_REENABLE  0x001  /* reenable IRQ line after interrupt */
 #  define IRQ_BYTE      0x100  /* byte values */      
 #  define IRQ_WORD      0x200  /* word values */
 #  define IRQ_LONG      0x400  /* long values */
-#define IRQ_HOOK_ID    m5_l3   /* id of irq hook at kernel */
 
 /* Field names for SYS_ABORT. */
 #define ABRT_HOW       m1_i1   /* RBT_REBOOT, RBT_HALT, etc. */

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index d64a7dac53ed2d845a86796722f7ac1880d9909d..4a9e728ce88e92b0d4c5b51694017af27886dab4 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -700,6 +700,23 @@ typedef struct {
 } mess_lsys_krn_schedctl;
 _ASSERT_MSG_SIZE(mess_lsys_krn_schedctl);
 
+typedef struct {
+       int request;
+       int vector;
+       int policy;
+       int hook_id;
+
+       uint8_t padding[40];
+} mess_lsys_krn_sys_irqctl;
+_ASSERT_MSG_SIZE(mess_lsys_krn_sys_irqctl);
+
+typedef struct {
+       int hook_id;
+
+       uint8_t padding[52];
+} mess_krn_lsys_sys_irqctl;
+_ASSERT_MSG_SIZE(mess_krn_lsys_sys_irqctl);
+
 typedef struct {
        int request;
        long int port;
@@ -1387,6 +1404,7 @@ typedef struct {
                mess_sigcalls           m_sigcalls;
 
                mess_krn_lsys_schedule  m_krn_lsys_schedule;
+               mess_krn_lsys_sys_irqctl m_krn_lsys_sys_irqctl;
 
                mess_fs_vfs_breadwrite  m_fs_vfs_breadwrite;
                mess_fs_vfs_chmod       m_fs_vfs_chmod;
@@ -1463,6 +1481,7 @@ typedef struct {
 
                mess_lsys_krn_schedctl  m_lsys_krn_schedctl;
                mess_lsys_krn_schedule  m_lsys_krn_schedule;
+               mess_lsys_krn_sys_irqctl m_lsys_krn_sys_irqctl;
                mess_lsys_krn_sys_memset m_lsys_krn_sys_memset;
                mess_lsys_krn_sys_sdevio m_lsys_krn_sys_sdevio;
                mess_lsys_krn_sys_setalarm m_lsys_krn_sys_setalarm;

diff --git a/kernel/system/do_irqctl.c b/kernel/system/do_irqctl.c
index 026fbfd6dfaaee686ac0810c3d070bbf8e33f3bc..2c330b6955b71362d6936196b4d1960b0b7a99a0 100644 (file)
--- a/kernel/system/do_irqctl.c
+++ b/kernel/system/do_irqctl.c
@@ -2,11 +2,11 @@
  *   m_type:   SYS_IRQCTL
  *
  * The parameters for this kernel call are:
- *    m5_s1:   IRQ_REQUEST     (control operation to perform)  
- *    m5_s2:   IRQ_VECTOR      (irq line that must be controlled)
- *    m5_i1:   IRQ_POLICY      (irq policy allows reenabling interrupts)
- *    m5_l3:   IRQ_HOOK_ID     (provides index to be returned on interrupt)
- *      ,,          ,,          (returns index of irq hook assigned at kernel)
+ *    m_lsys_krn_sys_irqctl.request    (control operation to perform)
+ *    m_lsys_krn_sys_irqctl.vector     (irq line that must be controlled)
+ *    m_lsys_krn_sys_irqctl.policy     (irq policy allows reenabling interrupts)
+ *    m_lsys_krn_sys_irqctl.hook_id    (provides index to be returned on interrupt)
+ *    m_krn_lsys_sys_irqctl.hook_id    (returns index of irq hook assigned at kernel)
  */
 
 #include "kernel/kernel.h"
@@ -33,11 +33,11 @@ int do_irqctl(struct proc * caller, message * m_ptr)
   struct priv *privp;
 
   /* Hook identifiers start at 1 and end at NR_IRQ_HOOKS. */
-  irq_hook_id = (unsigned) m_ptr->IRQ_HOOK_ID - 1;
-  irq_vec = (unsigned) m_ptr->IRQ_VECTOR; 
+  irq_hook_id = m_ptr->m_lsys_krn_sys_irqctl.hook_id - 1;
+  irq_vec = m_ptr->m_lsys_krn_sys_irqctl.vector;
 
   /* See what is requested and take needed actions. */
-  switch(m_ptr->IRQ_REQUEST) {
+  switch(m_ptr->m_lsys_krn_sys_irqctl.request) {
 
   /* Enable or disable IRQs. This is straightforward. */
   case IRQ_ENABLE:           
@@ -45,7 +45,7 @@ int do_irqctl(struct proc * caller, message * m_ptr)
       if (irq_hook_id >= NR_IRQ_HOOKS || irq_hook_id < 0 ||
           irq_hooks[irq_hook_id].proc_nr_e == NONE) return(EINVAL);
       if (irq_hooks[irq_hook_id].proc_nr_e != caller->p_endpoint) return(EPERM);
-      if (m_ptr->IRQ_REQUEST == IRQ_ENABLE) {
+      if (m_ptr->m_lsys_krn_sys_irqctl.request == IRQ_ENABLE) {
           enable_irq(&irq_hooks[irq_hook_id]); 
       }
       else 
@@ -85,7 +85,7 @@ int do_irqctl(struct proc * caller, message * m_ptr)
       /* When setting a policy, the caller must provide an identifier that
        * is returned on the notification message if a interrupt occurs.
        */
-      notify_id = (unsigned) m_ptr->IRQ_HOOK_ID;
+      notify_id = m_ptr->m_lsys_krn_sys_irqctl.hook_id;
       if (notify_id > CHAR_BIT * sizeof(irq_id_t) - 1) return(EINVAL);
 
       /* Try to find an existing mapping to override. */
@@ -111,13 +111,13 @@ int do_irqctl(struct proc * caller, message * m_ptr)
       /* Install the handler. */
       hook_ptr->proc_nr_e = caller->p_endpoint;        /* process to notify */
       hook_ptr->notify_id = notify_id;         /* identifier to pass */        
-      hook_ptr->policy = m_ptr->IRQ_POLICY;    /* policy for interrupts */
+      hook_ptr->policy = m_ptr->m_lsys_krn_sys_irqctl.policy;  /* policy for interrupts */
       put_irq_handler(hook_ptr, irq_vec, generic_handler);
       DEBUGBASIC(("IRQ %d handler registered by %s / %d\n",
                              irq_vec, caller->p_name, caller->p_endpoint));
 
       /* Return index of the IRQ hook in use. */
-      m_ptr->IRQ_HOOK_ID = irq_hook_id + 1;
+      m_ptr->m_krn_lsys_sys_irqctl.hook_id = irq_hook_id + 1;
       break;
 
   case IRQ_RMPOLICY:
@@ -133,7 +133,7 @@ int do_irqctl(struct proc * caller, message * m_ptr)
       break;
 
   default:
-      r = EINVAL;                              /* invalid IRQ_REQUEST */
+      r = EINVAL;                              /* invalid IRQ REQUEST */
   }
   return(r);
 }
@@ -174,4 +174,3 @@ irq_hook_t *hook;
 }
 
 #endif /* USE_IRQCTL */
-

diff --git a/lib/libsys/sys_irqctl.c b/lib/libsys/sys_irqctl.c
index 58578d707d099e2bc4bd96edce3f6237db63c907..2cf0ad63f66d3271be225c2e2fa1799f5320519e 100644 (file)
--- a/lib/libsys/sys_irqctl.c
+++ b/lib/libsys/sys_irqctl.c
@@ -13,14 +13,12 @@ int *hook_id;                               /* ID of IRQ hook at kernel */
     int s;
     
     m_irq.m_type = SYS_IRQCTL;
-    m_irq.IRQ_REQUEST = req;
-    m_irq.IRQ_VECTOR = irq_vec;
-    m_irq.IRQ_POLICY = policy;
-    m_irq.IRQ_HOOK_ID = *hook_id;
+    m_irq.m_lsys_krn_sys_irqctl.request = req;
+    m_irq.m_lsys_krn_sys_irqctl.vector = irq_vec;
+    m_irq.m_lsys_krn_sys_irqctl.policy = policy;
+    m_irq.m_lsys_krn_sys_irqctl.hook_id = *hook_id;
     
     s = _kernel_call(SYS_IRQCTL, &m_irq);
-    if (req == IRQ_SETPOLICY) *hook_id = m_irq.IRQ_HOOK_ID;
+    if (req == IRQ_SETPOLICY) *hook_id = m_irq.m_krn_lsys_sys_irqctl.hook_id;
     return(s);
 }
-
-