motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 18:44:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

next-cube: add rtc-cmd-reset named gpio to reset the rtc state machine

Browse source 
This allows us to decouple the next-pc and next-rtc devices from each
other in next_scr2_rtc_update().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20241222130012.1013374-30-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:08 +00:00 • committed by Thomas Huth
parent 44df953368
commit c1322be69d
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ struct NeXTPC {
NeXTRTC rtc; NeXTRTC rtc;
qemu_irq rtc_power_irq; qemu_irq rtc_power_irq;
qemu_irq rtc_data_irq; qemu_irq rtc_data_irq;
qemu_irq rtc_cmd_reset_irq;
}; };
typedef struct next_dma { typedef struct next_dma {
@ -264,7 +265,6 @@ static void next_rtc_data_in_irq(void *opaque, int n, int level)
static void next_scr2_rtc_update(NeXTPC *s) static void next_scr2_rtc_update(NeXTPC *s)
{ {
uint8_t old_scr2, scr2_2; uint8_t old_scr2, scr2_2;
NeXTRTC *rtc = &s->rtc;
old_scr2 = extract32(s->old_scr2, 8, 8); old_scr2 = extract32(s->old_scr2, 8, 8);
scr2_2 = extract32(s->scr2, 8, 8); scr2_2 = extract32(s->scr2, 8, 8);
@ -282,9 +282,7 @@ static void next_scr2_rtc_update(NeXTPC *s)
} }
} else { } else {
/* else end or abort */ /* else end or abort */
rtc->phase = 0; qemu_irq_raise(s->rtc_cmd_reset_irq);
rtc->command = 0;
rtc->value = 0;
} }
} }
@ -1015,6 +1013,17 @@ static const MemoryRegionOps next_dummy_en_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void next_rtc_cmd_reset_irq(void *opaque, int n, int level)
{
NeXTRTC *rtc = NEXT_RTC(opaque);
if (level) {
rtc->phase = 0;
rtc->command = 0;
rtc->value = 0;
}
}
static void next_rtc_reset_hold(Object *obj, ResetType type) static void next_rtc_reset_hold(Object *obj, ResetType type)
{ {
NeXTRTC *rtc = NEXT_RTC(obj); NeXTRTC *rtc = NEXT_RTC(obj);
@ -1033,6 +1042,8 @@ static void next_rtc_init(Object *obj)
"rtc-data-in", 1); "rtc-data-in", 1);
qdev_init_gpio_out_named(DEVICE(obj), &rtc->data_out_irq, qdev_init_gpio_out_named(DEVICE(obj), &rtc->data_out_irq,
"rtc-data-out", 1); "rtc-data-out", 1);
qdev_init_gpio_in_named(DEVICE(obj), next_rtc_cmd_reset_irq,
"rtc-cmd-reset", 1);
} }
static const VMStateDescription next_rtc_vmstate = { static const VMStateDescription next_rtc_vmstate = {
@ -1143,6 +1154,8 @@ static void next_pc_realize(DeviceState *dev, Error **errp)
qdev_connect_gpio_out_named(d, "rtc-data-out", 0, qdev_connect_gpio_out_named(d, "rtc-data-out", 0,
qdev_get_gpio_in_named(dev, qdev_get_gpio_in_named(dev,
"rtc-data-in", 0)); "rtc-data-in", 0));
qdev_connect_gpio_out_named(dev, "rtc-cmd-reset", 0,
qdev_get_gpio_in_named(d, "rtc-cmd-reset", 0));
} }
static void next_pc_init(Object *obj) static void next_pc_init(Object *obj)
@ -1183,6 +1196,8 @@ static void next_pc_init(Object *obj)
"rtc-data-in", 1); "rtc-data-in", 1);
qdev_init_gpio_out_named(DEVICE(obj), &s->rtc_data_irq, qdev_init_gpio_out_named(DEVICE(obj), &s->rtc_data_irq,
"rtc-data-out", 1); "rtc-data-out", 1);
qdev_init_gpio_out_named(DEVICE(obj), &s->rtc_cmd_reset_irq,
"rtc-cmd-reset", 1);
} }
/* /*