Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added try_detach to USBInterface

Browse source
This commit is contained in:
Ingo Ruhnke 2011-05-26 15:03:34 +02:00
parent 7a00c3fef6
commit 429d808d4e
2 changed files with 26 additions and 3 deletions

27
src/usb_interface.cpp
View file

@ -53,13 +53,36 @@ private:
USBWriteCallback& operator=(const USBWriteCallback&);
};
USBInterface::USBInterface(libusb_device_handle* handle, int interface) :
USBInterface::USBInterface(libusb_device_handle* handle, int interface, bool try_detach) :
m_handle(handle),
m_interface(interface),
m_endpoints()
{
int ret = libusb_claim_interface(handle, m_interface);
if (ret != LIBUSB_SUCCESS)
if (ret == LIBUSB_SUCCESS)
{
// success
}
else if (ret == LIBUSB_ERROR_BUSY && try_detach)
{
// try to detach and then try to reopen
ret = libusb_detach_kernel_driver(handle, interface);
if (ret != LIBUSB_SUCCESS)
{
raise_exception(std::runtime_error, "error detaching kernel driver: "
<< interface << ": " << usb_strerror(ret));
}
else
{
// kernel driver detached, try to claim it again
ret = libusb_claim_interface(handle, interface);
if (ret != LIBUSB_SUCCESS)
{
raise_exception(std::runtime_error, "error claiming interface: " << interface << ": " << usb_strerror(ret));
}
}
}
else
{
raise_exception(std::runtime_error, "error claiming interface: " << interface << ": " << usb_strerror(ret));
}

2
src/usb_interface.hpp
View file

@ -35,7 +35,7 @@ private:
Endpoints m_endpoints;
public:
USBInterface(libusb_device_handle* handle, int interface);
USBInterface(libusb_device_handle* handle, int interface, bool try_detach = false);
~USBInterface();
void submit_read(int endpoint, int len,