Merge branch 'master' into killsg

Conflicts:
	src/stlink-common.c
	src/test_sg.c

Conflicts were only in changes to logging.

nbproject/configurations.xml

@@ -127,20 +127,6 @@
         <df name="stm32l_notes">
         </df>
       </df>
-      <df name="uwe">
-      </df>
-      <df name="uwe2">
-        <df name="stlink">
-        </df>
-      </df>
-      <df name="uwe3">
-        <df name="out">
-        </df>
-      </df>
-      <df name="uwe4">
-        <df name="out">
-        </df>
-      </df>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"

src/stlink-common.c

@@ -348,19 +348,18 @@ void _parse_version(stlink_t *sl, stlink_version_t *slv) {
 
 void stlink_version(stlink_t *sl) {
     DLOG("*** looking up stlink version\n");
-    stlink_version_t slv;
     sl->backend->version(sl);
-    _parse_version(sl, &slv);
+    _parse_version(sl, &sl->version);
     
-    DLOG("st vid         = 0x%04x (expect 0x%04x)\n", slv.st_vid, USB_ST_VID);
-    DLOG("stlink pid     = 0x%04x\n", slv.stlink_pid);
-    DLOG("stlink version = 0x%x\n", slv.stlink_v);
-    DLOG("jtag version   = 0x%x\n", slv.jtag_v);
-    DLOG("swim version   = 0x%x\n", slv.swim_v);
-    if (slv.jtag_v == 0) {
+    DLOG("st vid         = 0x%04x (expect 0x%04x)\n", sl->version.st_vid, USB_ST_VID);
+    DLOG("stlink pid     = 0x%04x\n", sl->version.stlink_pid);
+    DLOG("stlink version = 0x%x\n", sl->version.stlink_v);
+    DLOG("jtag version   = 0x%x\n", sl->version.jtag_v);
+    DLOG("swim version   = 0x%x\n", sl->version.swim_v);
+    if (sl->version.jtag_v == 0) {
         DLOG("    notice: the firmware doesn't support a jtag/swd interface\n");
     }
-    if (slv.swim_v == 0) {
+    if (sl->version.swim_v == 0) {
         DLOG("    notice: the firmware doesn't support a swim interface\n");
     }
 }

src/stlink-common.h

@@ -179,6 +179,7 @@ extern "C" {
         stm32_addr_t sram_base;
         size_t sram_size;
 
+        struct stlink_version_ version;
     };
 
     //stlink_t* stlink_quirk_open(const char *dev_name, const int verbose);

src/stlink-sg.c

@@ -274,35 +274,6 @@ void stlink_stat(stlink_t *stl, char *txt) {
 }
 
 
-static void parse_version(stlink_t *stl) {
-  struct stlink_libsg *sl = stl->backend_data;
-
-  sl->st_vid = 0;
-  sl->stlink_pid = 0;
-
-  if (stl->q_len <= 0) {
-    fprintf(stderr, "Error: could not parse the stlink version");
-    return;
-  }
-
-  uint32_t b0 = stl->q_buf[0]; //lsb
-  uint32_t b1 = stl->q_buf[1];
-  uint32_t b2 = stl->q_buf[2];
-  uint32_t b3 = stl->q_buf[3];
-  uint32_t b4 = stl->q_buf[4];
-  uint32_t b5 = stl->q_buf[5]; //msb
-
-  // b0 b1 || b2 b3 | b4 b5
-  // 4b | 6b | 6b || 2B | 2B
-  // stlink_v | jtag_v | swim_v || st_vid | stlink_pid
-
-  sl->stlink_v = (b0 & 0xf0) >> 4;
-  sl->jtag_v = ((b0 & 0x0f) << 2) | ((b1 & 0xc0) >> 6);
-  sl->swim_v = b1 & 0x3f;
-  sl->st_vid = (b3 << 8) | b2;
-  sl->stlink_pid = (b5 << 8) | b4;
-}
-
 void _stlink_sg_version(stlink_t *stl) {
     struct stlink_libsg *sl = stl->backend_data;
     DLOG("\n*** stlink_version ***\n");
@@ -311,7 +282,6 @@ void _stlink_sg_version(stlink_t *stl) {
     stl->q_len = 6;
     sl->q_addr = 0;
     stlink_q(stl);
-    parse_version(stl);
 }
 
 // Get stlink mode:
@@ -787,7 +757,6 @@ stlink_t* stlink_open(const char *dev_name, const int verbose) {
 
     slsg->sg_fd = sg_fd;
     sl->core_stat = STLINK_CORE_STAT_UNKNOWN;
-    slsg->core_id = 0;
     slsg->q_addr = 0;
     clear_buf(sl);
 
@@ -820,13 +789,13 @@ stlink_t* stlink_v1_open(const char *dev_name, const int verbose) {
     stlink_version(sl);
     struct stlink_libsg *sg = sl->backend_data;
 
-    if ((sg->st_vid != USB_ST_VID) || (sg->stlink_pid != USB_STLINK_PID)) {
+    if ((sl->version.st_vid != USB_ST_VID) || (sl->version.stlink_pid != USB_STLINK_PID)) {
         fprintf(stderr, "Error: the device %s is not a stlink\n",
                 dev_name);
         fprintf(stderr, "       VID: got %04x expect %04x \n",
-                sg->st_vid, USB_ST_VID);
+                sl->version.st_vid, USB_ST_VID);
         fprintf(stderr, "       PID: got %04x expect %04x \n",
-                sg->stlink_pid, USB_STLINK_PID);
+                sl->version.stlink_pid, USB_STLINK_PID);
         return NULL;
     }
 

src/stlink-sg.h

@@ -53,13 +53,6 @@ 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;
     };
 

src/test_sg.c

@@ -10,7 +10,6 @@
 
 int main(int argc, char *argv[]) {
 	// set scpi lib debug level: 0 for no debug info, 10 for lots
-	const int scsi_verbose = 2;
 	char *dev_name;
 
 	switch (argc) {
@@ -33,11 +32,7 @@ int main(int argc, char *argv[]) {
 		return EXIT_FAILURE;
 	}
 
-	fputs("*** stlink access test ***\n", stderr);
-	fprintf(stderr, "Using sg_lib %s : scsi_pt %s\n", sg_lib_version(),
-		scsi_pt_version());
-
-	stlink_t *sl = stlink_v1_open(dev_name, scsi_verbose);
+	stlink_t *sl = stlink_v1_open(dev_name, 10);
 	if (sl == NULL)
 		return EXIT_FAILURE;
 
@@ -172,7 +167,7 @@ int main(int argc, char *argv[]) {
 	stlink_force_debug(sl);
 	stlink_status(sl);
 #endif
-#if 1 /* read the system bootloader */
+#if 0 /* read the system bootloader */
 	fputs("\n++++++++++ reading bootloader ++++++++++++++++\n\n", stderr);
 	stlink_fread(sl, "/tmp/barfoo", sl->sys_base, sl->sys_size);
 #endif
@@ -198,6 +193,7 @@ int main(int argc, char *argv[]) {
 	stlink_run_at(sl, sl->sram_base);
 #endif
 
+#if 0
 	stlink_run(sl);
 	stlink_status(sl);
 	//----------------------------------------------------------------------
@@ -205,6 +201,7 @@ int main(int argc, char *argv[]) {
 	stlink_exit_debug_mode(sl);
 	stlink_current_mode(sl);
 	stlink_close(sl);
+#endif
 
 	//fflush(stderr); fflush(stdout);
 	return EXIT_SUCCESS;