Changeset 516 for GPL/branches/uniaud32-2.1.x/lib32/sound.c

Timestamp:

Jul 14, 2010, 10:34:40 PM (15 years ago)

Author:

David Azarewicz

Message:

OSS32_Initialize changes, code cleanups

File:

• GPL/branches/uniaud32-2.1.x/lib32/sound.c (modified) (5 diffs)

GPL/branches/uniaud32-2.1.x/lib32/sound.c

@@ -1124 +1124 @@
                 }
 
-                iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulReqSize, &pHandle->file.f_pos);
+                iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulSize, &pHandle->file.f_pos);
 
                 if (iRet < 0 ) break;
@@ -1132 +1132 @@
                 //this is done to make sure we don't block inside ALSA while trying to write
                 //more data than fits in the internal dma buffer.
-                ulSize = ulReqSize;
-                ulReqSize = min(ulReqSize, samples_to_bytes(status.avail));
+                ulSize = min(ulReqSize, samples_to_bytes(status.avail));
 
                 //printk("OSS32_WaveAddBuffer N:%d hw=%x app=%x avail=%x req size=%x size=%x\n",
                 //      CountWv, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), ulSize, ulReqSize);
 
-                if (ulReqSize == 0) {
+                if (ulSize == 0) {
                         rprintf(("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n"));
-                        rprintf(("state=%x avail=%x SizeReq=%x\n", status.state, status.avail, ulSize));
+                        rprintf(("state=%x avail=%x SizeReq=%x\n", status.state, status.avail, ulReqSize));
                         *pulTransferred = 0;
                         return OSSERR_BUFFER_FULL;
@@ -1148 +1147 @@
                 ulJ = 10;                        // 10 try if error
                 iRet = -11;
-                while (ulReqSize && ulJ && iRet)
+                while (ulSize && ulJ && iRet)
                 {
                         for (i=0; i < 1000; i++)
@@ -1169 +1168 @@
                         }
 
-                        iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulReqSize, &pHandle->file.f_pos);
+                        iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulSize, &pHandle->file.f_pos);
 
                         if (iRet < 0 ) {  // We have any error, don't try more
@@ -1182 +1181 @@
                         // printk("written: now: %d, trans: %d need %d tot:%d\n", iRet, ulTransferred, ulReqSize,ulSize);
                         ulBuffer += iRet;
-                        if (ulReqSize > iRet)
-                                ulReqSize       -= iRet;
-                        else
-                                ulReqSize = 0;
+                        if (ulSize > iRet) ulSize       -= iRet;
+                        else ulSize = 0;
                 }
 #endif