X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstlink-sg.h;h=7c020285176283602885d285bf38e7e13eef8d98;hb=04bed6788b319296d776cad9796d5dcd30e12626;hp=2e27ceb5fc82527093f98eca24d17fd0ae41a89c;hpb=9ff594a6a76ec29b3f979c2b143b9816a6505c75;p=fw%2Fstlink

diff --git a/src/stlink-sg.h b/src/stlink-sg.h
index 2e27ceb..7c02028 100644
--- a/src/stlink-sg.h
+++ b/src/stlink-sg.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * File:   stlink-sg.h
  * Author: karl
  *
@@ -11,14 +11,15 @@
 #ifdef	__cplusplus
 extern "C" {
 #endif
-    
-#include <libusb-1.0/libusb.h>
+
+#include <libusb.h>
 #include "stlink-common.h"
-    
-        // device access
+
+    // device access
 #define RDWR		0
 #define RO		1
 #define SG_TIMEOUT_SEC	1 // actually 1 is about 2 sec
+#define SG_TIMEOUT_MSEC	3 * 1000
     // Each CDB can be a total of 6, 10, 12, or 16 bytes, later version
     // of the SCSI standard also allow for variable-length CDBs (min. CDB is 6).
     // the stlink needs max. 10 bytes.
@@ -45,7 +46,7 @@ extern "C" {
         libusb_device_handle *usb_handle;
         unsigned ep_rep;
         unsigned ep_req;
-        
+
         int sg_fd;
         int do_scsi_pt_err;
 
@@ -56,12 +57,13 @@ extern "C" {
         uint32_t q_addr;
 
         // Sense (error information) data
+        // obsolete, this was fed to the scsi tools
         unsigned char sense_buf[SENSE_BUF_LEN];
 
         reg reg;
     };
 
-    stlink_t* stlink_v1_open(const char *dev_name, const int verbose);
+    stlink_t* stlink_v1_open(const int verbose, int reset);
 
 #ifdef	__cplusplus
 }