SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

next-cube: move reset of next-rtc fields from next-pc to next-rtc

Browse Source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20241222130012.1013374-27-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
This commit is contained in:
Mark Cave-Ayland 2024-12-22 13:00:05 +00:00 committed by Thomas Huth
parent 49100693e9
commit 96d5c4d524
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/m68k/next-cube.c
View File

@ -1018,6 +1018,16 @@ static const MemoryRegionOps next_dummy_en_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void next_rtc_reset_hold(Object *obj, ResetType type)
{
NeXTRTC *rtc = NEXT_RTC(obj);
rtc->status = 0x90;
/* Load RTC RAM - TODO: provide possibility to load contents from file */
memcpy(rtc->ram, rtc_ram2, 32);
}
static const VMStateDescription next_rtc_vmstate = { static const VMStateDescription next_rtc_vmstate = {
.name = "next-rtc", .name = "next-rtc",
.version_id = 3, .version_id = 3,
@ -1037,9 +1047,11 @@ static const VMStateDescription next_rtc_vmstate = {
static void next_rtc_class_init(ObjectClass *klass, void *data) static void next_rtc_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
dc->desc = "NeXT RTC"; dc->desc = "NeXT RTC";
dc->vmsd = &next_rtc_vmstate; dc->vmsd = &next_rtc_vmstate;
rc->phases.hold = next_rtc_reset_hold;
} }
static const TypeInfo next_rtc_info = { static const TypeInfo next_rtc_info = {
@ -1072,11 +1084,6 @@ static void next_pc_reset_hold(Object *obj, ResetType type)
s->scr1 = 0x00011102; s->scr1 = 0x00011102;
s->scr2 = 0x00ff0c80; s->scr2 = 0x00ff0c80;
s->old_scr2 = s->scr2; s->old_scr2 = s->scr2;
s->rtc.status = 0x90;
/* Load RTC RAM - TODO: provide possibility to load contents from file */
memcpy(s->rtc.ram, rtc_ram2, 32);
} }
static void next_pc_realize(DeviceState *dev, Error **errp) static void next_pc_realize(DeviceState *dev, Error **errp)