[ros-diffs] [hbelusca] 64167: [NTVDM] - Code formatting and precise an info in a comment, - Remove an unneeded commented call, and - Mention that INT 15h functions C1h and C2h need to be implemented for PS/2 s...

Author: hbelusca
Date: Tue Sep 16 00:25:40 2014
New Revision: 64167

URL: http://svn.reactos.org/svn/reactos?rev=64167&view=rev
Log:
[NTVDM]
- Code formatting and precise an info in a comment,
- Remove an unneeded commented call, and
- Mention that INT 15h functions C1h and C2h need to be implemented for PS/2 support.

Modified:
    trunk/reactos/subsystems/ntvdm/bios/bios.h
    trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c
    trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c

Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios....
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios.h	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios.h	[iso-8859-1] Tue Sep 16 00:25:40 2014
@@ -20,7 +20,8 @@
 #define BDA_SEGMENT     0x40
 #define BIOS_SEGMENT    0xF000

-#define BIOS_EQUIPMENT_LIST     0x2C // HACK: Disable FPU for now
+// HACK: Disable FPU for now
+#define BIOS_EQUIPMENT_LIST     0x2C // Bit 2 set: Mouse present

#pragma pack(push, 1)

Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios3...
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c	[iso-8859-1] Tue Sep 16 00:25:40 2014
@@ -125,6 +125,13 @@
             setAH(0x00);
             Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF;

+            break;
+        }
+
+        case 0xC1:
+        case 0xC2:
+        {
+            DPRINT1("INT 15h, AH = 0x%02X must be implemented in order to support vendor mouse drivers\n");
             break;
         }

@@ -412,8 +419,9 @@
     /* Initialize platform hardware (PIC/PIT chips, ...) */
     BiosHwSetup();

-    /* Initialize the Keyboard and Video BIOS */
-    if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) return FALSE;
+    /* Initialize the Keyboard, Video and Mouse BIOS */
+    if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize())
+        return FALSE;

///////////// MUST BE DONE AFTER IVT INITIALIZATION !! /////////////////////

Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios3...
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c	[iso-8859-1] Tue Sep 16 00:25:40 2014
@@ -198,7 +198,7 @@
     WORD Character;

/* Get the scan code and virtual key code */
-    ScanCode = IOReadB(PS2_DATA_PORT);
+    ScanCode   = IOReadB(PS2_DATA_PORT);
     VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK);

/* Check if this is a key press or release */
@@ -280,7 +280,6 @@

/* Set up the HW vector interrupts */
     EnableHwIRQ(1, BiosKeyboardIrq);
-    // EnableHwIRQ(12, BiosMouseIrq);

return TRUE;
 }