mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-26 12:12:02 +00:00
Code Issues Releases Activity

ums: implement umsUnmountDevice

Browse source 
Other changes include:

* libs: update libusbhsfs to latest commit
* nxdt_rw_poc: fix UMS device unmounting, change output XCI naming scheme.
This commit is contained in:
Pablo Curiel 2023-06-29 00:12:51 +02:00
parent af0db8b0ee
commit 3071cee3bd
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code_templates/nxdt_rw_poc.c
View file

@ -31,7 +31,7 @@
#define BLOCK_SIZE USB_TRANSFER_BUFFER_SIZE #define BLOCK_SIZE USB_TRANSFER_BUFFER_SIZE
#define WAIT_TIME_LIMIT 30 #define WAIT_TIME_LIMIT 30
#define OUTDIR "nxdt_rw_poc" #define OUTDIR APP_TITLE
/* Type definitions. */ /* Type definitions. */
@ -1322,7 +1322,7 @@ int main(int argc, char *argv[])
} else } else
if ((btn_down & HidNpadButton_X) && g_umsDeviceCount) if ((btn_down & HidNpadButton_X) && g_umsDeviceCount)
{ {
for(u32 i = 0; i < g_umsDeviceCount; i++) usbHsFsUnmountDevice(&(g_umsDevices[i]), false); for(u32 i = 0; i < g_umsDeviceCount; i++) umsUnmountDevice(&(g_umsDevices[i]));
updateStorageList(); updateStorageList();
} else } else
if (((btn_down & (HidNpadButton_L)) || (btn_held & HidNpadButton_ZL)) && (cur_menu->id == MenuId_NSP || cur_menu->id == MenuId_Ticket || cur_menu->id == MenuId_Nca) && title_info->previous) if (((btn_down & (HidNpadButton_L)) || (btn_held & HidNpadButton_ZL)) && (cur_menu->id == MenuId_NSP || cur_menu->id == MenuId_Ticket || cur_menu->id == MenuId_Nca) && title_info->previous)
@ -2223,7 +2223,7 @@ static bool saveGameCardImage(void *userdata)
consolePrint("gamecard size (with key area): 0x%lX\n", gc_size); consolePrint("gamecard size (with key area): 0x%lX\n", gc_size);
} }
snprintf(path, MAX_ELEMENTS(path), " (%s) (%s) (%s).xci", prepend_key_area ? "keyarea" : "keyarealess", keep_certificate ? "cert" : "certless", trim_dump ? "trimmed" : "untrimmed"); snprintf(path, MAX_ELEMENTS(path), " [%s][%s][%s].xci", prepend_key_area ? "KA" : "NKA", keep_certificate ? "C" : "NC", trim_dump ? "T" : "NT");
filename = generateOutputGameCardFileName("Gamecard", path, true); filename = generateOutputGameCardFileName("Gamecard", path, true);
if (!filename) goto end; if (!filename) goto end;

4
include/core/ums.h
View file

@ -43,6 +43,10 @@ bool umsIsDeviceInfoUpdated(void);
/// Returns NULL if an error occurs. /// Returns NULL if an error occurs.
UsbHsFsDevice *umsGetDevices(u32 *out_count); UsbHsFsDevice *umsGetDevices(u32 *out_count);
/// Unmounts a USB Mass Storage device using a UsbHsFsDevice element.
/// If successful, USB Mass Storage device info will be automatically reloaded, and the next call to umsIsDeviceInfoUpdated() shall return true.
bool umsUnmountDevice(const UsbHsFsDevice *device);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
libs/libusbhsfs

@ -1 +1 @@
Subproject commit 68da93049d85e890c7388f4fc14805dedf55af94 Subproject commit 972bddf8967e801569d809b776a8d1c9acb606c2

15
source/core/ums.c
View file

@ -109,6 +109,21 @@ UsbHsFsDevice *umsGetDevices(u32 *out_count)
return devices; return devices;
} }
bool umsUnmountDevice(const UsbHsFsDevice *device)
{
if (!device)
{
LOG_MSG_ERROR("Invalid parameters!");
return false;
}
/* Unmount USB Mass Storage device. If successful, let libusbhsfs automatically call our populate callback. */
bool ret = usbHsFsUnmountDevice(device, true);
if (!ret) LOG_MSG_ERROR("Failed to unmount UMS device \"%s\"!", device->name);
return ret;
}
static void umsFreeDeviceData(void) static void umsFreeDeviceData(void)
{ {
/* Free devices buffer. */ /* Free devices buffer. */