From 4286a86d77844026de788fe9283f710c7a7ec8ad Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 23 Dec 2014 21:45:56 -0500
Subject: ich9deblob: x86compatibility.c: only print output on error

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

diff --git a/resources/utilities/ich9deblob/gbe/gbe.c b/resources/utilities/ich9deblob/gbe/gbe.c
index 504a4f7..87d6fc6 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.c
+++ b/resources/utilities/ich9deblob/gbe/gbe.c
@@ -110,6 +110,8 @@ void printGbeChecksumDataFromStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, cha
 		gbeGetChecksumFrom4kStruct(gbeStruct4k, GBECHECKSUMTOTAL), 
 		gbeStruct4k.checkSum
 	);
+	
+	return;
 }
 
 /*
@@ -120,4 +122,6 @@ void printGbeChecksumDataFromStruct8k(struct GBEREGIONRECORD_8K gbeStruct8k, cha
 {	
 	printGbeChecksumDataFromStruct4k(gbeStruct8k.main, romName, "main");
 	printGbeChecksumDataFromStruct4k(gbeStruct8k.backup, romName, "backup");
+	
+	return;
 }
diff --git a/resources/utilities/ich9deblob/x86compatibility.c b/resources/utilities/ich9deblob/x86compatibility.c
index b37eed6..57d5864 100644
--- a/resources/utilities/ich9deblob/x86compatibility.c
+++ b/resources/utilities/ich9deblob/x86compatibility.c
@@ -94,15 +94,6 @@ int structMembersWrongOrder()
 	 * 04 03 02 01 40 30 20 10 44 33 22 11 08 07 06 05 80 70 60 50 88 77 66 55 AA BB CC DD <-- it should match this
 	 */
 	
-	printf("\nStruct member order check (descriptorDummy.meVsccTable) with junk/dummy data:");
-	printf("\nShould be: 04 03 02 01 40 30 20 10 44 33 22 11 08 07 06 05 80 70 60 50 88 77 66 55 aa bb cc dd ");
-	printf("\nAnd it is: ");
-	
-	for (i = 0; i < 28; i++) {
-		printf("%02x ", *(meVsccTablePtr + i));	
-	}
-	printf("\n");
-	
 	if (
 			!
 			(
@@ -115,11 +106,19 @@ int structMembersWrongOrder()
 			&& *(meVsccTablePtr+24) == 0xAA && *(meVsccTablePtr+25) == 0xBB && *(meVsccTablePtr+26) == 0xCC && *(meVsccTablePtr+27) == 0xDD
 	      )
 	   ) {
-		printf("Incorrect order.\n");
+			
+		printf("\nStruct member order check (descriptorDummy.meVsccTable) with junk/dummy data:");
+		printf("\nShould be: 04 03 02 01 40 30 20 10 44 33 22 11 08 07 06 05 80 70 60 50 88 77 66 55 aa bb cc dd ");
+		printf("\nAnd it is: ");
+		
+		for (i = 0; i < 28; i++) {
+			printf("%02x ", *(meVsccTablePtr + i));	
+		}
+		printf("\nIncorrect order.\n");
+		
 		return 1;
 	}
 	
-	printf("Correct order.\n");
 	return 0;
 }
 
@@ -146,22 +145,21 @@ int structBitfieldWrongOrder()
 	 * or in hex:
 	 * A2 E2 D2 E5
 	 */
-	
-	printf("\nBitfield order check (descriptorDummy.flMaps.flMaps0) with junk/dummy data:");
-	printf("\nShould be: a2 e2 d2 e5 ");
-	printf("\nAnd it is: ");
+		
+	if (!(*flMap0Ptr == 0xA2 && *(flMap0Ptr+1) == 0xE2 && *(flMap0Ptr+2) == 0xD2 && *(flMap0Ptr+3) == 0xE5)) 
+	{
+		printf("\nBitfield order check (descriptorDummy.flMaps.flMaps0) with junk/dummy data:");
+		printf("\nShould be: a2 e2 d2 e5 ");
+		printf("\nAnd it is: ");
 
-	for (i = 0; i < 4; i++) {
-		printf("%02x ", *(flMap0Ptr + i));	
-	}
-	printf("\n");
-	
-	if (!(*flMap0Ptr == 0xA2 && *(flMap0Ptr+1) == 0xE2 && *(flMap0Ptr+2) == 0xD2 && *(flMap0Ptr+3) == 0xE5)) {
-		printf("Incorrect order.\n");
+		for (i = 0; i < 4; i++) {
+			printf("%02x ", *(flMap0Ptr + i));	
+		}
+		printf("\nIncorrect order.\n");
+		
 		return 1;
 	}
 	
-	printf("Correct order.\n");
 	return 0;
 }
 
--
cgit v0.9.1