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

Timestamp:

Mar 30, 2012 10:02:19 AM (13 years ago)

Author:

vboxsync

Message:

BIOS-new: Enable interrupts when polling for keyboard input.

Location:

trunk/src/VBox/Devices/PC/BIOS-new

Files:

• biosint.h (modified) (3 diffs)
• keyboard.c (modified) (3 diffs)
• notes.txt (modified) (1 diff)
• orgs.asm (modified) (3 diffs)

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

@@ -111 +111 @@
         } r16;
         struct {
-            uint16_t    flagsl;
-            uint16_t    flagsh;
+            uint8_t     flagsl;
+            uint8_t     flagsh;
         } r8;
     } u;
@@ -132 +132 @@
 typedef struct {
     pusha_regs_t    gr;
-    flags_t         fl;
+    uint16_t        es;
+    uint16_t        ds;
+    iret_addr_t     ra;
 } kbd_regs_t;
 
@@ -189 +191 @@
 #define CLEAR_ZF()   FLAGS &= 0xffbf
 #define GET_ZF()     (FLAGS & 0x0040)
+
+#define SET_IF()     FLAGS |= 0x0200
 
 typedef unsigned short  bx_bool;

trunk/src/VBox/Devices/PC/BIOS-new/keyboard.c

@@ -573 +573 @@
 #define BP      r.gr.u.r16.bp
 #define SP      r.gr.u.r16.sp
-#define FLAGS   r.fl.u.r16.flags
+#define FLAGS   r.ra.flags.u.r16.flags
 
 /* Interrupt 16h service implementation. */
@@ -615 +615 @@
     
     case 0x01: /* check keyboard status */
+        SET_IF();   /* Enable interrupts. Some callers depend on that! */
         if ( !dequeue_key(&scan_code, &ascii_code, 0) ) {
             SET_ZF();
@@ -691 +692 @@
     
     case 0x11: /* check MF-II keyboard status */
+        SET_IF();
         if ( !dequeue_key(&scan_code, &ascii_code, 0) ) {
             SET_ZF();

trunk/src/VBox/Devices/PC/BIOS-new/notes.txt

@@ -8 +8 @@
 - OS/2 (WSeB/MCP/ACP) and Windows 98 SE are some of the very few operating
   systems which use the El Torito floppy emulation.
+
+- Keystroke check (INT 16h, fn 01h/10h) always enables interrupts on return.
+  DOS POWER.EXE depends on that in some situations.
 
 - MS-DOS 6.2/V is a rare user of the INT 15h keyboard intercept routines.

trunk/src/VBox/Devices/PC/BIOS-new/orgs.asm

@@ -767 +767 @@
                 push    es
                 push    ds
-                ;; TODO: the caller already pushed flags (INT instruction)??
-                pushf
                 pusha
 
@@ -780 +778 @@
                 call    _int16_function
                 popa
-                popf
                 pop     ds
                 pop     es
-                jz      int16_zero_set
-
-                ;; TODO: Could use SP directly here (386+)
-int16_zero_clear:
-                push    bp
-                mov     bp, sp
-                and     byte ptr [bp+6], 0BFh
-                pop     bp
-                iret
-
-int16_zero_set:
-                push    bp
-                mov     bp, sp
-                or      byte ptr [bp+6], 040h
-                pop     bp
                 iret
 
@@ -823 +805 @@
                 call    _int16_function
                 popa
-                popf
                 pop     ds
                 pop     es
-; TODO: review/enable?
+; TODO: review/enable? If so, flags should be restored here?
 if 0
                 push    ax