From 0d67aa72c1ab0d0da7313fb170e3efb015ac0e0c Mon Sep 17 00:00:00 2001 From: Extrems Date: Fri, 21 Feb 2025 13:38:34 -0500 Subject: [PATCH] - Adjust for libogc2 changes. --- cube/swiss/source/devices/aram/aram.c | 11 ++--------- cube/swiss/source/devices/flippydrive/flippy.c | 3 ++- cube/swiss/source/devices/system/deviceHandler-SYS.c | 10 ++-------- cube/swiss/source/main.c | 4 ++-- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/cube/swiss/source/devices/aram/aram.c b/cube/swiss/source/devices/aram/aram.c index a7ae472c..567667f9 100644 --- a/cube/swiss/source/devices/aram/aram.c +++ b/cube/swiss/source/devices/aram/aram.c @@ -33,15 +33,8 @@ static bool __aram_Startup(DISC_INTERFACE *disc) if (disc->ioType != DEVICE_TYPE_GAMECUBE_ARAM) return false; if (initialized) return true; - if (!AR_CheckInit()) { - AR_Init(NULL, 0); - AR_Reset(); - } - - if (!ARQ_CheckInit()) { - ARQ_Init(); - ARQ_Reset(); - } + AR_Init(NULL, 0); + ARQ_Init(); initialized = true; return true; diff --git a/cube/swiss/source/devices/flippydrive/flippy.c b/cube/swiss/source/devices/flippydrive/flippy.c index e9bec2bc..24cff836 100644 --- a/cube/swiss/source/devices/flippydrive/flippy.c +++ b/cube/swiss/source/devices/flippydrive/flippy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Extrems + * Copyright (c) 2024-2025, Extrems * * This file is part of Swiss. * @@ -835,6 +835,7 @@ flippyresult flippy_init(void) if (initialized) return flippy_bypass(false); DVD_Init(); + DVD_Reset(DVD_RESETNONE); if (DVD_Inquiry(&block, &driveinfo) < 0 || driveinfo.rel_date != 0x20220426) return FLIPPY_RESULT_NOT_READY; diff --git a/cube/swiss/source/devices/system/deviceHandler-SYS.c b/cube/swiss/source/devices/system/deviceHandler-SYS.c index b712611a..b9b81570 100644 --- a/cube/swiss/source/devices/system/deviceHandler-SYS.c +++ b/cube/swiss/source/devices/system/deviceHandler-SYS.c @@ -392,14 +392,8 @@ bool is_rom_name(char* filename) { } s32 deviceHandler_SYS_init(file_handle* file) { - if(!AR_CheckInit()) { - AR_Init(NULL, 0); - AR_Reset(); - } - if(!ARQ_CheckInit()) { - ARQ_Init(); - ARQ_Reset(); - } + AR_Init(NULL, 0); + ARQ_Init(); rom_sizes[ROM_ARAM] = AR_GetSize(); rom_sizes[ROM_ARAM_INTERNAL] = AR_GetInternalSize(); diff --git a/cube/swiss/source/main.c b/cube/swiss/source/main.c index e9ca82b8..888bf942 100644 --- a/cube/swiss/source/main.c +++ b/cube/swiss/source/main.c @@ -57,7 +57,8 @@ static void driveInfoCallback(s32 result, dvdcmdblk *block) { void Initialise(void) { PAD_Init (); - DVD_Init(); + DVD_Init(); + DVD_Reset(DVD_RESETNONE); DVD_InquiryAsync(&commandBlock, &driveInfo, driveInfoCallback); // Disable IPL modchips to allow access to IPL ROM fonts @@ -117,7 +118,6 @@ void __SYS_PreInit(void) *(u32 *)0x8000002C += ((vu32 *)0xCC003000)[11] >> 28; - *(u32 *)0x800000F0 = 0x1800000; *(u32 *)0x800000F8 = TB_BUS_CLOCK; *(u32 *)0x800000FC = TB_CORE_CLOCK;