diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-01-01 20:57:25 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-01-01 20:57:25 +0000 |
| commit | e3a79bcadd9792c6efd4b7379fed026061bdfdbb (patch) | |
| tree | c94a0e2244e87e3a35d4e8dd9997948e563c9406 /hw/sun4m.c | |
| parent | 045380be94a96dc8dc2d31cb23d1fc634440f53b (diff) | |
Fix Debian serial console boot problem reported by Aurelien Jarno
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3883 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index 6f6f705059..e645ad8cbb 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -89,8 +89,7 @@ struct hwdef { 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 except for clock_irq, which indexes cpu - // interrupt controller register + // register bit numbers 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 @@ -695,7 +694,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 14, + .clock_irq = 7, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -736,7 +735,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 14, + .clock_irq = 7, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -777,7 +776,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 14, + .clock_irq = 7, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, @@ -818,7 +817,7 @@ static const struct hwdef hwdefs[] = { .nvram_size = 0x2000, .esp_irq = 18, .le_irq = 16, - .clock_irq = 14, + .clock_irq = 7, .clock1_irq = 19, .ms_kb_irq = 14, .ser_irq = 15, |