Merge branch 'master' into killsg

[fw/stlink] / src / stlink-sg.h

diff --git a/src/stlink-sg.h b/src/stlink-sg.h
index 523b7d8836927df90385f94df8ca1613307bd390..723c66a05678cc2ba45057180b683b0fe3f8d1cd 100644 (file)
--- a/src/stlink-sg.h
+++ b/src/stlink-sg.h
@@ -40,7 +40,6 @@ extern "C" {
 
 
 
-#if defined(CONFIG_USE_LIBUSB)
     struct stlink_libsg {
         int sg_fd;
         int do_scsi_pt_err;
@@ -54,20 +53,10 @@ extern "C" {
         // Sense (error information) data
         unsigned char sense_buf[SENSE_BUF_LEN];
 
-        uint32_t st_vid;
-        uint32_t stlink_pid;
-        uint32_t stlink_v;
-        uint32_t jtag_v;
-        uint32_t swim_v;
-        uint32_t core_id;
-
         reg reg;
     };
-#else
-    struct stlink_libsg {};
-#endif
 
-    stlink_t* stlink_quirk_open(const char *dev_name, const int verbose);
+    stlink_t* stlink_v1_open(const char *dev_name, const int verbose);
 
 #ifdef __cplusplus
 }