add EXFAT filesystem support

israpps · Feb 2, 2023 · 28cb18d · 28cb18d
1 parent 2ae9bce
commit 28cb18d
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 77 deletions.
diff --git a/Makefile b/Makefile
@@ -75,7 +75,7 @@ LUA_LIBS =	luaplayer.o luacontrols.o \
 
 IOP_MODULES = iomanx.o filexio.o \
 			  sio2man.o mcman.o mcserv.o padman.o libsd.o \
-			  usbd.o bdm.o bdmfs_vfat.o \
+			  usbd.o bdm.o bdmfs_fatfs.o \
 			  usbmass_bd.o cdfs.o ds34bt.o ds34usb.o \
 			  secrsif.o IOPRP.o secrman.o poweroff.o
 
@@ -119,79 +119,6 @@ $(EE_ASM_DIR)%.s: EMBED/%.png
 	$(BIN2S) $< $@ $(shell basename $< .png)
 #------------------------------------------------------------------#
 
-
-#-------------------- Embedded IOP Modules ------------------------#
-$(EE_ASM_DIR)iomanx.s: $(PS2SDK)/iop/irx/iomanX.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ iomanX_irx
-
-$(EE_ASM_DIR)poweroff.s: $(PS2SDK)/iop/irx/poweroff.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ poweroff_irx
-
-$(EE_ASM_DIR)filexio.s: $(PS2SDK)/iop/irx/fileXio.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ fileXio_irx
-
-$(EE_ASM_DIR)sio2man.s: $(PS2SDK)/iop/irx/sio2man.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ sio2man_irx
-
-$(EE_ASM_DIR)mcman.s: $(PS2SDK)/iop/irx/mcman.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ mcman_irx
-
-$(EE_ASM_DIR)mcserv.s: $(PS2SDK)/iop/irx/mcserv.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ mcserv_irx
-
-$(EE_ASM_DIR)padman.s: $(PS2SDK)/iop/irx/padman.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ padman_irx
-
-$(EE_ASM_DIR)libsd.s: $(PS2SDK)/iop/irx/libsd.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ libsd_irx
-
-$(EE_ASM_DIR)usbd.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ usbd_irx
-
-$(EE_ASM_DIR)audsrv.s: $(PS2SDK)/iop/irx/audsrv.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ audsrv_irx
-
-$(EE_ASM_DIR)bdm.s: $(PS2SDK)/iop/irx/bdm.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ bdm_irx
-
-$(EE_ASM_DIR)bdmfs_vfat.s: $(PS2SDK)/iop/irx/bdmfs_vfat.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ bdmfs_vfat_irx
-
-$(EE_ASM_DIR)usbmass_bd.s: $(PS2SDK)/iop/irx/usbmass_bd.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ usbmass_bd_irx
-
-$(EE_ASM_DIR)IOPRP.s: iop/IOPRP.img | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ IOPRP
-
-$(EE_ASM_DIR)secrsif.s: iop/secrsif.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ secrsif_irx
-
-$(EE_ASM_DIR)secrman.s: iop/secrman.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ secrman_irx
-
-$(EE_ASM_DIR)cdfs.s: $(PS2SDK)/iop/irx/cdfs.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ cdfs_irx
-
-modules/ds34bt/ee/libds34bt.a: modules/ds34bt/ee
-	$(MAKE) -C $<
-
-modules/ds34bt/iop/ds34bt.irx: modules/ds34bt/iop
-	$(MAKE) -C $<
-
-$(EE_ASM_DIR)ds34bt.s: modules/ds34bt/iop/ds34bt.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ ds34bt_irx
-
-modules/ds34usb/ee/libds34usb.a: modules/ds34usb/ee
-	$(MAKE) -C $<
-
-modules/ds34usb/iop/ds34usb.irx: modules/ds34usb/iop
-	$(MAKE) -C $<
-
-$(EE_ASM_DIR)ds34usb.s: modules/ds34usb/iop/ds34usb.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ ds34usb_irx
-
-#------------------------------------------------------------------#
-
 $(EE_OBJS_DIR):
 	@mkdir -p $@
 
@@ -247,5 +174,6 @@ ifeq ($(DEBUG),0)
 endif
 	$(EE_CXX) $(EE_CXXFLAGS) $(EE_INCS) -c $< -o $@
 
+include embed.make
 include $(PS2SDK)/samples/Makefile.pref
 include $(PS2SDK)/samples/Makefile.eeglobal
diff --git a/embed.make b/embed.make
@@ -0,0 +1,73 @@
+#-------------------- Embedded IOP Modules ------------------------#
+IRXTAG = $(notdir $(addsuffix _irx, $(basename $<)))
+
+$(EE_ASM_DIR)iomanx.s: $(PS2SDK)/iop/irx/iomanX.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)poweroff.s: $(PS2SDK)/iop/irx/poweroff.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)filexio.s: $(PS2SDK)/iop/irx/fileXio.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)sio2man.s: $(PS2SDK)/iop/irx/sio2man.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)mcman.s: $(PS2SDK)/iop/irx/mcman.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)mcserv.s: $(PS2SDK)/iop/irx/mcserv.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)padman.s: $(PS2SDK)/iop/irx/padman.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)libsd.s: $(PS2SDK)/iop/irx/libsd.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)usbd.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)audsrv.s: $(PS2SDK)/iop/irx/audsrv.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)bdm.s: $(PS2SDK)/iop/irx/bdm.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)bdmfs_fatfs.s: $(PS2SDK)/iop/irx/bdmfs_fatfs.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ bdmfs_fatfs_irx
+
+$(EE_ASM_DIR)usbmass_bd.s: $(PS2SDK)/iop/irx/usbmass_bd.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)IOPRP.s: iop/IOPRP.img | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ IOPRP
+
+$(EE_ASM_DIR)secrsif.s: iop/secrsif.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)secrman.s: iop/secrman.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+$(EE_ASM_DIR)cdfs.s: $(PS2SDK)/iop/irx/cdfs.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+modules/ds34bt/ee/libds34bt.a: modules/ds34bt/ee
+	$(MAKE) -C $<
+
+modules/ds34bt/iop/ds34bt.irx: modules/ds34bt/iop
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds34bt.s: modules/ds34bt/iop/ds34bt.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+modules/ds34usb/ee/libds34usb.a: modules/ds34usb/ee
+	$(MAKE) -C $<
+
+modules/ds34usb/iop/ds34usb.irx: modules/ds34usb/iop
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds34usb.s: modules/ds34usb/iop/ds34usb.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ $(IRXTAG)
+
+#------------------------------------------------------------------#
diff --git a/src/main.cpp b/src/main.cpp
@@ -56,7 +56,7 @@ IMPORT_BIN2C(libsd_irx);
 IMPORT_BIN2C(cdfs_irx);
 IMPORT_BIN2C(usbd_irx);
 IMPORT_BIN2C(bdm_irx);
-IMPORT_BIN2C(bdmfs_vfat_irx);
+IMPORT_BIN2C(bdmfs_fatfs_irx);
 IMPORT_BIN2C(usbmass_bd_irx);
 // IMPORT_BIN2C(audsrv_irx);
 IMPORT_BIN2C(ds34usb_irx);
@@ -255,8 +255,8 @@ int main(int argc, char *argv[])
 
     ret = SifExecModuleBuffer(&bdm_irx, size_bdm_irx, 0, NULL, &STAT);
     DPRINTF("[BDM.IRX]: ret=%d, stat=%d\n", ret, STAT);
-    ret = SifExecModuleBuffer(&bdmfs_vfat_irx, size_bdmfs_vfat_irx, 0, NULL, &STAT);
-    DPRINTF("[BDMFS_VFAT.IRX]: ret=%d, stat=%d\n", ret, STAT);
+    ret = SifExecModuleBuffer(&bdmfs_fatfs_irx, size_bdmfs_fatfs_irx, 0, NULL, &STAT);
+    DPRINTF("[BDMFS_FATFS.IRX]: ret=%d, stat=%d\n", ret, STAT);
     ret = SifExecModuleBuffer(&usbmass_bd_irx, size_usbmass_bd_irx, 0, NULL, &STAT);
     DPRINTF("[USBMASS_BD.IRX]: ret=%d, stat=%d\n", ret, STAT);