mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-09-20 05:53:25 +01:00
Code Issues Releases Activity

Mooore USB fixes.

Browse source
This commit is contained in:
Pablo Curiel 2020-05-11 15:12:03 -04:00
parent d6179f77fb
commit a3790dd0d6
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/usb.c
View file

@ -280,7 +280,7 @@ bool usbSendFileData(void *data, u64 data_size)
} }
/* Optimization for buffers that already are page aligned */ /* Optimization for buffers that already are page aligned */
if (!((u64)data & (USB_TRANSFER_ALIGNMENT - 1))) if (IS_ALIGNED((u64)data, USB_TRANSFER_ALIGNMENT))
{ {
buf = data; buf = data;
} else { } else {
@ -920,13 +920,14 @@ NX_INLINE bool usbWrite(void *buf, u64 size)
{ {
rwlockWriteLock(&(g_usbDeviceInterface.lock_in)); rwlockWriteLock(&(g_usbDeviceInterface.lock_in));
bool ret = usbTransferData(buf, size, g_usbDeviceInterface.endpoint_in); bool ret = usbTransferData(buf, size, g_usbDeviceInterface.endpoint_in);
if (ret) usbDsEndpoint_SetZlt(g_usbDeviceInterface.endpoint_in, true);
rwlockWriteUnlock(&(g_usbDeviceInterface.lock_in)); rwlockWriteUnlock(&(g_usbDeviceInterface.lock_in));
return ret; return ret;
} }
static bool usbTransferData(void *buf, u64 size, UsbDsEndpoint *endpoint) static bool usbTransferData(void *buf, u64 size, UsbDsEndpoint *endpoint)
{ {
if (!buf || ((u64)buf & (USB_TRANSFER_ALIGNMENT - 1)) > 0 || !size || !endpoint) if (!buf || !IS_ALIGNED((u64)buf, USB_TRANSFER_ALIGNMENT) || !size || !endpoint)
{ {
LOGFILE("Invalid parameters!"); LOGFILE("Invalid parameters!");
return false; return false;
@ -959,7 +960,13 @@ static bool usbTransferData(void *buf, u64 size, UsbDsEndpoint *endpoint)
if (R_FAILED(rc)) if (R_FAILED(rc))
{ {
/* Cancel transfer */
usbDsEndpoint_Cancel(endpoint); usbDsEndpoint_Cancel(endpoint);
/* Safety measure: wait until the completion event is triggered again before proceeding */
eventWait(&(endpoint->CompletionEvent), UINT64_MAX);
eventClear(&(endpoint->CompletionEvent));
LOGFILE("eventWait failed! (0x%08X)", rc); LOGFILE("eventWait failed! (0x%08X)", rc);
return false; return false;
} }

1
source/utils.h
View file

@ -32,6 +32,7 @@
#define ALIGN_DOWN(x, y) ((x) & ~((y) - 1)) #define ALIGN_DOWN(x, y) ((x) & ~((y) - 1))
#define ALIGN_UP(x, y) ((((y) - 1) + (x)) & ~((y) - 1)) #define ALIGN_UP(x, y) ((((y) - 1) + (x)) & ~((y) - 1))
#define IS_ALIGNED(x, y) (((x) & ((y) - 1)) == 0)
#define BIS_SYSTEM_PARTITION_MOUNT_NAME "sys:" #define BIS_SYSTEM_PARTITION_MOUNT_NAME "sys:"