From 24e129cc56f5f2d2866b7a02e19d25a735592f08 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Thu, 25 Dec 2014 20:42:45 +0000 Subject: ich9deblob: rename common/common.c to common/descriptor_gbe.c --- resources/utilities/ich9deblob/Makefile | 13 ++-- resources/utilities/ich9deblob/common/common.c | 70 ---------------------- resources/utilities/ich9deblob/common/common.h | 35 ----------- .../utilities/ich9deblob/common/descriptor_gbe.c | 70 ++++++++++++++++++++++ .../utilities/ich9deblob/common/descriptor_gbe.h | 35 +++++++++++ resources/utilities/ich9deblob/ich9deblob.c | 2 +- 6 files changed, 114 insertions(+), 111 deletions(-) delete mode 100644 resources/utilities/ich9deblob/common/common.c delete mode 100644 resources/utilities/ich9deblob/common/common.h create mode 100644 resources/utilities/ich9deblob/common/descriptor_gbe.c create mode 100644 resources/utilities/ich9deblob/common/descriptor_gbe.h (limited to 'resources/utilities/ich9deblob') diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile index 06b1e32e..ddf9c84d 100644 --- a/resources/utilities/ich9deblob/Makefile +++ b/resources/utilities/ich9deblob/Makefile @@ -22,11 +22,14 @@ CFLAGS=-I. -Wall -g all: ich9deblob -ich9deblob: ich9deblob.o common/common.o descriptor/descriptor.o gbe/gbe.o x86compatibility.o - $(CC) $(CFLAGS) ich9deblob.o common/common.o descriptor/descriptor.o gbe/gbe.o x86compatibility.o -o ich9deblob - -common/common.o: common/common.c - $(CC) $(CFLAGS) -c common/common.c -o common/common.o +ich9deblob: ich9deblob.o common/descriptor_gbe.o descriptor/descriptor.o \ + gbe/gbe.o x86compatibility.o + + $(CC) $(CFLAGS) ich9deblob.o common/descriptor_gbe.o \ + descriptor/descriptor.o gbe/gbe.o x86compatibility.o -o ich9deblob + +common/descriptor_gbe.o: common/descriptor_gbe.c + $(CC) $(CFLAGS) -c common/descriptor_gbe.c -o common/descriptor_gbe.o ich9deblob.o: ich9deblob.c $(CC) $(CFLAGS) -c ich9deblob.c -o ich9deblob.o diff --git a/resources/utilities/ich9deblob/common/common.c b/resources/utilities/ich9deblob/common/common.c deleted file mode 100644 index cef5b3e0..00000000 --- a/resources/utilities/ich9deblob/common/common.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * common.c - * This file is part of the ich9deblob utility from the libreboot project - * - * Purpose: common functions/methods used by ich9deblob - * - * Copyright (C) 2014 Steve Shenton - * Francis Rowe - * - * 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 . - */ - -#include -#include -#include "common.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; - - /* These will have the structs copied to them */ - char descriptorBuffer[DESCRIPTORREGIONSIZE]; - char gbeBuffer8k[GBEREGIONSIZE_8K]; - - /* Copy the structs to buffers, to make writing them as files easier */ - memcpy(&descriptorBuffer, &descriptorStruct, DESCRIPTORREGIONSIZE); /* descriptor */ - memcpy(&gbeBuffer8k, &gbeStruct8k, GBEREGIONSIZE_8K); /* gbe */ - - /* 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(descriptorBuffer, sizeof(char), DESCRIPTORREGIONSIZE, fileStream)) - { - printf("\nerror: writing descriptor region failed\n"); - return 1; - } - - /* add gbe to the end of the file */ - if (GBEREGIONSIZE_8K != fwrite(gbeBuffer8k, sizeof(char), GBEREGIONSIZE_8K, 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=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc\n"); - printf("(in other words, add the modified descriptor+gbe to your ROM image)\n\n"); - - return 0; -} diff --git a/resources/utilities/ich9deblob/common/common.h b/resources/utilities/ich9deblob/common/common.h deleted file mode 100644 index e72821dc..00000000 --- a/resources/utilities/ich9deblob/common/common.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * common.h - * This file is part of the ich9deblob utility from the libreboot project - * - * Purpose: header file for common.c - * - * Copyright (C) 2014 Steve Shenton - * Francis Rowe - * - * 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 . - */ - -#ifndef COMMON_H -#define COMMON_H - -#include -#include - -#include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */ -#include "../gbe/gbe.h" /* structs describing what's in the gbe region */ - -int notCreatedDescriptorGbeFile(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k, char* fileName); - -#endif diff --git a/resources/utilities/ich9deblob/common/descriptor_gbe.c b/resources/utilities/ich9deblob/common/descriptor_gbe.c new file mode 100644 index 00000000..8aba9dbe --- /dev/null +++ b/resources/utilities/ich9deblob/common/descriptor_gbe.c @@ -0,0 +1,70 @@ +/* + * 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 Steve Shenton + * Francis Rowe + * + * 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 . + */ + +#include +#include +#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; + + /* These will have the structs copied to them */ + char descriptorBuffer[DESCRIPTORREGIONSIZE]; + char gbeBuffer8k[GBEREGIONSIZE_8K]; + + /* Copy the structs to buffers, to make writing them as files easier */ + memcpy(&descriptorBuffer, &descriptorStruct, DESCRIPTORREGIONSIZE); /* descriptor */ + memcpy(&gbeBuffer8k, &gbeStruct8k, GBEREGIONSIZE_8K); /* gbe */ + + /* 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(descriptorBuffer, sizeof(char), DESCRIPTORREGIONSIZE, fileStream)) + { + printf("\nerror: writing descriptor region failed\n"); + return 1; + } + + /* add gbe to the end of the file */ + if (GBEREGIONSIZE_8K != fwrite(gbeBuffer8k, sizeof(char), GBEREGIONSIZE_8K, 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=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc\n"); + printf("(in other words, add the modified descriptor+gbe to your ROM image)\n\n"); + + return 0; +} diff --git a/resources/utilities/ich9deblob/common/descriptor_gbe.h b/resources/utilities/ich9deblob/common/descriptor_gbe.h new file mode 100644 index 00000000..cc0cc42f --- /dev/null +++ b/resources/utilities/ich9deblob/common/descriptor_gbe.h @@ -0,0 +1,35 @@ +/* + * 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 Steve Shenton + * Francis Rowe + * + * 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 . + */ + +#ifndef COMMON_DESCRIPTOR_GBE_H +#define COMMON_DESCRIPTOR_GBE_H + +#include +#include + +#include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */ +#include "../gbe/gbe.h" /* structs describing what's in the gbe region */ + +int notCreatedDescriptorGbeFile(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k, char* fileName); + +#endif diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c index fafa9a2e..6a4297c0 100644 --- a/resources/utilities/ich9deblob/ich9deblob.c +++ b/resources/utilities/ich9deblob/ich9deblob.c @@ -46,7 +46,7 @@ #include #include -#include "common/common.h" /* common functions used by ich9deblob */ +#include "common/descriptor_gbe.h" /* common descriptor/gbe functions used by ich9deblob */ #include "descriptor/descriptor.h" /* structs describing what's in the descriptor region */ #include "gbe/gbe.h" /* structs describing what's in the gbe region */ #include "x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */ -- cgit v1.2.3-70-g09d2