am c672cb07: Merge "Include the error code if GetPipeProperties fails."
* commit 'c672cb07431c66e80a4e1b8845f25a7abb0bac9b':
Include the error code if GetPipeProperties fails.
diff --git a/adb/usb_osx.cpp b/adb/usb_osx.cpp
index af65130..939f319 100644
--- a/adb/usb_osx.cpp
+++ b/adb/usb_osx.cpp
@@ -34,6 +34,10 @@
#define DBG D
+// There's no strerror equivalent for the errors returned by IOKit.
+// https://developer.apple.com/library/mac/documentation/DeviceDrivers/Conceptual/AccessingHardware/AH_Handling_Errors/AH_Handling_Errors.html
+// Search the web for "IOReturn.h" to find a complete up to date list.
+
static IONotificationPortRef notificationPort = 0;
static io_iterator_t notificationIterator;
@@ -362,7 +366,7 @@
handle->zero_mask = maxPacketSize - 1;
} else {
- DBG("ERR: FindDeviceInterface - could not get pipe properties\n");
+ DBG("ERR: FindDeviceInterface - could not get pipe properties (%08x)\n", kr);
goto err_get_pipe_props;
}
}
diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp
index a959566..1c7eff0 100644
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
@@ -210,7 +210,7 @@
handle->zero_mask = maxPacketSize - 1;
}
} else {
- ERR("could not get pipe properties\n");
+ ERR("could not get pipe properties (%08x)\n", kr);
}
if (handle->info.has_bulk_in && handle->info.has_bulk_out) {