diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-12-23 17:15:35 (EST) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-12-23 17:15:35 (EST) |
| commit | 1082934d042a5f8b397afc48a0b92edd8d779610 (patch) | |
| tree | c5172f50bb812a94a72f383d3052fe981934bde4 | |
| parent | a8605043c58cb0afd157d11431125b988f7af455 (diff) | |
| download | libreboot-1082934d042a5f8b397afc48a0b92edd8d779610.zip libreboot-1082934d042a5f8b397afc48a0b92edd8d779610.tar.gz libreboot-1082934d042a5f8b397afc48a0b92edd8d779610.tar.bz2 | |
ich9deblob: define GBEREGIONSIZE_4K and use it
| -rw-r--r-- | resources/utilities/ich9deblob/gbe/gbe.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/resources/utilities/ich9deblob/gbe/gbe.h b/resources/utilities/ich9deblob/gbe/gbe.h index 3b25ddf..0e3f059 100644 --- a/resources/utilities/ich9deblob/gbe/gbe.h +++ b/resources/utilities/ich9deblob/gbe/gbe.h @@ -36,8 +36,15 @@ #include <stdio.h> #include <string.h> -/* Size of gbe region in bytes */ +/* Size of the full gbe region in bytes */ #define GBEREGIONSIZE_8K 0x2000 +/* + * Size of each sub-region in gbe. + * gbe contains two regions which + * can be identical: main and backup. + * These are each half the size of the full region + */ +#define GBEREGIONSIZE_4K 0x1000 /* * These will have a modified descriptor+gbe based on what's in the factory.rom @@ -99,7 +106,7 @@ unsigned short gbeGetChecksumFrom8kBuffer(char* regionData, unsigned short desir * if isBackup is true, use 2nd gbe region ("backup" region) * this function uses *word* not *byte* indexes, hence the bit shift. */ - if (isBackup) offset = 0x1000>>1; + if (isBackup) offset = GBEREGIONSIZE_4K>>1; for (i = 0; i < 0x3F; i++) { regionWord = gbeGetRegionWordFrom8kBuffer(i+offset, regionData); @@ -112,8 +119,8 @@ unsigned short gbeGetChecksumFrom8kBuffer(char* regionData, unsigned short desir /* checksum calculation for 4k gbe struct (algorithm based on datasheet) */ unsigned short gbeGetChecksumFrom4kStruct(struct GBEREGIONRECORD_4K gbeStruct4k, unsigned short desiredValue) { - char gbeBuffer4k[GBEREGIONSIZE_8K>>1]; - memcpy(&gbeBuffer4k, &gbeStruct4k, GBEREGIONSIZE_8K>>1); + char gbeBuffer4k[GBEREGIONSIZE_4K]; + memcpy(&gbeBuffer4k, &gbeStruct4k, GBEREGIONSIZE_4K); return gbeGetChecksumFrom8kBuffer(gbeBuffer4k, desiredValue, 0); } @@ -130,7 +137,7 @@ struct GBEREGIONRECORD_8K deblobbedGbeStructFromFactory(struct GBEREGIONRECORD_8 memcpy(&deblobbedGbeStruct8k, &factoryGbeStruct8k, GBEREGIONSIZE_8K); deblobbedGbeStruct8k.backup.checkSum = gbeGetChecksumFrom4kStruct(deblobbedGbeStruct8k.backup, 0xBABA); - memcpy(&deblobbedGbeStruct8k.main, &deblobbedGbeStruct8k.backup, GBEREGIONSIZE_8K>>1); + memcpy(&deblobbedGbeStruct8k.main, &deblobbedGbeStruct8k.backup, GBEREGIONSIZE_4K); /* * Debugging: |