From 7e81837e64e7fd14a74600b14ac65f046985dbfa Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 23 Dec 2014 11:40:10 -0500
Subject: ich9deblob: move gbe/struct.h to gbe/gbe.h

---
(limited to 'resources')

diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index 6d6a905..5588ec5 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -20,8 +20,8 @@
 CC=gcc
 CFLAGS=-I.
 
-ich9deblob: ich9deblob.c descriptor/struct.h gbe/struct.h
-	$(CC) $(CFLAGS) ich9deblob.c descriptor/struct.h gbe/struct.h -o ich9deblob
+ich9deblob: ich9deblob.c descriptor/struct.h gbe/gbe.h
+	$(CC) $(CFLAGS) ich9deblob.c descriptor/struct.h gbe/gbe.h -o ich9deblob
 	
 clean:
 	rm -f ich9deblob *.o
diff --git a/resources/utilities/ich9deblob/gbe/struct.h b/resources/utilities/ich9deblob/gbe/gbe.h
index cbc2635..cbc2635 100644
--- a/resources/utilities/ich9deblob/gbe/struct.h
+++ b/resources/utilities/ich9deblob/gbe/gbe.h
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index e308312..17d0a3e 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "descriptor/struct.h" // structs describing what's in the descriptor region
-#include "gbe/struct.h" // structs describing what's in the gbe region
+#include "gbe/gbe.h" // structs describing what's in the gbe region, plus functions that use them
 #include "x86compatibility.c" // compatibility checks. this utility is not portable yet.
 
 struct DESCRIPTORREGIONRECORD deblobbedDescriptorStructFromFactory(struct DESCRIPTORREGIONRECORD factoryDescriptorStruct, unsigned int factoryRomSize);
diff --git a/resources/utilities/ich9deblob/x86compatibility.c b/resources/utilities/ich9deblob/x86compatibility.c
index 56a0791..ebbf2d2 100644
--- a/resources/utilities/ich9deblob/x86compatibility.c
+++ b/resources/utilities/ich9deblob/x86compatibility.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "descriptor/struct.h" // structs describing what's in the descriptor region
-#include "gbe/struct.h" // structs describing what's in the gbe region
+#include "gbe/gbe.h" // structs describing what's in the gbe region, plus functions that use them
 
 // ---------------------------------------------------------------------
 // x86 compatibility checking:
--
cgit v0.9.1