Changeset 352

Timestamp:

04/21/08 11:54:49 (7 months ago)

Author:

psmedley

Message:

IRQ patch from Pavel

Location:

GPL/branches/uniaud32-2.0

Files:

• drv32/rmhelp.cpp (modified) (1 diff)
• lib32/irq.c (modified) (6 diffs)
• lib32/sound.c (modified) (6 diffs)

GPL/branches/uniaud32-2.0/drv32/rmhelp.cpp

@@ -156 +156 @@
 
   Resource.ResourceType          = RS_TYPE_IRQ;
-  Resource.IRQResource.IRQLevel  = (USHORT)ulIrq;
+  Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
   Resource.IRQResource.IRQFlags  = ( fShared ) ? RS_IRQ_SHARED : RS_IRQ_EXCLUSIVE;
-  Resource.IRQResource.PCIIrqPin = RS_PCI_INT_NONE;
+  Resource.IRQResource.PCIIrqPin = (USHORT)( (ulIrq >> 8) & 0xf);
 
   rc = RMAllocResource(DriverHandle,                    // Handle to driver.

GPL/branches/uniaud32-2.0/lib32/irq.c

@@ -69 +69 @@
                     unsigned long x0, const char *x1, void *x2)
 {
-    IRQ_SLOT    *pSlot = FindSlot(irq);
+    IRQ_SLOT    *pSlot = FindSlot(irq & 0xff);
     unsigned    u, uSlotNo = (unsigned)-1;
     if( !pSlot )
@@ -86 +86 @@
     if( pSlot )
     {
-        if(RMRequestIRQ(/*hResMgr,*/ irq, (x0 & SA_SHIRQ) != 0) == FALSE) {
+        if(RMRequestIRQ(/*hResMgr,*/ irq , (x0 & SA_SHIRQ) != 0) == FALSE) {
             dprintf(("RMRequestIRQ failed for irq %d", irq));
             //  return 0;
@@ -95 +95 @@
             if( pSlot->irqHandlers[u].handler == NULL )
             {
-                pSlot->irqNo = irq;
+                pSlot->irqNo = irq & 0xff;
                 pSlot->irqHandlers[u].handler = handler;
                 pSlot->irqHandlers[u].x0 = x0;
@@ -102 +102 @@
 
                 if( pSlot->flHandlers != 0 ||
-                   ALSA_SetIrq(irq, uSlotNo, (x0 & SA_SHIRQ) != 0) )
+                   ALSA_SetIrq( irq & 0xff, uSlotNo, (x0 & SA_SHIRQ) != 0) )
                 {
                     pSlot->flHandlers |= 1 << u;
@@ -113 +113 @@
     }
 
-    dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq));
+    dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq & 0xff ));
     return 1;
 }
@@ -162 +162 @@
      if( pSlot )        pSlot->fEOI = 1;
      */
-    eoiIrq[irq]++;
+    eoiIrq[irq & 0xff]++;
 }
 

GPL/branches/uniaud32-2.0/lib32/sound.c

@@ -778 +778 @@
     BOOL                fTryAgain = FALSE;
     ULONG ulMinRate, ulMaxRate;
-    struct snd_pcm_info      *pcminfo = NULL;
 
 #ifdef DEBUG
@@ -803 +802 @@
         return OSSERR_INVALID_PARAMETER;
     }
-
-    // Get pcminfo so that we have the device & mixer name so we can do chipset specific hacks 
-    pcminfo = (struct snd_pcm_info *)kmalloc(sizeof(struct snd_pcm_info)+sizeof(struct snd_pcm_hw_params), GFP_KERNEL);
-    //set operation to non-blocking
-    pHandle->file.f_flags = O_NONBLOCK;
-    
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
-
 tryagain:
     //set operation to non-blocking
@@ -930 +921 @@
     minperiodbytes = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->min;
     maxperiodbytes = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->max;
+
     if(periodbytes < minperiodbytes) {
         periodbytes = minperiodbytes;
@@ -955 +947 @@
     //make sure period size is a whole fraction of the buffer size
     bufsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->max;
+
+#if 0
     if(periodsize) {
         nrperiods = bufsize/periodbytes;
@@ -964 +958 @@
         return OSSERR_INVALID_PARAMETER;
     }
+#else
+    nrperiods = 3;
+#endif
     //check nr of periods against lower and upper boundaries
     minnrperiods = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIODS)->min;
@@ -1012 +1009 @@
 
 //#ifdef DEBUG_PK
-    printk("Hardware parameters: sample rate %i, data type %i, channels %i, period size %i, nrperiods %i\n",
-             pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodsize, nrperiods);
+    printk("Hardware parameters: sample rate %i, data type %i, channels %i, period bytes %i, period size %i, nrperiods %i\n",
+             pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodbytes, periodsize, nrperiods);
 //#endif
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_PARAMS, (ULONG)__Stack32ToFlat(&params));