Add lockdown command line option

3 files changed, 14 insertions, 8 deletions

diff --git a/rmi4update/main.cpp b/rmi4update/main.cpp
index 764acc7..766d95d 100644
--- a/rmi4update/main.cpp
+++ b/rmi4update/main.cpp
@@ -31,7 +31,7 @@
 #include "hiddevice.h"
 #include "rmi4update.h"
 
-#define RMI4UPDATE_GETOPTS	"hfd:p"
+#define RMI4UPDATE_GETOPTS	"hfd:pl"
 
 void printHelp(const char *prog_name)
 {
@@ -40,9 +40,10 @@ void printHelp(const char *prog_name)
 	fprintf(stdout, "\t-f, --force\tForce updating firmware even it the image provided is older\n\t\t\tthen the current firmware on the device.\n");
 	fprintf(stdout, "\t-d, --device\thidraw device file associated with the device being updated.\n");
 	fprintf(stdout, "\t-p, --fw-props\tPrint the firmware properties.\n");
+	fprintf(stdout, "\t-l, --lockdown\tPerform lockdown.\n");
 }
 
-int UpdateDevice(FirmwareImage & image, bool force, const char * deviceFile)
+int UpdateDevice(FirmwareImage & image, bool force, bool performLockdown, const char * deviceFile)
 {
 	HIDDevice rmidevice;
 	int rc;
@@ -52,7 +53,7 @@ int UpdateDevice(FirmwareImage & image, bool force, const char * deviceFile)
 		return rc;
 
 	RMI4Update update(rmidevice, image);
-	rc = update.UpdateFirmware(force);
+	rc = update.UpdateFirmware(force, performLockdown);
 	if (rc != UPDATE_SUCCESS)
 		return rc;
 
@@ -205,11 +206,13 @@ int main(int argc, char **argv)
 		{"force", 0, NULL, 'f'},
 		{"device", 1, NULL, 'd'},
 		{"fw-props", 0, NULL, 'p'},
+		{"lockdown", 0, NULL, 'l'},
 		{0, 0, 0, 0},
 	};
 	struct dirent * devDirEntry;
 	DIR * devDir;
 	bool printFirmwareProps = false;
+	bool performLockdown = false;
 
 	while ((opt = getopt_long(argc, argv, RMI4UPDATE_GETOPTS, long_options, &index)) != -1) {
 		switch (opt) {
@@ -225,6 +228,9 @@ int main(int argc, char **argv)
 			case 'p':
 				printFirmwareProps = true;
 				break;
+			case 'l':
+				performLockdown = true;
+				break;
 			default:
 				break;
 
@@ -262,7 +268,7 @@ int main(int argc, char **argv)
 
 	if (deviceName) {
 		char * rawDevice;
-		rc = UpdateDevice(image, force, deviceName);
+		rc = UpdateDevice(image, force, performLockdown, deviceName);
 		if (rc)
 			return rc;
 
@@ -283,7 +289,7 @@ int main(int argc, char **argv)
 			if (strstr(devDirEntry->d_name, "hidraw")) {
 				strncpy(rawDevice, devDirEntry->d_name, PATH_MAX);
 				snprintf(deviceFile, PATH_MAX, "/dev/%s", devDirEntry->d_name);
-				rc = UpdateDevice(image, force, deviceFile);
+				rc = UpdateDevice(image, force, performLockdown, deviceFile);
 				if (rc != 0) {
 					continue;
 				} else {
diff --git a/rmi4update/rmi4update.cpp b/rmi4update/rmi4update.cpp
index 9f3d860..f8fe388 100644
--- a/rmi4update/rmi4update.cpp
+++ b/rmi4update/rmi4update.cpp
@@ -84,7 +84,7 @@
  */
 #define RMI_F01_CRTL0_NOSLEEP_BIT	(1 << 2)
 
-int RMI4Update::UpdateFirmware(bool force)
+int RMI4Update::UpdateFirmware(bool force, bool performLockdown)
 {
 	struct timespec start;
 	struct timespec end;
@@ -124,7 +124,7 @@ int RMI4Update::UpdateFirmware(bool force)
 		}
 	}
 
-	if (m_unlocked) {
+	if (performLockdown && m_unlocked) {
 		if (m_firmwareImage.GetLockdownData()) {
 			fprintf(stdout, "Writing lockdown...\n");
 			clock_gettime(CLOCK_MONOTONIC, &start);
diff --git a/rmi4update/rmi4update.h b/rmi4update/rmi4update.h
index b59dfc9..ff69ae2 100644
--- a/rmi4update/rmi4update.h
+++ b/rmi4update/rmi4update.h
@@ -29,7 +29,7 @@ public:
 	RMI4Update(RMIDevice & device, FirmwareImage & firmwareImage) : m_device(device), 
 			m_firmwareImage(firmwareImage)
 	{}
-	int UpdateFirmware(bool force = false);
+	int UpdateFirmware(bool force = false, bool performLockdown = false);
 
 private:
 	int FindUpdateFunctions();