← Back to branch summary

~vcs-imports/qemu/git

« back to all changes in this revision

Viewing changes to hw/pl181.c

  • Committer: pbrook
  • Date: 2007-04-07 18:14:41 UTC
  • Revision ID: git-v1:d537cf6c8624b27ce2b63431d2f8937f6356f652
Unify IRQ handling.


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

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/pl181.c
40
40
    int fifo_pos;
41
41
    int fifo_len;
42
42
    uint32_t fifo[PL181_FIFO_LEN];
43
 
    void *pic;
44
 
    int irq[2];
 
43
    qemu_irq irq[2];
45
44
} pl181_state;
46
45
 
47
46
#define PL181_CMD_INDEX     0x3f
96
95
{
97
96
    int i;
98
97
    for (i = 0; i < 2; i++) {
99
 
        pic_set_irq_new(s->pic, s->irq[i], (s->status & s->mask[i]) != 0);
 
98
        qemu_set_irq(s->irq[i], (s->status & s->mask[i]) != 0);
100
99
    }
101
100
}
102
101
 
425
424
}
426
425
 
427
426
void pl181_init(uint32_t base, BlockDriverState *bd,
428
 
                void *pic, int irq0, int irq1)
 
427
                qemu_irq irq0, qemu_irq irq1)
429
428
{
430
429
    int iomemtype;
431
430
    pl181_state *s;
436
435
    cpu_register_physical_memory(base, 0x00000fff, iomemtype);
437
436
    s->base = base;
438
437
    s->card = sd_init(bd);
439
 
    s->pic = pic;
440
438
    s->irq[0] = irq0;
441
439
    s->irq[1] = irq1;
442
440
    qemu_register_reset(pl181_reset, s);