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

Fallback to libusb backend when rf2500hidapi fails 

In some macOS configurations, macOS 10.13.5 on Macmini4,1 in my case,
rf2500hidapi transport fails to open RF2500 device with unknown
reason. This CL enables mspdebug to fallback to libusb backend in such
situation.
This commit is contained in:
Tadashi G. Takaoka 2018-06-25 23:47:01 +09:00
parent 9032544df1
commit 915ee94e02
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -77,7 +77,7 @@ else
PORTS_LDFLAGS := -L/opt/local/lib -lhidapi -framework IOKit -framework CoreFoundation
endif
BSLHID_OBJ = transport/bslosx.o
RF25000_OBJ = transport/rf2500hidapi.o
RF25000_OBJ += transport/rf2500hidapi.o
LDFLAGS =
else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),)
PORTS_CFLAGS := $(shell pkg-config --cflags libusb)

2
transport/rf2500.c
View File

@ -228,7 +228,7 @@ static const struct transport_class rf2500_transport = {
.set_modem = usbtr_set_modem
};
transport_t rf2500_open(const char *devpath, const char *requested_serial)
transport_t rf2500_libusb_open(const char *devpath, const char *requested_serial)
{
struct rf2500_transport *tr = malloc(sizeof(*tr));
struct usb_device *dev;

1
transport/rf2500.h
View File

@ -28,5 +28,6 @@
* A particular device may be specified in bus:dev form.
*/
transport_t rf2500_open(const char *dev_path, const char *requested_serial);
transport_t rf2500_libusb_open(const char *dev_path, const char *requested_serial);
#endif

3
transport/rf2500hidapi.c
View File

@ -196,7 +196,8 @@ transport_t rf2500_open(const char *devpath, const char *requested_serial)
printc_err("rf2500: failed to open RF2500 device\n");
free(tr);
hid_exit();
return NULL;
printc_err("rf2500: fallback to libusb backend\n");
return rf2500_libusb_open(devpath, requested_serial);
}
tr->handle = handle;