diff options
author | Andrew Robbins <contact@andrewrobbins.info> | 2018-01-15 21:47:32 -0500 |
---|---|---|
committer | Andrew Robbins <contact@andrewrobbins.info> | 2018-01-15 22:09:01 -0500 |
commit | 115fe0d7fe537a3069ba2051942c2f3333d0baa5 (patch) | |
tree | e81daabd17d46c68a645079c251e499e1d8c3191 /projects/ich9gen/sources/src/common | |
parent | b2321c6f7be6e0d9fe1e9ef01427f353a0eb55a7 (diff) | |
download | librebootfr-115fe0d7fe537a3069ba2051942c2f3333d0baa5.tar.gz librebootfr-115fe0d7fe537a3069ba2051942c2f3333d0baa5.zip |
Delete trailing whitespace from ich9gen & co.
Diffstat (limited to 'projects/ich9gen/sources/src/common')
4 files changed, 46 insertions, 46 deletions
diff --git a/projects/ich9gen/sources/src/common/descriptor_gbe.c b/projects/ich9gen/sources/src/common/descriptor_gbe.c index 1c1ad32b..bce8afc3 100644 --- a/projects/ich9gen/sources/src/common/descriptor_gbe.c +++ b/projects/ich9gen/sources/src/common/descriptor_gbe.c @@ -1,7 +1,7 @@ /* * descriptor_gbe.c * This file is part of the ich9deblob utility from the libreboot project - * + * * Purpose: common descriptor/gbe functions used by ich9deblob * * Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org> @@ -20,71 +20,71 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #include "descriptor_gbe.h" -/* +/* * create 12KiB file with descriptor, and then gbe immediately after. */ int notCreatedDescriptorGbeFile(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k, char* fileName) { FILE* fileStream = NULL; - + /* delete old file before continuing */ remove(fileName); - + /* open new file for writing the descriptor+gbe */ fileStream = fopen(fileName, "ab"); - + /* write the descriptor region into the first part */ if (DESCRIPTORREGIONSIZE != fwrite((uint8_t*)&descriptorStruct, 1, sizeof(descriptorStruct), fileStream)) { printf("\nerror: writing descriptor region failed\n"); return 1; } - + /* add gbe to the end of the file */ if (GBEREGIONSIZE_8K != fwrite((uint8_t*)&gbeStruct8k, 1, sizeof(gbeStruct8k), fileStream)) { printf("\nerror: writing GBe region failed\n"); return 1; } - + fclose(fileStream); - + printf("descriptor and gbe successfully written to the file: %s\n", fileName); printf("Now do: dd if=%s of=libreboot.rom bs=1 count=12k conv=notrunc\n", fileName); printf("(in other words, add the modified descriptor+gbe to your ROM image)\n\n"); - + return 0; } -/* +/* * create 4KiB file with descriptor */ int notCreated4kDescriptorFile(struct DESCRIPTORREGIONRECORD descriptorStruct, char* fileName) { FILE* fileStream = NULL; - + /* delete old file before continuing */ remove(fileName); - + /* open new file for writing the descriptor+gbe */ fileStream = fopen(fileName, "ab"); - + /* write the descriptor region into the first part */ if (DESCRIPTORREGIONSIZE != fwrite((uint8_t*)&descriptorStruct, 1, sizeof(descriptorStruct), fileStream)) { printf("\nerror: writing descriptor region failed\n"); return 1; } - - + + fclose(fileStream); - + printf("descriptor successfully written to the file: %s\n", fileName); printf("Now do: dd if=%s of=yourrom.rom bs=1 count=4k conv=notrunc\n", fileName); printf("(in other words, add the modified descriptor to your ROM image)\n\n"); - + return 0; } diff --git a/projects/ich9gen/sources/src/common/descriptor_gbe.h b/projects/ich9gen/sources/src/common/descriptor_gbe.h index b3713c80..ff685720 100644 --- a/projects/ich9gen/sources/src/common/descriptor_gbe.h +++ b/projects/ich9gen/sources/src/common/descriptor_gbe.h @@ -1,7 +1,7 @@ /* * gbe_descriptor.h * This file is part of the ich9deblob utility from the libreboot project - * + * * Purpose: header file for descriptor_gbe.c * * Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org> @@ -20,7 +20,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #ifndef COMMON_DESCRIPTOR_GBE_H #define COMMON_DESCRIPTOR_GBE_H diff --git a/projects/ich9gen/sources/src/common/x86compatibility.c b/projects/ich9gen/sources/src/common/x86compatibility.c index 362c634b..522f3e29 100644 --- a/projects/ich9gen/sources/src/common/x86compatibility.c +++ b/projects/ich9gen/sources/src/common/x86compatibility.c @@ -1,7 +1,7 @@ /* * x86compatibility.c * This file is part of the ich9deblob utility from the libreboot project - * + * * Purpose: compiler/cpu compatibility checks. ich9deblob is not portable, yet. * * Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org> @@ -30,11 +30,11 @@ */ /* fail if struct size is incorrect */ -int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy) +int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy) { unsigned int descriptorRegionStructSize = sizeof(descriptorDummy); unsigned int gbeRegion8kStructSize = sizeof(gbe8kDummy); - + /* check compiler bit-packs in a compatible way. basically, it is expected that this code will be used on x86 */ if (DESCRIPTORREGIONSIZE != descriptorRegionStructSize){ printf("\nerror: compiler incompatibility: descriptor struct length is %i bytes (should be %i)\n", descriptorRegionStructSize, DESCRIPTORREGIONSIZE); @@ -44,7 +44,7 @@ int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct G printf("\nerror: compiler incompatibility: gbe struct length is %i bytes (should be %i)\n", gbeRegion8kStructSize, GBEREGIONSIZE_8K); return 1; } - + return 0; } @@ -54,7 +54,7 @@ int structMembersWrongOrder() int i; struct DESCRIPTORREGIONRECORD descriptorDummy; uint8_t *meVsccTablePtr = (uint8_t*)&descriptorDummy.meVsccTable; - + /* These do not use bitfields. */ descriptorDummy.meVsccTable.jid0 = 0x01020304; /* unsigned int 32-bit */ descriptorDummy.meVsccTable.vscc0 = 0x10203040; /* unsigned int 32-bit */ @@ -66,10 +66,10 @@ int structMembersWrongOrder() descriptorDummy.meVsccTable.padding[1] = 0xBB; /* unsigned char 8-bit */ descriptorDummy.meVsccTable.padding[2] = 0xCC; /* unsigned char 8-bit */ descriptorDummy.meVsccTable.padding[3] = 0xDD; /* unsigned char 8-bit */ - + /* * Look from the top down, and concatenate the unsigned ints but - * with each unsigned in little endian order. + * with each unsigned in little endian order. * Then, concatenate the unsigned chars in big endian order. (in the padding array) * * combined, these should become: @@ -77,7 +77,7 @@ int structMembersWrongOrder() * 04030201 40302010 44332211 08070605 80706050 88776655 AA BB CC DD (ignore this. not byte-separated, just working it out:) * 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 */ - + if ( ! ( @@ -90,65 +90,65 @@ int structMembersWrongOrder() && *(meVsccTablePtr+24) == 0xAA && *(meVsccTablePtr+25) == 0xBB && *(meVsccTablePtr+26) == 0xCC && *(meVsccTablePtr+27) == 0xDD ) ) { - + 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("%02x ", *(meVsccTablePtr + i)); } printf("\nIncorrect order.\n"); - + return 1; } - + return 0; } /* fail if bit fields are presented in the wrong order */ -int structBitfieldWrongOrder() +int structBitfieldWrongOrder() { int i; struct DESCRIPTORREGIONRECORD descriptorDummy; uint8_t *flMap0Ptr = (uint8_t*)&descriptorDummy.flMaps.flMap0; - + descriptorDummy.flMaps.flMap0.FCBA = 0xA2; /* :8 --> 10100010 */ descriptorDummy.flMaps.flMap0.NC = 0x02; /* :2 --> 10 */ descriptorDummy.flMaps.flMap0.reserved1 = 0x38; /* :6 --> 111000 */ descriptorDummy.flMaps.flMap0.FRBA = 0xD2; /* :8 --> 11010010 */ descriptorDummy.flMaps.flMap0.NR = 0x05; /* :3 --> 101 */ descriptorDummy.flMaps.flMap0.reserved2 = 0x1C; /* :5 --> 11100 */ - + /* * Look from the top bottom up, and concatenate the binary strings. * Then, convert the 8-bit groups to hex and reverse the (8-bit)byte order - * + * * combined, these should become (in memory), in binary: * 10100010 11100010 11010010 11100101 * or in hex: * A2 E2 D2 E5 */ - - if (!(*flMap0Ptr == 0xA2 && *(flMap0Ptr+1) == 0xE2 && *(flMap0Ptr+2) == 0xD2 && *(flMap0Ptr+3) == 0xE5)) + + 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("%02x ", *(flMap0Ptr + i)); } printf("\nIncorrect order.\n"); - + return 1; } - + return 0; } /* Compatibility checks. This version of ich9deblob is not yet porable. */ -int systemOrCompilerIncompatible(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k) +int systemOrCompilerIncompatible(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k) { if (structSizesIncorrect(descriptorStruct, gbeStruct8k)) return 1; if (IS_BIG_ENDIAN) { @@ -156,6 +156,6 @@ int systemOrCompilerIncompatible(struct DESCRIPTORREGIONRECORD descriptorStruct, return 1; } if (structBitfieldWrongOrder()) return 1; - if (structMembersWrongOrder()) return 1; + if (structMembersWrongOrder()) return 1; return 0; } diff --git a/projects/ich9gen/sources/src/common/x86compatibility.h b/projects/ich9gen/sources/src/common/x86compatibility.h index 5a598adc..a4829888 100644 --- a/projects/ich9gen/sources/src/common/x86compatibility.h +++ b/projects/ich9gen/sources/src/common/x86compatibility.h @@ -1,7 +1,7 @@ /* * x86compatibility.h * This file is part of the ich9deblob utility from the libreboot project - * + * * Purpose: keep gcc/make happy. no actual code here, just function definitions. * * Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org> @@ -20,7 +20,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #ifndef X86COMPATIBILITY_H #define X86COMPATIBILITY_H |