Changeset 78571 in vbox for trunk/src/VBox/Devices/PC/BIOS

Timestamp:

May 17, 2019 2:24:30 PM (6 years ago)

Author:

vboxsync

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

130625

Message:

DevACPI: First check input, then take a lock.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ata.c (modified) (1 diff)
• disk.c (modified) (2 diffs)
• makefile (modified) (1 diff)

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

@@ -638 +638 @@
                     fdpt = ebda_seg :> &EbdaData->fdpt1;
 
-#if 0
+#if 1
                 /* Place the FDPT outside of conventional memory. Needed for
                  * 286 XENIX 2.1.3/2.2.1 because it completely wipes out

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

@@ -162 +162 @@
             dpt->heads     = bios_dsk->devices[device].pchs.heads;
             dpt->spt       = bios_dsk->devices[device].pchs.spt;
+#if 1
             lba = bios_dsk->devices[device].sectors;
+#else
+            // Makes PC DOS 7.1 FDISK32 happy
+            lba = (uint32_t)dpt->cylinders * dpt->heads * dpt->spt;
+#endif
             dpt->sector_count1 = lba;
             dpt->sector_count2 = lba >> 32;
@@ -395 +400 @@
         break;
 
+#ifdef VBOX_WITH_SCSIz
+    case 0x06: /* identify SCSI devices */
+        if (VBOX_IS_SCSI_DEVICE(device)|| 1) {
+            BX_INFO("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x\n", __func__, AX, BX, CX, DX, ES);
+            BX_INFO("%s: function %02xh detected SCSI drive\n", __func__, GET_AH());
+            SET_BH(0);
+            SET_BL(0);
+            SET_AL(0x80);
+            goto int13_success;
+        }
+        BX_INFO("%s no SCSI drives, returns fail\n", __func__);
+        goto int13_fail;
+        break;
+#endif
     case 0x08: /* read disk drive parameters */
 
         /* Get the logical geometry from internal table. */
+#if 0
+        /* Windows 3.1 FastDisk (wdctrl) insists on this */
+        nlc   = bios_dsk->devices[device].lchs.cylinders - 1;
+#else
         nlc   = bios_dsk->devices[device].lchs.cylinders;
+#endif
         nlh   = bios_dsk->devices[device].lchs.heads;
         nlspt = bios_dsk->devices[device].lchs.spt;

trunk/src/VBox/Devices/PC/BIOS/makefile

@@ -47 +47 @@
 
 vbxbios.rom : vbxbios.bin
+!if $(CPU) > 286
         biossums $< $@
+!else
+        cp $< $@
+!endif
 
 vbxbios.bin : $(OBJS) $(__MAKEFILES__)