v2.0.2

* Fix segfault when file to flash does not exist * Rename some fields in the flashing protocol, MMC4096 seem to be UFS, and what I thought was the protocol number seem to be the number of logical units in the storage
FlashAction: fix FileOpen check
2022-07-12 17:42:55 +02:00 · 2022-07-12 17:23:21 +02:00 · 2022-05-04 13:12:31 +02:00 · 2022-05-04 13:12:28 +02:00 · 2022-05-04 13:11:18 +02:00 · 2022-02-13 11:38:55 +01:00
12 changed files with 152 additions and 168 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,9 @@
 # Heimdall

+[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/ubuntu.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/ubuntu.yml?)
+[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/archlinux.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/archlinux.yml?)
+[![builds.sr.ht status](https://builds.sr.ht/~grimler/Heimdall/commits/alpine.yml.svg)](https://builds.sr.ht/~grimler/Heimdall/commits/alpine.yml?)
+
 Heimdall is a cross-platform open-source tool suite used to flash
 firmware (aka ROMs) onto Samsung mobile devices.

@ -20,7 +24,7 @@ Heimdall communicate via the custom Samsung-developed protocol
 typically referred to as the 'Odin 3 protocol'.

 USB communication in Heimdall is handled by the popular open-source
-USB library, [libusb](http://libusb.info).
+USB library, [libusb](https://libusb.info).

 ## Free & Open Source

@ -40,12 +44,17 @@ refer to the appropriate platform specific README:

 #### Linux

- - Linux/README ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/Linux/README))
+ - Linux/README ([online](Linux/README))

 #### OS X

- - OSX/README.txt ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/OSX/README.txt))
+ - OSX/README.txt ([online](OSX/README.txt))

 #### Windows

- - Win32/README.txt ([online](https://raw.githubusercontent.com/Benjamin-Dobell/Heimdall/master/Win32/README.txt))
+ - Win32/README.txt ([online](Win32/README.txt))
+
+### Odin protocol and PIT format
+
+For more details on the Odin protocol, and the PIT files, see the
+external project [samsung-loki/samsung-docs](https://samsung-loki.github.io/samsung-docs/).
--- a/Win32/Drivers/zadig.exe
+++ b/Win32/Drivers/zadig.exe
--- a/Win32/README.txt
+++ b/Win32/README.txt
@ -20,7 +20,7 @@ Driver Installation Instructions:

    1. Put your device into download mode and plug it in.

-    2. Run zadig.exe included in the Drivers subdirectory.
+    2. Download zadig from https://zadig.akeo.ie/downloads/, and run zadig.exe.

    3. From the menu chose Options -> List All Devices.

--- a/heimdall-frontend/aboutform.ui
+++ b/heimdall-frontend/aboutform.ui
@ -114,7 +114,7 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Heimdall Frontend&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 1.4.2&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 2.0.2&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2010-2017 Benjamin Dobell, Glass Echidna&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Heimdall (command line)&lt;/span&gt;&lt;/p&gt;
--- a/heimdall/source/BridgeManager.cpp
+++ b/heimdall/source/BridgeManager.cpp
@ -20,6 +20,7 @@

 // C Standard Library
 #include <cstdio>
+#include <fstream>

 // libusb
 #include <libusb.h>
@ -80,16 +81,17 @@ int BridgeManager::FindDeviceInterface(void)
 	Interface::Print("Detecting device...\n");

 	struct libusb_device **devices;
-	int deviceCount = libusb_get_device_list(libusbContext, &devices);
+	unsigned int deviceCount = libusb_get_device_list(libusbContext, &devices);

-	for (int deviceIndex = 0; deviceIndex < deviceCount; deviceIndex++)
+	for (unsigned int deviceIndex = 0; deviceIndex < deviceCount; deviceIndex++)
 	{
 		libusb_device_descriptor descriptor;
 		libusb_get_device_descriptor(devices[deviceIndex], &descriptor);

 		for (int i = 0; i < BridgeManager::kSupportedDeviceCount; i++)
 		{
-			if (descriptor.idVendor == supportedDevices[i].vendorId && descriptor.idProduct == supportedDevices[i].productId)
+			if (descriptor.idVendor == supportedDevices[i].vendorId &&
+			    descriptor.idProduct == supportedDevices[i].productId)
 			{
 				heimdallDevice = devices[deviceIndex];
 				libusb_ref_device(heimdallDevice);
@ -310,14 +312,20 @@ bool BridgeManager::InitialiseProtocol(void)
 	memcpy(dataBuffer, "ODIN", 4);
 	memset(dataBuffer + 4, 0, 1);

-	if (libusb_reset_device(deviceHandle))
+#ifdef OS_LINUX
+	if (IsUbuntu())
 	{
-		Interface::PrintError("Failed to reset device!");
+		Interface::Print("Resetting device...\n");
+		if (libusb_reset_device(deviceHandle))
+		{
+			Interface::PrintError("Failed to reset device!\n");
+		}
 	}
+#endif

 	if (!SendBulkTransfer(dataBuffer, 4, 1000))
 	{
-		Interface::PrintError("Failed to send handshake!");
+		Interface::PrintError("Failed to send handshake!\n");
 	}

 	// Expect "LOKE"
@ -407,29 +415,8 @@ bool BridgeManager::DetectDevice(void)
 		return (false);
 	}

-	// Setup libusb log level.
-	switch (usbLogLevel)
-	{
-		case UsbLogLevel::None:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
-			break;
-
-		case UsbLogLevel::Error:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
-			break;
-
-		case UsbLogLevel::Warning:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
-			break;
-
-		case UsbLogLevel::Info:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
-			break;
-
-		case UsbLogLevel::Debug:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
-			break;
-	}
+	// Set libusb log level.
+	SetUsbLogLevel(usbLogLevel);

 	// Get handle to Galaxy S device
 	struct libusb_device **devices;
@ -442,7 +429,8 @@ bool BridgeManager::DetectDevice(void)

 		for (int i = 0; i < BridgeManager::kSupportedDeviceCount; i++)
 		{
-			if (descriptor.idVendor == supportedDevices[i].vendorId && descriptor.idProduct == supportedDevices[i].productId)
+			if (descriptor.idVendor == supportedDevices[i].vendorId &&
+			    descriptor.idProduct == supportedDevices[i].productId)
 			{
 				libusb_free_device_list(devices, deviceCount);

@ -468,33 +456,12 @@ int BridgeManager::Initialise(bool resume)
 	if (result != LIBUSB_SUCCESS)
 	{
 		Interface::PrintError("Failed to initialise libusb. libusb error: %d\n", result);
-		Interface::Print("Failed to connect to device!");
+		Interface::Print("Failed to connect to device!\n");
 		return (BridgeManager::kInitialiseFailed);
 	}

 	// Setup libusb log level.
-	switch (usbLogLevel)
-	{
-		case UsbLogLevel::None:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
-			break;
-
-		case UsbLogLevel::Error:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
-			break;
-
-		case UsbLogLevel::Warning:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
-			break;
-
-		case UsbLogLevel::Info:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
-			break;
-
-		case UsbLogLevel::Debug:
-			libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
-			break;
-	}
+	SetUsbLogLevel(usbLogLevel);

 	result = FindDeviceInterface();

@ -749,7 +716,7 @@ bool BridgeManager::ReceivePacket(InboundPacket *packet, int timeout, int emptyT
 	if (receivedSize < 0)
 		return (false);

-	if (receivedSize != packet->GetSize() && !packet->IsSizeVariable())
+	if (static_cast<unsigned int>(receivedSize) != packet->GetSize() && !packet->IsSizeVariable())
 	{
 		if (verbose)
 			Interface::PrintError("Incorrect packet size received - expected size = %d, received size = %d.\n", packet->GetSize(), receivedSize);
@ -1277,3 +1244,32 @@ void BridgeManager::SetUsbLogLevel(UsbLogLevel usbLogLevel)
 		}
 	}
 }
+
+#ifdef OS_LINUX
+bool BridgeManager::IsUbuntu()
+{
+	std::ifstream os_release("/etc/os-release");
+	std::string line, entry, os;
+	int pos;
+	while (std::getline(os_release, line))
+	{
+		pos = line.find("=");
+		entry = line.substr(0, pos);
+		if (entry == "ID")
+		{
+			os = line.substr(pos+1);
+			if (verbose)
+			{
+				Interface::Print("Linux distro ID: %s\n",
+						 os.c_str());
+			}
+			if (os == "ubuntu")
+			{
+				return true;
+			}
+			break;
+		}
+	}
+	return false;
+}
+#endif
--- a/heimdall/source/BridgeManager.h
+++ b/heimdall/source/BridgeManager.h
@ -166,7 +166,9 @@ namespace Heimdall
 			bool SendFile(FILE *file, unsigned int destination, unsigned int deviceType, unsigned int fileIdentifier = 0xFFFFFFFF) const;

 			void SetUsbLogLevel(UsbLogLevel usbLogLevel);
-
+#ifdef OS_LINUX
+			bool IsUbuntu(void);
+#endif
 			UsbLogLevel GetUsbLogLevel(void) const
 			{
 				return usbLogLevel;
--- a/heimdall/source/DownloadPitAction.cpp
+++ b/heimdall/source/DownloadPitAction.cpp
@ -148,7 +148,7 @@ int DownloadPitAction::Execute(int argc, char **argv)

 	if (fileSize > 0)
 	{
-		if (fwrite(pitBuffer, 1, fileSize, outputPitFile) != fileSize)
+		if (fwrite(pitBuffer, 1, fileSize, outputPitFile) != static_cast<size_t>(fileSize))
 		{
 			Interface::PrintError("Failed to write PIT data to output file.\n");
 			success = false;
--- a/heimdall/source/FlashAction.cpp
+++ b/heimdall/source/FlashAction.cpp
@ -48,10 +48,11 @@ Arguments:\n\
    --repartition --pit <filename> [--<partition name> <filename> ...]\n\
    [--<partition identifier> <filename> ...] [--verbose] [--no-reboot]\n\
    [--resume] [--stdout-errors] [--usb-log-level <none/error/warning/debug>]\n\
-    [--tflash]\n\
+    [--tflash] [--skip-size-check]\n\
 Description: Flashes one or more firmware files to your phone. Partition names\n\
    (or identifiers) can be obtained by executing the print-pit action.\n\
    T-Flash mode allows to flash the inserted SD-card instead of the internal MMC.\n\
+    Use --skip-size-check to not verify that files fit in the specified partition.\n\
 Note: --no-reboot causes the device to remain in download mode after the action\n\
      is completed. If you wish to perform another action whilst remaining in\n\
      download mode, then the following action must specify the --resume flag.\n\
@ -62,11 +63,13 @@ struct PartitionFile
 {
 	const char *argumentName;
 	FILE *file;
+	unsigned long fileSize;

-	PartitionFile(const char *argumentName, FILE *file)
+	PartitionFile(const char *argumentName, FILE *file, unsigned long fileSize)
 	{
 		this->argumentName = argumentName;
 		this->file = file;
+		this->fileSize = fileSize;
 	}
 };

@ -113,14 +116,17 @@ static bool openFiles(Arguments& arguments, vector<PartitionFile>& partitionFile
 		{
 			const StringArgument *stringArgument = static_cast<const StringArgument *>(*it);
 			FILE *file = FileOpen(stringArgument->GetValue().c_str(), "rb");
-
 			if (!file)
 			{
 				Interface::PrintError("Failed to open file \"%s\"\n", stringArgument->GetValue().c_str());
 				return (false);
 			}

-			partitionFiles.push_back(PartitionFile(argumentName.c_str(), file));
+			FileSeek(file, 0, SEEK_END);
+			unsigned long fileSize = (unsigned long)FileTell(file);
+			FileRewind(file);
+
+			partitionFiles.push_back(PartitionFile(argumentName.c_str(), file, fileSize));
 		}
 	}

@ -151,9 +157,7 @@ static bool sendTotalTransferSize(BridgeManager *bridgeManager, const vector<Par

 	for (vector<PartitionFile>::const_iterator it = partitionFiles.begin(); it != partitionFiles.end(); it++)
 	{
-		FileSeek(it->file, 0, SEEK_END);
-		totalBytes += (unsigned long)FileTell(it->file);
-		FileRewind(it->file);
+		totalBytes += it->fileSize;
 	}

 	if (repartition)
@ -284,7 +288,7 @@ static bool flashFile(BridgeManager *bridgeManager, const PartitionFlashInfo& pa
 	}
 }

-static bool flashPartitions(BridgeManager *bridgeManager, const vector<PartitionFile>& partitionFiles, const PitData *pitData, bool repartition)
+static bool flashPartitions(BridgeManager *bridgeManager, const vector<PartitionFile>& partitionFiles, const PitData *pitData, bool repartition, bool skip_size_check)
 {
 	vector<PartitionFlashInfo> partitionFlashInfos;

@ -292,6 +296,28 @@ static bool flashPartitions(BridgeManager *bridgeManager, const vector<Partition
 	if (!setupPartitionFlashInfo(partitionFiles, pitData, partitionFlashInfos))
 		return (false);

+	/* Verify that the files we want to flash fit in partitions */
+	if (!skip_size_check)
+	{
+		for (vector<PartitionFile>::const_iterator it = partitionFiles.begin(); it != partitionFiles.end(); it++)
+		{
+			const PitEntry *part = pitData->FindEntry(it->argumentName);
+			if (part->GetDeviceType() != PitEntry::kDeviceTypeMMC &&
+			    part->GetDeviceType() != PitEntry::kDeviceTypeUFS)
+				continue;
+			unsigned long partitionSize = part->GetBlockCount();
+			unsigned int blockSize = 512;
+			if (part->GetDeviceType() == PitEntry::kDeviceTypeUFS)
+				blockSize = 4096;
+			if (partitionSize > 0 && it->fileSize > partitionSize*blockSize)
+			{
+				Interface::PrintError("%s partition is too small for given file. Use --skip-size-check to flash anyways.\n",
+						      it->argumentName);
+				return (false);
+			}
+		}
+	}
+
 	// If we're repartitioning then we need to flash the PIT file first (if it is listed in the PIT file).
 	if (repartition)
 	{
@ -431,6 +457,7 @@ int FlashAction::Execute(int argc, char **argv)
 	argumentTypes["stdout-errors"] = kArgumentTypeFlag;
 	argumentTypes["usb-log-level"] = kArgumentTypeString;
 	argumentTypes["tflash"] = kArgumentTypeFlag;
+	argumentTypes["skip-size-check"] = kArgumentTypeFlag;

 	argumentTypes["pit"] = kArgumentTypeString;
 	shortArgumentAliases["pit"] = "pit";
@ -459,6 +486,7 @@ int FlashAction::Execute(int argc, char **argv)
 	bool resume = arguments.GetArgument("resume") != nullptr;
 	bool verbose = arguments.GetArgument("verbose") != nullptr;
 	bool tflash = arguments.GetArgument("tflash") != nullptr;
+	bool skip_size_check = arguments.GetArgument("skip-size-check") != nullptr;

 	if (arguments.GetArgument("stdout-errors") != nullptr)
 		Interface::SetStdoutErrors(true);
@ -560,7 +588,9 @@ int FlashAction::Execute(int argc, char **argv)
 		PitData *pitData = getPitData(bridgeManager, pitFile, repartition);

 		if (pitData)
-			success = flashPartitions(bridgeManager, partitionFiles, pitData, repartition);
+			success = flashPartitions(bridgeManager, partitionFiles,
+						  pitData, repartition,
+						  skip_size_check);
 		else
 			success = false;

--- a/heimdall/source/Interface.cpp
+++ b/heimdall/source/Interface.cpp
@ -42,7 +42,7 @@ using namespace Heimdall;
 map<string, Interface::ActionInfo> actionMap;
 bool stdoutErrors = false;
 		
-const char *version = "v1.4.2";
+const char *version = "v2.0.2";
 const char *actionUsage = "Usage: heimdall <action> <action arguments>\n";

 const char *releaseInfo = "Heimdall %s\n\n\
@ -207,16 +207,11 @@ void Interface::PrintDeviceDetectionFailed(void)

 void Interface::PrintPit(const PitData *pitData)
 {
+	Interface::Print("--- PIT Header ---\n");
 	Interface::Print("Entry Count: %d\n", pitData->GetEntryCount());
-
-	Interface::Print("Unknown 1: %d\n", pitData->GetUnknown1());
-	Interface::Print("Unknown 2: %d\n", pitData->GetUnknown2());
-	Interface::Print("Unknown 3: %d\n", pitData->GetUnknown3());
-	Interface::Print("Unknown 4: %d\n", pitData->GetUnknown4());
-	Interface::Print("Unknown 5: %d\n", pitData->GetUnknown5());
-	Interface::Print("Unknown 6: %d\n", pitData->GetUnknown6());
-	Interface::Print("Unknown 7: %d\n", pitData->GetUnknown7());
-	Interface::Print("Unknown 8: %d\n", pitData->GetUnknown8());
+	Interface::Print("Unknown string: %s\n", pitData->GetComTar2());
+	Interface::Print("CPU/bootloader tag: %s\n", pitData->GetCpuBlId());
+	Interface::Print("Logic unit count: %d\n", pitData->GetLUCount());

 	for (unsigned int i = 0; i < pitData->GetEntryCount(); i++)
 	{
@ -262,6 +257,10 @@ void Interface::PrintPit(const PitData *pitData)
 				Interface::Print("All (?)");
 				break;

+			case PitEntry::kDeviceTypeUFS:
+				Interface::Print("UFS");
+				break;
+
 			default:
 				Interface::Print("Unknown");
 				break;
--- a/heimdall/source/Packet.h
+++ b/heimdall/source/Packet.h
@ -45,7 +45,7 @@ namespace Heimdall
 				memset(data, 0, size);
 			}

-			~Packet()
+			virtual ~Packet()
 			{
 				delete [] data;
 			}
--- a/libpit/source/libpit.cpp
+++ b/libpit/source/libpit.cpp
@ -66,17 +66,10 @@ PitData::PitData()
 {
 	entryCount = 0;

-	unknown1 = 0;
-	unknown2 = 0;
+	com_tar2[0] = '\0';
+	cpu_bl_id[0] = '\0';

-	unknown3 = 0;
-	unknown4 = 0;
-
-	unknown5 = 0;
-	unknown6 = 0;
-
-	unknown7 = 0;
-	unknown8 = 0;
+	luCount = 0;
 }

 PitData::~PitData()
@ -98,17 +91,14 @@ bool PitData::Unpack(const unsigned char *data)

 	entries.resize(entryCount);

-	unknown1 = PitData::UnpackInteger(data, 8);
-	unknown2 = PitData::UnpackInteger(data, 12);
+	if (!memcpy(com_tar2, &data[8], 8))
+		return (false);
+	com_tar2[8]='\0';
+	if (!memcpy(cpu_bl_id, &data[16], 8))
+		return (false);
+	cpu_bl_id[8]='\0';

-	unknown3 = PitData::UnpackShort(data, 16);
-	unknown4 = PitData::UnpackShort(data, 18);
-
-	unknown5 = PitData::UnpackShort(data, 20);
-	unknown6 = PitData::UnpackShort(data, 22);
-
-	unknown7 = PitData::UnpackShort(data, 24);
-	unknown8 = PitData::UnpackShort(data, 26);
+	luCount = PitData::UnpackShort(data, 24);

 	unsigned int integerValue;
 	unsigned int entryOffset;
@ -160,17 +150,10 @@ void PitData::Pack(unsigned char *data) const

 	PitData::PackInteger(data, 4, entryCount);

-	PitData::PackInteger(data, 8, unknown1);
-	PitData::PackInteger(data, 12, unknown2);
+	memcpy(&data[8], com_tar2, 8);
+	memcpy(&data[16], cpu_bl_id, 8);

-	PitData::PackShort(data, 16, unknown3);
-	PitData::PackShort(data, 18, unknown4);
-
-	PitData::PackShort(data, 20, unknown5);
-	PitData::PackShort(data, 22, unknown6);
-
-	PitData::PackShort(data, 24, unknown7);
-	PitData::PackShort(data, 26, unknown8);
+	PitData::PackShort(data, 24, luCount);

 	int entryOffset;

@ -201,9 +184,10 @@ void PitData::Pack(unsigned char *data) const

 bool PitData::Matches(const PitData *otherPitData) const
 {
-	if (entryCount == otherPitData->entryCount && unknown1 == otherPitData->unknown1 && unknown2 == otherPitData->unknown2
-		&& unknown3 == otherPitData->unknown3 && unknown4 == otherPitData->unknown4 && unknown5 == otherPitData->unknown5
-		&& unknown6 == otherPitData->unknown6 && unknown7 == otherPitData->unknown7 && unknown8 == otherPitData->unknown8)
+	if (entryCount == otherPitData->entryCount &&
+	    (strncmp(com_tar2, otherPitData->com_tar2, 8) == 0) &&
+	    (strncmp(cpu_bl_id, otherPitData->cpu_bl_id, 8) == 0) &&
+	    luCount == otherPitData->luCount)
 	{
 		for (unsigned int i = 0; i < entryCount; i++)
 		{
@ -223,17 +207,11 @@ void PitData::Clear(void)
 {
 	entryCount = 0;

-	unknown1 = 0;
-	unknown2 = 0;
+	com_tar2[0] = '\0';

-	unknown3 = 0;
-	unknown4 = 0;
+	cpu_bl_id[0] = '\0';

-	unknown5 = 0;
-	unknown6 = 0;
-
-	unknown7 = 0;
-	unknown8 = 0;
+	luCount = 0;

 	for (unsigned int i = 0; i < entries.size(); i++)
 		delete entries[i];
--- a/libpit/source/libpit.h
+++ b/libpit/source/libpit.h
@ -61,14 +61,15 @@ namespace libpit
 				kDeviceTypeOneNand = 0,
 				kDeviceTypeFile, // FAT
 				kDeviceTypeMMC,
-				kDeviceTypeAll // ?
+				kDeviceTypeAll, // ?
+				kDeviceTypeUFS = 8
 			};

 			enum
 			{
 				kAttributeWrite = 1,
-				kAttributeSTL = 1 << 1/*,
-				kAttributeBML = 1 << 2*/ // ???
+				kAttributeSTL = 1 << 1
+				/* kAttributeBML = 1 << 2 */ // ???
 			};

 			enum
@ -261,17 +262,11 @@ namespace libpit
 		private:

 			unsigned int entryCount; // 0x04
-			unsigned int unknown1;   // 0x08
-			unsigned int unknown2;   // 0x0C
+			char com_tar2[8+1];      // 0x08

-			unsigned short unknown3; // 0x10
-			unsigned short unknown4; // 0x12
+			char cpu_bl_id[8+1];     // 0x10

-			unsigned short unknown5; // 0x14
-			unsigned short unknown6; // 0x16
-
-			unsigned short unknown7; // 0x18
-			unsigned short unknown8; // 0x1A
+			unsigned short luCount;  // 0x18

 			// Entries start at 0x1C
 			std::vector<PitEntry *> entries;
@ -370,44 +365,19 @@ namespace libpit
 				return paddedSize;
 			}

-			unsigned int GetUnknown1(void) const
+			const char * GetComTar2(void) const
 			{
-				return unknown1;
+				return com_tar2;
 			}

-			unsigned int GetUnknown2(void) const
+			const char * GetCpuBlId(void) const
 			{
-				return unknown2;
+				return cpu_bl_id;
 			}

-			unsigned short GetUnknown3(void) const
+			unsigned int GetLUCount(void) const
 			{
-				return unknown3;
-			}
-
-			unsigned short GetUnknown4(void) const
-			{
-				return unknown4;
-			}
-
-			unsigned short GetUnknown5(void) const
-			{
-				return unknown5;
-			}
-
-			unsigned short GetUnknown6(void) const
-			{
-				return unknown6;
-			}
-
-			unsigned short GetUnknown7(void) const
-			{
-				return unknown7;
-			}
-
-			unsigned short GetUnknown8(void) const
-			{
-				return unknown8;
+				return luCount;
 			}
 	};
 }
Author	SHA1	Message	Date
Henrik Grimler	02b577ec77	v2.0.2 * Fix segfault when file to flash does not exist * Rename some fields in the flashing protocol, MMC4096 seem to be UFS, and what I thought was the protocol number seem to be the number of logical units in the storage	2022-07-12 17:42:55 +02:00
Henrik Grimler	14f3521a6b	FlashAction: fix FileOpen check Check needs to be right after it is opened, before we try to seek in it. Before this fix, heimdall segfaults if file does not exist. Fixes commit `60ab9bbaff` ("FlashAction: Make sure file fit partition before flashing")	2022-07-12 17:23:21 +02:00
Henrik Grimler	0cf817a591	libpit: MMC4096 is really UFS Change name to better describe the hardware.	2022-05-04 13:12:31 +02:00
Henrik Grimler	c3516307d2	libpit: last number in PIT header is the "LUN count" Where LUN probably stands for Logical Unit Number. Previous assumption that it was the odin protocol version was wrong, so let's fix this.	2022-05-04 13:12:28 +02:00
Henrik Grimler	f6c4698c8b	Revert "PIT: unknown version in PIT header has to be protocol version" This assumption was wrong. The number is really the number of logical units in the storage, which tends to increase over time as the storage space is increased I suppose. This reverts commit `e916c679ed`.	2022-05-04 13:11:18 +02:00
Henrik Grimler	d81e0f5bc2	v2.0.1 Except for general cleanup we have these functional changes: * Change printed pit header: last unknown number seem to be the Odin protocol version. * Only run libusb_reset_device on ubuntu: on some distros/devices resetting the device causes the handshake to fail (observered for degaswifi/SM-T230).	2022-02-13 11:38:55 +01:00
Henrik Grimler	62368adc7d	BridgeManager: only libusb_reset_device on ubuntu It seems that only ubuntu needs libusb_reset_device for successful handshake. On most distros and device it works with or without, but for some devices (like degaswifi/SM-T230 with a Marvell PXA 1088 SOC) it causes handshake to fail. Probably libusb_reset_device causes issues only for some devices, but there seem to be no way to distinguish which ones from Heimdall (not based on Odin protocol version or SOC at least). Fixes commit `07a14d4aa8` ("InitialiseProtocol: reset device before handshake").	2022-02-13 11:17:22 +01:00
Henrik Grimler	0f1843c93c	BridgeManager: break another long line	2022-02-13 08:53:03 +01:00
Henrik Grimler	172ab65cbe	BridgeManager: use SetUsbLogLevel for setting usb log level	2022-02-13 08:53:00 +01:00
Henrik Grimler	1e7ff3b659	README: point to samsung-loki/samsung-docs for more docs	2022-01-01 20:38:27 +01:00
Henrik Grimler	e916c679ed	PIT: unknown version in PIT header has to be protocol version And in that case there now exists a fifth version of the Odin protocol, seen on Galaxy S9 and newer. In total we have seen these versions (as of January 2022): * 0, on devices from around 2014 or older * 3, on devices from around 2015 * 4, on devices from around 2016 - 2017 * 5, on devices from around 2018 or newer	2022-01-01 20:38:19 +01:00
Henrik Grimler	e9a68f6862	BridgeManager: fix return value by libusb_get_device_list And remove unnecessary spaces and break a long line.	2022-01-01 20:38:12 +01:00
Henrik Grimler	990ce68f5c	BridgeManager: fix missing newline in error messages	2021-12-31 00:16:46 +01:00
Antony Cherepanov	c939ab18d1	Fix comparison between signed and unsigned integers Warning was seen when compiling with -Wall.	2021-12-18 18:22:42 +01:00
Antony Cherepanov	1385b183d2	Packet destructor should be virtual Fixes warning seen when compiling with -Wall.	2021-12-18 18:21:40 +01:00
Henrik Grimler	95e5c1cdcb	heimdall-frontend: set version to 2.0.0 here as well Will not make a new release for just this though.	2021-12-16 17:40:42 +01:00
Henrik Grimler	622067f284	Release v2.0.0 Go from 1.4.2 to 2.0.0 to indicate that maintainer, and upstream repo, has changed. Main changes: * A check so that partition is not smaller than file size has been added, to make it a bit harder to overwrite things on the emmc by accident: `60ab9bbaff` * libusb_reset_device is needed before handshake on ubuntu: https://github.com/Benjamin-Dobell/Heimdall/pull/478 * Support for flashing images larger than 3.5 GB: https://github.com/Benjamin-Dobell/Heimdall/pull/459 * Avoid libusb_set_interface_alt_setting when it anyways doesn't do anything: https://github.com/Benjamin-Dobell/Heimdall/issues/497, fixed in: `2ecc98020c` * Some compilation issues on [freeBSD](`64bd479db6`), [Android](`719edaff9e`) and [macOS](`6ede1f1f33`) have been fixed. All changes are verified to be compatible for devices as old as Galaxy S3, and as new as Galaxy S8 (I don't have access to anything older, or newer, than that).	2021-12-16 16:59:29 +01:00
Henrik Grimler	9b0e9ff174	README: add build status images	2021-12-16 16:15:51 +01:00
Henrik Grimler	225164f87e	README: point to OS specific READMEs inside the repository	2021-12-16 16:14:05 +01:00
Henrik Grimler	91802883a0	README: use https for libusb link	2021-12-16 16:13:47 +01:00
Henrik Grimler	40be58b43e	FlashAction: add option --skip-size-check Can be used to skip the check that verifies that all files fit in the partitions. The option need to be set if we are to be able to flash stock android to some devices, for example klimtlte (sboot.bin is larger than the BOOTLOADER partition on this device).	2021-12-16 16:07:41 +01:00
Henrik Grimler	60ab9bbaff	FlashAction: Make sure file fit partition before flashing Partition size is calculated as block count times a block size of 512 for DeviceType 2 and 4096 for DeviceType 8. Flashing stock android on some devices fail due to some partitions being too small for the corresponding file. This is the case on klimtlte (and other exynos5420 devices), where sboot.bin does not fit into the BOOTLOADER partition. Tests done: * Flash stock android (A500FXXS1CSB2) to a5lte, works fine * Flash stock android (I9300XXUGPE1) to i9300, works fine * Flash stock android (I9505XXUPQG1) to i9505, works fine * Flash stock android (G930FXXU8ETI2) to herolte (with block size 4096), works fine * Flash stock android (T705XXU1CPL1) to klimtlte, fails due to BOOTLOADER partition being smaller than sboot.bin, the file has a size of 1148160, and the partition 2046*512=1047552	2021-12-16 16:05:42 +01:00
Henrik Grimler	e51c9119f1	libpit: describe more parts of pit header The unknown string is "COM_TAR2" in all devices I have access to. The last unknown 4 bytes might be some sort of version, in old devices it is 0000, in Galaxy S6 0003, in Galaxy S7 and S8 0004 and in Galaxy S9 and tab S6 lite 0005. The CPU/bootloader string looks something like: * LSI5410 - Seen in Exynos 5420, 5433 devices (and perhaps others) * LSI7420 - Seen in Exynos 7420, 8890, 8895 devices (and perhaps others) * LSI7880 - Seen in a5y17lte (exynos 7880) * LSI9610 - Seen in gta4xl (exynos 9611) * LSI9810 - Seen in star2lte (exynos 9810) * Mx - Seen in Galaxy S3 (device codename is m0/m3) * MSM8916 - Seen in MSM8916 devices * MSM8960 - Seen in jflte (and probably in others, jflte has a APQ8064AB CPU)	2021-12-16 16:01:18 +01:00
Henrik Grimler	31745c287a	libpit: add DeviceType = 8 entry for MMC with blksize 4096 Newer devices have an emmc with 4096 block size instead of 512. These seem to have DeviceType=8 instead of DeviceType=2.	2021-12-16 16:01:15 +01:00
Henrik Grimler	cedfcd8c80	win32: remove zadig.exe from repo Carrying around this (now outdated) driver in the repo seems unnecessary. Windows users can download latest from https://zadig.akeo.ie/downloads/ instead.	2021-12-14 11:22:04 +01:00