sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Proper serial number management to select USB device

This commit is contained in:
Emmanuel Blot 2017-04-26 13:04:34 +02:00
parent 95dd38b52a
commit 2bedf39532
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
transport/rf2500hidapi.c
View File

@ -165,6 +165,15 @@ static const struct transport_class rf2500_transport = {
.set_modem = usbtr_set_modem .set_modem = usbtr_set_modem
}; };
static const wchar_t * get_wc(const char *c)
{
const size_t csize = strlen(c)+1;
wchar_t* wc = malloc(sizeof(wchar_t)*csize);
mbstowcs (wc, c, csize);
return wc;
}
transport_t rf2500_open(const char *devpath, const char *requested_serial) transport_t rf2500_open(const char *devpath, const char *requested_serial)
{ {
struct rf2500_transport *tr = malloc(sizeof(*tr)); struct rf2500_transport *tr = malloc(sizeof(*tr));
@ -180,11 +189,21 @@ transport_t rf2500_open(const char *devpath, const char *requested_serial)
hid_init(); hid_init();
if (devpath) if (devpath) {
handle = hid_open_path(devpath); handle = hid_open_path(devpath);
else }
handle = hid_open(USB_FET_VENDOR, USB_FET_PRODUCT, else {
(wchar_t *)requested_serial); const wchar_t * wc_serial;
if ( requested_serial ) {
wc_serial = get_wc(requested_serial);
} else {
wc_serial = NULL;
}
handle = hid_open(USB_FET_VENDOR, USB_FET_PRODUCT, wc_serial);
if ( wc_serial ) {
free((wchar_t *)wc_serial);
}
}
if (!handle) { if (!handle) {
printc_err("rf2500: failed to open RF2500 device\n"); printc_err("rf2500: failed to open RF2500 device\n");