Changeset 468 for OCO/trunk/drv16/ssm_idc.cpp

Timestamp:

Nov 4, 2009, 4:21:24 PM (16 years ago)

Author:

pasha

Message:

Rebuild buffers supply, fix DDCMD_WRITE with len=0 in WAVE chain, remove/add debug output, change DebugInt3 for debug/nondebug version, move unused code to unused directore

File:

• OCO/trunk/drv16/ssm_idc.cpp (modified) (7 diffs)

OCO/trunk/drv16/ssm_idc.cpp

@@ -29 +29 @@
 #include "event.hpp"
 #include <include.h>
-
+#include <devhelp.h>
 
 extern "C" int open_strategy;
@@ -47 +47 @@
 
       case DDCMD_SETUP: {
-         ddprintf(("DDCMD_SETUP"));
          if (!pstream)
-            return ERROR_INVALID_STREAM;
+         {
+             dprintf(("DDCMD_SETUP err pstream"));
+             return ERROR_INVALID_STREAM;
+         }
          PDDCMDSETUP p = (PDDCMDSETUP) pCommon;
          SETUP_PARM __far *psp = (SETUP_PARM __far *) p->pSetupParm;
@@ -56 +58 @@
            // if there is a flags field in the SETUP_PARM
            // the tell MMPM it can send us 'RECURRING' events....
-         if (p->ulSetupParmSize > sizeof(ULONG)) {
+         if (p->ulSetupParmSize > sizeof(ULONG)) 
+         {
+//            dprintf(("DDCMD_SETUP ParmSize %ld", p->ulSetupParmSize));
             psp->ulFlags = SETUP_RECURRING_EVENTS;
          }
@@ -74 +78 @@
          break;
       }
-      case DDCMD_WRITE: {
-          PDDCMDREADWRITE p=(PDDCMDREADWRITE) pCommon;
+      // Task time
+      case DDCMD_WRITE: 
+      {
+           PDDCMDREADWRITE p=(PDDCMDREADWRITE) pCommon;
+           ULONG           Space;
 
-         if (!pstream)
-            return ERROR_INVALID_STREAM;
-         ulReturnCode = pstream->Write((PSTREAMBUF) p->pBuffer,(unsigned) p->ulBufferSize);
-         ddprintf(("DDCMD_WRITE %lx",p->ulBufferSize));
-         if (ulReturnCode)
-            return ulReturnCode;
+           if (!pstream)
+           {
+              dprintf(("DDCMD_WRITE err stream %x", (USHORT)pstream));
+              return ERROR_INVALID_STREAM;
+           }
+#ifdef PS_Thinking
+           OSS16_WaveGetSpace(pstream->StreamId, &Space);
+           ddprintf(("DDCMD_WRITE %lx space %lx",p->ulBufferSize, Space));
+           if (Space < p->ulBufferSize)
+           {
+               DevHelp_ProcBlock (pstream->StreamId, 2, 0);
+               ddprintf(("DDCMD_WRITE after %lx space %lx",p->ulBufferSize, Space));
+           }
+#endif
+           ulReturnCode = pstream->Write((PSTREAMBUF) p->pBuffer,(unsigned) p->ulBufferSize);
+//           ddprintf(("DDCMD_WRITE %lx rc=%ld",p->ulBufferSize, ulReturnCode));
+           if (ulReturnCode)
+              return ulReturnCode;
          break;
       }
       case DDCMD_STATUS: {
-         ddprintf(("DDCMD_STATUS"));
+//         ddprintf(("DDCMD_STATUS"));
          PDDCMDSTATUS p = (PDDCMDSTATUS) pCommon;
          PSTATUS_PARM p2 = (PSTATUS_PARM) p->pStatus;
@@ -92 +111 @@
            return ERROR_INVALID_STREAM;
          p2->ulTime = pstream->GetCurrentTime();
+//         ddprintf(("DDCMD_STATUS time:%ld",p2->ulTime));
          break;
       }
-      case DDCMD_CONTROL: {
+      case DDCMD_CONTROL: 
+      {
          PDDCMDCONTROL p = (PDDCMDCONTROL) pCommon;
          if (!pstream)
-            return ERROR_INVALID_STREAM;
+         {
+             dprintf(("DDCMD_CONTROL err stream %x", (USHORT)pstream));
+             return ERROR_INVALID_STREAM;
+         }
 
-         switch (p->ulCmd) {
+         switch (p->ulCmd) 
+         {
          case DDCMD_START:
              ddprintf(("DDCMD_START"));
-             return pstream->StartStream();
+             ulReturnCode = pstream->StartStream();
+             ddprintf(("DDCMD_START End rc=%ld",ulReturnCode));
+             return ulReturnCode;
          case DDCMD_STOP:
              ddprintf(("DDCMD_STOP"));
+             DevHelp_ProcBlock ((ULONG)p, 2, 0);
              p->ulParmSize=sizeof(ULONG);
-            return pstream->StopStream((PCONTROL_PARM)p->pParm);
+             return pstream->StopStream((PCONTROL_PARM)p->pParm);
          case DDCMD_PAUSE:
              ddprintf(("DDCMD_PAUSE"));
@@ -118 +146 @@
              return pstream->EnableEvent(p);
          case DDCMD_DISABLE_EVENT:
-             ddprintf(("DDCMD_DISABLE_EVENT"));
+//             ddprintf(("DDCMD_DISABLE_EVENT"));
              return pstream->DisableEvent(p);
          case DDCMD_PAUSE_TIME:
-             ddprintf(("DDCMD_PAUSE_TIME"));
+//             ddprintf(("DDCMD_PAUSE_TIME"));
              return pstream->PauseStreamTime();
          case DDCMD_RESUME_TIME:
@@ -130 +158 @@
          } /* endswitch */
       }
-      case DDCMD_REG_STREAM: {
-         ddprintf(("DDCMD_REG_STREAM"));
+      case DDCMD_REG_STREAM: 
+      {
+         ddprintf(("DDCMD_REG_STREAM size:%lx countbuf:%lx",((PDDCMDREGISTER) pCommon)->ulBufSize, ((PDDCMDREGISTER) pCommon)->ulNumBufs));
          if (pstream)
+         {
+             dprintf(("DDCMD_REG_STREAM err stream %x", (USHORT)pstream));
              return ERROR_HNDLR_REGISTERED;
+         }
          pstream = FindStream_fromFile(((PDDCMDREGISTER) pCommon)->ulSysFileNum);
          if (!pstream)
-            return ERROR_STREAM_CREATION;
+         {
+             dprintf(("DDCMD_REG_STREAM1 err stream %x", (USHORT)pstream));
+             return ERROR_STREAM_CREATION;
+         }
          ulReturnCode = pstream->Register((PDDCMDREGISTER) pCommon);
-         //dprintf(("DDCMD_EntryPoint: DDCMD_REG_STREAM stream %x returned %d", (USHORT)pCommon->hStream, (USHORT)ulReturnCode));
          if (ulReturnCode)
-            return ERROR_STREAM_CREATION;
+         {
+             dprintf(("DDCMD_REG_STREAM err stream %x returned %d", (USHORT)pCommon->hStream, (USHORT)ulReturnCode));
+             return ERROR_STREAM_CREATION;
+         }
+         ddprintf(("DDCMD_REG_STREAM end size:%lx countbuf:%lx",((PDDCMDREGISTER) pCommon)->ulBufSize, ((PDDCMDREGISTER) pCommon)->ulNumBufs));
          break;
       }