Commit acf695ec authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael Tokarev
Browse files

hw/timer/i8254: rename pit_init() -> i8254_pit_init() 



and remove the old i386/pc dependency

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 40a3bbc9

hw/alpha/dp264.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) 
    /* Since we have an SRM-compatible PALcode, use the SRM epoch.  */

    rtc_init(isa_bus, 1900, rtc_irq);



    pit_init(isa_bus, 0x40, 0, NULL);

    i8254_pit_init(isa_bus, 0x40, 0, NULL);

    isa_create_simple(isa_bus, "i8042");



    /* VGA setup.  Don't bother loading the bios.  */

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
        if (kvm_pit_in_kernel()) {

            pit = kvm_pit_init(isa_bus, 0x40);

        } else {

            pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);

            pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);

        }

        if (hpet) {

            /* connect PIT to output control line of the HPET */

hw/isa/i82378.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) 
    isa_bus_irqs(isabus, s->i8259);



    /* 1 82C54 (pit) */

    isa = pit_init(isabus, 0x40, 0, NULL);

    isa = i8254_pit_init(isabus, 0x40, 0, NULL);



    /* speaker */

    pcspk_init(isabus, isa);

hw/mips/mips_fulong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void mips_fulong2e_init(MachineState *machine) 
    smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));



    /* init other devices */

    pit = pit_init(isa_bus, 0x40, 0, NULL);

    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);

    DMA_init(isa_bus, 0);



    /* Super I/O */

hw/mips/mips_jazz.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void mips_jazz_init(MachineState *machine, 
    i8259 = i8259_init(isa_bus, env->irq[4]);

    isa_bus_irqs(isa_bus, i8259);

    DMA_init(isa_bus, 0);

    pit = pit_init(isa_bus, 0x40, 0, NULL);

    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);

    pcspk_init(isa_bus, pit);



    /* Video card */