Added unlock command

azonenberg · Jul 13, 2018 · a7f08a4 · a7f08a4
1 parent 2ea21cb
commit a7f08a4
Showing 1 changed file with 39 additions and 1 deletion.
diff --git a/jtagclient/main.cpp b/jtagclient/main.cpp
@@ -130,7 +130,8 @@ int main(int argc, char* argv[])
 			MODE_ERASE,
 			MODE_REBOOT,
 			MODE_DUMP,
-			MODE_LOCK
+			MODE_LOCK,
+			MODE_UNLOCK
 		} mode = MODE_NONE;
 
 		//Device index
@@ -202,6 +203,18 @@ int main(int argc, char* argv[])
 				mode = MODE_LOCK;
 				devnum = atoi(argv[++i]);
 			}
+			else if(s == "--unlock")
+			{
+				if(i+1 >= argc)
+				{
+					fprintf(stderr, "Not enough arguments for --lock\n");
+					return 1;
+				}
+
+				//Expect device index
+				mode = MODE_UNLOCK;
+				devnum = atoi(argv[++i]);
+			}
 			else if(s == "--dump")
 			{
 				if(i+2 >= argc)
@@ -526,6 +539,31 @@ int main(int argc, char* argv[])
 					pdev->SetReadLock();
 				};
 
+			case MODE_UNLOCK:
+				{
+					//Get the device
+					JtagDevice* device = iface.GetDevice(devnum);
+					if(device == NULL)
+					{
+						throw JtagExceptionWrapper(
+							"Device is null, cannot continue",
+							"");
+					}
+
+					//Make sure it's a lockable device
+					LockableDevice* pdev = dynamic_cast<LockableDevice*>(device);
+					if(pdev == NULL)
+					{
+						throw JtagExceptionWrapper(
+							"Device is not lockable, cannot continue",
+							"");
+					}
+
+					//Lock it
+					LogNotice("Unlocking (will probably trigger bulk flash erase)...\n");
+					pdev->ClearReadLock();
+				};
+
 			default:
 				break;
 		}