Changeset 168 for sbliveos2/trunk

Timestamp:

Mar 23, 2001, 6:14:13 PM (24 years ago)

Author:

sandervl

Message:

Updates + fixes for DirectAudio interface

Location:

sbliveos2/trunk/drv16

Files:

• dwavestrm.cpp (modified) (6 diffs)
• header.c (modified) (2 diffs)
• strmbuff.hpp (modified) (1 diff)
• wavestrm.cpp (modified) (1 diff)

sbliveos2/trunk/drv16/dwavestrm.cpp

@@ -33 +33 @@
 #include "malloc.h"
 
-
 void cdecl HookHandler(ULONG ulSysFileNum)
 {
@@ -57 +56 @@
         DevHelp_VMFree((LIN)temp->pBuffptr);
         DevHelp_VMUnLock(temp->linLock);
-        free(temp->pLock);
         delete temp;
+
+        temp = (PSTREAMBUFFEREX)pStream->qhReturn.PopHead();
     }
     return;
@@ -67 +67 @@
 {
     PSTREAMBUFFEREX pStreamBuf;
-    LIN   linAddr;
-    PULONG pLock;
-    ULONG PageListCount;
-    LIN   linLock;
-    int   rc;
+    LIN             linAddr;
+    PULONG          pLock;
+    ULONG           PageListCount;
+    LIN             linLock;
+    int             rc;
 
-    pLock = (PULONG)malloc(12);
-    if(pLock == NULL) {
+    pStreamBuf = new STREAMBUFFEREX(uLength, (PSTREAMBUF)0);
+    if(pStreamBuf == NULL) {
         DebugInt3();
         return 1;
     }
 
+    pLock = &pStreamBuf->lock[0];
+
     rc = DevHelp_VirtToLin(SELECTOROF(pLock), OFFSETOF(pLock), &linLock);
     if(rc) {
         DebugInt3();
+        delete pStreamBuf;
         return rc;
     }
@@ -88 +91 @@
     if(rc) {
         DebugInt3();
-        DevHelp_VMFree(linAddr);
+        delete pStreamBuf;
         return rc;
     }
@@ -95 +98 @@
     if(rc) {
         DebugInt3();
+        DevHelp_VMUnLock(linLock);
+        delete pStreamBuf;
         return rc;
     }
-
-    pStreamBuf = new STREAMBUFFEREX(uLength, (PSTREAMBUF)linAddr, linLock, pLock);
+    pStreamBuf->pBuffptr = (PSTREAMBUF)linAddr;
+    pStreamBuf->linLock  = linLock;
 
     return WAVESTREAM::Write((PSTREAMBUFFER)pStreamBuf);
@@ -111 +116 @@
         if(ulStreamState == STREAM_STREAMING) {//means we're called during an interrupt
             qhReturn.PushOnTail((PQUEUEELEMENT)temp);
-            DevHelp_ArmCtxHook(hCtxHook, ulSysFileNum);
+            DevHelp_ArmCtxHook(ulSysFileNum, hCtxHook);
         }
         else {
             DevHelp_VMFree((LIN)temp->pBuffptr);
             DevHelp_VMUnLock(temp->linLock);
-            free(temp->pLock);
             delete temp;
         }

sbliveos2/trunk/drv16/header.c

@@ -34 +34 @@
 
 DEV_HEADER header[2] = {
-   {  -1,
+   {  sizeof(DEV_HEADER),
       DA_CHAR | DA_IDCSET | DA_NEEDOPEN | DA_USESCAP,
       (PFNENTRY) StrategyHandler,
@@ -41 +41 @@
       0,0,
       DC_INITCPLT | DC_IOCTL2 | DC_32BIT
+   },
+   {  -1,
+      DA_CHAR | DA_IDCSET | DA_NEEDOPEN | DA_USESCAP,
+      (PFNENTRY) StrategyHandler2,
+      (PFNENTRY) 0,
+      {'D','A','U','D','I','O','1','$'},
+      0,0,
+      DC_INITCPLT | DC_IOCTL2 | DC_32BIT
    }
 };

sbliveos2/trunk/drv16/strmbuff.hpp

@@ -48 +48 @@
 {
 public:
-    STREAMBUFFEREX(ULONG bufsize, PSTREAMBUF bufptr, ULONG linLock, PULONG pLock):
+    STREAMBUFFEREX(ULONG bufsize, PSTREAMBUF bufptr):
     STREAMBUFFER(bufsize, bufptr), fDone(FALSE)
     {
-       this->linLock = linLock;
-       this->pLock = pLock;
     };
 
+    ULONG  lock[3];     //lock handle
     ULONG  linLock;
-    PULONG pLock;
     BOOL   fDone;
 

sbliveos2/trunk/drv16/wavestrm.cpp

@@ -326 +326 @@
 {
    qhInProcess.PushOnTail((PQUEUEELEMENT)pStreamBuf);
-   dprintf2(("WAVESTREAM::Write: Push on tail %lx %d", ((PSTREAMBUFFER)qhInProcess.Head())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Head())->ulBuffsz));
+   dprintf2(("WAVESTREAM::Write: Push on tail %lx %ld", ((PSTREAMBUFFER)qhInProcess.Tail())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Tail())->ulBuffsz));
    if(fUnderrun) {
         fUnderrun = FALSE;