Changeset 528 for GPL/trunk/lib32/sound.c

Timestamp:

Jul 25, 2010, 7:16:22 PM (15 years ago)

Author:

David Azarewicz

Message:

debug statement changes, add quirk for eMachines STAC mixer

File:

• GPL/trunk/lib32/sound.c (modified) (4 diffs)

GPL/trunk/lib32/sound.c

@@ -1116 +1116 @@
                 iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulSize, &pHandle->file.f_pos);
 
+                if (iRet != ulSize) rprintf(("WaveAddBuffer: ReqSize=%x Size=%x iRet=%x\n", ulReqSize, ulSize, iRet));
+
                 if (iRet < 0 ) break;
                 ulTransferred = iRet;
@@ -1134 +1136 @@
                 }
 
+                rprintf(("WaveAddBuffer: ReqSize=%x Size=%x\n", ulReqSize, ulSize));
+
                 // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
                 ulJ = 10;                        // 10 try if error
                 iRet = -11;
-                while (ulSize && ulJ && iRet)
-                {
-                        for (ulI=0; ulI < 1000; ulI++)
-                        {
+                while (ulSize && ulJ && iRet) {
+                        for (ulI=0; ulI < 1000; ulI++) {
                                 iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
                                 // If here any state and have free buffer to any byte
@@ -1148 +1150 @@
                                 }
                                 if (ulI > 998) {
-                                        // printk("timeout stat %x avail:%d hw:%d app:%d\n",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr));
+                                        rprintf(("timeout state=%x avail=%d hw=%d app=%d",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr)));
                                         iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
                                 }
@@ -1154 +1156 @@
 
                         if (iRet1 < 0) {
-                                // printk("Status Error iRet1:%i trans: %i need %d tot:%d\n",iRet1,ulTransferred, ulReqSize,ulSize);
+                                rprintf(("iRet1=%i trans=%x ReqSize=%x Size=%x\n", iRet1, ulTransferred, ulReqSize, ulSize));
                                 break;     // We have any global error, don't try more
                         }
 
                         iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulSize, &pHandle->file.f_pos);
+                        rprintf(("J=%x iRet=%x", ulJ, iRet));
 
                         if (iRet < 0 ) {  // We have any error, don't try more
                                 ulJ--;
-                                if ( iRet != -11 )
-                                iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-                                // printk("Error ret:%i ret1:%i trans: %d need %d tot:%d\n",iRet,iRet1,ulTransferred, ulReqSize,ulSize);
+                                rprintf(("Error ret=%i ret1=%i trans=%x ReqSize=%x Size=%x", iRet, iRet1, ulTransferred, ulReqSize, ulSize));
+                                if ( iRet != -11 ) {
+                                        rprintf(("Doing prepare"));
+                                        iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                                }
                                 continue;
                         }
-                        if (iRet == 0)  continue;
+                        if (iRet == 0) {
+                                continue;
+                        }
                         ulTransferred += iRet;
                         // printk("written: now: %d, trans: %d need %d tot:%d\n", iRet, ulTransferred, ulReqSize,ulSize);