Compare commits

...

1 Commits

Author SHA1 Message Date
coah
ff555eb630 fix(fa): preserve the USB disk receiver and match FAAttach 2026-10-02 22:11:32 -05:00
2 changed files with 13 additions and 18 deletions

View File

@@ -6,11 +6,6 @@ typedef struct FA_NAND_ATTACH {
u32 size;
} FA_NAND_ATTACH;
typedef struct FA_ATTACH_REQUEST {
FADrvTbl* table;
u32 count;
} FA_ATTACH_REQUEST;
FADisk* gOpenDisk[26];
FAPartition* gOpenPartition[26];
typedef struct FA_DISK_INIT {
@@ -34,13 +29,13 @@ static struct {
} drvInitFunc = {diskInitTbl, 3};
extern s32 pdm_open_disk(FA_DISK_INIT* table, FADisk** disk);
extern s32 pdm_open_partition(FADisk* disk, u32 index, FAPartition** partition);
extern s32 pfstub_attach(FA_ATTACH_REQUEST* request, FA_NAND_ATTACH* nand);
extern s32 pfstub_attach(FADrvTbl** drives, FA_NAND_ATTACH* nand);
extern s32 pfd_sddrv_is_media_insert(void);
extern s32 pfd_mscdrv_is_media_insert(void);
extern s32 pfd_mscdrv_is_media_insert(FADisk* disk);
FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
FADisk* disk;
FA_ATTACH_REQUEST request;
FADrvTbl* drives[2];
FA_NAND_ATTACH nand;
s32 error;
s32 index;
@@ -65,16 +60,16 @@ FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
return -1;
}
}
request.table = table;
request.count = 0;
drives[0] = table;
drives[1] = NULL;
if (device == 2) {
memcpy(nand.path, nand_path, 78);
nand.size = nand_size;
}
if (device == 2) {
error = pfstub_attach(&request, &nand);
error = pfstub_attach(drives, &nand);
} else {
error = pfstub_attach(&request, NULL);
error = pfstub_attach(drives, NULL);
}
if (error != 0) {
return -1;
@@ -85,11 +80,11 @@ FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
gOpenPartition[index] = table->pPart;
if (device == 0) {
if (pfd_sddrv_is_media_insert()) {
request.table->stat |= 0x10;
drives[0]->stat |= 0x10;
}
} else if (device == 1) {
if (pfd_mscdrv_is_media_insert()) {
request.table->stat |= 0x10;
if (pfd_mscdrv_is_media_insert(disk)) {
drives[0]->stat |= 0x10;
}
}
} else {

View File

@@ -3,7 +3,7 @@
static FAEjectCallback g_detach_func;
static FAInsertCallback g_attach_func;
extern s32 uhf_msc_is_media_insert(void);
extern s32 uhf_msc_is_media_insert(FADisk* disk);
s32 pfd_mscdrv_registar_callback(FAInsertCallback insert, FAEjectCallback eject) {
g_attach_func = insert;
@@ -11,6 +11,6 @@ s32 pfd_mscdrv_registar_callback(FAInsertCallback insert, FAEjectCallback eject)
return 0;
}
s32 pfd_mscdrv_is_media_insert(void) {
return uhf_msc_is_media_insert();
s32 pfd_mscdrv_is_media_insert(FADisk* disk) {
return uhf_msc_is_media_insert(disk);
}