summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-12-22 05:17:38 (EST)
committer Francis Rowe <info@gluglug.org.uk>2014-12-22 05:17:38 (EST)
commitb9bcb5c141131e955e18b67d1107db8f3a13aebf (patch)
tree58830baafd66ed4ed1f2f82ca4dd0b392991148f /resources
parent69851cca105176263aa310ca7b80d6b16effae90 (diff)
downloadlibreboot-b9bcb5c141131e955e18b67d1107db8f3a13aebf.zip
libreboot-b9bcb5c141131e955e18b67d1107db8f3a13aebf.tar.gz
libreboot-b9bcb5c141131e955e18b67d1107db8f3a13aebf.tar.bz2
ich9deblob: separate gbe struct into new file ich9gbe.c
Diffstat (limited to 'resources')
-rw-r--r--resources/utilities/ich9deblob/Makefile4
-rw-r--r--resources/utilities/ich9deblob/ich9deblob.c7
-rw-r--r--resources/utilities/ich9deblob/ich9desc.c12
-rw-r--r--resources/utilities/ich9deblob/ich9gbe.c29
4 files changed, 35 insertions, 17 deletions
diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index c52e493..d6f07be 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -20,8 +20,8 @@
CC=gcc
CFLAGS=-I.
-ich9deblob: ich9deblob.c ich9desc.c
- $(CC) $(CFLAGS) ich9deblob.c ich9desc.c -o ich9deblob
+ich9deblob: ich9deblob.c ich9desc.c ich9gbe.c
+ $(CC) $(CFLAGS) ich9deblob.c ich9desc.c ich9gbe.c -o ich9deblob
clean:
rm -f ich9deblob
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index aa55a1f..0d1768d 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -1,10 +1,8 @@
/*
* ich9deblob.c
*
- * gcc -o ich9deblob ich9deblob.c ich9desc.c -I.
- *
- * Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
* Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ * Francis Rowe <info@gluglug.org.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +20,8 @@
#include <stdio.h>
#include <string.h>
-#include "ich9desc.c" // structs describing what's in the descriptor and gbe regions
+#include "ich9desc.c" // structs describing what's in the descriptor region
+#include "ich9gbe.c" // structs describing what's in the gbe region
#define DESCRIPTORREGIONSIZE 0x1000 // 4096 bytes / 4KiB
#define GBEREGIONSIZE 0x2000 // 8192 bytes / 8KiB
diff --git a/resources/utilities/ich9deblob/ich9desc.c b/resources/utilities/ich9deblob/ich9desc.c
index 8a58a87..c3e1edf 100644
--- a/resources/utilities/ich9deblob/ich9desc.c
+++ b/resources/utilities/ich9deblob/ich9desc.c
@@ -2,6 +2,7 @@
* ich9desc.c
*
* Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ * Francis Rowe <info@gluglug.org.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -182,17 +183,6 @@ struct OEMSECTIONRECORD {
unsigned char padding[248];
};
-struct GBEREGIONRECORD {
- unsigned char macAddress[6];
- unsigned char otherStuff[120];
- unsigned short checkSum;
- unsigned char padding1[3968];
- unsigned char macAddress2[6];
- unsigned char otherStuff2[120];
- unsigned short checkSum2;
- unsigned char padding2[3968];
-};
-
struct DESCRIPTORREGIONRECORD {
struct FLVALSIG flValSig;
struct FLMAPS flMaps;
diff --git a/resources/utilities/ich9deblob/ich9gbe.c b/resources/utilities/ich9deblob/ich9gbe.c
new file mode 100644
index 0000000..69eb9ca
--- /dev/null
+++ b/resources/utilities/ich9deblob/ich9gbe.c
@@ -0,0 +1,29 @@
+/*
+ * ich9gbe.c
+ *
+ * Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+struct GBEREGIONRECORD {
+ unsigned char macAddress[6];
+ unsigned char otherStuff[120];
+ unsigned short checkSum;
+ unsigned char padding1[3968];
+ unsigned char macAddress2[6];
+ unsigned char otherStuff2[120];
+ unsigned short checkSum2;
+ unsigned char padding2[3968];
+};