Skip to content

remove free space logic/warning #54

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
jmlee337 wants to merge 1 commit into
base: slippi
Choose a base branch
from
Open

remove free space logic/warning #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion fatfs/ffconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
/ disk_ioctl() function. */


#define _FS_NOFSINFO 1
#define _FS_NOFSINFO 0
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
/ option, and f_getfree() function at first time after volume mount will force
/ a full FAT scan. Bit 1 controls the use of last allocated cluster number.
Expand Down
22 changes: 0 additions & 22 deletions loader/source/global.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,6 @@ int CreateNewFile(const char *Path, unsigned int size)
FATFS *devices[2];

FATFS *usb_info;
u32 usb_free_clusters;
u32 usb_total_sectors;
u32 usb_free_sectors;
u32 usb_free_kib;
u32 usb_total_kib;
u32 usb_replays_left;
u32 usb_attached;

// Device initialization data.
typedef struct _devInitInfo_t
Expand Down Expand Up @@ -577,21 +570,6 @@ const WCHAR *MountDevice(BYTE pdrv)
if (f_mount(devices[pdrv], devInitInfo[pdrv].devNameFF, 1) == FR_OK)
{
gprintf("Mounted %s!\n", devInitInfo[pdrv].devNameDisplay);


/* When we mount a USB drive, get the total/free FAT32 space in KiB.
* Calculate the approximate number of replays we could store, assuming
* a replay is somewhere around 1.5MB (1464KiB) */
if (pdrv == DEV_USB)
{
f_getfree(devInitInfo[pdrv].devNameFF, &usb_free_clusters, &usb_info);
usb_total_sectors = (usb_info->n_fatent - 2) * usb_info->csize;
usb_free_sectors = usb_free_clusters * usb_info->csize;
usb_total_kib = usb_total_sectors / 2;
usb_free_kib = usb_free_sectors / 2;
usb_replays_left = usb_free_kib / 1464;
usb_attached = 1;
}
}
else
{
Expand Down
22 changes: 0 additions & 22 deletions loader/source/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,8 +770,6 @@ static bool Menu_GameSelection_InputHandler(MenuCtx *ctx)
/* Menu_GameSelection_Redraw()
* Redraw the game selection menu.
*/
extern u32 usb_replays_left;
extern u32 usb_attached;
static void Menu_GameSelection_Redraw(MenuCtx *ctx)
{
u32 i;
Expand Down Expand Up @@ -824,26 +822,6 @@ static void Menu_GameSelection_Redraw(MenuCtx *ctx)
PrintFormat(DEFAULT_SIZE, BLACK, MENU_POS_X+320+(17*10), gamelist_y, "REPLAY: ");
PrintFormat(DEFAULT_SIZE, (ncfg->Config & (NIN_CFG_SLIPPI_REPLAYS)) ? GREEN : RED, MENU_POS_X+320+(24*10),
gamelist_y, "%-3s", (ncfg->Config & (NIN_CFG_SLIPPI_REPLAYS)) ? "ON" : "OFF");

// Warn the user if they're running low on USB disk space
if ((usb_attached == 1) && (ncfg->Config & (NIN_CFG_SLIPPI_REPLAYS)))
{
int lowUsbWarnThreshold = 500;
int lowUsbErrorThreshold = 50;

if ((usb_replays_left < lowUsbWarnThreshold) && (usb_replays_left > lowUsbErrorThreshold))
PrintFormat(MENU_SIZE, ORANGE, MENU_POS_X, SettingY(11),"[!] WARNING, LOW USB SPACE");
if (usb_replays_left <= lowUsbErrorThreshold)
PrintFormat(MENU_SIZE, RED, MENU_POS_X, SettingY(11),"[!] WARNING, LOW USB SPACE");

if (usb_replays_left < lowUsbWarnThreshold) {
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X, SettingY(12), "Your USB drive is running");
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X, SettingY(13), "low on free space. There ");
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X, SettingY(14), "should be enough space for");
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X, SettingY(15), "about %d more replays.",
(int)usb_replays_left);
}
}
}
}

Expand Down