commit ec1542f22dba42f66453133eb03c5dfc3685902f
author Tobias Thierer <tobiast@google.com> Wed Jul 25 10:41:24 2018 +0000
committer Tobias Thierer <tobiast@google.com> Wed Jul 25 10:41:24 2018 +0000
tree c166c42f1151cb9e2336d857792762b1f7a31570
parent ceb7cbf5fde0ff26a35d442135d01e52b0ef0771

Revert "Add derived UsbTransport class with USB reset method"

This reverts commit ceb7cbf5fde0ff26a35d442135d01e52b0ef0771.

Reason for revert: Broke mac builds:
system/core/fastboot/usb_osx.cpp:513:35: error: use of undeclared identifier 'USB_TRANSACTION_TIMEOUT'
USB_TRANSACTION_TIMEOUT, USB_TRANSACTION_TIMEOUT);
^

Change-Id: Ibe2f9ff2d5c63f9d33f4bd6d9ba962604cf8caeb

fastboot/usb_osx.cpp

diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp
index 442dea5..e95b049 100644
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
@@ -65,20 +65,17 @@
     unsigned int zero_mask;
 };
 
-class OsxUsbTransport : public UsbTransport {
+class OsxUsbTransport : public Transport {
   public:
-    OsxUsbTransport(std::unique_ptr<usb_handle> handle, uint32_t ms_timeout)
-        : handle_(std::move(handle)), ms_timeout_(ms_timeout) {}
+    OsxUsbTransport(std::unique_ptr<usb_handle> handle) : handle_(std::move(handle)) {}
     ~OsxUsbTransport() override = default;
 
     ssize_t Read(void* data, size_t len) override;
     ssize_t Write(const void* data, size_t len) override;
     int Close() override;
-    int Reset() override;
 
   private:
     std::unique_ptr<usb_handle> handle_;
-    const uint32_t ms_timeout_;
 
     DISALLOW_COPY_AND_ASSIGN(OsxUsbTransport);
 };
@@ -459,7 +456,7 @@
  * Definitions of this file's public functions.
  */
 
-UsbTransport* usb_open(ifc_match_func callback, uint32_t timeout_ms) {
+Transport* usb_open(ifc_match_func callback) {
     std::unique_ptr<usb_handle> handle;
 
     if (init_usb(callback, &handle) < 0) {
@@ -467,7 +464,7 @@
         return nullptr;
     }
 
-    return new OsxUsbTransport(std::move(handle), timeout_ms);
+    return new OsxUsbTransport(std::move(handle));
 }
 
 int OsxUsbTransport::Close() {
@@ -475,17 +472,6 @@
     return 0;
 }
 
-int OsxUsbTransport::Reset() {
-    IOReturn result = (*handle_->interface)->ResetDevice(handle_->interface);
-
-    if (result == 0) {
-        return 0;
-    } else {
-        ERR("usb_reset failed with status %x\n", result);
-        return -1;
-    }
-}
-
 ssize_t OsxUsbTransport::Read(void* data, size_t len) {
     IOReturn result;
     UInt32 numBytes = len;
@@ -508,9 +494,7 @@
         return -1;
     }
 
-    result = (*handle_->interface)
-                     ->ReadPipeTO(handle_->interface, handle_->bulkIn, data, &numBytes,
-                                  USB_TRANSACTION_TIMEOUT, USB_TRANSACTION_TIMEOUT);
+    result = (*handle_->interface)->ReadPipe(handle_->interface, handle_->bulkIn, data, &numBytes);
 
     if (result == 0) {
         return (int) numBytes;