[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 12/13] hw/isa/vt82c686: Embed RTCState in host device
From: |
Bernhard Beschow |
Subject: |
[PATCH v5 12/13] hw/isa/vt82c686: Embed RTCState in host device |
Date: |
Thu, 1 Sep 2022 13:41:26 +0200 |
Embed the rtc in the host device, analoguous to the other child devices
and analoguous to PIIX4.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/isa/vt82c686.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 91686e9570..48cd4d0036 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -550,6 +550,7 @@ struct ViaISAState {
qemu_irq cpu_intr;
qemu_irq *isa_irqs;
ViaSuperIOState via_sio;
+ RTCState rtc;
PCIIDEState ide;
UHCIState uhci[2];
ViaPMState pm;
@@ -571,6 +572,7 @@ static void via_isa_init(Object *obj)
{
ViaISAState *s = VIA_ISA(obj);
+ object_initialize_child(obj, "rtc", &s->rtc, TYPE_MC146818_RTC);
object_initialize_child(obj, "ide", &s->ide, TYPE_VIA_IDE);
object_initialize_child(obj, "uhci1", &s->uhci[0],
TYPE_VT82C686B_USB_UHCI);
object_initialize_child(obj, "uhci2", &s->uhci[1],
TYPE_VT82C686B_USB_UHCI);
@@ -624,7 +626,15 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
isa_bus_irqs(isa_bus, s->isa_irqs);
i8254_pit_init(isa_bus, 0x40, 0, NULL);
i8257_dma_init(isa_bus, 0);
- mc146818_rtc_init(isa_bus, 2000, NULL);
+
+ /* RTC */
+ qdev_prop_set_int32(DEVICE(&s->rtc), "base_year", 2000);
+ if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) {
+ return;
+ }
+ object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(&s->rtc),
+ "date");
+ isa_connect_gpio_out(ISA_DEVICE(&s->rtc), 0, s->rtc.isairq);
for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
--
2.37.3
- [PATCH v5 00/13] Instantiate VT82xx functions in host device, Bernhard Beschow, 2022/09/01
- [PATCH v5 13/13] hw/isa/vt82c686: Create rtc-time alias in boards instead, Bernhard Beschow, 2022/09/01
- [PATCH v5 06/13] hw/isa/vt82c686: Instantiate IDE function in host device, Bernhard Beschow, 2022/09/01
- [PATCH v5 10/13] hw/isa/vt82c686: Instantiate AC97 and MC97 functions in host device, Bernhard Beschow, 2022/09/01
- [PATCH v5 12/13] hw/isa/vt82c686: Embed RTCState in host device,
Bernhard Beschow <=
- [PATCH v5 05/13] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define, Bernhard Beschow, 2022/09/01
- [PATCH v5 01/13] hw/isa/vt82c686: Resolve chip-specific realize methods, Bernhard Beschow, 2022/09/01
- [PATCH v5 04/13] hw/isa/vt82c686: Reuse errp, Bernhard Beschow, 2022/09/01
- [PATCH v5 02/13] hw/isa/vt82c686: Resolve unneeded attribute, Bernhard Beschow, 2022/09/01
- [PATCH v5 07/13] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define, Bernhard Beschow, 2022/09/01
- [PATCH v5 03/13] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory(), Bernhard Beschow, 2022/09/01
- [PATCH v5 11/13] hw/mips/fuloong2e: Inline vt82c686b_southbridge_init() and remove it, Bernhard Beschow, 2022/09/01