diff --git a/Makefile b/Makefile
index 4f9ed42..f35e545 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ ROMFS := romfs
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -Wextra -O2 -ffunction-sections $(ARCH) $(DEFINES) $(INCLUDE) -D__SWITCH__
-CFLAGS += -DAPP_TITLE=\"${APP_TITLE}\" -DAPP_VERSION=\"${APP_VERSION}\"
+CFLAGS += -DVERSION_MAJOR=${VERSION_MAJOR} -DVERSION_MINOR=${VERSION_MINOR} -DVERSION_MICRO=${VERSION_MICRO} -DAPP_TITLE=\"${APP_TITLE}\" -DAPP_AUTHOR=\"${APP_AUTHOR}\" -DAPP_VERSION=\"${APP_VERSION}\"
CFLAGS += `freetype-config --cflags`
CFLAGS += `aarch64-none-elf-pkg-config zlib --cflags`
CFLAGS += `aarch64-none-elf-pkg-config libxml-2.0 --cflags`
diff --git a/source/main.c b/source/main.c
index 4d26a36..2920961 100644
--- a/source/main.c
+++ b/source/main.c
@@ -28,6 +28,7 @@
#include "utils.h"
#include "bktr.h"
#include "gamecard.h"
+#include "usb.h"
#define TEST_BUF_SIZE 0x800000
@@ -383,7 +384,38 @@ int main(int argc, char *argv[])
shared_data.data_written = 0;
gamecardGetTotalSize(&(shared_data.total_size));
- thrd_t read_thread, write_thread;
+
+
+ consolePrint("waiting for usb connection... ");
+
+ u8 count = 0;
+
+ while(appletMainLoop())
+ {
+ /* Avoid using usbIsHostAvailable() alone inside a loop, because it can hang up the system */
+ consolePrint("%u ", count);
+ if (usbIsHostAvailable()) break;
+ utilsSleep(1);
+ count++;
+ if (count == 10) break;
+ }
+
+ if (count == 10)
+ {
+ consolePrint("\nusb connection not detected\n");
+ goto out2;
+ }
+
+ consolePrint("\nusb connection detected\n");
+
+ if (usbSendFileProperties(shared_data.total_size, "gamecard.xci"))
+ {
+ consolePrint("usb send file properties succeeded\n");
+ } else {
+ consolePrint("usb send file properties failed\n");
+ }
+
+ /*thrd_t read_thread, write_thread;
consolePrint("creating threads\n\n");
thrd_create(&read_thread, read_thread_func, &shared_data);
@@ -419,7 +451,7 @@ int main(int argc, char *argv[])
consolePrint("waiting for threads to join\n");
thrd_join(read_thread, NULL);
- thrd_join(write_thread, NULL);
+ thrd_join(write_thread, NULL);*/
diff --git a/source/services.c b/source/services.c
index 76f57a3..e0e33d5 100644
--- a/source/services.c
+++ b/source/services.c
@@ -59,8 +59,7 @@ static ServicesInfoEntry g_serviceInfo[] = {
{ false, "clk", &servicesClkGetServiceType, NULL, NULL }, /* Placeholder for pcv / clkrst */
{ false, "fsp-usb", &servicesFspUsbCheckAvailability, &fspusbInitialize, &fspusbExit }, /* Checks if fsp-usb is really available */
{ false, "es", NULL, &esInitialize, &esExit },
- { false, "set:cal", NULL, &setcalInitialize, &setcalExit },
- { false, "usb:ds", NULL, &usbCommsInitialize, &usbCommsExit }
+ { false, "set:cal", NULL, &setcalInitialize, &setcalExit }
};
static const u32 g_serviceInfoCount = MAX_ELEMENTS(g_serviceInfo);
diff --git a/source/usb.c b/source/usb.c
new file mode 100644
index 0000000..adff9d9
--- /dev/null
+++ b/source/usb.c
@@ -0,0 +1,894 @@
+/*
+ * Copyright (c) 2020 DarkMatterCore
+ * Heavily based in usb_comms.c/h from libnx
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+#include
+#include
+#include
+
+#include "usb.h"
+#include "utils.h"
+
+#define USB_CMD_HEADER_MAGIC 0x4E584454 /* "NXDT" */
+
+#define USB_TRANSFER_ALIGNMENT 0x1000
+#define USB_TRANSFER_TIMEOUT (u64)10000000000 /* 10 seconds (in nanoseconds) */
+
+/* Type definitions. */
+
+typedef struct {
+ RwLock lock, lock_in, lock_out;
+ bool initialized;
+ UsbDsInterface *interface;
+ UsbDsEndpoint *endpoint_in, *endpoint_out;
+} usbDeviceInterface;
+
+typedef enum {
+ UsbCommandType_PerformHandshake = 0,
+ UsbCommandType_SendFileProperties = 1,
+ UsbCommandType_SendNspHeader = 2 /* Needs to be implemented */
+} UsbCommandType;
+
+typedef struct {
+ u32 magic;
+ u32 cmd;
+ u32 cmd_block_size;
+ u8 reserved[0x4];
+} UsbCommandHeader;
+
+typedef struct {
+ u8 version_major;
+ u8 version_minor;
+ u8 version_micro;
+ u8 reserved[0x9];
+} UsbCommandPerformHandshake;
+
+typedef struct {
+ u64 file_size;
+ u32 filename_length;
+ u8 reserved_1[0x4];
+ char filename[FS_MAX_PATH];
+ u8 reserved_2[0xF];
+} UsbCommandSendFileProperties;
+
+typedef enum {
+ UsbStatusType_Success = 0,
+
+ UsbStatusType_InvalidCommandSize = 1,
+ UsbStatusType_WriteCommandFailed = 2,
+ UsbStatusType_ReadStatusFailed = 3,
+ UsbStatusType_InvalidMagicWord = 4,
+
+ UsbStatusType_MalformedCommand = 5,
+ UsbStatusType_UnsupportedProtocolVersion = 6,
+ UsbStatusType_UnsupportedCommand = 7,
+ UsbStatusType_HostIoError = 8
+} UsbStatusType;
+
+typedef struct {
+ u32 magic;
+ u32 status;
+ u8 reserved[0x8];
+} UsbStatus;
+
+/* Global variables. */
+
+static bool g_usbDeviceInterfaceInitialized = false;
+static usbDeviceInterface g_usbDeviceInterface = {0};
+static RwLock g_usbDeviceLock = {0};
+
+static u8 *g_usbTransferBuffer = NULL;
+static u64 g_usbTransferRemainingSize = 0;
+
+/* Function prototypes. */
+
+NX_INLINE void usbPrepareCommandHeader(u32 cmd, u32 cmd_block_size);
+static u32 usbSendCommand(size_t cmd_size);
+NX_INLINE void usbLogStatusDetail(u32 status);
+
+NX_INLINE bool usbAllocateTransferBuffer(void);
+NX_INLINE void usbFreeTransferBuffer(void);
+
+static bool usbInitializeComms(void);
+static void usbCloseComms(void);
+
+static void usbFreeDeviceInterface(void);
+
+NX_INLINE bool usbInitializeDeviceInterface(void);
+static bool usbInitializeDeviceInterface5x(void);
+static bool usbInitializeDeviceInterface1x(void);
+
+static bool usbRead(void *buf, size_t size);
+static bool usbWrite(void *buf, size_t size);
+static bool usbTransferData(void *buf, size_t size, UsbDsEndpoint *endpoint);
+
+bool usbInitialize(void)
+{
+ bool ret = false;
+
+ rwlockWriteLock(&g_usbDeviceLock);
+
+ /* Allocate USB transfer buffer */
+ if (!usbAllocateTransferBuffer())
+ {
+ LOGFILE("Failed to allocate memory for the USB transfer buffer!");
+ goto exit;
+ }
+
+ /* Initialize USB device interface */
+ if (!usbInitializeComms())
+ {
+ LOGFILE("Failed to initialize USB device interface!");
+ goto exit;
+ }
+
+ ret = true;
+
+exit:
+ rwlockWriteUnlock(&g_usbDeviceLock);
+
+ return ret;
+}
+
+void usbExit(void)
+{
+ rwlockWriteLock(&g_usbDeviceLock);
+
+ /* Close USB device interface */
+ usbCloseComms();
+
+ /* Free USB transfer buffer */
+ usbFreeTransferBuffer();
+
+ rwlockWriteUnlock(&g_usbDeviceLock);
+}
+
+bool usbIsHostAvailable(void)
+{
+ u32 state = 0;
+ usbDsGetState(&state);
+ return (state == 5);
+}
+
+bool usbPerformHandshake(void)
+{
+ rwlockWriteLock(&g_usbDeviceLock);
+ rwlockWriteLock(&(g_usbDeviceInterface.lock));
+
+ bool ret = false;
+ UsbCommandPerformHandshake *cmd_block = NULL;
+ size_t cmd_size = 0;
+ u32 status = UsbStatusType_Success;
+
+ if (!g_usbTransferBuffer || !g_usbDeviceInterfaceInitialized || !g_usbDeviceInterface.initialized)
+ {
+ LOGFILE("Invalid parameters!");
+ goto exit;
+ }
+
+ usbPrepareCommandHeader(UsbCommandType_PerformHandshake, (u32)sizeof(UsbCommandPerformHandshake));
+
+ cmd_block = (UsbCommandPerformHandshake*)(g_usbTransferBuffer + sizeof(UsbCommandHeader));
+ memset(cmd_block, 0, sizeof(UsbCommandPerformHandshake));
+ cmd_block->version_major = VERSION_MAJOR;
+ cmd_block->version_minor = VERSION_MINOR;
+ cmd_block->version_micro = VERSION_MICRO;
+
+ cmd_size = (sizeof(UsbCommandHeader) + sizeof(UsbCommandPerformHandshake));
+ memset(g_usbTransferBuffer + cmd_size, 0, USB_TRANSFER_ALIGNMENT - cmd_size);
+ cmd_size = USB_TRANSFER_ALIGNMENT;
+
+ status = usbSendCommand(cmd_size);
+ if (status != UsbStatusType_Success) usbLogStatusDetail(status);
+
+ ret = (status == UsbStatusType_Success);
+
+exit:
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+ rwlockWriteUnlock(&g_usbDeviceLock);
+
+ return ret;
+}
+
+bool usbSendFileProperties(u64 file_size, const char *filename)
+{
+ rwlockWriteLock(&g_usbDeviceLock);
+ rwlockWriteLock(&(g_usbDeviceInterface.lock));
+
+ bool ret = false;
+ UsbCommandSendFileProperties *cmd_block = NULL;
+ size_t cmd_size = 0;
+ u32 status = UsbStatusType_Success;
+ u32 filename_length = 0;
+
+ if (!g_usbTransferBuffer || !g_usbDeviceInterfaceInitialized || !g_usbDeviceInterface.initialized || g_usbTransferRemainingSize > 0 || !filename || \
+ !(filename_length = (u32)strlen(filename)) || filename_length >= FS_MAX_PATH)
+ {
+ LOGFILE("Invalid parameters!");
+ goto exit;
+ }
+
+ usbPrepareCommandHeader(UsbCommandType_SendFileProperties, (u32)sizeof(UsbCommandSendFileProperties));
+
+ cmd_block = (UsbCommandSendFileProperties*)(g_usbTransferBuffer + sizeof(UsbCommandHeader));
+ memset(cmd_block, 0, sizeof(UsbCommandSendFileProperties));
+ cmd_block->file_size = file_size;
+ cmd_block->filename_length = filename_length;
+ sprintf(cmd_block->filename, filename);
+
+ cmd_size = (sizeof(UsbCommandHeader) + sizeof(UsbCommandSendFileProperties));
+ memset(g_usbTransferBuffer + cmd_size, 0, USB_TRANSFER_ALIGNMENT - cmd_size);
+ cmd_size = USB_TRANSFER_ALIGNMENT;
+
+ status = usbSendCommand(cmd_size);
+ if (status == UsbStatusType_Success)
+ {
+ ret = true;
+ g_usbTransferRemainingSize = file_size;
+ } else {
+ usbLogStatusDetail(status);
+ }
+
+exit:
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+ rwlockWriteUnlock(&g_usbDeviceLock);
+
+ return ret;
+}
+
+bool usbSendFileData(void *data, u32 data_size)
+{
+ rwlockWriteLock(&g_usbDeviceLock);
+ rwlockWriteLock(&(g_usbDeviceInterface.lock));
+
+ bool ret = false;
+ u32 block_size = 0;
+
+ if (!g_usbTransferBuffer || !g_usbDeviceInterfaceInitialized || !g_usbDeviceInterface.initialized || !g_usbTransferRemainingSize || !data || !data_size || data_size > USB_TRANSFER_BUFFER_SIZE || \
+ data_size > g_usbTransferRemainingSize)
+ {
+ LOGFILE("Invalid parameters!");
+ goto exit;
+ }
+
+ block_size = ALIGN_UP(data_size, USB_TRANSFER_ALIGNMENT);
+ memcpy(g_usbTransferBuffer, data, data_size);
+ if (block_size > data_size) memset(g_usbTransferBuffer + data_size, 0, block_size - data_size);
+
+ if (!usbWrite(g_usbTransferBuffer, block_size))
+ {
+ LOGFILE("Failed to write 0x%lX bytes long file data chunk!", block_size);
+ goto exit;
+ }
+
+ ret = true;
+ g_usbTransferRemainingSize -= data_size;
+
+ /* Check if this is the last chunk */
+ if (!g_usbTransferRemainingSize)
+ {
+ UsbStatus *cmd_status = NULL;
+
+ if (!usbRead(g_usbTransferBuffer, USB_TRANSFER_ALIGNMENT))
+ {
+ LOGFILE("Failed to read 0x%lX bytes long status block!", USB_TRANSFER_ALIGNMENT);
+ ret = false;
+ goto exit;
+ }
+
+ cmd_status = (UsbStatus*)g_usbTransferBuffer;
+
+ if (cmd_status->magic != __builtin_bswap32(USB_CMD_HEADER_MAGIC))
+ {
+ LOGFILE("Invalid status block magic word!");
+ ret = false;
+ goto exit;
+ }
+
+ ret = (cmd_status->status == UsbStatusType_Success);
+ if (!ret) usbLogStatusDetail(cmd_status->status);
+ }
+
+exit:
+ if (!ret) g_usbTransferRemainingSize = 0;
+
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+ rwlockWriteUnlock(&g_usbDeviceLock);
+
+ return ret;
+}
+
+NX_INLINE void usbPrepareCommandHeader(u32 cmd, u32 cmd_block_size)
+{
+ if (cmd > UsbCommandType_SendNspHeader) return;
+ UsbCommandHeader *cmd_header = (UsbCommandHeader*)g_usbTransferBuffer;
+ memset(cmd_header, 0, sizeof(UsbCommandHeader));
+ cmd_header->magic = __builtin_bswap32(USB_CMD_HEADER_MAGIC);
+ cmd_header->cmd = cmd;
+ cmd_header->cmd_block_size = cmd_block_size;
+}
+
+static u32 usbSendCommand(size_t cmd_size)
+{
+ u32 cmd = ((UsbCommandHeader*)g_usbTransferBuffer)->cmd;
+ UsbStatus *cmd_status = NULL;
+
+ if (!cmd_size || (cmd_size % USB_TRANSFER_ALIGNMENT) > 0 || cmd_size > USB_TRANSFER_BUFFER_SIZE)
+ {
+ LOGFILE("Invalid command size!");
+ return UsbStatusType_InvalidCommandSize;
+ }
+
+ if (!usbWrite(g_usbTransferBuffer, cmd_size))
+ {
+ LOGFILE("Failed to write 0x%lX bytes long block for type 0x%X command!", cmd_size, cmd);
+ return UsbStatusType_WriteCommandFailed;
+ }
+
+ if (!usbRead(g_usbTransferBuffer, USB_TRANSFER_ALIGNMENT))
+ {
+ LOGFILE("Failed to read 0x%lX bytes long status block for type 0x%X command!", USB_TRANSFER_ALIGNMENT, cmd);
+ return UsbStatusType_ReadStatusFailed;
+ }
+
+ cmd_status = (UsbStatus*)g_usbTransferBuffer;
+
+ if (cmd_status->magic != __builtin_bswap32(USB_CMD_HEADER_MAGIC))
+ {
+ LOGFILE("Invalid status block magic word for type 0x%X command!", cmd);
+ return UsbStatusType_InvalidMagicWord;
+ }
+
+ return cmd_status->status;
+}
+
+NX_INLINE void usbLogStatusDetail(u32 status)
+{
+ switch(status)
+ {
+ case UsbStatusType_Success:
+ case UsbStatusType_InvalidCommandSize:
+ case UsbStatusType_WriteCommandFailed:
+ case UsbStatusType_ReadStatusFailed:
+ case UsbStatusType_InvalidMagicWord:
+ break;
+ case UsbStatusType_MalformedCommand:
+ LOGFILE("Host replied with Malformed Command status code.");
+ break;
+ case UsbStatusType_UnsupportedProtocolVersion:
+ LOGFILE("Host replied with Unsupported Protocol Version status code.");
+ break;
+ case UsbStatusType_UnsupportedCommand:
+ LOGFILE("Host replied with Unsupported Command status code.");
+ break;
+ case UsbStatusType_HostIoError:
+ LOGFILE("Host replied with I/O Error status code.");
+ break;
+ default:
+ LOGFILE("Unknown status code: 0x%X.", status);
+ break;
+ }
+}
+
+NX_INLINE bool usbAllocateTransferBuffer(void)
+{
+ if (g_usbTransferBuffer) return true;
+ g_usbTransferBuffer = memalign(USB_TRANSFER_ALIGNMENT, USB_TRANSFER_BUFFER_SIZE);
+ return (g_usbTransferBuffer != NULL);
+}
+
+NX_INLINE void usbFreeTransferBuffer(void)
+{
+ if (!g_usbTransferBuffer) return;
+ free(g_usbTransferBuffer);
+ g_usbTransferBuffer = NULL;
+ g_usbTransferRemainingSize = 0;
+}
+
+static bool usbInitializeComms(void)
+{
+ Result rc = 0;
+
+ bool ret = (g_usbDeviceInterfaceInitialized && g_usbDeviceInterface.initialized);
+ if (ret) goto exit;
+
+ rc = usbDsInitialize();
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInitialize failed! (0x%08X)", rc);
+ goto exit;
+ }
+
+ if (hosversionAtLeast(5,0,0))
+ {
+ u8 manufacturer = 0, product = 0, serial_number = 0;
+ static const u16 supported_langs[1] = { 0x0409 };
+
+ struct usb_device_descriptor device_descriptor = {
+ .bLength = USB_DT_DEVICE_SIZE,
+ .bDescriptorType = USB_DT_DEVICE,
+ .bcdUSB = 0x0110,
+ .bDeviceClass = 0x00,
+ .bDeviceSubClass = 0x00,
+ .bDeviceProtocol = 0x00,
+ .bMaxPacketSize0 = 0x40,
+ .idVendor = 0x057e,
+ .idProduct = 0x3000,
+ .bcdDevice = 0x0100,
+ .iManufacturer = manufacturer,
+ .iProduct = product,
+ .iSerialNumber = serial_number,
+ .bNumConfigurations = 0x01
+ };
+
+ u8 bos[0x16] = {
+ /* USB 1.1 */
+ 0x05, /* .bLength */
+ USB_DT_BOS, /* .bDescriptorType */
+ 0x16, 0x00, /* .wTotalLength */
+ 0x02, /* .bNumDeviceCaps */
+
+ /* USB 2.0 */
+ 0x07, /* .bLength */
+ USB_DT_DEVICE_CAPABILITY, /* .bDescriptorType */
+ 0x02, /* .bDevCapabilityType */
+ 0x02, 0x00, 0x00, 0x00, /* dev_capability_data */
+
+ /* USB 3.0 */
+ 0x0A, /* .bLength */
+ USB_DT_DEVICE_CAPABILITY, /* .bDescriptorType */
+ 0x03, /* .bDevCapabilityType */
+ 0x00, 0x0E, 0x00, 0x03, 0x00, 0x00, 0x00
+ };
+
+ /* Send language descriptor */
+ rc = usbDsAddUsbLanguageStringDescriptor(NULL, supported_langs, sizeof(supported_langs) / sizeof(u16));
+ if (R_FAILED(rc)) LOGFILE("usbDsAddUsbLanguageStringDescriptor failed! (0x%08X)", rc);
+
+ /* Send manufacturer */
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsAddUsbStringDescriptor(&manufacturer, APP_AUTHOR);
+ if (R_FAILED(rc)) LOGFILE("usbDsAddUsbStringDescriptor failed! (0x%08X) (manufacturer)", rc);
+ }
+
+ /* Send product */
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsAddUsbStringDescriptor(&product, APP_TITLE);
+ if (R_FAILED(rc)) LOGFILE("usbDsAddUsbStringDescriptor failed! (0x%08X) (product)", rc);
+ }
+
+ /* Send serial number */
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsAddUsbStringDescriptor(&serial_number, APP_VERSION);
+ if (R_FAILED(rc)) LOGFILE("usbDsAddUsbStringDescriptor failed! (0x%08X) (serial number)", rc);
+ }
+
+ /* Send device descriptors */
+
+ /* Full Speed is USB 1.1 */
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsSetUsbDeviceDescriptor(UsbDeviceSpeed_Full, &device_descriptor);
+ if (R_FAILED(rc)) LOGFILE("usbDsSetUsbDeviceDescriptor failed! (0x%08X) (USB 1.1)", rc);
+ }
+
+ /* High Speed is USB 2.0 */
+ device_descriptor.bcdUSB = 0x0200;
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsSetUsbDeviceDescriptor(UsbDeviceSpeed_High, &device_descriptor);
+ if (R_FAILED(rc)) LOGFILE("usbDsSetUsbDeviceDescriptor failed! (0x%08X) (USB 2.0)", rc);
+ }
+
+ /* Super Speed is USB 3.0 */
+ /* Upgrade packet size to 512 */
+ device_descriptor.bcdUSB = 0x0300;
+ device_descriptor.bMaxPacketSize0 = 0x09;
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsSetUsbDeviceDescriptor(UsbDeviceSpeed_Super, &device_descriptor);
+ if (R_FAILED(rc)) LOGFILE("usbDsSetUsbDeviceDescriptor failed! (0x%08X) (USB 3.0)", rc);
+ }
+
+ /* Define Binary Object Store */
+ if (R_SUCCEEDED(rc))
+ {
+ rc = usbDsSetBinaryObjectStore(bos, sizeof(bos));
+ if (R_FAILED(rc)) LOGFILE("usbDsSetBinaryObjectStore failed! (0x%08X)", rc);
+ }
+ }
+
+ if (R_FAILED(rc)) goto exit;
+
+ /* Initialize USB device interface */
+ rwlockWriteLock(&(g_usbDeviceInterface.lock));
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_in));
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_out));
+
+ bool dev_iface_init = usbInitializeDeviceInterface();
+
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_out));
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_in));
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+
+ if (!dev_iface_init)
+ {
+ LOGFILE("Failed to initialize USB device interface!");
+ goto exit;
+ }
+
+ if (hosversionAtLeast(5,0,0))
+ {
+ rc = usbDsEnable();
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsEnable failed! (0x%08X)", rc);
+ goto exit;
+ }
+ }
+
+ ret = g_usbDeviceInterfaceInitialized = true;
+
+exit:
+ if (!ret) usbCloseComms();
+
+ return ret;
+}
+
+static void usbCloseComms(void)
+{
+ usbDsExit();
+ g_usbDeviceInterfaceInitialized = false;
+ usbFreeDeviceInterface();
+}
+
+static void usbFreeDeviceInterface(void)
+{
+ rwlockWriteLock(&(g_usbDeviceInterface.lock));
+
+ if (!g_usbDeviceInterface.initialized) {
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+ return;
+ }
+
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_in));
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_out));
+
+ g_usbDeviceInterface.initialized = false;
+
+ g_usbDeviceInterface.interface = NULL;
+ g_usbDeviceInterface.endpoint_in = NULL;
+ g_usbDeviceInterface.endpoint_out = NULL;
+
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_out));
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_in));
+
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock));
+}
+
+NX_INLINE bool usbInitializeDeviceInterface(void)
+{
+ return (hosversionAtLeast(5,0,0) ? usbInitializeDeviceInterface5x() : usbInitializeDeviceInterface1x());
+}
+
+static bool usbInitializeDeviceInterface5x(void)
+{
+ Result rc = 0;
+
+ struct usb_interface_descriptor interface_descriptor = {
+ .bLength = USB_DT_INTERFACE_SIZE,
+ .bDescriptorType = USB_DT_INTERFACE,
+ .bInterfaceNumber = 4,
+ .bNumEndpoints = 2,
+ .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+ .bInterfaceSubClass = USB_CLASS_VENDOR_SPEC,
+ .bInterfaceProtocol = USB_CLASS_VENDOR_SPEC,
+ };
+
+ struct usb_endpoint_descriptor endpoint_descriptor_in = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_ENDPOINT_IN,
+ .bmAttributes = USB_TRANSFER_TYPE_BULK,
+ .wMaxPacketSize = 0x40,
+ };
+
+ struct usb_endpoint_descriptor endpoint_descriptor_out = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_ENDPOINT_OUT,
+ .bmAttributes = USB_TRANSFER_TYPE_BULK,
+ .wMaxPacketSize = 0x40,
+ };
+
+ struct usb_ss_endpoint_companion_descriptor endpoint_companion = {
+ .bLength = sizeof(struct usb_ss_endpoint_companion_descriptor),
+ .bDescriptorType = USB_DT_SS_ENDPOINT_COMPANION,
+ .bMaxBurst = 0x0F,
+ .bmAttributes = 0x00,
+ .wBytesPerInterval = 0x00,
+ };
+
+ /* Enable device interface */
+ g_usbDeviceInterface.initialized = true;
+
+ /* Setup interface */
+ rc = usbDsRegisterInterface(&(g_usbDeviceInterface.interface));
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsRegisterInterface failed! (0x%08X)", rc);
+ return false;
+ }
+
+ interface_descriptor.bInterfaceNumber = g_usbDeviceInterface.interface->interface_index;
+ endpoint_descriptor_in.bEndpointAddress += (interface_descriptor.bInterfaceNumber + 1);
+ endpoint_descriptor_out.bEndpointAddress += (interface_descriptor.bInterfaceNumber + 1);
+
+ /* Full Speed config (USB 1.1) */
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Full, &interface_descriptor, USB_DT_INTERFACE_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 1.1) (interface)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Full, &endpoint_descriptor_in, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 1.1) (in endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Full, &endpoint_descriptor_out, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 1.1) (out endpoint)", rc);
+ return false;
+ }
+
+ /* High Speed config (USB 2.0) */
+ endpoint_descriptor_in.wMaxPacketSize = 0x200;
+ endpoint_descriptor_out.wMaxPacketSize = 0x200;
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_High, &interface_descriptor, USB_DT_INTERFACE_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 2.0) (interface)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_High, &endpoint_descriptor_in, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 2.0) (in endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_High, &endpoint_descriptor_out, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 2.0) (out endpoint)", rc);
+ return false;
+ }
+
+ /* Super Speed config (USB 3.0) */
+ endpoint_descriptor_in.wMaxPacketSize = 0x400;
+ endpoint_descriptor_out.wMaxPacketSize = 0x400;
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Super, &interface_descriptor, USB_DT_INTERFACE_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 3.0) (interface)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Super, &endpoint_descriptor_in, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 3.0) (in endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Super, &endpoint_companion, USB_DT_SS_ENDPOINT_COMPANION_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 3.0) (in endpoint companion)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Super, &endpoint_descriptor_out, USB_DT_ENDPOINT_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 3.0) (out endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_AppendConfigurationData(g_usbDeviceInterface.interface, UsbDeviceSpeed_Super, &endpoint_companion, USB_DT_SS_ENDPOINT_COMPANION_SIZE);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_AppendConfigurationData failed! (0x%08X) (USB 3.0) (out endpoint companion)", rc);
+ return false;
+ }
+
+ /* Setup endpoints */
+ rc = usbDsInterface_RegisterEndpoint(g_usbDeviceInterface.interface, &(g_usbDeviceInterface.endpoint_in), endpoint_descriptor_in.bEndpointAddress);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_RegisterEndpoint failed! (0x%08X) (in endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_RegisterEndpoint(g_usbDeviceInterface.interface, &(g_usbDeviceInterface.endpoint_out), endpoint_descriptor_out.bEndpointAddress);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_RegisterEndpoint failed! (0x%08X) (out endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_EnableInterface(g_usbDeviceInterface.interface);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_EnableInterface failed! (0x%08X)", rc);
+ return false;
+ }
+
+ return true;
+}
+
+static bool usbInitializeDeviceInterface1x(void)
+{
+ Result rc = 0;
+
+ struct usb_interface_descriptor interface_descriptor = {
+ .bLength = USB_DT_INTERFACE_SIZE,
+ .bDescriptorType = USB_DT_INTERFACE,
+ .bInterfaceNumber = 0,
+ .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+ .bInterfaceSubClass = USB_CLASS_VENDOR_SPEC,
+ .bInterfaceProtocol = USB_CLASS_VENDOR_SPEC,
+ };
+
+ struct usb_endpoint_descriptor endpoint_descriptor_in = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_ENDPOINT_IN,
+ .bmAttributes = USB_TRANSFER_TYPE_BULK,
+ .wMaxPacketSize = 0x200,
+ };
+
+ struct usb_endpoint_descriptor endpoint_descriptor_out = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_ENDPOINT_OUT,
+ .bmAttributes = USB_TRANSFER_TYPE_BULK,
+ .wMaxPacketSize = 0x200,
+ };
+
+ /* Enable device interface */
+ g_usbDeviceInterface.initialized = true;
+
+ /* Setup interface */
+ rc = usbDsGetDsInterface(&(g_usbDeviceInterface.interface), &interface_descriptor, "usb");
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsGetDsInterface failed! (0x%08X)", rc);
+ return false;
+ }
+
+ /* Setup endpoints */
+ rc = usbDsInterface_GetDsEndpoint(g_usbDeviceInterface.interface, &(g_usbDeviceInterface.endpoint_in), &endpoint_descriptor_in);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_GetDsEndpoint failed! (0x%08X) (in endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_GetDsEndpoint(g_usbDeviceInterface.interface, &(g_usbDeviceInterface.endpoint_out), &endpoint_descriptor_out);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_GetDsEndpoint failed! (0x%08X) (out endpoint)", rc);
+ return false;
+ }
+
+ rc = usbDsInterface_EnableInterface(g_usbDeviceInterface.interface);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsInterface_EnableInterface failed! (0x%08X)", rc);
+ return false;
+ }
+
+ return true;
+}
+
+static bool usbRead(void *buf, size_t size)
+{
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_out));
+ bool ret = usbTransferData(buf, size, g_usbDeviceInterface.endpoint_out);
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_out));
+ return ret;
+}
+
+static bool usbWrite(void *buf, size_t size)
+{
+ rwlockWriteLock(&(g_usbDeviceInterface.lock_in));
+ bool ret = usbTransferData(buf, size, g_usbDeviceInterface.endpoint_in);
+ rwlockWriteUnlock(&(g_usbDeviceInterface.lock_in));
+ return ret;
+}
+
+static bool usbTransferData(void *buf, size_t size, UsbDsEndpoint *endpoint)
+{
+ if (!buf || ((u64)buf & (USB_TRANSFER_ALIGNMENT - 1)) > 0 || !size || (size % USB_TRANSFER_ALIGNMENT) > 0 || !endpoint)
+ {
+ LOGFILE("Invalid parameters!");
+ return false;
+ }
+
+ if (!usbIsHostAvailable())
+ {
+ LOGFILE("USB host unavailable!");
+ return false;
+ }
+
+ u32 urb_id = 0;
+ Result rc = 0;
+ UsbDsReportData report_data = {0};
+ u32 transferred_size = 0;
+
+ /* Start an USB transfer using the provided endpoint */
+ rc = usbDsEndpoint_PostBufferAsync(endpoint, buf, size, &urb_id);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsEndpoint_PostBufferAsync failed! (0x%08X)", rc);
+ return false;
+ }
+
+ /* Wait for the transfer to finish */
+ rc = eventWait(&(endpoint->CompletionEvent), USB_TRANSFER_TIMEOUT);
+ eventClear(&(endpoint->CompletionEvent));
+
+ if (R_FAILED(rc))
+ {
+ LOGFILE("USB transfer timed out! (0x%08X)", rc);
+ return false;
+ }
+
+ rc = usbDsEndpoint_GetReportData(endpoint, &report_data);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsEndpoint_GetReportData failed! (0x%08X)", rc);
+ return false;
+ }
+
+ rc = usbDsParseReportData(&report_data, urb_id, NULL, &transferred_size);
+ if (R_FAILED(rc))
+ {
+ LOGFILE("usbDsEndpoint_GetReportData failed! (0x%08X)", rc);
+ return false;
+ }
+
+ if (transferred_size != size)
+ {
+ LOGFILE("USB transfer failed! Expected 0x%lX bytes, got 0x%X bytes.", size, transferred_size);
+ return false;
+ }
+
+ return true;
+}
diff --git a/source/usb.h b/source/usb.h
new file mode 100644
index 0000000..58ea375
--- /dev/null
+++ b/source/usb.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 DarkMatterCore
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#ifndef __USB_H__
+#define __USB_H__
+
+#include
+
+#define USB_TRANSFER_BUFFER_SIZE 0x800000
+
+/// Initializes the USB interface, input and output endpoints and allocates a 0x1000-byte aligned transfer buffer.
+bool usbInitialize(void);
+
+/// Closes the USB interface, input and output endpoints and frees the transfer buffer.
+void usbExit(void);
+
+/// Checks if the console is currently connected to a host device.
+bool usbIsHostAvailable(void);
+
+/// Performs a handshake with the host device. Returns true if the host device replies with valid data.
+bool usbPerformHandshake(void);
+
+/// Sends file properties to the host device before starting a file data transfer. Must be called before usbSendFileData().
+bool usbSendFileProperties(u64 file_size, const char *filename);
+
+/// Performs a file data transfer. Must be called after usbSendFileProperties().
+/// Data chunk size must not exceed USB_TRANSFER_BUFFER_SIZE.
+bool usbSendFileData(void *data, u32 data_size);
+
+#endif /* __USB_H__ */
diff --git a/source/utils.c b/source/utils.c
index 6116fb1..b3c96c7 100644
--- a/source/utils.c
+++ b/source/utils.c
@@ -29,6 +29,7 @@
#include "services.h"
#include "utils.h"
#include "nca.h"
+#include "usb.h"
#include "fatfs/ff.h"
/* Global variables. */
@@ -74,6 +75,13 @@ bool utilsInitializeResources(void)
goto exit;
}
+ /* Initialize USB interface */
+ if (!usbInitialize())
+ {
+ LOGFILE("Failed to initialize USB interface!");
+ goto exit;
+ }
+
/* Load NCA keyset */
if (!keysLoadNcaKeyset())
{
@@ -165,6 +173,9 @@ void utilsCloseResources(void)
/* Free NCA crypto buffer */
ncaFreeCryptoBuffer();
+ /* Close USB interface */
+ usbExit();
+
/* Close initialized services */
servicesClose();