Changeset 679 for GPL/trunk/drv32/strategy.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• drv32/strategy.c (modified) (3 diffs)

GPL/trunk/drv32/strategy.c

@@ -24 +24 @@
  */
 
-#define INCL_NOPMAPI
-#define INCL_DOSINFOSEG    // Need Global info seg in rm.cpp algorithms
 #include <os2.h>
-
 #include <devhelp.h>
-//DAZ #include <devrp.h>
-#include <devown.h>
-#include "strategy.h"
 #include <ossidc32.h>
 #include <dbgos2.h>
 #include <string.h>
+#include <u32ioctl.h>
+#include "devown.h"
+#include "strategy.h"
 
 ULONG StratRead(REQPACKET __far *_rp);
 ULONG StratIOCtl(REQPACKET __far *_rp);
-ULONG StratClose(REQPACKET __far *_rp);
 
 ULONG DiscardableInit(REQPACKET __far*);
@@ -54 +50 @@
   }
   numOS2Opens++;
+  return RPDONE;
+}
+
+//******************************************************************************
+ULONG StratClose(REQPACKET __far* rp)
+{
+  // only called if device successfully opened
+  //  printk("strat close\n");
+  numOS2Opens--;
+
+  UniaudCloseAll(rp->open_close.usSysFileNum);
+
+  if (numOS2Opens == 0)
+  {
+    deviceOwner = DEV_NO_OWNER;
+  }
   return RPDONE;
 }
@@ -172 +184 @@
   else return(RPERR_BADCOMMAND | RPDONE);
 }
-