From db592d8aebd047cabf8925b25fbf20d08d1c0495 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 4 Apr 2023 19:06:01 -0400 Subject: [PATCH] usbcomms: expose VID:PID configuration --- nx/include/switch/runtime/devices/usb_comms.h | 2 +- nx/source/runtime/devices/usb_comms.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nx/include/switch/runtime/devices/usb_comms.h b/nx/include/switch/runtime/devices/usb_comms.h index 268ae895..def34df6 100644 --- a/nx/include/switch/runtime/devices/usb_comms.h +++ b/nx/include/switch/runtime/devices/usb_comms.h @@ -18,7 +18,7 @@ typedef struct { Result usbCommsInitialize(void); /// Initializes usbComms with a specific number of interfaces. -Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos); +Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos, u16 idVendor, u16 idProduct); /// Exits usbComms. void usbCommsExit(void); diff --git a/nx/source/runtime/devices/usb_comms.c b/nx/source/runtime/devices/usb_comms.c index 5a7c830e..13705cf7 100644 --- a/nx/source/runtime/devices/usb_comms.c +++ b/nx/source/runtime/devices/usb_comms.c @@ -42,7 +42,7 @@ static void _usbCommsUpdateInterfaceDescriptor(struct usb_interface_descriptor * } } -Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos) +Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos, u16 idVendor, u16 idProduct) { Result rc = 0; rwlockWriteLock(&g_usbCommsLock); @@ -76,8 +76,8 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf .bDeviceSubClass = 0x00, .bDeviceProtocol = 0x00, .bMaxPacketSize0 = 0x40, - .idVendor = 0x057e, - .idProduct = 0x3000, + .idVendor = idVendor, + .idProduct = idProduct, .bcdDevice = 0x0100, .iManufacturer = iManufacturer, .iProduct = iProduct, @@ -157,7 +157,7 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf Result usbCommsInitialize(void) { - return usbCommsInitializeEx(1, NULL); + return usbCommsInitializeEx(1, NULL, 0x057e, 0x3000); } static void _usbCommsInterfaceFree(usbCommsInterface *interface)