Changeset 4687a26c in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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.

File:

• kernel/generic/src/ddi/ddi.c (modified) (1 diff)

kernel/generic/src/ddi/ddi.c

@@ -258 +258 @@
 }
 
-/** Disable or enable preemption.
- *
- * @param enable If non-zero, the preemption counter will be decremented,
- *               leading to potential enabling of preemption. Otherwise
- *               the preemption counter will be incremented, preventing
- *               preemption from occurring.
- *
- * @return Zero on success or EPERM if callers capabilities are not sufficient.
- *
- */
-unative_t sys_preempt_control(int enable)
-{
-        if (!(cap_get(TASK) & CAP_PREEMPT_CONTROL))
+/** 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 (enable)
-                preemption_enable();
-        else
-                preemption_disable();
-        
+                
+        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;
 }