Revision 502a5395 hw/ppc_chrp.c

b/hw/ppc_chrp.c
415 415

  
416 416
    if (is_heathrow) {
417 417
        isa_mem_base = 0x80000000;
418
        pci_bus = pci_grackle_init(0xfec00000);
419 418
        
420 419
        /* Register 2 MB of ISA IO space */
421 420
        PPC_io_memory = cpu_register_io_memory(0, PPC_io_read, PPC_io_write, NULL);
422 421
        cpu_register_physical_memory(0xfe000000, 0x00200000, PPC_io_memory);
423 422
        
424 423
        /* init basic PC hardware */
424
        pic = heathrow_pic_init(&heathrow_pic_mem_index);
425
        set_irq = heathrow_pic_set_irq;
426
        pci_bus = pci_grackle_init(0xfec00000, pic);
425 427
        vga_initialize(pci_bus, ds, phys_ram_base + ram_size, 
426 428
                       ram_size, vga_ram_size,
427 429
                       vga_bios_offset, vga_bios_size);
428
        pic = heathrow_pic_init(&heathrow_pic_mem_index);
429
        set_irq = heathrow_pic_set_irq;
430
        pci_set_pic(pci_bus, set_irq, pic);
431 430

  
432 431
        /* XXX: suppress that */
433 432
        isa_pic = pic_init(pic_irq_request, NULL);
......
462 461
        arch_name = "HEATHROW";
463 462
    } else {
464 463
        isa_mem_base = 0x80000000;
465
        pci_bus = pci_pmac_init();
466 464
        
467 465
        /* Register 8 MB of ISA IO space */
468 466
        PPC_io_memory = cpu_register_io_memory(0, PPC_io_read, PPC_io_write, NULL);
......
472 470
        unin_memory = cpu_register_io_memory(0, unin_read, unin_write, NULL);
473 471
        cpu_register_physical_memory(0xf8000000, 0x00001000, unin_memory);
474 472

  
473
        pic = openpic_init(NULL, &openpic_mem_index, 1, &env);
474
        set_irq = openpic_set_irq;
475
        pci_bus = pci_pmac_init(pic);
475 476
        /* init basic PC hardware */
476 477
        vga_initialize(pci_bus, ds, phys_ram_base + ram_size,
477 478
                       ram_size, vga_ram_size,
478 479
                       vga_bios_offset, vga_bios_size);
479
        pic = openpic_init(NULL, &openpic_mem_index, 1, &env);
480
        set_irq = openpic_set_irq;
481
        pci_set_pic(pci_bus, set_irq, pic);
482 480

  
483 481
        /* XXX: suppress that */
484 482
        isa_pic = pic_init(pic_irq_request, NULL);

Also available in: Unified diff