Changeset 598 for GPL/trunk/drv32/dispatch.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• drv32/dispatch.c (modified) (32 diffs)

GPL/trunk/drv32/dispatch.c

@@ -105 +105 @@
     //printk("StratIOCtl 0x%x\n", rp->Function);
     #endif
-    //    printk("cmd: %x, len: %i, pack: %x\n",rp->Function, rp->ioctl.usParmLen, rp->ParmPacket);
+    //    printk("cmd: %x, len: %i, pack: %x\n",rp->ioctl.bFunction, rp->ioctl.usParmLen, rp->ioctl.pvParm);
     // work with Parm Packet
     if ((rp->ioctl.usParmLen != 0 ||
@@ -183 +183 @@
     case IOCTL_OSS32_ATTACH:
         {
+          dprintf(("OSS32_ATTACH\n"));
             card_id = (ULONG) *linParm;
             // Check if audio init was successful
@@ -193 +194 @@
     case IOCTL_OSS32_VERSION:
         {
+          dprintf(("OSS32_VERSION\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -206 +208 @@
     case IOCTL_OSS32_GET_PCM_NUM:
         {
+          dprintf(("GET_PCM_NUM\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -219 +222 @@
 
     case IOCTL_OSS32_CARDS_NUM:
+        dprintf(("OSS32_CARDS_NUM\n"));
         if (rp->ioctl.usDataLen < sizeof(ULONG))
         {
@@ -231 +235 @@
     case IOCTL_OSS32_PCM_CAPS:
         {
+          dprintf(("OSS32_PCM_CAPS\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -244 +249 @@
     case IOCTL_OSS32_CARD_INFO:
         {
+          dprintf(("OSS32_CARD_INFO\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -257 +263 @@
     case IOCTL_OSS32_GET_POWER_STATE:
         {
+          dprintf(("OSS32_GET_POWER_STATE\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -270 +277 @@
     case IOCTL_OSS32_SET_POWER_STATE:
         {
+          dprintf(("OSS32_SET_POWER_STATE\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -283 +291 @@
     case IOCTL_OSS32_GET_CNTRLS_NUM:
         {
+          dprintf(("OSS32_GET_CNTRLS_NUM\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -298 +307 @@
     case IOCTL_OSS32_GET_CNTRLS:
         {
+          dprintf(("OSS32_GET_CNTRLS\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -311 +321 @@
     case IOCTL_OSS32_CNTRL_INFO:
         {
+          dprintf(("OSS32_CNTRL_INFO\n"));
 
             if (rp->ioctl.usDataLen < sizeof(ULONG))
@@ -336 +347 @@
     case IOCTL_OSS32_CNTRL_GET:
         {
+          dprintf(("OSS32_CNTRL_GET\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -360 +372 @@
     case IOCTL_OSS32_CNTRL_PUT:
         {
+          dprintf(("OSS32_CNTRL_PUT\n"));
 
             if (rp->ioctl.usDataLen < sizeof(ULONG)) {
@@ -383 +396 @@
     case IOCTL_OSS32_SET_PCM:
         {
+          dprintf(("OSS32_SET_PCM\n"));
 
             if (rp->ioctl.usParmLen < sizeof(ULONG))
@@ -399 +413 @@
     case IOCTL_OSS32_CNTRL_WAIT:
         {
+          dprintf(("OSS32_CNTRL_WAIT\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -414 +429 @@
             pData = (ULONG *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_OPEN\n"));
             // close all pcms from uniaud16 first
             pcm->ret = OSS32_WaveOpen(pcm->deviceid, pcm->streamtype, pData,  pcm->pcm, rp->ioctl.usSysFileNum);
@@ -422 +439 @@
         {
             ULONG alsa_id = *((ULONG *)linParm);
+
+          dprintf(("OSS32_PCM_CLOSE\n"));
             OSS32_WaveClose(alsa_id);
         }
@@ -429 +448 @@
             char *pData1 = (char *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_READ\n"));
             pcm->ret = UniaudIoctlPCMRead(pcm->deviceid, pData1, pcm->size);
         }
@@ -436 +457 @@
             char *pData1 = (char *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_WRITE\n"));
             pcm->ret = UniaudIoctlPCMWrite(pcm->deviceid, pData1, pcm->size);
         }
@@ -442 +465 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_PAUSE\n"));
             pcm->ret = UniaudIoctlPCMResume(pcm->deviceid, 0);
         }
@@ -448 +473 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_RESUME\n"));
             pcm->ret = UniaudIoctlPCMResume(pcm->deviceid, 1);
         }
@@ -454 +481 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_START\n"));
             pcm->ret = UniaudIoctlPCMStart(pcm->deviceid);
         }
@@ -460 +489 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_DROP\n"));
             pcm->ret = UniaudIoctlPCMDrop(pcm->deviceid);
         }
@@ -469 +500 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_STATUS\n"));
             pcm->ret = UniaudIoctlPCMStatus(pcm->deviceid, pData1);
         }
@@ -476 +509 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_REFINEHWPARAMS\n"));
             pcm->ret = UniaudIoctlHWRefine(pcm->deviceid, pData1);
         }
@@ -483 +518 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_SETHWPARAMS\n"));
             pcm->ret = UniaudIoctlHWParamSet(pcm->deviceid, pData1);
         }
@@ -490 +527 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_SETSWPARAMS\n"));
             pcm->ret = UniaudIoctlSWParamSet(pcm->deviceid, pData1);
         }
@@ -496 +535 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_PREPARE\n"));
             pcm->ret = UniaudIoctlPCMPrepare(pcm->deviceid);
         }
@@ -503 +544 @@
         {
             int unlock  = (int)*linParm;
+
+          dprintf(("OSS32_PCM_CLOSE_ALL\n"));
             if (unlock)
                 unlock_all = 1;
@@ -510 +553 @@
         break;
     case IOCTL_OSS32_PCM_CLOSE_16:
+          dprintf(("OSS32_PCM_CLOSE_16\n"));
         OSS32_CloseUNI16();
         break;
@@ -515 +559 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_WAIT_INT\n"));
             pcm->ret =  WaitForPCMInterrupt((void*)pcm->deviceid, pcm->streamtype);
         }