mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated fs_dev.h comments, etc. Fixed _fsdevUnmountDeviceStruct(). Added fsdevCommitDevice(). Check whether sdmc is already mounted in fsdevInit().

Browse Source
This commit is contained in:
yellows8 2017-11-30 13:00:47 -05:00
parent 0c5efe5f9c
commit 7da25ba40f
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nx/include/switch/devices/fs_dev.h
View File

@ -18,10 +18,10 @@ typedef struct
FsDirectoryEntry entry_data[32]; /*! Temporary storage for reading entries */ FsDirectoryEntry entry_data[32]; /*! Temporary storage for reading entries */
} fsdev_dir_t; } fsdev_dir_t;
/// Initializes the FS driver. /// Initializes the FS driver. Automatically initializes the sdmc device if accessible. If called again, sdmc mounting will be attempted again if it's not mounted.
Result fsdevInit(void); Result fsdevInit(void);
/// Exits the FS driver. /// Exits the FS driver. Any devices still mounted are unmounted.
Result fsdevExit(void); Result fsdevExit(void);
/// Mounts the input fs with the specified device name. fsdev will handle closing the fs when required, including when fsdevMountDevice() fails. /// Mounts the input fs with the specified device name. fsdev will handle closing the fs when required, including when fsdevMountDevice() fails.
@ -31,3 +31,7 @@ int fsdevMountDevice(const char *name, FsFileSystem fs);
/// Unmounts the specified device. /// Unmounts the specified device.
int fsdevUnmountDevice(const char *name); int fsdevUnmountDevice(const char *name);
/// Uses fsFsCommit() with the specified device. This must be used after any savedata-write operations(not just file-write).
/// This is not used automatically at device unmount.
Result fsdevCommitDevice(const char *name);

19
nx/source/devices/fs_dev.c
View File

@ -328,14 +328,15 @@ static int _fsdevUnmountDeviceStruct(fsdev_fsdevice *device)
RemoveDevice(name); RemoveDevice(name);
fsFsClose(&device->fs); fsFsClose(&device->fs);
memset(device, 0, sizeof(fsdev_fsdevice));
if(device->id == fsdev_fsdevice_default) if(device->id == fsdev_fsdevice_default)
fsdev_fsdevice_default = -1; fsdev_fsdevice_default = -1;
if(device->id == fsdev_fsdevice_cwd) if(device->id == fsdev_fsdevice_cwd)
fsdev_fsdevice_cwd = fsdev_fsdevice_default; fsdev_fsdevice_cwd = fsdev_fsdevice_default;
device->setup = 0;
memset(device->name, 0, sizeof(device->name));
return 0; return 0;
} }
@ -350,6 +351,17 @@ int fsdevUnmountDevice(const char *name)
return _fsdevUnmountDeviceStruct(device); return _fsdevUnmountDeviceStruct(device);
} }
Result fsdevCommitDevice(const char *name)
{
fsdev_fsdevice *device;
device = fsdevFindDevice(name);
if(device==NULL)
return MAKERESULT(MODULE_LIBNX, LIBNX_NOTFOUND);
return fsFsCommit(&device->fs);
}
/*! Initialize SDMC device */ /*! Initialize SDMC device */
Result fsdevInit(void) Result fsdevInit(void)
{ {
@ -377,6 +389,9 @@ Result fsdevInit(void)
fsdevInitialised = true; fsdevInitialised = true;
} }
if(fsdevFindDevice("sdmc"))
return 0;
rc = fsMountSdcard(&fs); rc = fsMountSdcard(&fs);
if(R_SUCCEEDED(rc)) if(R_SUCCEEDED(rc))
{ {