From 7f550097fa1089c6072e3373648a2278ee3b89d4 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 23 Dec 2014 21:19:42 -0500
Subject: ich9deblob: gbe related debugging moved to separate function

---
(limited to 'resources/utilities/ich9deblob')

diff --git a/resources/utilities/ich9deblob/gbe/gbe.c b/resources/utilities/ich9deblob/gbe/gbe.c
index d566906..3caa3ee 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.c
+++ b/resources/utilities/ich9deblob/gbe/gbe.c
@@ -89,18 +89,36 @@ struct GBEREGIONRECORD_8K deblobbedGbeStructFromFactory(struct GBEREGIONRECORD_8
 	deblobbedGbeStruct8k.backup.checkSum = gbeGetChecksumFrom4kStruct(deblobbedGbeStruct8k.backup, 0xBABA);
 	memcpy(&deblobbedGbeStruct8k.main, &deblobbedGbeStruct8k.backup, GBEREGIONSIZE_4K);
 	
-	/*
-	 * Debugging:
-	 * calculate the 0x3F'th 16-bit uint to make the desired final checksum for GBe
-	 * observed checksum matches (from X200 factory.rom dumps) on main: 0x3ABA 0x34BA 0x40BA. spec defined as 0xBABA.
-	 * X200 ships with a broken main gbe region by default (invalid checksum, and more)
-	 * The "backup" gbe regions on these machines are correct, though, and is what the machines default to
-	 * For libreboot's purpose, we can do much better than that by fixing the main one... below is only debugging
-	 */
-	printf("\nfactory Gbe (main): calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n", gbeGetChecksumFrom4kStruct(factoryGbeStruct8k.main, 0xBABA), factoryGbeStruct8k.main.checkSum);
-	printf("factory Gbe (backup) calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n", gbeGetChecksumFrom4kStruct(factoryGbeStruct8k.backup, 0xBABA), factoryGbeStruct8k.backup.checkSum);
-	printf("\ndeblobbed Gbe (main): calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n", gbeGetChecksumFrom4kStruct(deblobbedGbeStruct8k.main, 0xBABA), deblobbedGbeStruct8k.main.checkSum);
-	printf("deblobbed Gbe (backup) calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n", gbeGetChecksumFrom4kStruct(deblobbedGbeStruct8k.backup, 0xBABA), deblobbedGbeStruct8k.backup.checkSum);
-	
 	return deblobbedGbeStruct8k;
 }
+
+/*
+ * ---------------------------------------------------------------------
+ * Debugging functions:
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * show debugging info: show calculated (correct) cbe checksum and what
+ * is actually stored, in a 4K gbe struct. Only for a single region.
+ */
+void printGbeChecksumDataFromStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char *romName, char* regionName)
+{
+	printf(
+		"%s Gbe (%s): calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n", 
+		romName,
+		regionName,
+		gbeGetChecksumFrom4kStruct(gbeStruct4k, 0xBABA), 
+		gbeStruct4k.checkSum
+	);
+}
+
+/*
+ * show debugging info: show calculated (correct) gbe checksum and what 
+ * is actually stored, in a 8K gbe struct. Do so for main and backup regions.
+ */
+void printGbeChecksumDataFromStruct8k(struct GBEREGIONRECORD_8K gbeStruct8k, char* romName)
+{	
+	printGbeChecksumDataFromStruct4k(gbeStruct8k.main, romName, "main");
+	printGbeChecksumDataFromStruct4k(gbeStruct8k.backup, romName, "backup");
+}
diff --git a/resources/utilities/ich9deblob/gbe/gbe.h b/resources/utilities/ich9deblob/gbe/gbe.h
index d0ad649..17d6a93 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.h
+++ b/resources/utilities/ich9deblob/gbe/gbe.h
@@ -85,5 +85,7 @@ unsigned short gbeGetRegionWordFrom8kBuffer(int index, char* regionData);
 unsigned short gbeGetChecksumFrom8kBuffer(char* regionData, unsigned short desiredValue, int byteOffset);
 unsigned short gbeGetChecksumFrom4kStruct(struct GBEREGIONRECORD_4K gbeStruct4k, unsigned short desiredValue);
 struct GBEREGIONRECORD_8K deblobbedGbeStructFromFactory(struct GBEREGIONRECORD_8K factoryGbeStruct8k);
+void printGbeChecksumDataFromStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char* romName, char* regionName);
+void printGbeChecksumDataFromStruct8k(struct GBEREGIONRECORD_8K gbeStruct8k, char* romName);
 
 #endif
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index 7144f32..b6ad9cd 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -200,6 +200,13 @@ int main(int argc, char *argv[])
 	 * Modify the Gbe region (see function for details)
 	 */
 	deblobbedGbeStruct8k = deblobbedGbeStructFromFactory(factoryGbeStruct8k);
+	/*
+	 * Debugging: show difference between Gbe checksums in the
+	 * original gbe and the modified one
+	 */
+	printf("\n");
+	printGbeChecksumDataFromStruct8k(factoryGbeStruct8k, "Original");
+	printGbeChecksumDataFromStruct8k(deblobbedGbeStruct8k, "Modified");
 
 	/*
 	 * ------------------------------------------------------------------
--
cgit v0.9.1