[ros-diffs] [hbelusca] 62409: [NTVDM]: Add a common helper to sync the BIOS cursor for the active display page, with VGA.

[hbelusca]

Author: hbelusca
Date: Mon Mar  3 00:09:22 2014
New Revision: 62409

URL: http://svn.reactos.org/svn/reactos?rev=62409&view=rev
Log:
[NTVDM]: Add a common helper to sync the BIOS cursor for the active display 
page, with VGA.

Modified:
    branches/ntvdm/subsystems/ntvdm/bios/vidbios.c
    branches/ntvdm/subsystems/ntvdm/bios/vidbios.h

Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c
URL: 
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vidbios.c?rev=62409&r1=62408&r2=62409&view=diff
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/bios/vidbios.c      [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.c      [iso-8859-1] Mon Mar  3 
00:09:22 2014
@@ -880,24 +880,6 @@
     VgaSetPalette(Palette, Size);
 }
 
-static VOID VgaGetCursorPosition(PBYTE Row, PBYTE Column)
-{
-    SHORT ScreenColumns = VgaGetDisplayResolution().X;
-    BYTE OffsetLow, OffsetHigh;
-    WORD Offset;
-
-    /* Get the cursor location */
-    IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG);
-    OffsetLow  = IOReadB(VGA_CRTC_DATA);
-    IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG);
-    OffsetHigh = IOReadB(VGA_CRTC_DATA);
-
-    Offset = MAKEWORD(OffsetLow, OffsetHigh);
-
-    *Row    = (BYTE)(Offset / ScreenColumns);
-    *Column = (BYTE)(Offset % ScreenColumns);
-}
-
 static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page)
 {
     /* Make sure the selected video page is valid */
@@ -927,6 +909,28 @@
         IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG);
         IOWriteB(VGA_CRTC_DATA , HIBYTE(Offset));
     }
+}
+
+VOID VidBiosSyncCursorPosition(VOID)
+{
+    BYTE Row, Column;
+    BYTE Low, High;
+    SHORT ScreenColumns = VgaGetDisplayResolution().X;
+    WORD Offset;
+
+    /* Get the cursor location */
+    IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG);
+    Low  = IOReadB(VGA_CRTC_DATA);
+    IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG);
+    High = IOReadB(VGA_CRTC_DATA);
+
+    Offset = MAKEWORD(Low, High);
+
+    Row    = (BYTE)(Offset / ScreenColumns);
+    Column = (BYTE)(Offset % ScreenColumns);
+
+    /* Synchronize our cursor position with VGA */
+    VidBiosSetCursorPosition(Row, Column, Bda->VideoPage);
 }
 
 BYTE VidBiosGetVideoMode(VOID)
@@ -1530,8 +1534,6 @@
 
 BOOLEAN VidBiosInitialize(VOID)
 {
-    BYTE Row, Column;
-
     /* Some interrupts are in fact addresses to tables */
     ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL;
     ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL;
@@ -1542,9 +1544,8 @@
     /* Set the default video mode */
     VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE);
 
-    /* Update cursor position */
-    VgaGetCursorPosition(&Row, &Column);
-    VidBiosSetCursorPosition(Row, Column, Bda->VideoPage);
+    /* Synchronize our cursor position with VGA */
+    VidBiosSyncCursorPosition();
 
     /* Register the BIOS support BOPs */
     RegisterBop(BOP_VIDEO_INT, VidBiosVideoService);

Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.h
URL: 
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vidbios.h?rev=62409&r1=62408&r2=62409&view=diff
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/bios/vidbios.h      [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.h      [iso-8859-1] Mon Mar  3 
00:09:22 2014
@@ -39,6 +39,8 @@
 
 VOID WINAPI VidBiosVideoService(LPWORD Stack);
 
+VOID VidBiosSyncCursorPosition(VOID);
+
 BOOLEAN VidBiosInitialize(VOID);
 VOID VidBiosCleanup(VOID);