[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/35] next-cube: move next_scsi_init() to next_pc_realize()
From: |
Thomas Huth |
Subject: |
[PULL 06/35] next-cube: move next_scsi_init() to next_pc_realize() |
Date: |
Sun, 29 Dec 2024 08:24:57 +0100 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This reflects that the SCSI interface exists within the NeXT Peripheral
Controller (PC).
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20241222130012.1013374-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/next-cube.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 31c0532aff..97dea45b13 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -908,6 +908,9 @@ static void next_pc_realize(DeviceState *dev, Error **errp)
"next.scr", 0x20000);
sysbus_init_mmio(sbd, &s->mmiomem);
sysbus_init_mmio(sbd, &s->scrmem);
+
+ /* SCSI */
+ next_scsi_init(dev);
}
/*
@@ -1050,8 +1053,6 @@ static void next_cube_init(MachineState *machine)
/* TODO: */
/* Network */
- /* SCSI */
- next_scsi_init(pcdev);
/* DMA */
memory_region_init_io(&m->dmamem, NULL, &next_dma_ops, machine,
--
2.47.1
- [PULL 00/35] m68k / next-cube patches, Thomas Huth, 2024/12/29
- [PULL 01/35] hw/m68k: Mark devices as big-endian, Thomas Huth, 2024/12/29
- [PULL 03/35] next-cube: remove 0x14020 dummy value from next_mmio_read(), Thomas Huth, 2024/12/29
- [PULL 05/35] next-cube: create new next.scsi container memory region, Thomas Huth, 2024/12/29
- [PULL 02/35] hw/m68k/next-cube: Disable the default CD-ROM drive, Thomas Huth, 2024/12/29
- [PULL 04/35] next-cube: remove overlap between next.dma and next.mmio memory regions, Thomas Huth, 2024/12/29
- [PULL 06/35] next-cube: move next_scsi_init() to next_pc_realize(),
Thomas Huth <=
- [PULL 07/35] next-cube: introduce next_pc_init() object init function, Thomas Huth, 2024/12/29
- [PULL 08/35] next-cube: introduce next-scsi device, Thomas Huth, 2024/12/29
- [PULL 09/35] next-cube: move SCSI CSRs from next-pc to the next-scsi device, Thomas Huth, 2024/12/29
- [PULL 10/35] next-cube: move SCSI 4020/4021 logic from next-pc device to next-scsi device, Thomas Huth, 2024/12/29
- [PULL 11/35] next-cube: move floppy disk MMIO to separate memory region in next-pc, Thomas Huth, 2024/12/29
- [PULL 12/35] next-cube: map ESCC registers as a subregion of the next.scr memory region, Thomas Huth, 2024/12/29
- [PULL 13/35] next-cube: move ESCC to be QOM child of next-pc device, Thomas Huth, 2024/12/29
- [PULL 14/35] next-cube: move timer MMIO to separate memory region on next-pc device, Thomas Huth, 2024/12/29
- [PULL 15/35] next-cube: move en ethernet MMIO to separate memory region on next-pc device, Thomas Huth, 2024/12/29
- [PULL 16/35] next-cube: add empty slots for unknown accesses to next.scr memory region, Thomas Huth, 2024/12/29