[ros-diffs] [hbelusca] 69422: [NTVDM] - Temporarily hack the boot sequence to floppy, then hard disk. See r69421; will be improved in the future. - Complete the BIOS 16-bit bootstrap code.

Author: hbelusca
Date: Thu Oct  1 00:37:38 2015
New Revision: 69422

URL: http://svn.reactos.org/svn/reactos?rev=69422&view=rev
Log:
[NTVDM]
- Temporarily hack the boot sequence to floppy, then hard disk. See r69421; will be
improved in the future.
- Complete the BIOS 16-bit bootstrap code.

Modified:
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c	[iso-8859-1] Thu Oct  1
00:37:38 2015
@@ -20,6 +20,7 @@
 #include "cpu/cpu.h" // for EMULATOR_FLAG_CF
 #include "cpu/bop.h"
 #include "int32.h"
+#include <isvbop.h>
 
 #include <bios/bios.h>
 #include <bios/rom.h>
@@ -155,7 +156,8 @@
 {
     LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET,  // Call BIOS POST
     0xCD, BIOS_BOOTSTRAP_LOADER,                            // INT 0x19
-//  LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE
+    0xCD, BIOS_ROM_BASIC,                                   // INT 0x18
+    LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE
 };
 
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c	[iso-8859-1] Thu Oct  1 00:37:38
2015
@@ -483,6 +483,9 @@
     CmosMemory.ShutdownStatus = 0x00;
     CmosMemory.EquipmentList  = CMOS_EQUIPMENT_LIST;
 
+    // HACK: For the moment, set the boot sequence to:  1-Floppy, 2-Hard Disk .
+    CmosMemory.Regs[CMOS_REG_SYSOP] |= (1 << 5);
+
     /* Memory settings */
 
     /*