diff --git a/arch/m68k-amiga/hidd/gayle_ata/probe.c b/arch/m68k-amiga/hidd/gayle_ata/probe.c index da5192d57af..ecf8b161d80 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) { @@ -96,7 +97,8 @@ 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; DINIT(bug("[ATA:Probe] Port = GAYLE_BASE_DA (V4 Fast-IDE)\n");) diff --git a/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h b/arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h index 025425c5a7b..8e99c81e749 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] diff --git a/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c b/arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c index fe85c5d2cb2..c351be63c02 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; diff --git a/rom/devs/ata/lowlevel.c b/rom/devs/ata/lowlevel.c index 7683152bd60..64da7470fb7 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 *);