From 2edfdb1589a64046ae56da0048b7c4a4e59e0757 Mon Sep 17 00:00:00 2001
From: Gregor Haas <gregorhaas1997@gmail.com>
Date: Sat, 26 Oct 2019 16:46:07 -0400
Subject: [PATCH] Fixed the weird libusb issue...

---
 .idea/workspace.xml | 17 ++++++++---------
 libusb/config.h     |  4 ++--
 libusb_helpers.c    | 14 +++-----------
 libusb_helpers.h    |  2 +-
 main.c              | 32 ++++++++++++++++++--------------
 5 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1eaea39..7519e35 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,7 +13,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b2f61e55-9467-486e-b84a-47b98c1101b5" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/libusb/config.h" beforeDir="false" afterPath="$PROJECT_DIR$/libusb/config.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/libusb_helpers.c" beforeDir="false" afterPath="$PROJECT_DIR$/libusb_helpers.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/libusb_helpers.h" beforeDir="false" afterPath="$PROJECT_DIR$/libusb_helpers.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -94,14 +98,9 @@
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/libusb_helpers.c</url>
-          <line>133</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/libusb/libusb/os/linux_usbfs.c</url>
-          <line>2719</line>
-          <option name="timeStamp" value="3" />
+          <url>file://$PROJECT_DIR$/libusb/libusb/io.c</url>
+          <line>1579</line>
+          <option name="timeStamp" value="4" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/libusb/config.h b/libusb/config.h
index 3c216c9..b21863f 100644
--- a/libusb/config.h
+++ b/libusb/config.h
@@ -5,10 +5,10 @@
 #define DEFAULT_VISIBILITY __attribute__((visibility("default")))
 
 /* Start with debug message logging enabled */
-#define ENABLE_DEBUG_LOGGING 1
+//#define ENABLE_DEBUG_LOGGING 1
 
 /* Message logging */
-#define ENABLE_LOGGING 1
+//#define ENABLE_LOGGING 1
 
 /* Define to 1 if you have the <asm/types.h> header file. */
 /* #undef HAVE_ASM_TYPES_H */
diff --git a/libusb_helpers.c b/libusb_helpers.c
index 67ba74f..cfc6cb3 100644
--- a/libusb_helpers.c
+++ b/libusb_helpers.c
@@ -1,11 +1,6 @@
-//
-// Created by grg on 10/23/19.
-//
-
 #include "libusb_helpers.h"
 
 #include <string.h>
-#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -44,15 +39,14 @@ void libusb1_async_ctrl_transfer(libusb_device_handle *handle,
                                  unsigned int timeout)
 {
     struct timeval start, end;
-    unsigned char usb_transfer_buf[8 + 2 + data_len];
+    unsigned char usb_transfer_buf[8 + data_len];
     int ret;
 
     gettimeofday(&start, NULL);
 
     struct libusb_transfer *usb_transfer = libusb_alloc_transfer(0);
     libusb_fill_control_setup(usb_transfer_buf, bmRequestType, bRequest, wValue, wIndex, 0xC0);
-    memset(&usb_transfer_buf[8], data_len, 2);
-    memcpy(&usb_transfer_buf[10], data, data_len);
+    memcpy(&usb_transfer_buf[8], data, data_len);
     libusb_fill_control_transfer(usb_transfer, handle, usb_transfer_buf, NULL, NULL, 1);
 
     ret = libusb_submit_transfer(usb_transfer);
@@ -69,13 +63,11 @@ void libusb1_async_ctrl_transfer(libusb_device_handle *handle,
         if(end.tv_usec - start.tv_usec > timeout)
         {
             ret = libusb_cancel_transfer(usb_transfer);
-            libusb_free_transfer(usb_transfer);
             if(ret != 0)
             {
                 printf("Failed to cancel async USB transfer: %s\n", libusb_error_name(ret));
                 exit(ret);
             }
-
             return;
         }
     }
@@ -113,7 +105,7 @@ void stall(libusb_device_handle *handle)
     printf("Stall\n");
     unsigned char *data = malloc(0xC0);
     memset(data, 0xA, 0xC0);
-    libusb1_async_ctrl_transfer(handle, 0x80, 6, 0x304, 0x40A, data, 0xC0, 1000);
+    libusb1_async_ctrl_transfer(handle, 0x80, 6, 0x304, 0x40A, data, 0xC0, 1);
     free(data);
 }
 
diff --git a/libusb_helpers.h b/libusb_helpers.h
index ede752a..5a16987 100644
--- a/libusb_helpers.h
+++ b/libusb_helpers.h
@@ -1,7 +1,7 @@
 #ifndef IPWNDFU_REWRITE_C_LIBUSB_HELPERS_H
 #define IPWNDFU_REWRITE_C_LIBUSB_HELPERS_H
 
-#include "libusb-1.0/libusb.h"
+#include <libusb-1.0/libusb.h>
 
 struct libusb_device_bundle
 {
diff --git a/main.c b/main.c
index 3f4a06a..971e8d1 100644
--- a/main.c
+++ b/main.c
@@ -49,21 +49,25 @@ int main()
     usb_req_leak(usb_handle);
     no_leak(usb_handle);
 
-//    libusb_close(usb_handle);
-//    libusb_exit(usb_ctx);
-//
-//    usb_bundle.handle = NULL;
-//
-//    // section 2
-//    libusb_init(&usb_ctx);
-//    get_test_device(usb_ctx, &usb_bundle);
-//    if(usb_bundle.handle == NULL)
-//    {
-//        libusb_exit(usb_ctx);
-//        printf("Could not find device\n");
-//        return 1;
-//    }
+    libusb_reset_device(usb_handle);
 
+    libusb_close(usb_handle);
+    libusb_exit(usb_ctx);
+
+    usb_bundle.handle = NULL;
+
+    // section 2
+    libusb_init(&usb_ctx);
+    get_test_device(usb_ctx, &usb_bundle);
+    if(usb_bundle.handle == NULL)
+    {
+        libusb_exit(usb_ctx);
+        printf("Could not find device\n");
+        return 1;
+    }
+
+    usb_handle = usb_bundle.handle;
+    usb_desc = usb_bundle.descriptor;
 
     return 0;
 }
\ No newline at end of file