commit c0504e18734ee87e737eb9d80311f5c3478974c3
author David Pursell <dpursell@google.com> Sat Nov 14 00:15:57 2015 +0000
committer David Pursell <dpursell@google.com> Sat Nov 14 00:15:57 2015 +0000
tree efcb262afdf49668dff2b3873274aafa15bf45b5
parent 6f233a7799a681e65c539e9c8287db0814c8948f

Revert "fastboot: create Transport object."

This broke some stuff, will look into it Monday.

This reverts commit 6f233a7799a681e65c539e9c8287db0814c8948f.

Change-Id: I155bc85d21fda3b0ba1e5e17839059797fb15509

fastboot/usbtest.cpp

diff --git a/fastboot/usbtest.cpp b/fastboot/usbtest.cpp
index 9423c6d..e6e2b37 100644
--- a/fastboot/usbtest.cpp
+++ b/fastboot/usbtest.cpp
@@ -86,7 +86,7 @@
     return 0;
 }
 
-int test_null(Transport* usb)
+int test_null(usb_handle *usb)
 {
     unsigned i;
     unsigned char buf[4096];
@@ -94,8 +94,8 @@
     long long t0, t1;
 
     t0 = NOW();
-    for (i = 0; i < arg_count; i++) {
-        if (usb->Write(buf, arg_size) != static_cast<int>(arg_size)) {
+    for(i = 0; i < arg_count; i++) {
+        if(usb_write(usb, buf, arg_size) != (int)arg_size) {
             fprintf(stderr,"write failed (%s)\n", strerror(errno));
             return -1;
         }
@@ -105,15 +105,15 @@
     return 0;
 }
 
-int test_zero(Transport* usb)
+int test_zero(usb_handle *usb)
 {
     unsigned i;
     unsigned char buf[4096];
     long long t0, t1;
 
     t0 = NOW();
-    for (i = 0; i < arg_count; i++) {
-        if (usb->Read(buf, arg_size) != static_cast<int>(arg_size)) {
+    for(i = 0; i < arg_count; i++) {
+        if(usb_read(usb, buf, arg_size) != (int)arg_size) {
             fprintf(stderr,"read failed (%s)\n", strerror(errno));
             return -1;
         }
@@ -127,7 +127,7 @@
 {
     const char *cmd;
     ifc_match_func match;
-    int (*test)(Transport* usb);
+    int (*test)(usb_handle *usb);
     const char *help;
 } tests[] = {
     { "list", printifc,   NULL,      "list interfaces" },
@@ -177,7 +177,7 @@
 
 int main(int argc, char **argv)
 {
-    Transport* usb;
+    usb_handle *usb;
     int i;
 
     if(argc < 2)