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

next-cube: rearrange NeXTState declarations to improve readability

Browse Source 
Move the NeXTState, next_dma and TYPE_NEXT_MACHINE definition to the same area
at the top of next-cube.c.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20241222130012.1013374-17-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 12:59:55 +00:00 committed by Thomas Huth
parent d06a0ca96a
commit 9f15303ce2
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,30 +38,10 @@
#define DPRINTF(fmt, ...) do { } while (0) #define DPRINTF(fmt, ...) do { } while (0)
#endif #endif
#define TYPE_NEXT_MACHINE MACHINE_TYPE_NAME("next-cube")
OBJECT_DECLARE_SIMPLE_TYPE(NeXTState, NEXT_MACHINE)
#define ENTRY 0x0100001e #define ENTRY 0x0100001e
#define RAM_SIZE 0x4000000 #define RAM_SIZE 0x4000000
#define ROM_FILE "Rev_2.5_v66.bin" #define ROM_FILE "Rev_2.5_v66.bin"
typedef struct next_dma {
uint32_t csr;
uint32_t saved_next;
uint32_t saved_limit;
uint32_t saved_start;
uint32_t saved_stop;
uint32_t next;
uint32_t limit;
uint32_t start;
uint32_t stop;
uint32_t next_initbuf;
uint32_t size;
} next_dma;
typedef struct NextRtc { typedef struct NextRtc {
int8_t phase; int8_t phase;
uint8_t ram[32]; uint8_t ram[32];
@ -72,18 +52,6 @@ typedef struct NextRtc {
uint8_t retval; uint8_t retval;
} NextRtc; } NextRtc;
struct NeXTState {
MachineState parent;
MemoryRegion rom;
MemoryRegion rom2;
MemoryRegion dmamem;
MemoryRegion bmapm1;
MemoryRegion bmapm2;
next_dma dma[10];
};
#define TYPE_NEXT_SCSI "next-scsi" #define TYPE_NEXT_SCSI "next-scsi"
OBJECT_DECLARE_SIMPLE_TYPE(NeXTSCSI, NEXT_SCSI) OBJECT_DECLARE_SIMPLE_TYPE(NeXTSCSI, NEXT_SCSI)
@ -132,6 +100,38 @@ struct NeXTPC {
NextRtc rtc; NextRtc rtc;
}; };
typedef struct next_dma {
uint32_t csr;
uint32_t saved_next;
uint32_t saved_limit;
uint32_t saved_start;
uint32_t saved_stop;
uint32_t next;
uint32_t limit;
uint32_t start;
uint32_t stop;
uint32_t next_initbuf;
uint32_t size;
} next_dma;
#define TYPE_NEXT_MACHINE MACHINE_TYPE_NAME("next-cube")
OBJECT_DECLARE_SIMPLE_TYPE(NeXTState, NEXT_MACHINE)
struct NeXTState {
MachineState parent;
MemoryRegion rom;
MemoryRegion rom2;
MemoryRegion dmamem;
MemoryRegion bmapm1;
MemoryRegion bmapm2;
next_dma dma[10];
};
/* Thanks to NeXT forums for this */ /* Thanks to NeXT forums for this */
/* /*
static const uint8_t rtc_ram3[32] = { static const uint8_t rtc_ram3[32] = {