Changeset 13141 in vbox

Timestamp:

Oct 9, 2008 4:55:54 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37647

Message:

unify biossums

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Graphics/BIOS/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/PC/BIOS/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/PC/BIOS/biossums.c (deleted)
• src/bldprogs/Makefile.kmk (modified) (1 diff)
• src/bldprogs/biossums.c (moved) (moved from trunk/src/VBox/Devices/Graphics/BIOS/biossums.c ) (3 diffs)

trunk/Config.kmk

@@ -1218 +1218 @@
 # 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

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -31 +31 @@
 # 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 +100 @@
 
 # 6. checksums
-$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(TARGET_vgabiossums)
-        $(call MSG_TOOL,vgabiossums,VgaBiosBin,$<,$@)
+$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(VBOX_BIOSSUMS)
+        $(call MSG_TOOL,biossums,VgaBiosBin,$<,$@)
         $(QUIET)$(CP) -f $(PATH_VgaBiosBin)/vgabios.tmp $@
-        $(QUIET)$(TARGET_vgabiossums) $@
+        $(QUIET)$(VBOX_BIOSSUMS) $@
 
 #

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -27 +27 @@
 #
 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 +86 @@
 
 # 5. calculate checksums for the final BIOS image.
-$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(TARGET_pcbiossums)
-        $(call MSG_TOOL,pcbiossums,PcBiosBin,$<,$@)
+$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(VBOX_BIOSSUMS)
+        $(call MSG_TOOL,biossums,PcBiosBin,$<,$@)
         $(QUIET)$(CP) -f $(PATH_PcBiosBin)/pcbios.tmp $(PATH_PcBiosBin)/pcbios.bin
-        $(QUIET)$(TARGET_pcbiossums) $(PATH_PcBiosBin)/pcbios.bin
+        $(QUIET)$(VBOX_BIOSSUMS) $(PATH_PcBiosBin)/pcbios.bin
 
 # 6. create the symbol table.

trunk/src/bldprogs/Makefile.kmk

@@ -23 +23 @@
 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
 

trunk/src/bldprogs/biossums.c

@@ -78 +78 @@
   }
   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) {
@@ -86 +101 @@
     modified = 1;
   }
+#endif
   bios_len_byte = (byte)(bios_len / 512);
   if (bios_len_byte != bios_data[2]) {
@@ -145 +161 @@
   } while (cur_val != new_val);
 
+  printf("\n");
+
   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
+    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);