From 14bdf57276a0f5b832fbe6d3b88936096e4b40ac Mon Sep 17 00:00:00 2001 From: Renaud Schweingruber Date: Tue, 10 Jun 2025 13:51:00 +0200 Subject: [PATCH 1/5] Update lowlevel.c --- rom/devs/ata/lowlevel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rom/devs/ata/lowlevel.c b/rom/devs/ata/lowlevel.c index 7683152bd6..64da7470fb 100644 --- a/rom/devs/ata/lowlevel.c +++ b/rom/devs/ata/lowlevel.c @@ -16,15 +16,16 @@ -#define VREG_BOARD_Unknown 0x00 /* Unknown */ +#define VREG_BOARD_Unknown 0x00 /* Unknown, */ #define VREG_BOARD_V600 0x01 /* Vampire V2 V600(+), for A600 */ #define VREG_BOARD_V500 0x02 /* Vampire V2 V500(+), for A500 */ -#define VREG_BOARD_V4FB 0x03 /* Apollo V4 FireBird, for A500 */ -#define VREG_BOARD_V4ID 0x04 /* Apollo V4 IceDrake, for A1200 */ +#define VREG_BOARD_V4FB 0x03 /* Apollo V4 Firebird, for A500 */ +#define VREG_BOARD_V4ID 0x04 /* Apollo V4 Icedrake, for A1200 */ #define VREG_BOARD_V4SA 0x05 /* Apollo V4 Standalone */ #define VREG_BOARD_V1200 0x06 /* Vampire V2 V1200, for A1200 */ #define VREG_BOARD_V4MC 0x07 /* Apollo V4 Manticore, for A600 */ -#define VREG_BOARD_Future 0x08 /* Unknow */ +#define VREG_BOARD_V4UNI 0x08 /* Apollo V4 Unicorn, */ +#define VREG_BOARD_Future 0x09 /* Unknown */ static BYTE ata_Identify(struct ata_Unit *unit); static BYTE ata_ReadSector32(struct ata_Unit *, ULONG, ULONG, APTR, ULONG *); From 64c675698db5b3cbdb19debf8d5fe86190db756d Mon Sep 17 00:00:00 2001 From: Renaud Schweingruber Date: Tue, 10 Jun 2025 13:52:18 +0200 Subject: [PATCH 2/5] Update sagagfx_hw.h --- arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h b/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h index 025425c5a7..8e99c81e74 100644 --- a/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h +++ b/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h @@ -24,12 +24,12 @@ #define VREG_BOARD_Unknown 0x00 // Unknown #define VREG_BOARD_V2_V600 0x01 // V2-V600 (legacy) #define VREG_BOARD_V2_V500 0x02 // V2-V500 (legacy) -#define VREG_BOARD_V4_V500 0x03 // V4-V500 = FireBird +#define VREG_BOARD_V4_V500 0x03 // V4-V500 = Firebird #define VREG_BOARD_V4_V1200 0x04 // V4-V1200 = Icedrake -#define VREG_BOARD_V4_SA 0x05 // V4-SA = StandAlone +#define VREG_BOARD_V4_SA 0x05 // V4-SA = Standalone #define VREG_BOARD_V2_V1200 0x06 // V2-V1200 (legacy) -#define VREG_BOARD_V4_V600 0x07 // V4-V600 = MantiCore -#define VREG_BOARD_Future_1 0x08 // Future +#define VREG_BOARD_V4_V600 0x07 // V4-V600 = Manticore +#define VREG_BOARD_V4_UNI 0x08 // V4-UNI = Unicorn #define VREG_BOARD_Future_2 0x09 // Future #define VREG_BOARD 0xDFF3FC // [16-bits] BoardID [HIGH-Byte: MODEL, LOW-Byte: xFREQ] From 3314a24a059ade103c4103e50fcd8b5b7beb5e2c Mon Sep 17 00:00:00 2001 From: Renaud Schweingruber Date: Tue, 10 Jun 2025 13:53:47 +0200 Subject: [PATCH 3/5] Update probe.c --- arch/m68k-amiga/hidd/gayle_ata/probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/m68k-amiga/hidd/gayle_ata/probe.c b/arch/m68k-amiga/hidd/gayle_ata/probe.c index da5192d57a..4d997884f1 100644 --- a/arch/m68k-amiga/hidd/gayle_ata/probe.c +++ b/arch/m68k-amiga/hidd/gayle_ata/probe.c @@ -59,7 +59,8 @@ #define VREG_BOARD_V4SA 0x05 /* Apollo V4 Standalone */ #define VREG_BOARD_V1200 0x06 /* Vampire V2 V1200, for A1200 */ #define VREG_BOARD_V4MC 0x07 /* Apollo V4 Manticore, for A600 */ -#define VREG_BOARD_Future 0x08 /* Unknow */ +#define VREG_BOARD_V4UNI 0x08 /* Apollo V4 Unicorn, */ +#define VREG_BOARD_Future 0x09 /* Unknown */ static UBYTE *getport(struct ata_ProbedBus *ddata, int buscounter) { @@ -97,6 +98,7 @@ static UBYTE *getport(struct ata_ProbedBus *ddata, int buscounter) ||(ApolloBoardID == VREG_BOARD_V1200) ||(ApolloBoardID == VREG_BOARD_V4FB) ||(ApolloBoardID == VREG_BOARD_V4SA)) + ||(ApolloBoardID == VREG_BOARD_V4UNI)) { ddata->v4 = TRUE; DINIT(bug("[ATA:Probe] Port = GAYLE_BASE_DA (V4 Fast-IDE)\n");) From 97bfd6bdc18f947d91dfb900315a96de7ba1ce4f Mon Sep 17 00:00:00 2001 From: Renaud Schweingruber Date: Tue, 10 Jun 2025 13:56:26 +0200 Subject: [PATCH 4/5] Update sagagfx_init.c --- arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c b/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c index fe85c5d2cb..c351be63c0 100644 --- a/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c +++ b/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c @@ -110,6 +110,7 @@ static int SAGAGfx_Init(LIBBASETYPEPTR LIBBASE) case VREG_BOARD_V4_V500: case VREG_BOARD_V4_V1200: case VREG_BOARD_V4_V600: + case VREG_BOARD_V4_UNI: // SAGA V4 METHODS xsd->SAGAGfx_GetPixFmt = SAGAHW_V4_GetPixFmt; xsd->SAGAGfx_GetModeID = SAGAHW_V4_GetModeID; From a8477f9a3899d3a531bfbdd8c3109df84dd54643 Mon Sep 17 00:00:00 2001 From: Renaud Schweingruber Date: Tue, 10 Jun 2025 14:21:41 +0200 Subject: [PATCH 5/5] Update probe.c --- arch/m68k-amiga/hidd/gayle_ata/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k-amiga/hidd/gayle_ata/probe.c b/arch/m68k-amiga/hidd/gayle_ata/probe.c index 4d997884f1..ecf8b161d8 100644 --- a/arch/m68k-amiga/hidd/gayle_ata/probe.c +++ b/arch/m68k-amiga/hidd/gayle_ata/probe.c @@ -97,7 +97,7 @@ static UBYTE *getport(struct ata_ProbedBus *ddata, int buscounter) ||(ApolloBoardID == VREG_BOARD_V600) ||(ApolloBoardID == VREG_BOARD_V1200) ||(ApolloBoardID == VREG_BOARD_V4FB) - ||(ApolloBoardID == VREG_BOARD_V4SA)) + ||(ApolloBoardID == VREG_BOARD_V4SA) ||(ApolloBoardID == VREG_BOARD_V4UNI)) { ddata->v4 = TRUE;