vbox的更動 13141 路徑 trunk/src/bldprogs

時間撮記:

2008-10-9 下午04:55:54 (16 年 以前)

作者:

vboxsync

訊息:

unify biossums

位置:

trunk/src/bldprogs

檔案:

• Makefile.kmk (修改) (1 筆差異)
• biossums.c (移動) (移動 從 trunk/src/VBox/Devices/Graphics/BIOS/biossums.c ) (3 筆差異)

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);