OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

SH4: Use qemu_irq in timer emulation.

Browse Source 
* hw/sh.h (tmu012_init): Accept qemu_irq, not intc_source.
        * hw/sh7750.c (sh7750_init): Pass qemu_irq to tmu012_init.
        * hw/sh_intc.c (sh_intc_set_irq): New.
        (sh_intc_init): Allocate irqs.
        * hw/sh_intc.h (struct intc_desc): New field irqs.
        * hw/sh_timer.c (sh_timer_state): Use qemu_irq, not intc_source.
        (sh_timer_update): Use qemu_set_irq, not sh_intc_toggle_source.
        (sh_timer_init, tmu012_init): Adjust.

(Vladimir Prus)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5768 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-11-21 21:06:42 +00:00
parent 380ce5ba93
commit 96e2fc41a9
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/sh.h
View File

@ -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 */

12
hw/sh7750.c
View File

@ -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);
}

10
hw/sh_intc.c
View File

@ -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);

5
hw/sh_intc.h
View File

@ -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 */
};

10
hw/sh_timer.c
View File

@ -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;