Changeset 550 for GPL

Timestamp:

Apr 14, 2011, 7:32:42 PM (14 years ago)

Author:

David Azarewicz

Message:

merge interrupt fixes from trunk

Location:

GPL/branches/uniaud32-2.1.x

Files:

• alsa-kernel/core/pcm_lib.c (modified) (2 diffs)
• drv32/idc.c (modified) (2 diffs)
• drv32/irq.cpp (modified) (3 diffs)
• drv32/read.cpp (modified) (1 diff)
• drv32/strategy.c (modified) (4 diffs)
• include/dbgos2.h (modified) (2 diffs)
• lib32/debug.c (modified) (2 diffs)
• lib32/ioctl.c (modified) (16 diffs)
• lib32/irq.c (modified) (2 diffs)
• lib32/pci.c (modified) (4 diffs)
• uniaud.inc (modified) (1 diff)

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/pcm_lib.c

@@ -394 +394 @@
         if (!xrun_debug(substream, XRUN_DEBUG_JIFFIESCHECK))
                 goto no_jiffies_check;
+#endif
         /* Skip the jiffies check for hardwares with BATCH flag.
          * Such hardware usually just increases the position at each IRQ,
@@ -436 +437 @@
         }
  no_jiffies_check:
-#endif
         if (delta > runtime->period_size + runtime->period_size / 2) {
                 hw_ptr_error(substream,

GPL/branches/uniaud32-2.1.x/drv32/idc.c

@@ -56 +56 @@
                 rprintf(("AlsaIDC: Resuming"));
                 OSS32_APMResume();
+                DbgPrintIrq();
         }
 
@@ -129 +130 @@
 
   case IDC32_WAVE_STOP:
+                DbgPrintIrq();
        return OSS32_WaveStop(pPacket->streamid);
 

GPL/branches/uniaud32-2.1.x/drv32/irq.cpp

@@ -46 +46 @@
 };
 
-extern DBGINT DbgInt;
+extern "C" DBGINT DbgInt;
 
 //******************************************************************************
@@ -98 +98 @@
    sti();
    if( process_interrupt(ulSlotNo, &ulIrqNo) ) {
-                DbgInt.ulIntServiced[DbgInt.usState]++;
+                DbgInt.ulIntServiced[DbgInt.ulState]++;
        // We've cleared all service requests.
        // Clear (disable) Interrupts, Send EOI
@@ -107 +107 @@
        return TRUE;
    }
-        DbgInt.ulIntUnserviced[DbgInt.usState]++;
+        DbgInt.ulIntUnserviced[DbgInt.ulState]++;
    // Indicate Interrupt not serviced by setting carry flag before
    // returning to OS/2 kernel.  OS/2 will then shut down the interrupt!

GPL/branches/uniaud32-2.1.x/drv32/read.cpp

@@ -16 +16 @@
 
 }
-
-extern DBGINT DbgInt;
 
 ULONG StratRead(RP __far* _rp)

GPL/branches/uniaud32-2.1.x/drv32/strategy.c

@@ -44 +44 @@
 extern "C" BOOL fRewired; //pci.c
 
-DBGINT DbgInt;
+extern "C" DBGINT DbgInt;
 
 //******************************************************************************
@@ -72 +72 @@
 
         memset(&DbgInt, 0, sizeof(DbgInt));
+        DbgPrintIrq();
 
         RPInit __far* rp = (RPInit __far*)_rp;
         rc = DiscardableInit(rp);
         //dprintf(("StratInit End rc=%d", rc));
-        DbgInt.usState = 1;
+        DbgPrintIrq();
+        DbgInt.ulState = 1;
         return rc;
 }
@@ -89 +91 @@
 #pragma on (unreferenced)
 {
-        DbgInt.usState = 2;
+        DbgInt.ulState = 2;
 #ifdef ACPI
         PciAdjustInterrupts();
 #endif
-        rprintf(("StratInitComplete: Init=%ld/%ld Between=%ld/%ld Complete=%ld/%ld",
-                DbgInt.ulIntServiced[0], DbgInt.ulIntUnserviced[0],
-                DbgInt.ulIntServiced[1], DbgInt.ulIntUnserviced[1],
-                DbgInt.ulIntServiced[2], DbgInt.ulIntUnserviced[2]));
+        DbgPrintIrq();
         //dprintf(("StratInitComplete"));
         return(RPDONE);
@@ -176 +175 @@
                 rprintf(("Strategy: Resuming"));
                 OSS32_APMResume();
+                DbgPrintIrq();
         }
 

GPL/branches/uniaud32-2.1.x/include/dbgos2.h

@@ -27 +27 @@
 
 typedef struct {
-        unsigned short usState;
+        unsigned long ulState;
         unsigned long ulIntServiced[4];
         unsigned long ulIntUnserviced[4];
@@ -39 +39 @@
 extern char *szprintBuf;
 int _cdecl printk(const char * fmt, ...);
+extern void DbgPrintIrq(void);
 #ifdef __cplusplus
 }

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

@@ -41 +41 @@
 char hextab[]="0123456789ABCDEF";
 
+DBGINT DbgInt;
                                         //-------------------- DecLongToASCII -
 char * DecLongToASCII(char *StrPtr, ULONG lDecVal,USHORT Option)
@@ -391 +392 @@
 }
 
+void DbgPrintIrq(void) {
+        rprintf(("Init=%ld/%ld Between=%ld/%ld Complete=%ld/%ld",
+                DbgInt.ulIntServiced[0], DbgInt.ulIntUnserviced[0],
+                DbgInt.ulIntServiced[1], DbgInt.ulIntUnserviced[1],
+                DbgInt.ulIntServiced[2], DbgInt.ulIntUnserviced[2]));
+}
+

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

@@ -402 +402 @@
         pcms = pcm_instances(deviceid);
 
-        dprintf(("FillCaps: pcms=%i\n", pcms));
+        //dprintf(("FillCaps: pcms=%i\n", pcms));
         if (!pcmcaps[deviceid])
         {
@@ -546 +546 @@
         mixerhandle *pHandle = NULL;
         int              ret, i, j;
-//        struct snd_ctl_card_info *pinfo;
-
-        dprintf(("GetUniaudCardInfo"));
+
+        //dprintf(("GetUniaudCardInfo"));
 
         if(alsa_fops == NULL) {
@@ -603 +602 @@
         int              ret, i, j, sz;
 
-        dprintf(("GetUniaudControlNum"));
+        //dprintf(("GetUniaudControlNum"));
 
         if(alsa_fops == NULL) {
@@ -670 +669 @@
         int              ret, i, j, sz;
 
-        dprintf(("GetUniaudControls"));
+        //dprintf(("GetUniaudControls"));
 
         if(alsa_fops == NULL) {
@@ -762 +761 @@
         int              ret, i, j, sz;
 
-        dprintf(("GetUniaudControlInfo"));
+        //dprintf(("GetUniaudControlInfo"));
 
         if(alsa_fops == NULL) {
@@ -863 +862 @@
         if(pHandle) kfree(pHandle);
 
-        dprintf(("GetUniaudControlValueGet: id=%x 0=%x 1=%x", pElem->id.numid, pElem->value.integer.value[0], pElem->value.integer.value[1]));
+        //dprintf(("GetUniaudControlValueGet: id=%x 0=%x 1=%x", pElem->id.numid, pElem->value.integer.value[0], pElem->value.integer.value[1]));
 
         return OSSERR_SUCCESS;
@@ -939 +938 @@
         params = (struct snd_pcm_hw_params *)pHwParams;
 
-        dprintf(("UniaudIoctlHWRefine"));
+        //dprintf(("UniaudIoctlHWRefine"));
 
         if (!params) return -1001;
@@ -957 +956 @@
         params = (struct snd_pcm_hw_params *)pHwParams;
 
-        dprintf(("UniaudIoctlHWParamSet"));
+        //dprintf(("UniaudIoctlHWParamSet"));
 
         if (!params) return -1001;
@@ -975 +974 @@
         params = (struct snd_pcm_sw_params *)pSwParams;
 
-        dprintf(("UniaudIoctlSWParamSet"));
+        //dprintf(("UniaudIoctlSWParamSet"));
 
         if (!params) return -1001;
@@ -992 +991 @@
         struct snd_pcm_status   *status = (struct snd_pcm_status *)pstatus;
 
-        dprintf(("UniaudIoctlPCMStatus"));
+        //dprintf(("UniaudIoctlPCMStatus"));
 
         if (!status) return -1001;
@@ -1008 +1007 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
-        dprintf(("UniaudIoctlPCMWrite"));
+        //dprintf(("UniaudIoctlPCMWrite"));
 
         if (!buf) return -1001;
@@ -1028 +1027 @@
         if (!pHandle) return -1002;
 
-        dprintf(("UniaudIoctlPCMRead"));
+        //dprintf(("UniaudIoctlPCMRead"));
 
         pHandle->file.f_flags = O_NONBLOCK;
@@ -1042 +1041 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
-        dprintf(("UniaudIoctlPCMPrepare"));
+        //dprintf(("UniaudIoctlPCMPrepare"));
 
         if (!pHandle) return -1002;
@@ -1057 +1056 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
-        dprintf(("UniaudIoctlPCMResume: %x", pause));
+        //dprintf(("UniaudIoctlPCMResume: %x", pause));
 
         if (!pHandle) return -1002;
@@ -1073 +1072 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
-        dprintf(("UniaudIoctlPCMStart"));
+        //dprintf(("UniaudIoctlPCMStart"));
 
         if (!pHandle) return -1002;
@@ -1089 +1088 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
-        dprintf(("UniaudIoctlPCMDrop"));
+        //dprintf(("UniaudIoctlPCMDrop"));
 
         if (!pHandle) return -1002;

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

@@ -38 +38 @@
 
 BOOL fInInterrupt = FALSE;
-extern BOOL fSuspended; //pci.c
-
 
 //******************************************************************************
@@ -171 +169 @@
 
         //dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
-
-        if(fSuspended)
-        {//If our device is suspended, then we can't receive interrupts, so it must
-                //be for some other device
-                //Don't pass it to the linux handler as the device doesn't respond as expected
-                //when suspended
-                rprintf(("Slot %d IRQ %d suspended",ulSlotNo, *pulIrq));
-                return FALSE;
-        }
 
         if( ulSlotNo < MAX_IRQ_SLOTS )

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

@@ -47 +47 @@
 //struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
 
-BOOL    fSuspended = FALSE;
 BOOL    fRewired = FALSE;
 extern int nrCardsDetected;
@@ -934 +933 @@
         dprintf(("OSS32_APMResume"));
 
-        fSuspended = FALSE;
-
         for(i=0;i<MAX_PCI_DEVICES;i++)
         {
@@ -958 +955 @@
 
         dprintf(("OSS32_APMSuspend 1"));
-
-        fSuspended = TRUE;
 
         for(i=0;i<MAX_PCI_DEVICES;i++)
@@ -994 +989 @@
                         driver = pcidev->pcidriver;
                         if(driver && driver->suspend) driver->suspend(pcidev, SNDRV_CTL_POWER_D0);
-                        fSuspended = TRUE;
 
                         pcidev->irq_resource[0].flags = IORESOURCE_IRQ;

GPL/branches/uniaud32-2.1.x/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = BETA SVNr548
+FIXPACK = BETA SVNr550
 
 # ALSA BUILD VERSION