aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/sh.h4
-rw-r--r--hw/sh7750.c12
-rw-r--r--hw/sh_intc.c10
-rw-r--r--hw/sh_intc.h5
-rw-r--r--hw/sh_timer.c10
5 files changed, 27 insertions, 14 deletions
diff --git a/hw/sh.h b/hw/sh.h
index 50a1ae961f..800b2a1e3f 100644
--- a/hw/sh.h
+++ b/hw/sh.h
@@ -28,8 +28,8 @@ int sh7750_register_io_device(struct SH7750State *s,
#define TMU012_FEAT_3CHAN (1 << 1)
#define TMU012_FEAT_EXTCLK (1 << 2)
void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq,
- struct intc_source *ch0_irq, struct intc_source *ch1_irq,
- struct intc_source *ch2_irq0, struct intc_source *ch2_irq1);
+ qemu_irq ch0_irq, qemu_irq ch1_irq,
+ qemu_irq ch2_irq0, qemu_irq ch2_irq1);
/* sh_serial.c */
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 62c226e371..f04d13a6f6 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -678,10 +678,10 @@ SH7750State *sh7750_init(CPUSH4State * cpu)
tmu012_init(0x1fd80000,
TMU012_FEAT_TOCR | TMU012_FEAT_3CHAN | TMU012_FEAT_EXTCLK,
s->periph_freq,
- sh_intc_source(&s->intc, TMU0),
- sh_intc_source(&s->intc, TMU1),
- sh_intc_source(&s->intc, TMU2_TUNI),
- sh_intc_source(&s->intc, TMU2_TICPI));
+ s->intc.irqs[TMU0],
+ s->intc.irqs[TMU1],
+ s->intc.irqs[TMU2_TUNI],
+ s->intc.irqs[TMU2_TICPI]);
if (cpu->id & (SH_CPU_SH7750 | SH_CPU_SH7750S | SH_CPU_SH7751)) {
sh_intc_register_sources(&s->intc,
@@ -700,8 +700,8 @@ SH7750State *sh7750_init(CPUSH4State * cpu)
_INTC_ARRAY(vectors_tmu34),
NULL, 0);
tmu012_init(0x1e100000, 0, s->periph_freq,
- sh_intc_source(&s->intc, TMU3),
- sh_intc_source(&s->intc, TMU4),
+ s->intc.irqs[TMU3],
+ s->intc.irqs[TMU4],
NULL, NULL);
}
diff --git a/hw/sh_intc.c b/hw/sh_intc.c
index 8d1674ae37..3c6809ac5f 100644
--- a/hw/sh_intc.c
+++ b/hw/sh_intc.c
@@ -73,6 +73,14 @@ void sh_intc_toggle_source(struct intc_source *source,
}
}
+void sh_intc_set_irq (void *opaque, int n, int level)
+{
+ struct intc_desc *desc = opaque;
+ struct intc_source *source = &(desc->sources[n]);
+
+ sh_intc_toggle_source(source, 0, level ? 1 : -1);
+}
+
int sh_intc_get_pending_vector(struct intc_desc *desc, int imask)
{
unsigned int i;
@@ -428,6 +436,8 @@ int sh_intc_init(struct intc_desc *desc,
source->parent = desc;
}
+
+ desc->irqs = qemu_allocate_irqs(sh_intc_set_irq, desc, nr_sources);
desc->iomemtype = cpu_register_io_memory(0, sh_intc_readfn,
sh_intc_writefn, desc);
diff --git a/hw/sh_intc.h b/hw/sh_intc.h
index d22a4a2a4c..4362dcf102 100644
--- a/hw/sh_intc.h
+++ b/hw/sh_intc.h
@@ -1,6 +1,9 @@
#ifndef __SH_INTC_H__
#define __SH_INTC_H__
+#include "qemu-common.h"
+#include "irq.h"
+
typedef unsigned char intc_enum;
struct intc_vect {
@@ -43,13 +46,13 @@ struct intc_source {
};
struct intc_desc {
+ qemu_irq *irqs;
struct intc_source *sources;
int nr_sources;
struct intc_mask_reg *mask_regs;
int nr_mask_regs;
struct intc_prio_reg *prio_regs;
int nr_prio_regs;
-
int iomemtype;
int pending; /* number of interrupt sources that has pending set */
};
diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index df265d2d2a..743a970a4b 100644
--- a/hw/sh_timer.c
+++ b/hw/sh_timer.c
@@ -36,7 +36,7 @@ typedef struct {
int old_level;
int feat;
int enabled;
- struct intc_source *irq;
+ qemu_irq irq;
} sh_timer_state;
/* Check all active timers, and schedule the next timer interrupt. */
@@ -46,7 +46,7 @@ static void sh_timer_update(sh_timer_state *s)
int new_level = s->int_level && (s->tcr & TIMER_TCR_UNIE);
if (new_level != s->old_level)
- sh_intc_toggle_source(s->irq, 0, new_level ? 1 : -1);
+ qemu_set_irq (s->irq, new_level);
s->old_level = s->int_level;
s->int_level = new_level;
@@ -185,7 +185,7 @@ static void sh_timer_tick(void *opaque)
sh_timer_update(s);
}
-static void *sh_timer_init(uint32_t freq, int feat, struct intc_source *irq)
+static void *sh_timer_init(uint32_t freq, int feat, qemu_irq irq)
{
sh_timer_state *s;
QEMUBH *bh;
@@ -307,8 +307,8 @@ static CPUWriteMemoryFunc *tmu012_writefn[] = {
};
void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq,
- struct intc_source *ch0_irq, struct intc_source *ch1_irq,
- struct intc_source *ch2_irq0, struct intc_source *ch2_irq1)
+ qemu_irq ch0_irq, qemu_irq ch1_irq,
+ qemu_irq ch2_irq0, qemu_irq ch2_irq1)
{
int iomemtype;
tmu012_state *s;