Le 14/09/2020 à 12:24, Philippe Mathieu-Daudé a écrit :
> As the 'io_base' argument of m48t59_init() is unused (set to 0),
> remove it to simplify.
> To create a device on the ISA bus, m48t59_init_isa() is the
> preferred function to use.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> include/hw/rtc/m48t59.h | 2 +-
> hw/ppc/ppc405_boards.c | 2 +-
> hw/rtc/m48t59.c | 10 ++--------
> hw/sparc/sun4m.c | 2 +-
> hw/sparc64/sun4u.c | 2 +-
> 5 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h
> index 04abedf3b2b..62297ee0db1 100644
> --- a/include/hw/rtc/m48t59.h
> +++ b/include/hw/rtc/m48t59.h
> @@ -50,7 +50,7 @@ struct NvramClass {
> Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
> int base_year, int type);
> Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> - uint32_t io_base, uint16_t size, int base_year,
> + uint16_t size, int base_year,
> int type);
>
> #endif /* HW_M48T59_H */
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 6198ec1035b..93ffee801a3 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -227,7 +227,7 @@ static void ref405ep_init(MachineState *machine)
> /* Register FPGA */
> ref405ep_fpga_init(sysmem, 0xF0300000);
> /* Register NVRAM */
> - m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);
> + m48t59_init(NULL, 0xF0000000, 8192, 1968, 8);
> /* Load kernel */
> linux_boot = (kernel_filename != NULL);
> if (linux_boot) {
> diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
> index 6525206976b..2d6a095c4e4 100644
> --- a/hw/rtc/m48t59.c
> +++ b/hw/rtc/m48t59.c
> @@ -566,7 +566,7 @@ const MemoryRegionOps m48t59_io_ops = {
>
> /* Initialisation routine */
> Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> - uint32_t io_base, uint16_t size, int base_year,
> + uint16_t size, int base_year,
> int model)
> {
> DeviceState *dev;
> @@ -584,13 +584,7 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> s = SYS_BUS_DEVICE(dev);
> sysbus_realize_and_unref(s, &error_fatal);
> sysbus_connect_irq(s, 0, IRQ);
> - if (io_base != 0) {
> - memory_region_add_subregion(get_system_io(), io_base,
> - sysbus_mmio_get_region(s, 1));
> - }
> - if (mem_base != 0) {
> - sysbus_mmio_map(s, 0, mem_base);
> - }
> + sysbus_mmio_map(s, 0, mem_base);
>
> return NVRAM(s);
> }
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 947b69d1597..56a0d38f274 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -970,7 +970,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
> create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
> }
>
> - nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968,
> 8);
> + nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0x2000, 1968, 8);
>
> slavio_timer_init_all(hwdef->counter_base, slavio_irq[19],
> slavio_cpu_irq, smp_cpus);
>
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index b4aabfc076f..1cc57b030a7 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -675,7 +675,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
> pci_ide_create_devs(pci_dev);
>
> /* Map NVRAM into I/O (ebus) space */
> - nvram = m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59);
> + nvram = m48t59_init(NULL, 0, NVRAM_SIZE, 1968, 59);
> s = SYS_BUS_DEVICE(nvram);
> memory_region_add_subregion(pci_address_space_io(ebus), 0x2000,
> sysbus_mmio_get_region(s, 0));
>
Applied to my trivial-patches branch.
Thanks,
Laurent
