Changeset 953bc1ef in mainline

Timestamp:

2010-04-29T08:34:29Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

cfe7716

Parents:

5af21c5

Message:

introduced an 'interrupt_enable' syscall as a temporary solution for enabling/disabling interrupts

Files:

• kernel/generic/include/ddi/ddi.h (modified) (2 diffs)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/ddi/ddi.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (1 diff)
• uspace/app/trace/syscalls.c (modified) (1 diff)
• uspace/lib/libc/generic/ddi.c (modified) (1 diff)
• uspace/lib/libc/include/ddi.h (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -56 +56 @@
 extern unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg);
 extern unative_t sys_preempt_control(int enable);
+extern unative_t sys_interrupt_enable(int irq, int enable);
 
 /*
@@ -62 +63 @@
 extern int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size);
 
+
 #endif
 

kernel/generic/include/syscall/syscall.h

@@ -81 +81 @@
         SYS_IOSPACE_ENABLE,
         SYS_PREEMPT_CONTROL,
+        SYS_INTERRUPT_ENABLE,
         
         SYS_SYSINFO_VALID,

kernel/generic/src/ddi/ddi.c

@@ -287 +287 @@
 }
 
+/** Disable or enable specified interrupts.
+ * 
+ * @param irq the interrupt to be enabled/disabled.
+ * @param enable if true enable the interrupt, disable otherwise.
+ * 
+ * @retutn Zero on success, error code otherwise.
+ */
+unative_t sys_interrupt_enable(int irq, int enable)
+{       
+        cap_t task_cap = cap_get(TASK);
+        if (!(task_cap & CAP_PREEMPT_CONTROL) || !(task_cap & CAP_IRQ_REG))
+                return EPERM;
+                
+        if (irq < 0 || irq > 16) {
+                return EINVAL;
+        }
+        
+        uint16_t irq_mask = (uint16_t)(1 << irq);
+        if (enable) {
+                trap_virtual_enable_irqs(irq_mask);
+        } else {
+                trap_virtual_disable_irqs(irq_mask);
+        }
+        
+        return 0;       
+}
+
 /** @}
  */

kernel/generic/src/syscall/syscall.c

@@ -151 +151 @@
         (syshandler_t) sys_iospace_enable,
         (syshandler_t) sys_preempt_control,
+        (syshandler_t) sys_interrupt_enable,
         
         /* Sysinfo syscalls */

uspace/app/trace/syscalls.c

@@ -74 +74 @@
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
     [SYS_PREEMPT_CONTROL] = { "preempt_control",        1,      V_ERRNO },
+        [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",  2,      V_ERRNO },
 
     [SYS_SYSINFO_VALID] = { "sysinfo_valid",            2,      V_HASH },

uspace/lib/libc/generic/ddi.c

@@ -105 +105 @@
 }
 
+/** Enable/disable interrupt.
+ * 
+ * @param irq the interrupt.
+ * @param enable 1 - enable interrupt, 0 - disable interrupt.
+ * 
+ * @return Zero on success, negative error code otherwise. 
+ */
+int interrupt_enable(int irq, int enable) 
+{
+        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, (sysarg_t) enable);
+}
+
 /** Enable PIO for specified I/O range.
  *

uspace/lib/libc/include/ddi.h

@@ -43 +43 @@
 extern int preemption_control(int);
 extern int pio_enable(void *, size_t, void **);
+extern int interrupt_enable(int, int);
 
 #endif