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

hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init() 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent acf695ec

hw/alpha/dp264.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void clipper_init(MachineState *machine) 
                           clipper_pci_map_irq);



    /* Since we have an SRM-compatible PALcode, use the SRM epoch.  */

    rtc_init(isa_bus, 1900, rtc_irq);

    mc146818_rtc_init(isa_bus, 1900, rtc_irq);



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

    isa_create_simple(isa_bus, "i8042");

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
            rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);

        }

    }

    *rtc_state = rtc_init(isa_bus, 2000, rtc_irq);

    *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq);



    qemu_register_boot_set(pc_boot_set, *rtc_state);

hw/isa/i82378.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "hw/pci/pci.h"

#include "hw/i386/pc.h"

#include "hw/timer/i8254.h"

#include "hw/timer/mc146818rtc.h"

#include "hw/audio/pcspk.h"



#define TYPE_I82378 "i82378"
@@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) 
    isa = isa_create_simple(isabus, "i82374");



    /* timer */

    isa_create_simple(isabus, "mc146818rtc");

    isa_create_simple(isabus, TYPE_MC146818_RTC);

}



static void i82378_init(Object *obj)

hw/mips/mips_fulong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void mips_fulong2e_init(MachineState *machine) 
    /* Super I/O */

    isa_create_simple(isa_bus, "i8042");



    rtc_init(isa_bus, 2000, NULL);

    mc146818_rtc_init(isa_bus, 2000, NULL);



    serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);

    parallel_hds_isa_init(isa_bus, 1);

hw/mips/mips_jazz.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void mips_jazz_init(MachineState *machine, 
    fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds);



    /* Real time clock */

    rtc_init(isa_bus, 1980, NULL);

    mc146818_rtc_init(isa_bus, 1980, NULL);

    memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000);

    memory_region_add_subregion(address_space, 0x80004000, rtc);