REVERTME: print size of files and partition sizes in PIT

For debugging purposes.

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,6 +116,9 @@ static bool openFiles(Arguments& arguments, vector<PartitionFile>& partitionFile
 		{
 			const StringArgument *stringArgument = static_cast<const StringArgument *>(*it);
 			FILE *file = FileOpen(stringArgument->GetValue().c_str(), "rb");
+			FileSeek(file, 0, SEEK_END);
+			unsigned long fileSize = (unsigned long)FileTell(file);
+			FileRewind(file);
 
 			if (!file)
 			{
@@ -120,7 +126,7 @@ static bool openFiles(Arguments& arguments, vector<PartitionFile>& partitionFile
 				return (false);
 			}
 
-			partitionFiles.push_back(PartitionFile(argumentName.c_str(), 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 += it->fileSize;
-		totalBytes += (unsigned long)FileTell(it->file);
-		FileRewind(it->file);
 	}
 
 	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,29 @@ 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::kDeviceTypeMMC4096)
+				continue;
+			unsigned long partitionSize = part->GetBlockCount();
+			unsigned int blockSize = 512;
+			if (part->GetDeviceType() == PitEntry::kDeviceTypeMMC4096)
+				blockSize = 4096;
+			printf("Partition %s: size %lu, size in PIT: %lu\n", it->argumentName, it->fileSize, partitionSize*blockSize);
+			if (partitionSize > 0 && it->fileSize > partitionSize*blockSize)
+			{
+				Interface::PrintError("%s partition is too small for specified file\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 +458,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 +487,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 +589,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;
 

heimdall/source/Interface.cpp

@@ -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 string: %s\n", pitData->GetComTar2());
-	Interface::Print("Unknown 1: %d\n", pitData->GetUnknown1());
+	Interface::Print("CPU/bootloader tag: %s\n", pitData->GetCpuBlId());
-	Interface::Print("Unknown 2: %d\n", pitData->GetUnknown2());
+	Interface::Print("Unknown: 0x%04x\n", pitData->GetUnknown());
-	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());
 
 	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::kDeviceTypeMMC4096:
+				Interface::Print("MMC 4096");
+				break;
+
 			default:
 				Interface::Print("Unknown");
 				break;

libpit/source/libpit.cpp

@@ -66,17 +66,10 @@ PitData::PitData()
 {
 	entryCount = 0;
 
-	unknown1 = 0;
+	com_tar2[0] = '\0';
-	unknown2 = 0;
+	cpu_bl_id[0] = '\0';
 
-	unknown3 = 0;
+	unknown = 0;
-	unknown4 = 0;
-
-	unknown5 = 0;
-	unknown6 = 0;
-
-	unknown7 = 0;
-	unknown8 = 0;
 }
 
 PitData::~PitData()
@@ -98,17 +91,14 @@ bool PitData::Unpack(const unsigned char *data)
 
 	entries.resize(entryCount);
 
-	unknown1 = PitData::UnpackInteger(data, 8);
+	if (!memcpy(com_tar2, &data[8], 8))
-	unknown2 = PitData::UnpackInteger(data, 12);
+		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);
+	unknown = PitData::UnpackShort(data, 24);
-	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);
 
 	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);
+	memcpy(&data[8], com_tar2, 8);
-	PitData::PackInteger(data, 12, unknown2);
+	memcpy(&data[16], cpu_bl_id, 8);
 
-	PitData::PackShort(data, 16, unknown3);
+	PitData::PackShort(data, 24, unknown);
-	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);
 
 	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
+	if (entryCount == otherPitData->entryCount &&
-		&& unknown3 == otherPitData->unknown3 && unknown4 == otherPitData->unknown4 && unknown5 == otherPitData->unknown5
+	    (strncmp(com_tar2, otherPitData->com_tar2, 8) == 0) &&
-		&& unknown6 == otherPitData->unknown6 && unknown7 == otherPitData->unknown7 && unknown8 == otherPitData->unknown8)
+	    (strncmp(cpu_bl_id, otherPitData->cpu_bl_id, 8) == 0) &&
+	    unknown == otherPitData->unknown)
 	{
 		for (unsigned int i = 0; i < entryCount; i++)
 		{
@@ -223,17 +207,11 @@ void PitData::Clear(void)
 {
 	entryCount = 0;
 
-	unknown1 = 0;
+	com_tar2[0] = '\0';
-	unknown2 = 0;
 
-	unknown3 = 0;
+	cpu_bl_id[0] = '\0';
-	unknown4 = 0;
 
-	unknown5 = 0;
+	unknown = 0;
-	unknown6 = 0;
-
-	unknown7 = 0;
-	unknown8 = 0;
 
 	for (unsigned int i = 0; i < entries.size(); i++)
 		delete entries[i];

libpit/source/libpit.h

@@ -61,14 +61,15 @@ namespace libpit
 				kDeviceTypeOneNand = 0,
 				kDeviceTypeFile, // FAT
 				kDeviceTypeMMC,
-				kDeviceTypeAll // ?
+				kDeviceTypeAll, // ?
+				kDeviceTypeMMC4096 = 8 // block size 4096
 			};
 
 			enum
 			{
 				kAttributeWrite = 1,
-				kAttributeSTL = 1 << 1/*,
+				kAttributeSTL = 1 << 1
-				kAttributeBML = 1 << 2*/ // ???
+				/* kAttributeBML = 1 << 2 */ // ???
 			};
 
 			enum
@@ -261,17 +262,11 @@ namespace libpit
 		private:
 
 			unsigned int entryCount; // 0x04
-			unsigned int unknown1;   // 0x08
+			char com_tar2[8+1];      // 0x08
-			unsigned int unknown2;   // 0x0C
 
-			unsigned short unknown3; // 0x10
+			char cpu_bl_id[8+1];     // 0x10
-			unsigned short unknown4; // 0x12
 
-			unsigned short unknown5; // 0x14
+			unsigned short unknown;  // 0x18
-			unsigned short unknown6; // 0x16
-
-			unsigned short unknown7; // 0x18
-			unsigned short unknown8; // 0x1A
 
 			// 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 GetUnknown(void) const
 			{
-				return unknown3;
+				return unknown;
-			}
-
-			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;
 			}
 	};
 }