From ebbc3e7cd2086a9f62a857dffe9ab0bd1f5da768 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Fri, 8 Mar 2013 00:00:52 +1100
Subject: - Removed legacy command line hard-coded partition name parameters. -
 As a result of the above two points, there are no "known boot   partitions",
 and hence boot partitions are not automatically flashed   last. - Made
 partitions flash in the order in order in which partition arguments   are
 specified. Hence, it's recommended that you specify boot partitions   last. -
 Added --usb-level argument that can be used for debugging libusbx, or  
 flashing issues in general. - Removed generally non-functional firmware
 dumping behaviour. - Removed auto-resume functionality - Although this
 feature was definitely   nice to have; I believe it may be responsible for
 flashing compatibility   issues for a variety of devices. - As a result of
 the above. In order perform another action after a   --no-reboot action, you
 must provide the --resume flag. - Heimdall Frontend also has support for
 specifying the --resume flag   via a GUI. Heimdall Frontend also tries to
 keep track of your actions   and enable "Resume" automatically after a "No
 Reboot" action. - Refactored quite a few of the actions, and code responsible
 for flashing   (particularly PIT file flashing). - Bumped version to 1.4RC3
 *however* this commit is not yet an official   release candidate. It's still
 a WIP. In particular build files still   have not been updated for Linux and
 OS X.

---
 heimdall/source/PrintPitAction.cpp | 46 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

(limited to 'heimdall/source/PrintPitAction.cpp')

diff --git a/heimdall/source/PrintPitAction.cpp b/heimdall/source/PrintPitAction.cpp
index c520d1c..cdf5b4e 100644
--- a/heimdall/source/PrintPitAction.cpp
+++ b/heimdall/source/PrintPitAction.cpp
@@ -28,11 +28,13 @@
 #include "Interface.h"
 #include "PrintPitAction.h"
 
+using namespace std;
+using namespace libpit;
 using namespace Heimdall;
 
 const char *PrintPitAction::usage = "Action: print-pit\n\
 Arguments: [--file <filename>] [--verbose] [--no-reboot] [--stdout-errors]\n\
-    [--delay <ms>]\n\
+    [--delay <ms>] [--usb-log-level <none/error/warning/debug>]\n\
 Description: Prints the contents of a PIT file in a human readable format. If\n\
     a filename is not provided then Heimdall retrieves the PIT file from the \n\
     connected device.\n";
@@ -44,9 +46,11 @@ int PrintPitAction::Execute(int argc, char **argv)
 	map<string, ArgumentType> argumentTypes;
 	argumentTypes["file"] = kArgumentTypeString;
 	argumentTypes["no-reboot"] = kArgumentTypeFlag;
+	argumentTypes["resume"] = kArgumentTypeFlag;
 	argumentTypes["delay"] = kArgumentTypeUnsignedInteger;
 	argumentTypes["verbose"] = kArgumentTypeFlag;
 	argumentTypes["stdout-errors"] = kArgumentTypeFlag;
+	argumentTypes["usb-log-level"] = kArgumentTypeString;
 
 	Arguments arguments(argumentTypes);
 
@@ -60,11 +64,48 @@ int PrintPitAction::Execute(int argc, char **argv)
 	const UnsignedIntegerArgument *communicationDelayArgument = static_cast<const UnsignedIntegerArgument *>(arguments.GetArgument("delay"));
 
 	bool reboot = arguments.GetArgument("no-reboot") == nullptr;
+	bool resume = arguments.GetArgument("resume") != nullptr;
 	bool verbose = arguments.GetArgument("verbose") != nullptr;
 	
 	if (arguments.GetArgument("stdout-errors") != nullptr)
 		Interface::SetStdoutErrors(true);
 
+	const StringArgument *usbLogLevelArgument = static_cast<const StringArgument *>(arguments.GetArgument("usb-log-level"));
+
+	BridgeManager::UsbLogLevel usbLogLevel = BridgeManager::UsbLogLevel::Default;
+
+	if (usbLogLevelArgument)
+	{
+		const string& usbLogLevelString = usbLogLevelArgument->GetValue();
+
+		if (usbLogLevelString.compare("none") == 0 || usbLogLevelString.compare("NONE") == 0)
+		{
+			usbLogLevel = BridgeManager::UsbLogLevel::None;
+		}
+		else if (usbLogLevelString.compare("error") == 0 || usbLogLevelString.compare("ERROR") == 0)
+		{
+			usbLogLevel = BridgeManager::UsbLogLevel::Error;
+		}
+		else if (usbLogLevelString.compare("warning") == 0 || usbLogLevelString.compare("WARNING") == 0)
+		{
+			usbLogLevel = BridgeManager::UsbLogLevel::Warning;
+		}
+		else if (usbLogLevelString.compare("info") == 0 || usbLogLevelString.compare("INFO") == 0)
+		{
+			usbLogLevel = BridgeManager::UsbLogLevel::Info;
+		}
+		else if (usbLogLevelString.compare("debug") == 0 || usbLogLevelString.compare("DEBUG") == 0)
+		{
+			usbLogLevel = BridgeManager::UsbLogLevel::Debug;
+		}
+		else
+		{
+			Interface::Print("Unknown USB log level: %s\n\n", usbLogLevelString.c_str());
+			Interface::Print(PrintPitAction::usage);
+			return (0);
+		}
+	}
+
 	// Open file (if specified).
 
 	FILE *localPitFile = nullptr;
@@ -120,8 +161,9 @@ int PrintPitAction::Execute(int argc, char **argv)
 			communicationDelay = communicationDelayArgument->GetValue();
 
 		BridgeManager *bridgeManager = new BridgeManager(verbose, communicationDelay);
+		bridgeManager->SetUsbLogLevel(usbLogLevel);
 
-		if (bridgeManager->Initialise() != BridgeManager::kInitialiseSucceeded || !bridgeManager->BeginSession())
+		if (bridgeManager->Initialise(resume) != BridgeManager::kInitialiseSucceeded || !bridgeManager->BeginSession())
 		{
 			delete bridgeManager;
 			return (1);
-- 
cgit v1.2.3