diff --git a/bootloader/libs/fatfs/diskio.h b/bootloader/libs/fatfs/diskio.h index d6ae8f8..e868352 100644 --- a/bootloader/libs/fatfs/diskio.h +++ b/bootloader/libs/fatfs/diskio.h @@ -47,6 +47,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff); /* Generic command (Used by FatFs) */ #define CTRL_SYNC 0 /* Complete pending write process (needed at FF_FS_READONLY == 0) */ #define GET_SECTOR_COUNT 1 /* Get media size (needed at FF_USE_MKFS == 1) */ +#define SET_SECTOR_COUNT 1 /* Set media size (needed at FF_USE_MKFS == 1) */ #define GET_SECTOR_SIZE 2 /* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */ #define GET_BLOCK_SIZE 3 /* Get erase block size (needed at FF_USE_MKFS == 1) */ #define CTRL_TRIM 4 /* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */ diff --git a/nyx/nyx_gui/libs/fatfs/diskio.c b/nyx/nyx_gui/libs/fatfs/diskio.c index f0f9396..5cdfba9 100644 --- a/nyx/nyx_gui/libs/fatfs/diskio.c +++ b/nyx/nyx_gui/libs/fatfs/diskio.c @@ -12,6 +12,7 @@ #include "diskio.h" /* FatFs lower layer API */ #include "../../../../common/memory_map.h" #include "../../storage/nx_sd.h" +#include "../../storage/ramdisk.h" #include "../../storage/sdmmc.h" /*-----------------------------------------------------------------------*/ @@ -44,7 +45,15 @@ DRESULT disk_read ( UINT count /* Number of sectors to read */ ) { - return sdmmc_storage_read(&sd_storage, sector, count, buff) ? RES_OK : RES_ERROR; + switch (pdrv) + { + case DRIVE_SD: + return sdmmc_storage_read(&sd_storage, sector, count, (void *)buff) ? RES_OK : RES_ERROR; + case DRIVE_RAM: + return ram_disk_read(sector, count, (void *)buff); + } + + return RES_ERROR; } /*-----------------------------------------------------------------------*/ @@ -57,17 +66,74 @@ DRESULT disk_write ( UINT count /* Number of sectors to write */ ) { - return sdmmc_storage_write(&sd_storage, sector, count, (void *)buff) ? RES_OK : RES_ERROR; + switch (pdrv) + { + case DRIVE_SD: + return sdmmc_storage_write(&sd_storage, sector, count, (void *)buff) ? RES_OK : RES_ERROR; + case DRIVE_RAM: + return ram_disk_write(sector, count, (void *)buff); + } + + return RES_ERROR; } /*-----------------------------------------------------------------------*/ /* Miscellaneous Functions */ /*-----------------------------------------------------------------------*/ +static u32 part_rsvd_size = 0; DRESULT disk_ioctl ( BYTE pdrv, /* Physical drive nmuber (0..) */ BYTE cmd, /* Control code */ void *buff /* Buffer to send/receive control data */ ) { + DWORD *buf = (DWORD *)buff; + + if (pdrv == DRIVE_SD) + { + switch (cmd) + { + case GET_SECTOR_COUNT: + *buf = sd_storage.sec_cnt - part_rsvd_size; + break; + case GET_BLOCK_SIZE: + *buf = 32768; // Align to 16MB. + break; + } + } + else if (pdrv == DRIVE_RAM) + { + switch (cmd) + { + case GET_SECTOR_COUNT: + *buf = RAM_DISK_SZ >> 9; // 1GB. + break; + case GET_BLOCK_SIZE: + *buf = 2048; // Align to 1MB. + break; + } + } + + return RES_OK; +} + +DRESULT disk_set_info ( + BYTE pdrv, /* Physical drive nmuber (0..) */ + BYTE cmd, /* Control code */ + void *buff /* Buffer to send/receive control data */ +) +{ + DWORD *buf = (DWORD *)buff; + + if (pdrv == DRIVE_SD) + { + switch (cmd) + { + case SET_SECTOR_COUNT: + part_rsvd_size = *buf; + break; + } + } + return RES_OK; } diff --git a/nyx/nyx_gui/libs/fatfs/diskio.h b/nyx/nyx_gui/libs/fatfs/diskio.h index d6ae8f8..9d40b66 100644 --- a/nyx/nyx_gui/libs/fatfs/diskio.h +++ b/nyx/nyx_gui/libs/fatfs/diskio.h @@ -23,6 +23,11 @@ typedef enum { RES_PARERR /* 4: Invalid Parameter */ } DRESULT; +typedef enum { + DRIVE_SD = 0, + DRIVE_RAM = 1, +} DDRIVE; + /*---------------------------------------*/ /* Prototypes for disk control functions */ @@ -33,6 +38,7 @@ DSTATUS disk_status (BYTE pdrv); DRESULT disk_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count); DRESULT disk_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count); DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff); +DRESULT disk_set_info (BYTE pdrv, BYTE cmd, void *buff); /* Disk Status Bits (DSTATUS) */ @@ -47,6 +53,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff); /* Generic command (Used by FatFs) */ #define CTRL_SYNC 0 /* Complete pending write process (needed at FF_FS_READONLY == 0) */ #define GET_SECTOR_COUNT 1 /* Get media size (needed at FF_USE_MKFS == 1) */ +#define SET_SECTOR_COUNT 1 /* Set media size (needed at FF_USE_MKFS == 1) */ #define GET_SECTOR_SIZE 2 /* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */ #define GET_BLOCK_SIZE 3 /* Get erase block size (needed at FF_USE_MKFS == 1) */ #define CTRL_TRIM 4 /* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */ diff --git a/nyx/nyx_gui/libs/fatfs/ffconf.h b/nyx/nyx_gui/libs/fatfs/ffconf.h index e54f7fd..e6afb51 100644 --- a/nyx/nyx_gui/libs/fatfs/ffconf.h +++ b/nyx/nyx_gui/libs/fatfs/ffconf.h @@ -38,7 +38,7 @@ / f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */ -#define FF_USE_MKFS 0 +#define FF_USE_MKFS 1 /* This option switches f_mkfs() function. (0:Disable or 1:Enable) */ #define FF_FASTFS 1 @@ -60,7 +60,7 @@ / (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */ -#define FF_USE_LABEL 0 +#define FF_USE_LABEL 1 /* This option switches volume label functions, f_getlabel() and f_setlabel(). / (0:Disable or 1:Enable) */ @@ -155,7 +155,7 @@ */ -#define FF_FS_RPATH 0 +#define FF_FS_RPATH 1 /* This option configures support for relative path. / / 0: Disable relative path and remove related functions. @@ -168,12 +168,13 @@ / Drive/Volume Configurations /---------------------------------------------------------------------------*/ -#define FF_VOLUMES 1 +#define FF_VOLUMES 2 /* Number of volumes (logical drives) to be used. (1-10) */ -#define FF_STR_VOLUME_ID 0 -#define FF_VOLUME_STRS "sd" +#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" /* 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 @@ -241,7 +242,7 @@ / Note that enabling exFAT discards ANSI C (C89) compatibility. */ -#define FF_FS_NORTC 1 +#define FF_FS_NORTC 0 #define FF_NORTC_MON 1 #define FF_NORTC_MDAY 1 #define FF_NORTC_YEAR 2019 diff --git a/nyx/nyx_gui/storage/nx_sd.c b/nyx/nyx_gui/storage/nx_sd.c index bdaa7d8..a6e3d61 100644 --- a/nyx/nyx_gui/storage/nx_sd.c +++ b/nyx/nyx_gui/storage/nx_sd.c @@ -151,7 +151,7 @@ bool sd_mount() else { sd_init_done = true; - res = f_mount(&sd_fs, "", 1); + res = f_mount(&sd_fs, "sd:", 1); if (res == FR_OK) { sd_mounted = true; @@ -173,7 +173,7 @@ void sd_unmount(bool deinit) if (sd_init_done && sd_mounted) { - f_mount(NULL, "", 1); + f_mount(NULL, "sd:", 1); sd_mounted = false; } if (sd_init_done && deinit)