Skip to content

Add new VREG id #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WDrijver merged 5 commits into from
Jun 10, 2025
Merged

Add new VREG id #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14bdf57
Update lowlevel.c
TuKo1982 Jun 10, 2025
64c6756
Update sagagfx_hw.h
TuKo1982 Jun 10, 2025
3314a24
Update probe.c
TuKo1982 Jun 10, 2025
97bfd6b
Update sagagfx_init.c
TuKo1982 Jun 10, 2025
a8477f9
Update probe.c
TuKo1982 Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions arch/m68k-amiga/hidd/gayle_ata/probe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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");)
Expand Down
8 changes: 4 additions & 4 deletions arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions rom/devs/ata/lowlevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down