From 559229f75eba545a64b3246a91e85e71b2f43eae Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 9 Oct 2018 13:53:32 -0700 Subject: [PATCH] usbComms: make default initialize take no args --- nx/include/switch/runtime/devices/usb_comms.h | 2 +- nx/source/runtime/devices/usb_comms.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nx/include/switch/runtime/devices/usb_comms.h b/nx/include/switch/runtime/devices/usb_comms.h index ff9946da..b06af541 100644 --- a/nx/include/switch/runtime/devices/usb_comms.h +++ b/nx/include/switch/runtime/devices/usb_comms.h @@ -15,7 +15,7 @@ typedef struct { } UsbCommsInterfaceInfo; /// Initializes usbComms with the default number of interfaces (1) -Result usbCommsInitialize(const UsbCommsInterfaceInfo *info); +Result usbCommsInitialize(void); /// Initializes usbComms with a specific number of interfaces. Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos); diff --git a/nx/source/runtime/devices/usb_comms.c b/nx/source/runtime/devices/usb_comms.c index f675e514..5e859259 100644 --- a/nx/source/runtime/devices/usb_comms.c +++ b/nx/source/runtime/devices/usb_comms.c @@ -123,7 +123,7 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf rwlockWriteLock(&intf->lock); rwlockWriteLock(&intf->lock_in); rwlockWriteLock(&intf->lock_out); - rc = _usbCommsInterfaceInit(i, infos + i); + rc = _usbCommsInterfaceInit(i, infos == NULL ? NULL : infos + i); rwlockWriteUnlock(&intf->lock_out); rwlockWriteUnlock(&intf->lock_in); rwlockWriteUnlock(&intf->lock); @@ -149,9 +149,9 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf return rc; } -Result usbCommsInitialize(const UsbCommsInterfaceInfo *info) +Result usbCommsInitialize(void) { - return usbCommsInitializeEx(1, info); + return usbCommsInitializeEx(1, NULL); } static void _usbCommsInterfaceFree(usbCommsInterface *interface)