Changeset 1746 for trunk/src/ddraw/OS2DDRAW.CPP

Timestamp:

Nov 14, 1999, 11:16:32 PM (26 years ago)

Author:

hugh

Message:

Fixes to let RA run

File:

• trunk/src/ddraw/OS2DDRAW.CPP (modified) (7 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -17 +17 @@
 #include <builtin.h>
 #include "cio2.h"
-
+#include "os2util.h"
 // include with the videomodes we support
 // better would be to get these modes from the card
@@ -176 +176 @@
   else
     bScale = FALSE;
+
+  rc = InitIO();
+
+  if(rc)  // try to get IOPL for the thread
+  {
+    dprintf(("DDRAW: No IOPL\n"));
+  }
+  else
+  {
+    dprintf(("DDRAW: IOPL 3!\n"));
+  }
 }
 //******************************************************************************
@@ -1558 +1569 @@
   HRESULT rc;
   int rci;
-
+  USHORT sel;
   dprintf(("DDRAW: WaitForVerticalBlank\n"));
 
@@ -1564 +1575 @@
     return (DDERR_UNSUPPORTED);
 
-
-  rci = io_init1();
-
+  return DD_OK;
+
+  rci = InitIO();
 
   if(rci)  // try to get IOPL for the thread
@@ -1574 +1585 @@
   }
   // AT this point we should have IOPL so lets use it!
+  dprintf(("DDRAW: IOPL 3!\n"));
 
   rc = DDERR_INVALIDPARAMS; // set returnvalue to fail
@@ -1579 +1591 @@
   if(DDWAITVB_BLOCKBEGIN == dwFlags)
   {
+    dprintf(("DDRAW: BLOCKBEGIN\n"));
+
     while ((c_inb1(0x3da)&0x08)!=0); // Wait for end of vert. retrace if one is running
     while ((c_inb1(0x3da)&0x08)==0); // Wait for new start of retrace
@@ -1586 +1600 @@
   if(DDWAITVB_BLOCKEND == dwFlags)
   {
+    dprintf(("DDRAW: BLOCKEND\n"));
     rc = DD_OK;
     if((c_inb1(0x3da)&0x08)!=0)        // Are we in a vert. retrace