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

hw/m68k/next-cube: Move rtc into NeXTPC struct

Browse Source 
Move the rtc into the NeXTPC struct. Since this is the last
use of the 'backdoor' NextState pointer we can now remove that.

Probably the RTC should be its own device at some point: in hardware
there is a separate MCS1850 RTC chip connected to the Peripheral
Controller via a 1-bit serial interface.  That goes beyond the remit
of the current refactoring, though.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210115201206.17347-9-peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
This commit is contained in:
Peter Maydell 2021-01-15 20:12:03 +00:00 committed by Thomas Huth
parent d9cd403972
commit 6f0face749
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,8 +78,6 @@ struct NeXTState {
qemu_irq scsi_dma; qemu_irq scsi_dma;
qemu_irq scsi_reset; qemu_irq scsi_reset;
qemu_irq *fd_irq; qemu_irq *fd_irq;
NextRtc rtc;
}; };
#define TYPE_NEXT_PC "next-pc" #define TYPE_NEXT_PC "next-pc"
@ -89,9 +87,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(NeXTPC, NEXT_PC)
struct NeXTPC { struct NeXTPC {
SysBusDevice parent_obj; SysBusDevice parent_obj;
/* Temporary until all functionality has been moved into this device */
NeXTState *ns;
M68kCPU *cpu; M68kCPU *cpu;
MemoryRegion mmiomem; MemoryRegion mmiomem;
@ -103,6 +98,8 @@ struct NeXTPC {
uint8_t scsi_csr_2; uint8_t scsi_csr_2;
uint32_t int_mask; uint32_t int_mask;
uint32_t int_status; uint32_t int_status;
NextRtc rtc;
}; };
/* Thanks to NeXT forums for this */ /* Thanks to NeXT forums for this */
@ -131,7 +128,7 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int size)
static int phase; static int phase;
static uint8_t old_scr2; static uint8_t old_scr2;
uint8_t scr2_2; uint8_t scr2_2;
NextRtc *rtc = &s->ns->rtc; NextRtc *rtc = &s->rtc;
if (size == 4) { if (size == 4) {
scr2_2 = (val >> 8) & 0xFF; scr2_2 = (val >> 8) & 0xFF;
@ -865,6 +862,11 @@ static void next_pc_reset(DeviceState *dev)
/* 0x0000XX00 << vital bits */ /* 0x0000XX00 << vital bits */
s->scr1 = 0x00011102; s->scr1 = 0x00011102;
s->scr2 = 0x00ff0c80; s->scr2 = 0x00ff0c80;
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)
@ -921,7 +923,6 @@ static void next_cube_init(MachineState *machine)
MemoryRegion *bmapm2 = g_new(MemoryRegion, 1); MemoryRegion *bmapm2 = g_new(MemoryRegion, 1);
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
const char *bios_name = machine->firmware ?: ROM_FILE; const char *bios_name = machine->firmware ?: ROM_FILE;
NeXTState *ns = NEXT_MACHINE(machine);
DeviceState *dev; DeviceState *dev;
DeviceState *pcdev; DeviceState *pcdev;
@ -941,13 +942,6 @@ static void next_cube_init(MachineState *machine)
pcdev = qdev_new(TYPE_NEXT_PC); pcdev = qdev_new(TYPE_NEXT_PC);
object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abort); object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abort);
sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal);
/* Temporary while we refactor this code */
NEXT_PC(pcdev)->ns = ns;
ns->rtc.status = 0x90;
/* Load RTC RAM - TODO: provide possibility to load contents from file */
memcpy(ns->rtc.ram, rtc_ram2, 32);
/* 64MB RAM starting at 0x04000000 */ /* 64MB RAM starting at 0x04000000 */
memory_region_add_subregion(sysmem, 0x04000000, machine->ram); memory_region_add_subregion(sysmem, 0x04000000, machine->ram);