Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 13154) +++ /trunk/Config.kmk (revision 13155) @@ -1218,4 +1218,7 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) + +# biossums (set BIOS checksums) +VBOX_BIOSSUMS ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE) # mkisofs Index: /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk =================================================================== --- /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk (revision 13154) +++ /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk (revision 13155) @@ -31,7 +31,5 @@ # Build program for calculating the VGA BIOS checksums. # -BLDPROGS += vgabiossums vbetables-gen -vgabiossums_TEMPLATE = VBOXBLDPROG -vgabiossums_SOURCES = biossums.c +BLDPROGS += vbetables-gen vbetables-gen_TEMPLATE = VBOXBLDPROG vbetables-gen_SOURCES = vbetables-gen.c @@ -102,8 +100,7 @@ # 6. checksums -$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(TARGET_vgabiossums) - $(call MSG_TOOL,vgabiossums,VgaBiosBin,$<,$@) - $(QUIET)$(CP) -f $(PATH_VgaBiosBin)/vgabios.tmp $@ - $(QUIET)$(TARGET_vgabiossums) $@ +$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(VBOX_BIOSSUMS) + $(call MSG_TOOL,biossums,VgaBiosBin,$<,$@) + $(QUIET)$(VBOX_BIOSSUMS) $< $@ # Index: unk/src/VBox/Devices/Graphics/BIOS/biossums.c =================================================================== --- /trunk/src/VBox/Devices/Graphics/BIOS/biossums.c (revision 13154) +++ (revision ) @@ -1,267 +1,0 @@ -/* biossums.c --- written by Eike W. for the Bochs BIOS */ -/* adapted for the LGPL'd VGABIOS by vruppert */ - -/* This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice - * other than GPL or LGPL is available it will apply instead, Sun elects to use only - * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where - * a choice of LGPL license versions is made available with the language indicating - * that LGPLv2 or any later version may be used, or where a choice of which version - * of the LGPL is applied is otherwise unspecified. - */ -#include -#include -#include - -typedef unsigned char byte; - -void check( int value, char* message ); - -#define MAX_BIOS_DATA 0x10000 - -long chksum_bios_get_offset( byte* data, long offset ); -byte chksum_bios_calc_value( byte* data, long offset ); -byte chksum_bios_get_value( byte* data, long offset ); -void chksum_bios_set_value( byte* data, long offset, byte value ); - - -#define PMID_LEN 20 -#define PMID_CHKSUM 19 - -long chksum_pmid_get_offset( byte* data, long offset ); -byte chksum_pmid_calc_value( byte* data, long offset ); -byte chksum_pmid_get_value( byte* data, long offset ); -void chksum_pmid_set_value( byte* data, long offset, byte value ); - - -byte bios_data[MAX_BIOS_DATA]; -long bios_len; - - -int main(int argc, char* argv[]) -{ - FILE* stream; - long offset, tmp_offset; - byte bios_len_byte, cur_val = 0, new_val = 0; - int hits, modified; - - if (argc != 2) { - printf( "Error. Need a file-name as an argument.\n" ); - exit( EXIT_FAILURE ); - } - - if ((stream = fopen(argv[1], "rb")) == NULL) { - printf("Error opening %s for reading.\n", argv[1]); - exit(EXIT_FAILURE); - } - memset(bios_data, 0, MAX_BIOS_DATA); - bios_len = fread(bios_data, 1, MAX_BIOS_DATA, stream); - if (bios_len > MAX_BIOS_DATA) { - printf("Error reading max. 65536 Bytes from %s.\n", argv[1]); - fclose(stream); - exit(EXIT_FAILURE); - } - fclose(stream); - modified = 0; - if (bios_len < 0x8000) { - bios_len = 0x8000; - modified = 1; - } else if ((bios_len & 0x1FF) != 0) { - bios_len = (bios_len + 0x200) & ~0x1FF; - modified = 1; - } - bios_len_byte = (byte)(bios_len / 512); - if (bios_len_byte != bios_data[2]) { - if (modified == 0) { - bios_len += 0x200; - } - bios_data[2] = (byte)(bios_len / 512); - modified = 1; - } - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum_pmid_get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum_pmid_get_value( bios_data, offset ); - new_val = chksum_pmid_calc_value( bios_data, offset ); - printf( "\nPMID entry at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if ((hits == 1) && (cur_val != new_val)) { - printf("Setting checksum."); - chksum_pmid_set_value( bios_data, offset, new_val ); - if (modified == 0) { - bios_len += 0x200; - bios_data[2]++; - } - modified = 1; - } - if (hits >= 2) { - printf( "Multiple PMID entries! No checksum set." ); - } - if (hits) { - printf("\n"); - } - - offset = 0L; - do { - offset = chksum_bios_get_offset(bios_data, offset); - cur_val = chksum_bios_get_value(bios_data, offset); - new_val = chksum_bios_calc_value(bios_data, offset); - if ((cur_val != new_val) && (modified == 0)) { - bios_len += 0x200; - bios_data[2]++; - modified = 1; - } else { - printf("\nBios checksum at: 0x%4lX\n", offset); - printf("Current checksum: 0x%02X\n", cur_val); - printf("Calculated checksum: 0x%02X ", new_val); - if (cur_val != new_val) { - printf("Setting checksum."); - chksum_bios_set_value(bios_data, offset, new_val); - cur_val = new_val; - modified = 1; - } - printf( "\n" ); - } - } while (cur_val != new_val); - - if (modified == 1) { -#ifdef VBOX - size_t new_bios_len; -#endif - if ((stream = fopen( argv[1], "wb")) == NULL) { - printf("Error opening %s for writing.\n", argv[1]); - exit(EXIT_FAILURE); - } -#ifdef VBOX - if (bios_len <= 0x8000) /* 32k */ - new_bios_len = 0x8000; - else if (bios_len <= 0xC000) /* 48k */ - new_bios_len = 0xC000; - else if (bios_len > 0xC000) /* 64k */ - new_bios_len = MAX_BIOS_DATA; - - if (fwrite(bios_data, 1, new_bios_len, stream) < new_bios_len) { -#else - if (fwrite(bios_data, 1, bios_len, stream) < bios_len) { -#endif - printf("Error writing %ld KBytes to %s.\n", bios_len / 1024, argv[1]); - fclose(stream); - exit(EXIT_FAILURE); - } - fclose(stream); - } - - return (EXIT_SUCCESS); -} - - -void check( int okay, char* message ) { - - if( !okay ) { - printf( "\n\nError. %s.\n", message ); - exit( EXIT_FAILURE ); - } -} - - -long chksum_bios_get_offset( byte* data, long offset ) { - - return (bios_len - 1); -} - - -byte chksum_bios_calc_value( byte* data, long offset ) { - - int i; - byte sum; - - sum = 0; - for( i = 0; i < offset; i++ ) { - sum = sum + *( data + i ); - } - sum = -sum; /* iso ensures -s + s == 0 on unsigned types */ - return( sum ); -} - - -byte chksum_bios_get_value( byte* data, long offset ) { - - return( *( data + offset ) ); -} - - -void chksum_bios_set_value( byte* data, long offset, byte value ) { - - *( data + offset ) = value; -} - - -byte chksum_pmid_calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - len = PMID_LEN; - check((offset + len) <= (bios_len - 1), "PMID entry length out of bounds" ); - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != PMID_CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum_pmid_get_offset( byte* data, long offset ) { - - long result = -1L; - - while ((offset + PMID_LEN) < (bios_len - 1)) { - offset = offset + 1; - if( *( data + offset + 0 ) == 'P' && \ - *( data + offset + 1 ) == 'M' && \ - *( data + offset + 2 ) == 'I' && \ - *( data + offset + 3 ) == 'D' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum_pmid_get_value( byte* data, long offset ) { - - check((offset + PMID_CHKSUM) <= (bios_len - 1), "PMID checksum out of bounds" ); - return( *( data + offset + PMID_CHKSUM ) ); -} - - -void chksum_pmid_set_value( byte* data, long offset, byte value ) { - - check((offset + PMID_CHKSUM) <= (bios_len - 1), "PMID checksum out of bounds" ); - *( data + offset + PMID_CHKSUM ) = value; -} Index: /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk =================================================================== --- /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk (revision 13154) +++ /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk (revision 13155) @@ -27,12 +27,4 @@ # VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices - -# -# Build program for calculating the PC BIOS checksums. -# -BLDPROGS += pcbiossums -pcbiossums_TEMPLATE = VBOXBLDPROG -pcbiossums_SOURCES = biossums.c - # @@ -94,8 +86,7 @@ # 5. calculate checksums for the final BIOS image. -$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(TARGET_pcbiossums) - $(call MSG_TOOL,pcbiossums,PcBiosBin,$<,$@) - $(QUIET)$(CP) -f $(PATH_PcBiosBin)/pcbios.tmp $(PATH_PcBiosBin)/pcbios.bin - $(QUIET)$(TARGET_pcbiossums) $(PATH_PcBiosBin)/pcbios.bin +$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(VBOX_BIOSSUMS) + $(call MSG_TOOL,biossums,PcBiosBin,$<,$@) + $(QUIET)$(VBOX_BIOSSUMS) $< $@ # 6. create the symbol table. Index: unk/src/VBox/Devices/PC/BIOS/biossums.c =================================================================== --- /trunk/src/VBox/Devices/PC/BIOS/biossums.c (revision 13154) +++ (revision ) @@ -1,505 +1,0 @@ -/* - * $Id: biossums.c,v 1.4 2007/05/28 08:09:13 vruppert Exp $ - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice - * other than GPL or LGPL is available it will apply instead, Sun elects to use only - * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where - * a choice of LGPL license versions is made available with the language indicating - * that LGPLv2 or any later version may be used, or where a choice of which version - * of the LGPL is applied is otherwise unspecified. - */ - -/* biossums.c --- written by Eike W. */ - -#include -#include - -typedef unsigned char byte; - -void check( int value, char* message ); - -#define LEN_BIOS_DATA 0x10000 -#define MAX_OFFSET (LEN_BIOS_DATA - 1) - - -#define BIOS_OFFSET 0xFFFF - -long chksum_bios_get_offset( byte* data, long offset ); -byte chksum_bios_calc_value( byte* data, long offset ); -byte chksum_bios_get_value( byte* data, long offset ); -void chksum_bios_set_value( byte* data, long offset, byte value ); - - -#define _32__LEN 9 -#define _32__CHKSUM 10 - -#define _32__MINHDR 16 - -long chksum__32__get_offset( byte* data, long offset ); -byte chksum__32__calc_value( byte* data, long offset ); -byte chksum__32__get_value( byte* data, long offset ); -void chksum__32__set_value( byte* data, long offset, byte value ); - - -#define _MP__LEN 8 -#define _MP__CHKSUM 10 - -#define _MP__MINHDR 16 - -long chksum__mp__get_offset( byte* data, long offset ); -byte chksum__mp__calc_value( byte* data, long offset ); -byte chksum__mp__get_value( byte* data, long offset ); -void chksum__mp__set_value( byte* data, long offset, byte value ); - - -#define PCMP_BASELEN 4 -#define PCMP_CHKSUM 7 -#define PCMP_EXT_LEN 40 -#define PCMP_EXT_CHKSUM 42 - -#define PCMP_MINHDR 42 - -long chksum_pcmp_get_offset( byte* data, long offset ); -byte chksum_pcmp_calc_value( byte* data, long offset ); -byte chksum_pcmp_get_value( byte* data, long offset ); -void chksum_pcmp_set_value( byte* data, long offset, byte value ); - - -#define _PIR_LEN 6 -#define _PIR_CHKSUM 31 - -#define _PIR_MINHDR 32 - -long chksum__pir_get_offset( byte *data, long offset ); -byte chksum__pir_calc_value( byte* data, long offset ); -byte chksum__pir_get_value( byte* data, long offset ); -void chksum__pir_set_value( byte* data, long offset, byte value ); - - -byte bios_data[LEN_BIOS_DATA]; - - -int main( int argc, char* argv[] ) { - - FILE* stream; - long offset, tmp_offset; - byte cur_val = 0, new_val = 0; - int hits; - - - if( argc != 2 ) { - printf( "Error. Need a file-name as an argument.\n" ); - exit( EXIT_FAILURE ); - } - - if(( stream = fopen( argv[1], "rb" )) == NULL ) { - printf( "Error opening %s for reading.\n", argv[1] ); - exit( EXIT_FAILURE ); - } - if( fread( bios_data, 1, LEN_BIOS_DATA, stream ) < LEN_BIOS_DATA ) { - printf( "Error reading 64KBytes from %s.\n", argv[1] ); - fclose( stream ); - exit( EXIT_FAILURE ); - } - fclose( stream ); - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum__32__get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum__32__get_value( bios_data, offset ); - new_val = chksum__32__calc_value( bios_data, offset ); - printf( "\nPCI-Bios header at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if( hits == 1 && cur_val != new_val ) { - printf( "Setting checksum." ); - chksum__32__set_value( bios_data, offset, new_val ); - } - if( hits >= 2 ) { - printf( "Multiple PCI headers! No checksum set." ); - } - if( hits ) { - printf( "\n" ); - } - - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum__mp__get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum__mp__get_value( bios_data, offset ); - new_val = chksum__mp__calc_value( bios_data, offset ); - printf( "\nMP header at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if( hits == 1 && cur_val != new_val ) { - printf( "Setting checksum." ); - chksum__mp__set_value( bios_data, offset, new_val ); - } - if( hits >= 2 ) { - printf( "Warning! Multiple MP headers. No checksum set." ); - } - if( hits ) { - printf( "\n" ); - } - - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum_pcmp_get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum_pcmp_get_value( bios_data, offset ); - new_val = chksum_pcmp_calc_value( bios_data, offset ); - printf( "\nPCMP header at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if( hits == 1 && cur_val != new_val ) { - printf( "Setting checksum." ); - chksum_pcmp_set_value( bios_data, offset, new_val ); - } - if( hits >= 2 ) { - printf( "Warning! Multiple PCMP headers. No checksum set." ); - } - if( hits ) { - printf( "\n" ); - } - - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum__pir_get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum__pir_get_value( bios_data, offset ); - new_val = chksum__pir_calc_value( bios_data, offset ); - printf( "\n$PIR header at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if( hits == 1 && cur_val != new_val ) { - printf( "Setting checksum." ); - chksum__pir_set_value( bios_data, offset, new_val ); - } - if( hits >= 2 ) { - printf( "Warning! Multiple $PIR headers. No checksum set." ); - } - if( hits ) { - printf( "\n" ); - } - - - offset = 0L; - offset = chksum_bios_get_offset( bios_data, offset ); - cur_val = chksum_bios_get_value( bios_data, offset ); - new_val = chksum_bios_calc_value( bios_data, offset ); - printf( "\nBios checksum at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - if( cur_val != new_val ) { - printf( "Setting checksum." ); - chksum_bios_set_value( bios_data, offset, new_val ); - } - printf( "\n\n" ); - - - if(( stream = fopen( argv[1], "wb" )) == NULL ) { - printf( "Error opening %s for writing.\n", argv[1] ); - exit( EXIT_FAILURE ); - } - if( fwrite( bios_data, 1, LEN_BIOS_DATA, stream ) < LEN_BIOS_DATA ) { - printf( "Error writing 64KBytes to %s.\n", argv[1] ); - fclose( stream ); - exit( EXIT_FAILURE ); - } - fclose( stream ); - - return( EXIT_SUCCESS ); -} - - -void check( int okay, char* message ) { - - if( !okay ) { - printf( "\n\nError. %s.\n", message ); - exit( EXIT_FAILURE ); - } -} - - -long chksum_bios_get_offset( byte* data, long offset ) { - - return( BIOS_OFFSET ); -} - - -byte chksum_bios_calc_value( byte* data, long offset ) { - - int i; - byte sum; - - sum = 0; - for( i = 0; i < MAX_OFFSET; i++ ) { - sum = sum + *( data + i ); - } - sum = -sum; /* iso ensures -s + s == 0 on unsigned types */ - return( sum ); -} - - -byte chksum_bios_get_value( byte* data, long offset ) { - - return( *( data + BIOS_OFFSET ) ); -} - - -void chksum_bios_set_value( byte* data, long offset, byte value ) { - - *( data + BIOS_OFFSET ) = value; -} - - -byte chksum__32__calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - check( offset + _32__MINHDR <= MAX_OFFSET, "_32_ header out of bounds" ); - len = *( data + offset + _32__LEN ) << 4; - check( offset + len <= MAX_OFFSET, "_32_ header-length out of bounds" ); - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != _32__CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum__32__get_offset( byte* data, long offset ) { - - long result = -1L; - - offset = offset + 0x0F; - offset = offset & ~( 0x0F ); - while( offset + 16 < MAX_OFFSET ) { - offset = offset + 16; - if( *( data + offset + 0 ) == '_' && \ - *( data + offset + 1 ) == '3' && \ - *( data + offset + 2 ) == '2' && \ - *( data + offset + 3 ) == '_' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum__32__get_value( byte* data, long offset ) { - - check( offset + _32__CHKSUM <= MAX_OFFSET, "PCI-Bios checksum out of bounds" ); - return( *( data + offset + _32__CHKSUM ) ); -} - - -void chksum__32__set_value( byte* data, long offset, byte value ) { - - check( offset + _32__CHKSUM <= MAX_OFFSET, "PCI-Bios checksum out of bounds" ); - *( data + offset + _32__CHKSUM ) = value; -} - - -byte chksum__mp__calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - check( offset + _MP__MINHDR <= MAX_OFFSET, "_MP_ header out of bounds" ); - len = *( data + offset + _MP__LEN ) << 4; - check( offset + len <= MAX_OFFSET, "_MP_ header-length out of bounds" ); - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != _MP__CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum__mp__get_offset( byte* data, long offset ) { - - long result = -1L; - - offset = offset + 0x0F; - offset = offset & ~( 0x0F ); - while( offset + 16 < MAX_OFFSET ) { - offset = offset + 16; - if( *( data + offset + 0 ) == '_' && \ - *( data + offset + 1 ) == 'M' && \ - *( data + offset + 2 ) == 'P' && \ - *( data + offset + 3 ) == '_' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum__mp__get_value( byte* data, long offset ) { - - check( offset + _MP__CHKSUM <= MAX_OFFSET, "MP checksum out of bounds" ); - return( *( data + offset + _MP__CHKSUM ) ); -} - - -void chksum__mp__set_value( byte* data, long offset, byte value ) { - - check( offset + _MP__CHKSUM <= MAX_OFFSET, "MP checksum out of bounds" ); - *( data + offset + _MP__CHKSUM ) = value; -} - - -byte chksum_pcmp_calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - check( offset + PCMP_MINHDR <= MAX_OFFSET, "PCMP header out of bounds" ); - len = *( data + offset + PCMP_BASELEN ) + \ - ( *( data + offset + PCMP_BASELEN + 1 ) << 8 ); - check( offset + len <= MAX_OFFSET, "PCMP header-length out of bounds" ); - if( *( data + offset + PCMP_EXT_LEN ) | \ - *( data + offset + PCMP_EXT_LEN + 1 ) | \ - *( data + offset + PCMP_EXT_CHKSUM ) ) { - check( 0, "PCMP header indicates extended tables (unsupported)" ); - } - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != PCMP_CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum_pcmp_get_offset( byte* data, long offset ) { - - long result = -1L; - - offset = offset + 0x0F; - offset = offset & ~( 0x0F ); - while( offset + 16 < MAX_OFFSET ) { - offset = offset + 16; - if( *( data + offset + 0 ) == 'P' && \ - *( data + offset + 1 ) == 'C' && \ - *( data + offset + 2 ) == 'M' && \ - *( data + offset + 3 ) == 'P' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum_pcmp_get_value( byte* data, long offset ) { - - check( offset + PCMP_CHKSUM <= MAX_OFFSET, "PCMP checksum out of bounds" ); - return( *( data + offset + PCMP_CHKSUM ) ); -} - - -void chksum_pcmp_set_value( byte* data, long offset, byte value ) { - - check( offset + PCMP_CHKSUM <= MAX_OFFSET, "PCMP checksum out of bounds" ); - *( data + offset + PCMP_CHKSUM ) = value; -} - - -byte chksum__pir_calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - check( offset + _PIR_MINHDR <= MAX_OFFSET, "$PIR header out of bounds" ); - len = *( data + offset + _PIR_LEN ) + \ - ( *( data + offset + _PIR_LEN + 1 ) << 8 ); - check( offset + len <= MAX_OFFSET, "$PIR header-length out of bounds" ); - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != _PIR_CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum__pir_get_offset( byte* data, long offset ) { - - long result = -1L; - - offset = offset + 0x0F; - offset = offset & ~( 0x0F ); - while( offset + 16 < MAX_OFFSET ) { - offset = offset + 16; - if( *( data + offset + 0 ) == '$' && \ - *( data + offset + 1 ) == 'P' && \ - *( data + offset + 2 ) == 'I' && \ - *( data + offset + 3 ) == 'R' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum__pir_get_value( byte* data, long offset ) { - - check( offset + _PIR_CHKSUM <= MAX_OFFSET, "$PIR checksum out of bounds" ); - return( *( data + offset + _PIR_CHKSUM ) ); -} - - -void chksum__pir_set_value( byte* data, long offset, byte value ) { - - check( offset + _PIR_CHKSUM <= MAX_OFFSET, "$PIR checksum out of bounds" ); - *( data + offset + _PIR_CHKSUM ) = value; -} - Index: /trunk/src/bldprogs/Makefile.kmk =================================================================== --- /trunk/src/bldprogs/Makefile.kmk (revision 13154) +++ /trunk/src/bldprogs/Makefile.kmk (revision 13155) @@ -23,8 +23,12 @@ include $(KBUILD_PATH)/subheader.kmk -BLDPROGS += bin2c +BLDPROGS += bin2c biossums + bin2c_TEMPLATE = VBOXBLDPROG bin2c_SOURCES = bin2c.c +biossums_TEMPLATE = VBOXBLDPROG +biossums_SOURCES = biossums.c + include $(KBUILD_PATH)/subfooter.kmk Index: unk/src/bldprogs/biossums.c =================================================================== --- /trunk/src/bldprogs/biossums.c (revision 13154) +++ (revision ) @@ -1,271 +1,0 @@ -/* biossums.c --- written by Eike W. for the Bochs BIOS */ -/* adapted for the LGPL'd VGABIOS by vruppert */ - -/* This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice - * other than GPL or LGPL is available it will apply instead, Sun elects to use only - * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where - * a choice of LGPL license versions is made available with the language indicating - * that LGPLv2 or any later version may be used, or where a choice of which version - * of the LGPL is applied is otherwise unspecified. - */ -#include -#include -#include - -typedef unsigned char byte; - -void check( int value, char* message ); - -#define MAX_BIOS_DATA 0x10000 - -long chksum_bios_get_offset( byte* data, long offset ); -byte chksum_bios_calc_value( byte* data, long offset ); -byte chksum_bios_get_value( byte* data, long offset ); -void chksum_bios_set_value( byte* data, long offset, byte value ); - - -#define PMID_LEN 20 -#define PMID_CHKSUM 19 - -long chksum_pmid_get_offset( byte* data, long offset ); -byte chksum_pmid_calc_value( byte* data, long offset ); -byte chksum_pmid_get_value( byte* data, long offset ); -void chksum_pmid_set_value( byte* data, long offset, byte value ); - - -byte bios_data[MAX_BIOS_DATA]; -long bios_len; - - -int main(int argc, char* argv[]) -{ - FILE* stream; - long offset, tmp_offset; - byte bios_len_byte, cur_val = 0, new_val = 0; - int hits, modified; - - if (argc != 2) { - printf( "Error. Need a file-name as an argument.\n" ); - exit( EXIT_FAILURE ); - } - - if ((stream = fopen(argv[1], "rb")) == NULL) { - printf("Error opening %s for reading.\n", argv[1]); - exit(EXIT_FAILURE); - } - memset(bios_data, 0, MAX_BIOS_DATA); - bios_len = fread(bios_data, 1, MAX_BIOS_DATA, stream); - if (bios_len > MAX_BIOS_DATA) { - printf("Error reading max. 65536 Bytes from %s.\n", argv[1]); - fclose(stream); - exit(EXIT_FAILURE); - } - fclose(stream); -#ifdef VBOX - modified = 1; - if (bios_len <= 0x1000) /* 4k */ - bios_len = 0x1000; - else if (bios_len <= 0x8000) /* 32k */ - bios_len = 0x8000; - else if (bios_len <= 0xC000) /* 48k */ - bios_len = 0xC000; - else if (bios_len > 0xC000) /* 64k */ - bios_len = MAX_BIOS_DATA; - else if ((bios_len & 0x1FF) != 0) - bios_len = (bios_len + 0x200) & ~0x1FF; - else - modified = 0; -#else - modified = 0; - if (bios_len < 0x8000) { - bios_len = 0x8000; - modified = 1; - } else if ((bios_len & 0x1FF) != 0) { - bios_len = (bios_len + 0x200) & ~0x1FF; - modified = 1; - } -#endif - bios_len_byte = (byte)(bios_len / 512); - if (bios_len_byte != bios_data[2]) { - if (modified == 0) { - bios_len += 0x200; - } - bios_data[2] = (byte)(bios_len / 512); - modified = 1; - } - - hits = 0; - offset = 0L; - while( (tmp_offset = chksum_pmid_get_offset( bios_data, offset )) != -1L ) { - offset = tmp_offset; - cur_val = chksum_pmid_get_value( bios_data, offset ); - new_val = chksum_pmid_calc_value( bios_data, offset ); - printf( "\nPMID entry at: 0x%4lX\n", offset ); - printf( "Current checksum: 0x%02X\n", cur_val ); - printf( "Calculated checksum: 0x%02X ", new_val ); - hits++; - } - if ((hits == 1) && (cur_val != new_val)) { - printf("Setting checksum."); - chksum_pmid_set_value( bios_data, offset, new_val ); - if (modified == 0) { - bios_len += 0x200; - bios_data[2]++; - } - modified = 1; - } - if (hits >= 2) { - printf( "Multiple PMID entries! No checksum set." ); - } - if (hits) { - printf("\n"); - } - - offset = 0L; - do { - offset = chksum_bios_get_offset(bios_data, offset); - cur_val = chksum_bios_get_value(bios_data, offset); - new_val = chksum_bios_calc_value(bios_data, offset); - if ((cur_val != new_val) && (modified == 0)) { - bios_len += 0x200; - bios_data[2]++; - modified = 1; - } else { - printf("\nBios checksum at: 0x%4lX\n", offset); - printf("Current checksum: 0x%02X\n", cur_val); - printf("Calculated checksum: 0x%02X ", new_val); - if (cur_val != new_val) { - printf("Setting checksum."); - chksum_bios_set_value(bios_data, offset, new_val); - cur_val = new_val; - modified = 1; - } - printf( "\n" ); - } - } while (cur_val != new_val); - - printf("\n"); - - if (modified == 1) { - if ((stream = fopen( argv[1], "wb")) == NULL) { - printf("Error opening %s for writing.\n", argv[1]); - exit(EXIT_FAILURE); - } - if (fwrite(bios_data, 1, bios_len, stream) < (size_t)bios_len) { - printf("Error writing %ld KBytes to %s.\n", bios_len / 1024, argv[1]); - fclose(stream); - exit(EXIT_FAILURE); - } - fclose(stream); - } - - return (EXIT_SUCCESS); -} - - -void check( int okay, char* message ) { - - if( !okay ) { - printf( "\n\nError. %s.\n", message ); - exit( EXIT_FAILURE ); - } -} - - -long chksum_bios_get_offset( byte* data, long offset ) { - - return (bios_len - 1); -} - - -byte chksum_bios_calc_value( byte* data, long offset ) { - - int i; - byte sum; - - sum = 0; - for( i = 0; i < offset; i++ ) { - sum = sum + *( data + i ); - } - sum = -sum; /* iso ensures -s + s == 0 on unsigned types */ - return( sum ); -} - - -byte chksum_bios_get_value( byte* data, long offset ) { - - return( *( data + offset ) ); -} - - -void chksum_bios_set_value( byte* data, long offset, byte value ) { - - *( data + offset ) = value; -} - - -byte chksum_pmid_calc_value( byte* data, long offset ) { - - int i; - int len; - byte sum; - - len = PMID_LEN; - check((offset + len) <= (bios_len - 1), "PMID entry length out of bounds" ); - sum = 0; - for( i = 0; i < len; i++ ) { - if( i != PMID_CHKSUM ) { - sum = sum + *( data + offset + i ); - } - } - sum = -sum; - return( sum ); -} - - -long chksum_pmid_get_offset( byte* data, long offset ) { - - long result = -1L; - - while ((offset + PMID_LEN) < (bios_len - 1)) { - offset = offset + 1; - if( *( data + offset + 0 ) == 'P' && \ - *( data + offset + 1 ) == 'M' && \ - *( data + offset + 2 ) == 'I' && \ - *( data + offset + 3 ) == 'D' ) { - result = offset; - break; - } - } - return( result ); -} - - -byte chksum_pmid_get_value( byte* data, long offset ) { - - check((offset + PMID_CHKSUM) <= (bios_len - 1), "PMID checksum out of bounds" ); - return( *( data + offset + PMID_CHKSUM ) ); -} - - -void chksum_pmid_set_value( byte* data, long offset, byte value ) { - - check((offset + PMID_CHKSUM) <= (bios_len - 1), "PMID checksum out of bounds" ); - *( data + offset + PMID_CHKSUM ) = value; -}