Commit fa296b0fb4ceb0a2535bce201a76f1c00ca21468
1 parent
3fc6c082
PIC fix - changed back TB frequency to 100 MHz
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1490 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
4 deletions
hw/ppc_chrp.c
| @@ -307,8 +307,8 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | @@ -307,8 +307,8 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | ||
| 307 | } | 307 | } |
| 308 | cpu_ppc_register(cpu_single_env, def); | 308 | cpu_ppc_register(cpu_single_env, def); |
| 309 | 309 | ||
| 310 | - /* Set time-base frequency to 10 Mhz */ | ||
| 311 | - cpu_ppc_tb_init(cpu_single_env, 10UL * 1000UL * 1000UL); | 310 | + /* Set time-base frequency to 100 Mhz */ |
| 311 | + cpu_ppc_tb_init(cpu_single_env, 100UL * 1000UL * 1000UL); | ||
| 312 | 312 | ||
| 313 | cpu_single_env->osi_call = vga_osi_call; | 313 | cpu_single_env->osi_call = vga_osi_call; |
| 314 | 314 | ||
| @@ -328,7 +328,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | @@ -328,7 +328,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | ||
| 328 | pci_set_pic(pci_bus, set_irq, pic); | 328 | pci_set_pic(pci_bus, set_irq, pic); |
| 329 | 329 | ||
| 330 | /* XXX: suppress that */ | 330 | /* XXX: suppress that */ |
| 331 | - pic_init(pic_irq_request, NULL); | 331 | + isa_pic = pic_init(pic_irq_request, NULL); |
| 332 | 332 | ||
| 333 | /* XXX: use Mac Serial port */ | 333 | /* XXX: use Mac Serial port */ |
| 334 | serial_init(0x3f8, 4, serial_hds[0]); | 334 | serial_init(0x3f8, 4, serial_hds[0]); |
| @@ -370,7 +370,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | @@ -370,7 +370,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, | ||
| 370 | pci_set_pic(pci_bus, set_irq, pic); | 370 | pci_set_pic(pci_bus, set_irq, pic); |
| 371 | 371 | ||
| 372 | /* XXX: suppress that */ | 372 | /* XXX: suppress that */ |
| 373 | - pic_init(pic_irq_request, NULL); | 373 | + isa_pic = pic_init(pic_irq_request, NULL); |
| 374 | 374 | ||
| 375 | /* XXX: use Mac Serial port */ | 375 | /* XXX: use Mac Serial port */ |
| 376 | serial_init(0x3f8, 4, serial_hds[0]); | 376 | serial_init(0x3f8, 4, serial_hds[0]); |