Skip to content

Fix GCLoader support, broken due to double-init of GCODE #40

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

Open
kemurphy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix GCLoader support, broken due to double-init of GCODE #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
befa70b
Use device type rather than index to gate setting SD bus speed
Feb 19, 2024
8ffbbb3
Fix GCLoader support, broken due to double-init of GCODE
Feb 19, 2024
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
24 changes: 14 additions & 10 deletions cubeboot/source/sd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ static int check_available_devices() {
for (int i = countof(drivers) - 1; i >= 0; i--) {
const DISC_INTERFACE *driver = drivers[i];
const char *dev_name = dev_names[i];
bool present = false;

// // skip GCLoader if we did not boot from ODE
// if (driver->ioType == DEVICE_TYPE_GAMECUBE_GCODE && low_mem->dhi.country_code != 0x03)
// continue;
switch (driver->ioType) {
case DEVICE_TYPE_GC_SD:
sdgecko_setSpeed(i, EXI_SPEED32MHZ);
present = driver->startup();
break;

// skip ODE to speed up loading
if (driver->ioType == DEVICE_TYPE_GAMECUBE_GCODE) {
case DEVICE_TYPE_GAMECUBE_GCODE:
// The manual inquiry is faster than driver->startup().
GCODE_Init();
GCODE_InquiryAsync(&blk, &drive_info, drive_info_callback);

Expand All @@ -64,14 +67,15 @@ static int check_available_devices() {
udelay(100); // 100 microseconds
}

if (drive_info.rel_date != 0x20196c64) continue;
present = (drive_info.rel_date != 0x20196c64);
break;
default:
// Unknown driver type? Something fatal is happening.
break;
}

iprintf("Trying mount %s\n", dev_name);
if (i < MAX_DRIVE)
sdgecko_setSpeed(i, EXI_SPEED32MHZ);

if (driver->startup() && driver->isInserted()) {
if (present && driver->isInserted()) {
// set driver for fatfs
current_device_index = i;
current_device = driver;
Expand Down