Changeset 1b11576d in mainline for kernel/generic

Timestamp:

2010-10-23T16:04:12Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c77b4d6

Parents:

84c20da (diff), 58b833c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/generic

Files:

• include/ddi/ddi.h (modified) (2 diffs)
• include/syscall/syscall.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (1 diff)
• src/syscall/syscall.c (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -54 +54 @@
 extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
 extern unative_t sys_iospace_enable(ddi_ioarg_t *);
+extern unative_t sys_interrupt_enable(int irq, int enable);
 
 /*
@@ -60 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
+
 #endif
 

kernel/generic/include/syscall/syscall.h

@@ -80 +80 @@
         SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
+        SYS_INTERRUPT_ENABLE,
         
         SYS_SYSINFO_GET_TAG,

kernel/generic/src/ddi/ddi.c

@@ -258 +258 @@
 }
 
+/** 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)
+{
+/* FIXME: this needs to be generic code, or better not be in kernel at all. */
+#if 0
+        cap_t task_cap = cap_get(TASK);
+        if (!(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);
+        }
+        
+#endif
+        return 0;
+}
+
 /** @}
  */

kernel/generic/src/syscall/syscall.c

@@ -159 +159 @@
         (syshandler_t) sys_physmem_map,
         (syshandler_t) sys_iospace_enable,
+        (syshandler_t) sys_interrupt_enable,
         
         /* Sysinfo syscalls */