summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-06-05 14:50:39 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-06-05 14:50:39 +0000
commit54fa5af54622a9bd2d4e6988a6e402f60bde3653 (patch)
tree9a1874a408520a45b0ab3e3004870fee128b7858 /hw
parentcc1daa40f188ec3ea6c37db546887488a419e900 (diff)
more generic IRQ support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1445 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/i8259.c6
-rw-r--r--hw/openpic.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/hw/i8259.c b/hw/i8259.c
index 8f1821d97f..9bfaaed1bc 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -179,6 +179,12 @@ void pic_set_irq(int irq, int level)
pic_update_irq();
}
+/* this function should be used to have the controller context */
+void pic_set_irq_new(void *opaque, int irq, int level)
+{
+ pic_set_irq(irq, level);
+}
+
/* acknowledge interrupt 'irq' */
static inline void pic_intack(PicState *s, int irq)
{
diff --git a/hw/openpic.c b/hw/openpic.c
index e6bca3270b..08fb9bd126 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -320,8 +320,9 @@ static void openpic_update_irq(openpic_t *opp, int n_IRQ)
}
}
-void openpic_set_irq(openpic_t *opp, int n_IRQ, int level)
+void openpic_set_irq(void *opaque, int n_IRQ, int level)
{
+ openpic_t *opp = opaque;
IRQ_src_t *src;
src = &opp->src[n_IRQ];