Changeset 84 for GPL/trunk/lib32

Timestamp:

Oct 23, 2006, 11:07:11 PM (19 years ago)

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

Location:

GPL/trunk/lib32

Files:

• irq.c (modified) (3 diffs)
• ossidc.cpp (modified) (1 diff)
• sound.c (modified) (6 diffs)
• soundmixer.c (modified) (4 diffs)
• stack.cpp (modified) (1 diff)

GPL/trunk/lib32/irq.c

@@ -176 +176 @@
 
 #ifdef DEBUG
-    dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
+//    dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
 #endif
 
@@ -213 +213 @@
                     OSS32_ProcessIRQ();
 #ifdef DEBUG
-                    dprintf(("exit(1) int proc %d %d",ulSlotNo, *pulIrq));
+//                    dprintf(("exit(1) int proc %d %d",ulSlotNo, *pulIrq));
 #endif
                     eoiIrq[pSlot->irqNo] = 0;
@@ -222 +222 @@
     }
 #ifdef DEBUG
-                    dprintf(("exit(0) int proc %d %d",ulSlotNo, *pulIrq));
+//                    dprintf(("exit(0) int proc %d %d",ulSlotNo, *pulIrq));
 #endif
 

GPL/trunk/lib32/ossidc.cpp

@@ -283 +283 @@
 
     if(nrCardsDetected != 0) {
+        dprintf(("OSS32_Initialize2"));
         pcm_info();
+        dprintf(("OSS32_Initialize3"));
         for(int i=0;i<nrCardsDetected;i++) {
+            dprintf(("OSS32_Initialize4 start: %d",i));
             FillCaps(i);
+            dprintf(("OSS32_Initialize4 end: %d",i));
         }
+        dprintf(("OSS32_Initialize: SUCCESS. nr. of cards: %d",nrCardsDetected));
         return OSSERR_SUCCESS;
     }
+    dprintf(("OSS32_Initialize. FAILED"));
     return OSSERR_INIT_FAILED;
 }

GPL/trunk/lib32/sound.c

@@ -754 +754 @@
     soundhandle        *pHandle = (soundhandle *)streamid;
     snd_pcm_hw_params_t params;
+    snd_pcm_status_t    status;
     snd_pcm_sw_params_t swparams;
     int                 ret, ret1, nrperiods, minnrperiods, maxnrperiods, samplesize, i;
@@ -889 +890 @@
             }
         }
+
 //        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         DebugInt3();
@@ -1040 +1042 @@
     total = 0;
     per_bytes = periodbytes;
+    ret = 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))) {
+        printk("Device is not in proper state: %i. Calling prepare\n", status.state);
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+    }
     printk("OSS32_WaveSetHwParams return %d after SNDRV_PCM_IOCTL_SW_PARAMS ioctl, streamid %X", ret,(ULONG)pHandle);
     return UNIXToOSSError(ret);
@@ -1133 +1142 @@
                     printk("OSS32_WaveAddBuffer failed on partial transfer %x %i; ret = %i\n", buffer, size, ret);
                     *pTransferred = transferred;
-                    return OSSERR_SUCCESS;
+                    if (toret)
+                        return OSSERR_SUCCESS; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
 
@@ -1143 +1155 @@
                     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;
-                    break; /* UGLY hack*/
-                    //goto again;
+                    //ret = size;
+                    //transferred = size;
+                    if (toret) break; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
                 else {
@@ -1162 +1175 @@
                 break;
             }
+            toret = 0;
             transferred += ret;
 //            printk("written: now: %i, buffer: %i, total: %i\n", ret, transferred, total);

GPL/trunk/lib32/soundmixer.c

@@ -72 +72 @@
         /* OSS_MIXER_3DDEPTH  */ { "3D Control - Depth", 0 , -1},
         /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
+        /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
 };
 char *szRecSources[OSS32_MIX_RECSRC_MAX] = {
@@ -201 +202 @@
                 int controlnamelen = strlen(pHandle->pids[i].name);
 
-                if(namelen == controlnamelen) 
+                if(namelen == controlnamelen)
                 {//control names are identical; found exact match
                     pHandle->controls[j].idxVolume = i;
@@ -392 +393 @@
         idx = pHandle->controls[OSS_MIXER_VOLUME].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_VOLUME].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MASTER_REAR: //TODO:
@@ -400 +407 @@
         idx = pHandle->controls[OSS_MIXER_PCM].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_PCM].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MIDI:

GPL/trunk/lib32/stack.cpp

@@ -33 +33 @@
 #endif
 
-#define MAX_STACK               8
+#define MAX_STACK               16
 #define STACKSIZE               (16*1024)
 #define TOTAL_STACKSIZE     MAX_STACK*(16*1024)