Changeset 92290 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 9, 2021 12:49:35 PM (3 years ago)

Author:

vboxsync

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

148136

Message:

BIOS: Use get_cmos_word in other places where we read two adjacent cmos values and combine them into a 16-bit word. Saves 128 bytes. bugref:6549

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ahci.c (modified) (1 diff)
• ata.c (modified) (1 diff)
• bios.c (modified) (1 diff)
• biosint.h (modified) (1 diff)
• scsi.c (modified) (1 diff)
• system.c (modified) (7 diffs)

trunk/src/VBox/Devices/PC/BIOS/ahci.c

@@ -751 +751 @@
                 if (idxCmosChsBase && inb_cmos(idxCmosChsBase+7))
                 {
-                    lgeo.cylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
+                    lgeo.cylinders = get_cmos_word(idxCmosChsBase /*, idxCmosChsBase+1*/);
                     lgeo.heads     = inb_cmos(idxCmosChsBase + 2);
                     lgeo.spt       = inb_cmos(idxCmosChsBase + 7);

trunk/src/VBox/Devices/PC/BIOS/ata.c

@@ -588 +588 @@
             if (chsgeo_base)
             {
-                lgeo.cylinders = inb_cmos(chsgeo_base) + (inb_cmos(chsgeo_base + 1) << 8);
+                lgeo.cylinders = get_cmos_word(chsgeo_base /*, chsgeo_base + 1*/);
                 lgeo.heads     = inb_cmos(chsgeo_base + 2);
                 lgeo.spt       = inb_cmos(chsgeo_base + 7);

trunk/src/VBox/Devices/PC/BIOS/bios.c

@@ -82 +82 @@
     outb(cmos_port, cmos_reg);
     outb(cmos_port + 1, val);
+}
+
+/**
+ * Reads two adjacent cmos bytes and return their values as a 16-bit word.
+ */
+uint16_t get_cmos_word(uint8_t idxFirst)
+{
+    return ((uint16_t)inb_cmos(idxFirst + 1) << 8)
+         |            inb_cmos(idxFirst);
 }
 

trunk/src/VBox/Devices/PC/BIOS/biosint.h

@@ -268 +268 @@
 extern  uint8_t     inb_cmos(uint8_t cmos_reg);
 extern  void        outb_cmos(uint8_t cmos_reg, uint8_t val);
+extern  uint16_t    get_cmos_word(uint8_t idxFirst);
 extern  uint16_t    cdrom_boot(void);
 extern  void        show_logo(void);

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -387 +387 @@
                 {
                     /* If provided, grab the logical geometry from CMOS. */
-                    cylinders         = inb_cmos(cmos_base + 0) + (inb_cmos(cmos_base + 1) << 8);
+                    cylinders         = get_cmos_word(cmos_base /*, cmos_base + 1*/);
                     heads             = inb_cmos(cmos_base + 2);
                     sectors_per_track = inb_cmos(cmos_base + 7);

trunk/src/VBox/Devices/PC/BIOS/system.c

@@ -468 +468 @@
         // Get the amount of extended memory (above 1M)
 #if VBOX_BIOS_CPU >= 80286
-        AX = (inb_cmos(0x31) << 8) | inb_cmos(0x30);
+        AX = get_cmos_word(0x30 /*, 0x31*/);
 
 #if VBOX_BIOS_CPU >= 80386
@@ -613 +613 @@
     fpRange->xlen   = c64k_above_4G_high;
     fpRange->type   = 1;        /* type is usable */
-}
-
-/**
- * Reads two adjacent cmos bytes and return their values as a 16-bit word.
- */
-static uint16_t get_cmos_word(uint8_t idxFirst)
-{
-    return ((uint16_t)inb_cmos(idxFirst + 1) << 8)
-         |            inb_cmos(idxFirst);
 }
 
@@ -655 +646 @@
 
                 /* Go for the amount of memory above 16MB first. */
-                extended_memory_size  = get_cmos_word(0x34 /*+ 0x35*/);
+                extended_memory_size  = get_cmos_word(0x34 /*, 0x35*/);
                 if (extended_memory_size > 0)
                 {
@@ -664 +655 @@
                 {
                     /* No memory above 16MB, query memory above 1MB ASSUMING we have at least 1MB. */
-                    extended_memory_size  = get_cmos_word(0x30 /*+ 0x31*/);
+                    extended_memory_size  = get_cmos_word(0x30 /*, 0x31*/);
                     extended_memory_size += _1M / _1K;
                     extended_memory_size *= _1K;
@@ -671 +662 @@
                 /* This is the amount of memory above 4GB measured in 64KB units.
                    Note! 0x65 can be used when we need to go beyond 255 TiB */
-                c64k_above_4G_low  = get_cmos_word(0x61 /*+ 0x62*/);
-                c64k_above_4G_high = get_cmos_word(0x63 /*+ 0x64*/);
+                c64k_above_4G_low  = get_cmos_word(0x61 /*, 0x62*/);
+                c64k_above_4G_high = get_cmos_word(0x63 /*, 0x64*/);
 
 #ifdef BIOS_WITH_MCFG_E820 /** @todo Actually implement the mcfg reporting. */
@@ -776 +767 @@
 
             // Get the amount of extended memory (above 1M)
-            CX = (inb_cmos(0x31) << 8) | inb_cmos(0x30);
+            CX = get_cmos_word(0x30 /*, 0x31*/);
 
             // limit to 15M
@@ -783 +774 @@
 
             // Get the amount of extended memory above 16M in 64k blocks
-            DX = (inb_cmos(0x35) << 8) | inb_cmos(0x34);
+            DX = get_cmos_word(0x34 /*, 0x35*/);
 
             // Set configured memory equal to extended memory