Support for NYX to load from BOOT1/GPP/SD in that order, UMS option to mount whatever volume is selected as boot storage

nyx/nyx_gui/libs/fatfs/diskio.c

@@ -9,16 +9,44 @@
 /* storage control modules to the FatFs module with a defined API.       */
 /*-----------------------------------------------------------------------*/
 
+#include <storage/emmc.h>
 #include <string.h>
 
 #include <bdk.h>
 
 #include <libs/fatfs/diskio.h>	/* FatFs lower layer API */
+#include <fatfs_cfg.h>
 
 static u32 sd_rsvd_sectors = 0;
 static u32 ramdisk_sectors = 0;
 static u32 emummc_sectors = 0;
 
+static bool ensure_partition(BYTE pdrv){
+	u8 part;
+	switch(pdrv){
+	case DRIVE_BOOT1:
+	case DRIVE_BOOT1_1MB:
+		part = EMMC_BOOT1;
+		break;
+	case DRIVE_EMMC:
+		part = EMMC_GPP;
+		break;
+	case DRIVE_SD:
+	case DRIVE_RAM:
+	case DRIVE_BIS:
+	case DRIVE_EMU:
+		return true;
+	default:
+		return false;
+	}
+
+	if(emmc_storage.partition != part){
+		return emmc_set_partition(part);
+	}
+
+	return true;
+}
+
 /*-----------------------------------------------------------------------*/
 /* Get Drive Status                                                      */
 /*-----------------------------------------------------------------------*/
@@ -49,6 +77,10 @@ DRESULT disk_read (
 	UINT count		/* Number of sectors to read */
 )
 {
+	if(!ensure_partition(pdrv)){
+		return RES_ERROR;
+	}
+
 	switch (pdrv)
 	{
 	case DRIVE_SD:
@@ -60,6 +92,10 @@ DRESULT disk_read (
 	case DRIVE_BIS:
 	case DRIVE_EMU:
 		return nx_emmc_bis_read(sector, count, (void *)buff) ? RES_OK : RES_ERROR;
+	case DRIVE_BOOT1_1MB:
+		return sdmmc_storage_read(&emmc_storage, sector + (0x100000 / 512), count, buff) ? RES_OK : RES_ERROR;
+	case DRIVE_BOOT1:
+		return sdmmc_storage_read(&emmc_storage, sector, count, buff) ? RES_OK : RES_ERROR;
 	}
 
 	return RES_ERROR;
@@ -75,6 +111,10 @@ DRESULT disk_write (
 	UINT count			/* Number of sectors to write */
 )
 {
+	if(!ensure_partition(pdrv)){
+		return RES_ERROR;
+	}
+
 	switch (pdrv)
 	{
 	case DRIVE_SD:
@@ -86,6 +126,10 @@ DRESULT disk_write (
 		return RES_WRPRT;
 	case DRIVE_EMU:
 		return nx_emmc_bis_write(sector, count, (void *)buff) ? RES_OK : RES_ERROR;
+	case DRIVE_BOOT1_1MB:
+		return sdmmc_storage_write(&emmc_storage, sector + (0x100000 / 512), count, (void*)buff) ? RES_OK : RES_ERROR;
+	case DRIVE_BOOT1:
+		return sdmmc_storage_write(&emmc_storage, sector, count, (void*)buff) ? RES_OK : RES_ERROR;
 	}
 
 	return RES_ERROR;

nyx/nyx_gui/libs/fatfs/ffconf.h

@@ -166,7 +166,7 @@
 */
 
 
-#define FF_FS_RPATH		1
+#define FF_FS_RPATH		2
 /* This option configures support for relative path.
 /
 /   0: Disable relative path and remove related functions.
@@ -179,13 +179,13 @@
 / Drive/Volume Configurations
 /---------------------------------------------------------------------------*/
 
-#define FF_VOLUMES		5
+#define FF_VOLUMES		7
 /* Number of volumes (logical drives) to be used. (1-10) */
 
 
 #define FF_STR_VOLUME_ID	1
 // Order is important. Any change to order, must also be reflected to diskio drive enum.
-#define FF_VOLUME_STRS		"sd","ram","emmc","bis","emu"
+#define FF_VOLUME_STRS		"sd","ram","emmc","bis","emu", "boot1", "boot1_1mb"
 /* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
 /  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
 /  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
@@ -301,6 +301,14 @@
 /  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
 /  included somewhere in the scope of ff.h. */
 
-
+typedef enum {
+	DRIVE_SD        = 0,
+	DRIVE_RAM       = 1,
+	DRIVE_EMMC      = 2,
+	DRIVE_BIS       = 3,
+	DRIVE_EMU       = 4,
+	DRIVE_BOOT1     = 5,
+	DRIVE_BOOT1_1MB = 6,
+} DDRIVE;
 
 /*--- End of configuration options ---*/