Fix CPU timer interrupts
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3876 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 67ebdfd..96515f2 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -88,8 +88,9 @@
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 @@
.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 @@
.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 @@
.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 @@
.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,
