motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

next-cube: use named gpio output for next-rtc data

Browse source 
Add a named gpio output for the next-rtc data and then update
next_rtc_data_in_irq() to drive the IRQ directly. This enables the next-rtc to
next-pc data to be wired up using the standard qdev gpio APIs.

At the same time rename the pc-rtc-data-in gpio to rtc-data-in which is possible
now that the previous rtc-data-in gpio has been moved to the next-rtc device.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20241222130012.1013374-29-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
This commit is contained in:
Mark Cave-Ayland 2024-12-22 13:00:07 +00:00 • committed by Thomas Huth
parent 4387e938f4
commit 44df953368
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hw/m68k/next-cube.c
View file

@ -56,6 +56,8 @@ struct NeXTRTC {
uint8_t status;
uint8_t control;
uint8_t retval;
qemu_irq data_out_irq;
};
#define TYPE_NEXT_SCSI "next-scsi"
@ -234,13 +236,10 @@ static void next_rtc_data_in_irq(void *opaque, int n, int level)
rtc->value = (rtc->value << 1) | level;
} else {
/* Shift out value to read */
qemu_irq rtc_data_in_irq = qdev_get_gpio_in_named(
DEVICE(s), "pc-rtc-data-in", 0);
if (rtc->retval & (0x80 >> (rtc->phase - 8))) {
qemu_irq_raise(rtc_data_in_irq);
qemu_irq_raise(rtc->data_out_irq);
} else {
qemu_irq_lower(rtc_data_in_irq);
qemu_irq_lower(rtc->data_out_irq);
}
}
}
@ -1028,8 +1027,12 @@ static void next_rtc_reset_hold(Object *obj, ResetType type)
static void next_rtc_init(Object *obj)
{
NeXTRTC *rtc = NEXT_RTC(obj);
qdev_init_gpio_in_named(DEVICE(obj), next_rtc_data_in_irq,
"rtc-data-in", 1);
qdev_init_gpio_out_named(DEVICE(obj), &rtc->data_out_irq,
"rtc-data-out", 1);
}
static const VMStateDescription next_rtc_vmstate = {
@ -1136,6 +1139,10 @@ static void next_pc_realize(DeviceState *dev, Error **errp)
/* Data from NeXTPC to RTC */
qdev_connect_gpio_out_named(dev, "rtc-data-out", 0,
qdev_get_gpio_in_named(d, "rtc-data-in", 0));
/* Data from RTC to NeXTPC */
qdev_connect_gpio_out_named(d, "rtc-data-out", 0,
qdev_get_gpio_in_named(dev,
"rtc-data-in", 0));
}
static void next_pc_init(Object *obj)
@ -1173,7 +1180,7 @@ static void next_pc_init(Object *obj)
s->rtc_power_irq = qdev_get_gpio_in(DEVICE(obj), NEXT_PWR_I);
qdev_init_gpio_in_named(DEVICE(obj), next_pc_rtc_data_in_irq,
"pc-rtc-data-in", 1);
"rtc-data-in", 1);
qdev_init_gpio_out_named(DEVICE(obj), &s->rtc_data_irq,
"rtc-data-out", 1);
}