Skip to content

Commit a570644

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "fastboot: fix USB_TRACE, make it better."
2 parents c23280a + f22e953 commit a570644

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

fastboot/usb_windows.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ std::unique_ptr<usb_handle> do_usb_open(const wchar_t* interface_name) {
106106

107107
if (nullptr == ret->adb_interface) {
108108
errno = GetLastError();
109+
DBG("failed to open interface %S\n", interface_name);
109110
return nullptr;
110111
}
111112

@@ -157,7 +158,7 @@ ssize_t WindowsUsbTransport::Write(const void* data, size_t len) {
157158
unsigned count = 0;
158159
int ret;
159160

160-
DBG("usb_write %d\n", len);
161+
DBG("usb_write %zu\n", len);
161162
if (nullptr != handle_) {
162163
// Perform write
163164
while(len > 0) {
@@ -195,7 +196,7 @@ ssize_t WindowsUsbTransport::Read(void* data, size_t len) {
195196
unsigned long read = 0;
196197
int ret;
197198

198-
DBG("usb_read %d\n", len);
199+
DBG("usb_read %zu\n", len);
199200
if (nullptr != handle_) {
200201
while (1) {
201202
int xfer = (len > MAX_USBFS_BULK_SIZE) ? MAX_USBFS_BULK_SIZE : len;
@@ -269,19 +270,22 @@ int recognized_device(usb_handle* handle, ifc_match_func callback) {
269270
return 0;
270271

271272
// Check vendor and product id first
272-
if (!AdbGetUsbDeviceDescriptor(handle->adb_interface,
273-
&device_desc)) {
273+
if (!AdbGetUsbDeviceDescriptor(handle->adb_interface, &device_desc)) {
274+
DBG("skipping device %x:%x\n", device_desc.idVendor, device_desc.idProduct);
274275
return 0;
275276
}
276277

277278
// Then check interface properties
278-
if (!AdbGetUsbInterfaceDescriptor(handle->adb_interface,
279-
&interf_desc)) {
279+
if (!AdbGetUsbInterfaceDescriptor(handle->adb_interface, &interf_desc)) {
280+
DBG("skipping device %x:%x, failed to find interface\n", device_desc.idVendor,
281+
device_desc.idProduct);
280282
return 0;
281283
}
282284

283285
// Must have two endpoints
284286
if (2 != interf_desc.bNumEndpoints) {
287+
DBG("skipping device %x:%x, incorrect number of endpoints\n", device_desc.idVendor,
288+
device_desc.idProduct);
285289
return 0;
286290
}
287291

@@ -305,9 +309,13 @@ int recognized_device(usb_handle* handle, ifc_match_func callback) {
305309
info.device_path[0] = 0;
306310

307311
if (callback(&info) == 0) {
312+
DBG("skipping device %x:%x, not selected by callback\n", device_desc.idVendor,
313+
device_desc.idProduct);
308314
return 1;
309315
}
310316

317+
DBG("found device %x:%x (%s)\n", device_desc.idVendor, device_desc.idProduct,
318+
info.serial_number);
311319
return 0;
312320
}
313321

@@ -338,6 +346,7 @@ static std::unique_ptr<usb_handle> find_usb_device(ifc_match_func callback) {
338346
}
339347
*copy_name = '\0';
340348

349+
DBG("attempting to open interface %S\n", next_interface->device_name);
341350
handle = do_usb_open(next_interface->device_name);
342351
if (NULL != handle) {
343352
// Lets see if this interface (device) belongs to us

0 commit comments

Comments
 (0)