Skip to content

Add GC Loader support #36

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
coolbho3k wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add GC Loader support #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aeae78
Add GC Loader support
coolbho3k Sep 11, 2022
760b897
Align FIL; move priority last
coolbho3k Sep 11, 2022
4b99576
Align FIL in load_parse_cli too
coolbho3k Sep 11, 2022
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ iplboot will attempt to load DOLs from the following locations in order:
- USB Gecko in Card Slot A
- SD Gecko in Card Slot A
- SD2SP2
- GC Loader

You can use button shortcuts to keep alternate software on quick access. When loading from an SD card, iplboot will look for and load different filenames depending on what buttons are being held:

Expand Down
2 changes: 1 addition & 1 deletion source/fatfs/ff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ typedef struct {
LBA_t bitbase; /* Allocation bitmap base sector */
#endif
LBA_t winsect; /* Current sector appearing in the win[] */
BYTE win[FF_MAX_SS]; /* Disk access window for Directory, FAT (and file data at tiny cfg) */
BYTE __attribute__((aligned (32))) win[FF_MAX_SS]; /* Disk access window for Directory, FAT (and file data at tiny cfg), must be 32-bit aligned for __io_gcode */
} FATFS;


Expand Down
6 changes: 4 additions & 2 deletions source/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void load_parse_cli(char *path)
path[path_length - 1] = 'i';

kprintf("Reading %s\n", path);
FIL file;
FIL file ATTRIBUTE_ALIGN (32);
FRESULT result = f_open(&file, path, FA_READ);
if (result != FR_OK)
{
Expand Down Expand Up @@ -173,7 +173,7 @@ int load_fat(const char *slot_name, const DISC_INTERFACE *iface_, char **paths,
{
char *path = paths[i];
kprintf("Reading %s\n", path);
FIL file;
FIL file ATTRIBUTE_ALIGN (32);
FRESULT open_result = f_open(&file, path, FA_READ);
if (open_result != FR_OK)
{
Expand Down Expand Up @@ -394,6 +394,8 @@ int main()

if (load_fat("sd2", &__io_gcsd2, paths, num_paths)) goto load;

if (load_fat("gcl", &__io_gcode, paths, num_paths)) goto load;

load:
if (!dol)
{
Expand Down