summaryrefslogtreecommitdiff
path: root/device
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-02-25 18:56:43 +0100
committerJustus Winter <justus@gnupg.org>2016-02-25 20:15:03 +0100
commitf7c2f4ba69c3ae7df8fddcc2969e2c21e109dbd1 (patch)
tree6c60dd687de4746e5e5e0b261771c84b5f6c1c82 /device
parent9ad7eb46b65b7324dd5f2c6f5568b6a0e033a5f4 (diff)
Disable disabling the irq via device_intr_enable
Diffstat (limited to 'device')
-rw-r--r--device/ds_routines.c9
-rw-r--r--device/intr.c3
2 files changed, 6 insertions, 6 deletions
diff --git a/device/ds_routines.c b/device/ds_routines.c
index 4f6b345..9d399ee 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -1844,11 +1844,10 @@ experimental_device_intr_enable(ipc_port_t master_port, int line, char status)
if (master_port != master_device_port)
return D_INVALID_OPERATION;
- if (status)
- /* TODO: better name for generic-to-arch-specific call */
- enable_irq (line);
- else
- disable_irq (line);
+ if (! status)
+ return D_INVALID_OPERATION;
+
+ enable_irq (line);
return 0;
#endif /* MACH_XEN */
}
diff --git a/device/intr.c b/device/intr.c
index 6fca328..02e0bab 100644
--- a/device/intr.c
+++ b/device/intr.c
@@ -35,11 +35,12 @@ search_intr (int line, ipc_port_t dest)
return NULL;
}
+void intr_thread (void);
+
/* This function can only be used in the interrupt handler. */
void
queue_intr (int line, ipc_port_t dest)
{
- extern void intr_thread ();
struct intr_entry *e;
cli ();