Merge pull request #1 from MicrochipTech/bugfix/sjtag-unlock

sjtag-unlock code flow update

Author: pvengat

cli/mfg.c

@@ -2334,14 +2334,18 @@ static int sjtag_unlock(int argc, char **argv)
 
         ret = switchtec_sjtag_status_get(cfg.dev, &status);
         if (ret)
-            switchtec_perror("mfg sjtag-sts-get");
+		{
+			switchtec_perror("Failed to retrive the SJTAG Status from the device");
+			ret = -1;
+			break;
+		}
 
         if(true == cfg.verbose)
         {
             printf("SJTAG Mode: %x\n", (status.data & 0x03));
         }
 
-        /* For Open mode - Unlock status(status.data[3]) should 1 */
+        /* For Open mode - Unlock status(status.data[2]) should 1 */
         if ((((status.data & 0x03) == 0x00) || ((status.data & 0x04) == 0x04)) && (false == cfg.force_hr))
         {
             printf("SJTAG is in Open State\n");
@@ -2352,50 +2356,63 @@ static int sjtag_unlock(int argc, char **argv)
         }
         else
         {
-            if (cfg.sjtag_debug_token_file) {
+            if (cfg.sjtag_debug_token_file)
+			{
                 ret = switchtec_read_sjtag_debug_token_file(cfg.sjtag_debug_token, &debug_token);
                 fclose(cfg.sjtag_debug_token);
-                if (ret) {
-                    printf("Invalid SJTAG Debug Token File\n");
-                    ret = -6;
+                if (ret)
+				{
+                    switchtec_perror("Invalid SJTAG Debug Token File");
+                    ret = -1;
                     break;
                 }
             }
             else
             {
                 ret = switchtec_sjtag_get_uuid_idcode(cfg.dev, uuid.uuid, sjtag_unlock.idcode);
                 if (ret)
-                    switchtec_perror("mfg sjtag-get-uuid");
+				{
+					switchtec_perror("Failed to retrive the UUID/IDCODE from the device");
+                    ret = -1;
+					break;
+				}
 
                 ret = switchtec_sn_ver_get(cfg.dev, &sn_info);
+				if (ret)
+				{
+					switchtec_perror("Failed to retrive the SUV from the device");
+					ret = -1;
+					break;
+				}
 
                 ret = sjtag_debug_token_gen(sjtag_unlock.idcode, uuid.uuid, (uint8_t *)&sn_info.ver_sec_unlock, debug_token.debug_token, cfg.verbose);
                 if(ret)
                 {
                     ret = -1;
                     break;
                 }
-                debug_token_bin_file = fopen("sjtag_debug_token.bin", "wb");
 
-                if (NULL == debug_token_bin_file) {
-                    perror("Error opening file");
+                debug_token_bin_file = fopen("sjtag_debug_token.bin", "wb");
+                if (NULL == debug_token_bin_file)
+				{
+					switchtec_perror("Error opening file");
+					ret = -1;
+					break;
                 }
 
                 fwrite(debug_token.debug_token, sizeof(uint8_t), SJTAG_DEBUG_TOKEN_LEN, debug_token_bin_file);
                 fclose(debug_token_bin_file);
-                if(getcwd(dir_path, sizeof(dir_path)) == NULL)
-				{
-					printf("Error getting the current working directory. sjtag_debug_token.bin was saved in the current directory");
-				}
-				else
-				{
-					printf("Generated SJTAG Debug Token Path: %s/sjtag_debug_token.bin\n", dir_path);
-				}
+				getcwd(dir_path, sizeof(dir_path));
+				printf("Generated SJTAG Debug Token Path: %s/sjtag_debug_token.bin\n", dir_path);
             }
 
             ret = switchtec_sjtag_get_nonce(cfg.dev, &nonce);
             if (ret)
-                switchtec_perror("mfg sjtag-get-uuid-nonce");
+			{
+				switchtec_perror("Failed to retrive the Nonce from the device");
+				ret = -1;
+				break;
+			}
 
             sjtag_hr_calc(debug_token.debug_token, nonce.nonce, sjtag_hr, cfg.verbose);