commit d537cf6c8624b27ce2b63431d2f8937f6356f652
author pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Apr 07 18:14:41 2007 +0000
committer pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Apr 07 18:14:41 2007 +0000
tree d7173d79977b4426b2ff225b35c839c8a2e4a215
parent b6e27ab8b12ef6075d85fc505f821643804a3a79

Unify IRQ handling.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2635 c046a42c-6fe2-441c-8c8c-71466251a162

hw/parallel.c

diff --git a/hw/parallel.c b/hw/parallel.c
index d751d7a..c927ddd 100644
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -65,7 +65,7 @@
     uint8_t datar;
     uint8_t status;
     uint8_t control;
-    int irq;
+    qemu_irq irq;
     int irq_pending;
     CharDriverState *chr;
     int hw_driver;
@@ -76,9 +76,9 @@
 static void parallel_update_irq(ParallelState *s)
 {
     if (s->irq_pending)
-        pic_set_irq(s->irq, 1);
+        qemu_irq_raise(s->irq);
     else
-        pic_set_irq(s->irq, 0);
+        qemu_irq_lower(s->irq);
 }
 
 static void
@@ -401,7 +401,7 @@
 }
 
 /* If fd is zero, it means that the parallel device uses the console */
-ParallelState *parallel_init(int base, int irq, CharDriverState *chr)
+ParallelState *parallel_init(int base, qemu_irq irq, CharDriverState *chr)
 {
     ParallelState *s;
     uint8_t dummy;