mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented del_device by vid/pid

Browse Source
This commit is contained in:
Armin Novak 2020-03-02 08:40:40 +01:00 committed by akallabeth
parent 1b1ab01e43
commit 30990089b8
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/urbdrc/client/libusb/libusb_udevman.c
View File

@ -628,7 +628,7 @@ static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* de
break;
case LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT:
del_device(idevman, bus, addr, desc.idVendor, desc.idProduct);
del_device(idevman, DEVICE_ADD_FLAG_ALL, bus, addr, desc.idVendor, desc.idProduct);
break;
default:

32
channels/urbdrc/client/urbdrc_main.c
View File

@ -836,7 +836,8 @@ BOOL add_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1
return TRUE;
}
BOOL del_device(IUDEVMAN* idevman, BYTE busnum, BYTE devnum, UINT16 idVendor, UINT16 idProduct)
BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT16 idVendor,
UINT16 idProduct)
{
IUDEVICE* pdev = NULL;
URBDRC_PLUGIN* urbdrc;
@ -854,9 +855,36 @@ BOOL del_device(IUDEVMAN* idevman, BYTE busnum, BYTE devnum, UINT16 idVendor, UI
while (idevman->has_next(idevman))
{
BOOL match = TRUE;
IUDEVICE* dev = idevman->get_next(idevman);
if (dev->get_bus_number(dev) == busnum && dev->get_dev_number(dev) == devnum)
if ((flags & (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR |
DEVICE_ADD_FLAG_PRODUCT)) == 0)
match = FALSE;
if (flags & DEVICE_ADD_FLAG_BUS)
{
if (dev->get_bus_number(dev) != busnum)
match = FALSE;
}
if (flags & DEVICE_ADD_FLAG_DEV)
{
if (dev->get_dev_number(dev) != devnum)
match = FALSE;
}
if (flags & DEVICE_ADD_FLAG_VENDOR)
{
int vid = dev->query_device_descriptor(dev, ID_VENDOR);
if (vid != idVendor)
match = FALSE;
}
if (flags & DEVICE_ADD_FLAG_PRODUCT)
{
int pid = dev->query_device_descriptor(dev, ID_PRODUCT);
if (pid != idProduct)
match = FALSE;
}
if (match)
{
pdev = dev;
break;

4
channels/urbdrc/client/urbdrc_main.h
View File

@ -236,8 +236,8 @@ enum
FREERDP_API BOOL add_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum,
UINT16 idVendor, UINT16 idProduct);
FREERDP_API BOOL del_device(IUDEVMAN* idevman, BYTE busnum, BYTE devnum, UINT16 idVendor,
UINT16 idProduct);
FREERDP_API BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum,
UINT16 idVendor, UINT16 idProduct);
UINT stream_write_and_free(IWTSPlugin* plugin, IWTSVirtualChannel* channel, wStream* s);