diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-29 20:09:57 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-29 20:09:57 +0000 |
| commit | 6341fdcb7841f364a6102ce2b3c375e6c0d7560e (patch) | |
| tree | faf3f23516de916d879cdc9242b9ce70d4d65954 /hw/sun4m.c | |
| parent | 371911094c728b8efe1e1270a0526758d1647a34 (diff) | |
Fix CPU timer interrupts
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3876 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index 67ebdfd621..96515f290a 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -88,8 +88,9 @@ struct hwdef { uint32_t ecc_version; target_phys_addr_t sun4c_intctl_base, sun4c_counter_base; long vram_size, nvram_size; - // IRQ numbers are not PIL ones, but master interrupt controller register - // bit numbers + // IRQ numbers are not PIL ones, but master interrupt controller + // register bit numbers except for clock_irq, which indexes cpu + // interrupt controller register int intctl_g_intr, esp_irq, le_irq, clock_irq, clock1_irq; int ser_irq, ms_kb_irq, fd_irq, me_irq, cs_irq; int machine_id; // For NVRAM @@ -691,7 +692,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 7, + .clock_irq = 14, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -732,7 +733,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 7, + .clock_irq = 14, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -773,7 +774,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 7, + .clock_irq = 14, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -814,7 +815,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 7, + .clock_irq = 14, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, |