mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-06 11:22:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

usbComms: make default initialize take no args

Browse Source
This commit is contained in:
Michael Scire 2018-10-09 13:53:32 -07:00
parent 08dc01d102
commit 559229f75e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/runtime/devices/usb_comms.h
View File

@ -15,7 +15,7 @@ typedef struct {
} UsbCommsInterfaceInfo; } UsbCommsInterfaceInfo;
/// Initializes usbComms with the default number of interfaces (1) /// 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. /// Initializes usbComms with a specific number of interfaces.
Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos); Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *infos);

6
nx/source/runtime/devices/usb_comms.c
View File

@ -123,7 +123,7 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf
rwlockWriteLock(&intf->lock); rwlockWriteLock(&intf->lock);
rwlockWriteLock(&intf->lock_in); rwlockWriteLock(&intf->lock_in);
rwlockWriteLock(&intf->lock_out); rwlockWriteLock(&intf->lock_out);
rc = _usbCommsInterfaceInit(i, infos + i); rc = _usbCommsInterfaceInit(i, infos == NULL ? NULL : infos + i);
rwlockWriteUnlock(&intf->lock_out); rwlockWriteUnlock(&intf->lock_out);
rwlockWriteUnlock(&intf->lock_in); rwlockWriteUnlock(&intf->lock_in);
rwlockWriteUnlock(&intf->lock); rwlockWriteUnlock(&intf->lock);
@ -149,9 +149,9 @@ Result usbCommsInitializeEx(u32 num_interfaces, const UsbCommsInterfaceInfo *inf
return rc; return rc;
} }
Result usbCommsInitialize(const UsbCommsInterfaceInfo *info) Result usbCommsInitialize(void)
{ {
return usbCommsInitializeEx(1, info); return usbCommsInitializeEx(1, NULL);
} }
static void _usbCommsInterfaceFree(usbCommsInterface *interface) static void _usbCommsInterfaceFree(usbCommsInterface *interface)