X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2Flibusb-1.0.22%2Flibusb%2Fcore.c;fp=app%2Fsrc%2Fmain%2Fjni%2Flibusb-1.0.22%2Flibusb%2Fcore.c;h=ab4b699a89bc733086f8daa96f47a24f786d2559;hb=831cc09829bc6e18d8d0d8bb78063e89ea565ce9;hp=50f92f6b1b46a5840255e29eca234bab1aaeca3c;hpb=061580c83656bf358b01a6b78fd22ae9bd497728;p=rtmpclient.git

diff --git a/app/src/main/jni/libusb-1.0.22/libusb/core.c b/app/src/main/jni/libusb-1.0.22/libusb/core.c
index 50f92f6..ab4b699 100644
--- a/app/src/main/jni/libusb-1.0.22/libusb/core.c
+++ b/app/src/main/jni/libusb-1.0.22/libusb/core.c
@@ -1211,6 +1211,21 @@ int usbi_clear_event(struct libusb_context *ctx)
 	return 0;
 }
 
+libusb_device * LIBUSB_CALL libusb_get_device_with_fd(libusb_context *ctx,
+	int vid, int pid, const char *serial, int fd, int busnum, int devaddr) {
+	usbi_dbg("libusb_get_device_with_fd, fd:%d, serial:%s", fd, serial);
+
+	struct libusb_device *device = NULL;
+	// android_generate_device内でusbi_alloc_deviceが呼ばれた時に参照カウンタは1
+	int ret = linux_generate_device(ctx, &device, vid, pid, serial, fd, busnum, devaddr);
+	if (ret) {
+		usbi_err(ctx, "libusb_get_device_with_fd");
+		device = NULL;
+	}
+	return device;
+}
+
+
 /** \ingroup libusb_dev
  * Open a device and obtain a device handle. A handle allows you to perform
  * I/O on the device in question.
@@ -1238,6 +1253,7 @@ int API_EXPORTED libusb_open(libusb_device *dev,
 	size_t priv_size = usbi_backend.device_handle_priv_size;
 	int r;
 	usbi_dbg("open %d.%d", dev->bus_number, dev->device_address);
+	__android_log_write(ANDROID_LOG_ERROR, "libusb", "haha");
 
 	if (!dev->attached) {
 		return LIBUSB_ERROR_NO_DEVICE;