ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch libusb_config_descriptor to RAII type

This commit is contained in:
nyanpasu64 2023-07-02 20:07:37 -07:00
parent c893ccca58
commit 5d0f1bd10b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -625,8 +625,8 @@ static bool CheckDeviceAccess(libusb_device* device)
static void AddGCAdapter(libusb_device* device) static void AddGCAdapter(libusb_device* device)
{ {
libusb_config_descriptor* config = nullptr; auto [error, config] = LibusbUtils::MakeConfigDescriptor(device);
if (const int error = libusb_get_config_descriptor(device, 0, &config); error != LIBUSB_SUCCESS) if (error != LIBUSB_SUCCESS)
{ {
WARN_LOG_FMT(CONTROLLERINTERFACE, "libusb_get_config_descriptor failed: {}", WARN_LOG_FMT(CONTROLLERINTERFACE, "libusb_get_config_descriptor failed: {}",
LibusbUtils::ErrorWrap(error)); LibusbUtils::ErrorWrap(error));
@ -647,13 +647,12 @@ static void AddGCAdapter(libusb_device* device)
} }
} }
} }
libusb_free_config_descriptor(config); config.reset();
int size = 0; int size = 0;
std::array<u8, CONTROLER_OUTPUT_INIT_PAYLOAD_SIZE> payload = {0x13}; std::array<u8, CONTROLER_OUTPUT_INIT_PAYLOAD_SIZE> payload = {0x13};
const int error = error = libusb_interrupt_transfer(s_handle, s_endpoint_out, payload.data(),
libusb_interrupt_transfer(s_handle, s_endpoint_out, payload.data(), CONTROLER_OUTPUT_INIT_PAYLOAD_SIZE, &size, USB_TIMEOUT_MS);
CONTROLER_OUTPUT_INIT_PAYLOAD_SIZE, &size, USB_TIMEOUT_MS);
if (error != LIBUSB_SUCCESS) if (error != LIBUSB_SUCCESS)
{ {
WARN_LOG_FMT(CONTROLLERINTERFACE, "AddGCAdapter: libusb_interrupt_transfer failed: {}", WARN_LOG_FMT(CONTROLLERINTERFACE, "AddGCAdapter: libusb_interrupt_transfer failed: {}",