Changeset 4285 for trunk/src/kernel32/hmdevio.cpp

Timestamp:

Sep 20, 2000, 11:32:58 PM (25 years ago)

Author:

hugh

Message:

Implemented Serial APIs

File:

• trunk/src/kernel32/hmdevio.cpp (modified) (11 diffs)

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.4 2000-03-04 19:52:36 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.5 2000-09-20 21:32:52 hugh Exp $ */
 
 /*
@@ -18 +18 @@
 #define INCL_DOSPROCESS          /* DOS Process values       */
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>  //Odin32 OS/2 api wrappers
 #include <string.h>
 
@@ -28 +28 @@
 #include "exceptutil.h"
 
-#define DBG_LOCALLOG    DBG_hmdevio
+#define DBG_LOCALLOG  DBG_hmdevio
 #include "dbglocal.h"
 
 static fX86Init  = FALSE;
 //SvL: Used in iccio.asm (how can you put these in the .asm data segment without messing things up?)
-ULONG  ioentry   = 0;
-USHORT gdt       = 0;
+//ULONG  ioentry   = 0;
+//USHORT gdt       = 0;
 char   devname[] = "/dev/fastio$";
 
@@ -42 +42 @@
 
 static WIN32DRV knownDriver[] =
-    {{"\\\\.\\GpdDev", "",      TRUE,  666,   GpdDevIOCtl},
+    {{"\\\\.\\GpdDev", "/dev/fastio$", TRUE,  666,   GpdDevIOCtl},
     { "\\\\.\\MAPMEM", "PMAP$", FALSE, 0,     MAPMEMIOCtl},
     { "FXMEMMAP.VXD",  "PMAP$", FALSE, 0,     FXMEMMAPIOCtl}};
@@ -55 +55 @@
  DWORD rc;
 
-    for(int i=0;i<nrKnownDrivers;i++) 
+    for(int i=0;i<nrKnownDrivers;i++)
     {
-        driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
+  driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
                                     knownDriver[i].szOS2Name,
                                     knownDriver[i].fCreateFile,
                                     knownDriver[i].devIOCtl);
 
-        rc = HMDeviceRegister(knownDriver[i].szWin32Name, driver);
-        if (rc != NO_ERROR)                                  /* check for errors */
-                dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n",
-                          knownDriver[i].szWin32Name, rc));
+  rc = HMDeviceRegister(knownDriver[i].szWin32Name, driver);
+      if (rc != NO_ERROR)                                  /* check for errors */
+          dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n",
+                    knownDriver[i].szWin32Name, rc));
     }
     return;
@@ -71 +71 @@
 //******************************************************************************
 //******************************************************************************
-HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate, 
+HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate,
                                WINIOCTL pDevIOCtl)
                 : HMDeviceKernelObjectClass(lpDeviceName)
@@ -110 +110 @@
 
   if(szOS2Name[0] == 0) {
-        pHMHandleData->hHMHandle = 0;
-        return (NO_ERROR);
+      pHMHandleData->hHMHandle = 0;
+      return (NO_ERROR);
   }
 
 tryopen:
-  rc = DosOpen( szOS2Name,                        /* File path name */
-                &hfFileHandle,                  /* File handle */
-                &ulAction,                      /* Action taken */
-                0,
-                FILE_NORMAL,
-                FILE_OPEN,
-                sharetype,
-                0L);                            /* No extended attribute */
+  rc = DosOpen( szOS2Name,                        /* File path name */
+                &hfFileHandle,                  /* File handle */
+                &ulAction,                      /* Action taken */
+          0,
+          FILE_NORMAL,
+            FILE_OPEN,
+            sharetype,
+                0L);                            /* No extended attribute */
 
   if(rc == ERROR_TOO_MANY_OPEN_FILES) {
@@ -128 +128 @@
    LONG  ReqCount = 32;
 
-        rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
-        if(rc) {
-                dprintf(("DosSetRelMaxFH returned %d", rc));
-                return rc;
-        }
-        dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
-        goto tryopen;
+  rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
+  if(rc) {
+    dprintf(("DosSetRelMaxFH returned %d", rc));
+    return rc;
+  }
+  dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
+  goto tryopen;
   }
 
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 
-  if(rc == NO_ERROR) {
-        pHMHandleData->hHMHandle = hfFileHandle;
-        return (NO_ERROR);
-  }
-  else  return(rc);
+  if(rc == NO_ERROR)
+  {
+    pHMHandleData->hHMHandle = hfFileHandle;
+    return (NO_ERROR);
+  }
+  else
+    return(rc);
 }
 //******************************************************************************
@@ -166 +168 @@
 {
  ULONG port, val = 0;
-
-  if(fX86Init == FALSE) {
-        if(io_init() == 0)
-                fX86Init = TRUE;
-        else    return(FALSE);
+ WORD  gdt;
+ HRESULT rc;
+ ULONG ulAction;
+
+  if(fX86Init == FALSE)
+  {
+    rc = DosDevIOCtl( hDevice, 118, 100, 0,0,0,&gdt,2,&ulAction);
+
+    if(rc)
+      return FALSE;
+
+    io_init2(gdt);
+
+    fX86Init = TRUE;
   }
 
@@ -298 +309 @@
   rc = DosTmrQueryTime(&time);
   if(rc) {
-        dprintf(("DosTmrQueryTime returned %d\n", rc));
-        return(FALSE);
+      dprintf(("DosTmrQueryTime returned %d\n", rc));
+      return(FALSE);
   }
   lpPerformanceCount->u.LowPart  = time.ulLo;
@@ -314 +325 @@
   rc = DosTmrQueryFreq(&freq);
   if(rc) {
-        dprintf(("DosTmrQueryFreq returned %d\n", rc));
-        return(FALSE);
+      dprintf(("DosTmrQueryFreq returned %d\n", rc));
+      return(FALSE);
   }
   lpFrequency->u.LowPart  = freq;