Changeset 269

Timestamp:

Nov 19, 2007, 7:04:04 AM (18 years ago)

Author:

Brendan Oakley

Message:

Load of work from Pavel to improve HDA in Uniaud32

Location:

GPL/trunk

Files:

• alsa-kernel/core/seq/seq_clientmgr.c (modified) (1 diff)
• include/dbgos2.h (modified) (1 diff)
• include/watcom32.mak (modified) (1 diff)
• lib32/memory.cpp (modified) (1 diff)
• lib32/ossidc.cpp (modified) (1 diff)
• lib32/sound.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/core/seq/seq_clientmgr.c

@@ -2180 +2180 @@
 }
 
-
-static int snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+//PS++ static int snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int snd_seq_ioctl(struct inode *inode, struct file *file,  unsigned int cmd, unsigned long arg)
 {
         struct snd_seq_client *client = file->private_data;

GPL/trunk/include/dbgos2.h

@@ -42 +42 @@
 #define dprintf3(a)     if(DebugLevel > 2) DPE a
 #define DebugInt3()     ; //_asm int 3;
+#define DebInt3()       _asm int 3;
 #else // #ifndef DEBUG
 #define dprintf(a)

GPL/trunk/include/watcom32.mak

@@ -13 +13 @@
 
 !if "$(DEBUG)" == "1"
-CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
+CFLAGS  = -dDEBUG -dCONFIG_SND_DEBUG_DETECT -bt=os2v2 -e60 -hc -d2 -5s -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
 CPPFLAGS= -xd 
 ASFLAGS = -Mb -Li -Sv:M510

GPL/trunk/lib32/memory.cpp

@@ -264 +264 @@
                     //oops, this didn't work, fail
                     VMFree((LINEAR)addr);
-                    dprintf(("get_free_dma_pages failed, trying wasteful method instead"));
+                    dprintf(("get_free_dma_pages failed %x size:%x st:%x end:%x, trying wasteful method instead",physaddr,size,startpage,endpage));
                     return 0;
                 }

GPL/trunk/lib32/ossidc.cpp

@@ -110 +110 @@
     }
 
-    dprintf(("OSS32_Initialize. Start addrees: %X", OffsetBeginCS32));
+    dprintf(("OSS32_Initialize. Start address: %X", OffsetBeginCS32));
 //    DebugInt3();
 
     if(call_module_init(alsa_sound_init) != 0)       return OSSERR_INIT_FAILED;
-    dprintf(("OSS32_Initialize1"));
+    dprintf(("OSS32_Initialize1. Start address: %X", OffsetBeginCS32));
     if(call_module_init(alsa_pcm_init) != 0)         return OSSERR_INIT_FAILED;
     if(call_module_init(alsa_hwdep_init) != 0)       return OSSERR_INIT_FAILED;

GPL/trunk/lib32/sound.c

@@ -52 +52 @@
 int pcm_device = 0;
 int total = 0;
-int pcm_instances = 0;
+// int pcm_instances = 0;  //PS+++ !!!!!!! what is it!!!! see pcm.lib
 
 OpenedHandles opened_handles[8 * 256] = {0};
@@ -1065 +1065 @@
 
 //******************************************************************************
+ULONG CountWv=0;
+ULONG LockAdd=0;
+extern  ULONG xchg( ULONG *p, ULONG x);
+#pragma aux xchg = "xchg [esi],eax" parm [ESI][EAX] value [EAX];
 //******************************************************************************
 OSSRET OSS32_WaveAddBuffer(OSSSTREAMID streamid, ULONG buffer, ULONG size, ULONG *pTransferred, int pcm)
@@ -1072 +1076 @@
     int                 ret, align, size1, ret1;
     LONG                transferred;
-    ULONG               position,i;
+    ULONG               position,i,j;
     char                *buf;
-    int toret = 0;
 
 //    return OSSERR_SUCCESS;
@@ -1103 +1106 @@
 
     size = min(size, samples_to_bytes(status.avail));
+
+#ifdef DEBUG_PK
     if (size1 != size)
-        printk("requested size [%i] less then available [%i]\n", size1, size);
-#if 0
-    if (size < per_bytes)
-    { /*HACK!!!*/
-        printk("HACK avoid buffer overrun: requested buffer [%i] less than period [%i]. prev size: %i\n", size, per_bytes, prev_size);
-        *pTransferred = size;
-        prev_size = size;
-        ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-        return OSSERR_SUCCESS;
-    }
+        printk("requested size [%d] less then available [%d]\n", size1, size);
 #endif
-//    size = per_bytes * (size / per_bytes);
-
-#ifdef DEBUG_PK
-    printk("OSS32_WaveAddBuffer hw %i app %i avail %i, orig size: %i, size %i align %i\n", samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size1, size, per_bytes);
+
+    CountWv++;
+
+#ifdef DEBUG
+    printk("OSS32_WaveAddBuffer N:%d hw %d app %d avail %d, orig size: %d, size %d\n",CountWv, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size1, size);
 #endif
 
-    if(size == 0) {
+    if (size == 0) 
+    {
 #ifdef DEBUG_PK
         printk("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n");
@@ -1133 +1131 @@
 
     transferred = 0;
+    *pTransferred = 0;
+    ret = -11;
     switch(SNDRV_MINOR_DEVICE(MINOR(pHandle->inode.i_rdev-pcm)))
     {
     case SNDRV_MINOR_PCM_PLAYBACK:
-        // size should be aligned to channels number * samplesize
-
-        while(TRUE) {
-        again:
-            for ( i=0; i < 10000; i++)
-            {
-            ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-            if ( status.state != SNDRV_PCM_STATE_XRUN ) break;
-            }
-            if ( i > 9998 ) 
-            {
-                printk("timeout stat %x avail:%i:%i \n",status.state,samples_to_bytes(status.avail),status.avail);
-                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-            }
-            ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
-            if(ret < 0) {
-                // check EAGAIN
-                if (ret == -EPIPE)
-                {
-                    ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-//                    if (ret1 == 0) continue;
-//                    printk("prepare rc %i\n",ret);
-                }
-
-                if(transferred > 0) {
-                    printk("OSS32_WaveAddBuffer failed on partial transfer %x %i; ret = %i\n", buffer, size, ret);
-                    *pTransferred = transferred;
-                    if (toret > 4)
-                        return OSSERR_SUCCESS; /* avoid infinite loop */
-                    toret++;
-                    goto again;
-                }
-
-                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-
-                if ( ((status.state != SNDRV_PCM_STATE_PREPARED) &&
-                      (status.state != SNDRV_PCM_STATE_RUNNING) &&
-                      (status.state != SNDRV_PCM_STATE_DRAINING)) || ret == -32 ) {
-                    ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-                    printk("OSS32_WaveAddBuffer buffer overrun: size %i, ret %i, trans %i, prev sz %i per sz %i total %i\n", size, ret, transferred, prev_size, per_bytes, total);
-                    //ret = size;
-                    //transferred = size;
-                    if (toret) break; /* avoid infinite loop */
-                    toret = 1;
-                    goto again;
-                }
-                else {
-                    printk("OSS32_WaveAddBuffer failed when SNDRV_MINOR_PCM_PLAYBACK. rc = %i\n",ret);
-                    printk("hw %i app %i avail %i, size %i\n", samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size);
-                    printk("total = %i\n",total);
-                    printk("state = %i\n",status.state);
-                    printk("avail = %i\n",status.avail);
-                    printk("size req = %i\n",size1);
-                    DebugInt3();
-                    return UNIXToOSSError(transferred);
-                }
-            }
-            if(ret == 0) {
-                break;
-            }
-            toret = 0;
-            transferred += ret;
-//            printk("written: now: %i, buffer: %i, total: %i\n", ret, transferred, total);
-            buffer += ret;
-            size   -= ret;
-            if((int)size <= 0) {
-                break;
-            }
+        // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
+        j = 10;            // 10 try if error
+        while (size && j && ret) 
+        {
+               for (i=0; i < 1000; i++)
+               {
+                     ret1 = 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
+                     if ((status.state != SNDRV_PCM_STATE_XRUN ) && samples_to_bytes(status.avail) )
+                         break;
+                     if (i > 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));
+                         ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                     }
+               }
+
+               if (ret1 < 0)
+               {
+//                   printk("Status Error ret1:%i trans: %i need %d tot:%d\n",ret1,transferred, size,size1);
+                   break;     // We have any global error, don't try more
+               }
+
+               ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
+
+               if (ret < 0 ) 
+               {  // We have any error, don't try more
+                  j--;
+                  if ( ret != -11 )
+                      ret1 = 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",ret,ret1,transferred, size,size1);
+                  continue; 
+               }
+               if (ret == 0)  continue;
+               transferred += ret;
+//               printk("written: now: %d, trans: %d need %d tot:%d\n", ret, transferred, size,size1);
+               buffer += ret;
+               if (size > ret)
+                  size   -= ret;
+               else
+                  size = 0;
         }
         break;
@@ -1215 +1187 @@
         return OSSERR_INVALID_PARAMETER;
     }
-    if(ret < 0) {
-        dprintf(("OSS32_WaveAddBuffer failed"));
-        DebugInt3();
-        return UNIXToOSSError(transferred);
-    }
-
-    total+=transferred;
+
+    total += transferred;
     *pTransferred = transferred;
     prev_size = transferred;
-    if (transferred < size)
-    {
-        printk("warning: transferred [%i] less than requested [%i]\n", transferred, size);
-        ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+    if (*pTransferred < size1)
+    {
+        printk("warning: transferred [%d] less than requested [%d]\n", *pTransferred, size1);
+//        ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
     }
 
@@ -1292 +1259 @@
         return UNIXToOSSError(ret);
     }
-    *pBytesAvail = samples_to_bytes(status.avail);
+    ret = samples_to_bytes(status.avail);
+    *pBytesAvail = ret > 752? ret - 752 : 0;
     return OSSERR_SUCCESS;
 }