[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add e
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-trivial] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS |
Date: |
Fri, 22 Sep 2017 13:01:02 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/timer/m48t59.h | 2 ++
hw/ppc/prep.c | 2 +-
hw/timer/m48t59-isa.c | 2 +-
MAINTAINERS | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h
index db5e43a8da..069bb045d7 100644
--- a/include/hw/timer/m48t59.h
+++ b/include/hw/timer/m48t59.h
@@ -25,6 +25,8 @@ typedef struct NvramClass {
void (*toggle_lock)(Nvram *obj, int lock);
} NvramClass;
+#define TYPE_M48T59_ISA "isa-m48t59"
+
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,
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 16f4537093..1f8ef4819b 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -777,7 +777,7 @@ static void ibm_40p_init(MachineState *machine)
/* add some more devices */
if (defaults_enabled()) {
isa_create_simple(isa_bus, TYPE_I8042);
- m48t59 = NVRAM(isa_create_simple(isa_bus, "isa-m48t59"));
+ m48t59 = NVRAM(isa_create_simple(isa_bus, TYPE_M48T59_ISA));
dev = DEVICE(isa_create(isa_bus, "cs4231a"));
qdev_prop_set_uint32(dev, "iobase", 0x830);
diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c
index ea1ba703d7..077346f7ca 100644
--- a/hw/timer/m48t59-isa.c
+++ b/hw/timer/m48t59-isa.c
@@ -49,7 +49,7 @@ typedef struct M48txxISADeviceClass {
static M48txxInfo m48txx_isa_info[] = {
{
- .bus_name = "isa-m48t59",
+ .bus_name = TYPE_M48T59_ISA,
.model = 59,
.size = 0x2000,
}
diff --git a/MAINTAINERS b/MAINTAINERS
index a79723601c..3cb6bc190c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -708,6 +708,8 @@ F: hw/pci-host/prep.[hc]
F: hw/isa/i82378.c
F: hw/isa/pc87312.[hc]
F: hw/dma/i82374.c
+F: hw/timer/m48t59-isa.c
+F: include/hw/timer/m48t59.h
F: pc-bios/ppc_rom.bin
sPAPR
--
2.14.1
- [Qemu-trivial] [PATCH 15/34] hw/i2c: remove old i386 dependency, (continued)
- [Qemu-trivial] [PATCH 15/34] hw/i2c: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 18/34] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 19/34] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 20/34] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 23/34] hw/dma/i8257: rename DMA_init() to i8257_dma_init(), Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS,
Philippe Mathieu-Daudé <=
- [Qemu-trivial] [PATCH 24/34] hw/timer/mc146818: rename rtc_init() -> mc146818_init(), Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 26/34] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-trivial] [PATCH 29/34] hw/net/e1000e: use TYPE_PCI_E1000E, Philippe Mathieu-Daudé, 2017/09/22