Fixed two major bugs in libpit related functionality:

- Partitions were being excluded from flashing (and UI) if the block-count
  was zero. Instead this is now done using a new IsFlashable() method
  which checks if the partition name is not blank.
- PitData::Pack() was packing the partition name where it should have been
  packing the "flash filename". This resulted in incorrect PIT files being
  flashed to the device.

3 files changed, 11 insertions, 6 deletions

diff --git a/heimdall-frontend/Source/mainwindow.cpp b/heimdall-frontend/Source/mainwindow.cpp
index 281fd77..862dc5a 100644
--- a/heimdall-frontend/Source/mainwindow.cpp
+++ b/heimdall-frontend/Source/mainwindow.cpp
@@ -102,7 +102,7 @@ void MainWindow::UpdateUnusedPartitionIds(void)
 	{

 		const PitEntry *pitEntry = currentPitData.GetEntry(i);

 

-		if (pitEntry->GetBlockCount() > 0 && strcmp(pitEntry->GetPartitionName(), "PIT") != 0 && strcmp(pitEntry->GetPartitionName(), "PT") != 0)

+		if (pitEntry->IsFlashable() && strcmp(pitEntry->GetPartitionName(), "PIT") != 0 && strcmp(pitEntry->GetPartitionName(), "PT") != 0)

 			unusedPartitionIds.append(pitEntry->GetIdentifier());

 	}

 

diff --git a/libpit/Source/libpit.cpp b/libpit/Source/libpit.cpp
index a1138b5..1f29816 100644
--- a/libpit/Source/libpit.cpp
+++ b/libpit/Source/libpit.cpp
@@ -193,7 +193,7 @@ void PitData::Pack(unsigned char *data) const
 		PitData::PackInteger(data, entryOffset + 32, entries[i]->GetFileSize());
 
 		memcpy(data + entryOffset + 36, entries[i]->GetPartitionName(), PitEntry::kPartitionNameMaxLength);
-		memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength, entries[i]->GetPartitionName(), PitEntry::kFlashFilenameMaxLength);
+		memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength, entries[i]->GetFlashFilename(), PitEntry::kFlashFilenameMaxLength);
 		memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength + PitEntry::kFlashFilenameMaxLength,
 			entries[i]->GetFotaFilename(), PitEntry::kFotaFilenameMaxLength);
 	}
@@ -255,7 +255,7 @@ PitEntry *PitData::FindEntry(const char *partitionName)
 {
 	for (unsigned int i = 0; i < entries.size(); i++)
 	{
-		if (entries[i]->GetBlockCount() > 0 && strcmp(entries[i]->GetPartitionName(), partitionName) == 0)
+		if (entries[i]->IsFlashable() && strcmp(entries[i]->GetPartitionName(), partitionName) == 0)
 			return (entries[i]);
 	}
 
@@ -266,7 +266,7 @@ const PitEntry *PitData::FindEntry(const char *partitionName) const
 {
 	for (unsigned int i = 0; i < entries.size(); i++)
 	{
-		if (entries[i]->GetBlockCount() > 0 && strcmp(entries[i]->GetPartitionName(), partitionName) == 0)
+		if (entries[i]->IsFlashable() && strcmp(entries[i]->GetPartitionName(), partitionName) == 0)
 			return (entries[i]);
 	}
 
@@ -277,7 +277,7 @@ PitEntry *PitData::FindEntry(unsigned int partitionIdentifier)
 {
 	for (unsigned int i = 0; i < entries.size(); i++)
 	{
-		if (entries[i]->GetBlockCount() > 0 && entries[i]->GetIdentifier() == partitionIdentifier)
+		if (entries[i]->IsFlashable() && entries[i]->GetIdentifier() == partitionIdentifier)
 			return (entries[i]);
 	}
 
@@ -288,7 +288,7 @@ const PitEntry *PitData::FindEntry(unsigned int partitionIdentifier) const
 {
 	for (unsigned int i = 0; i < entries.size(); i++)
 	{
-		if (entries[i]->GetBlockCount() > 0 && entries[i]->GetIdentifier() == partitionIdentifier)
+		if (entries[i]->IsFlashable() && entries[i]->GetIdentifier() == partitionIdentifier)
 			return (entries[i]);
 	}
 
diff --git a/libpit/Source/libpit.h b/libpit/Source/libpit.h
index eb37647..c2bc691 100644
--- a/libpit/Source/libpit.h
+++ b/libpit/Source/libpit.h
@@ -103,6 +103,11 @@ namespace libpit
 
 			bool Matches(const PitEntry *otherPitEntry) const;
 
+			bool IsFlashable(void) const
+			{
+				return strlen(partitionName) != 0;
+			}
+
 			unsigned int GetBinaryType(void) const
 			{
 				return binaryType;