Changeset 34 for GPL/trunk/drv32

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

Location:

GPL/trunk/drv32

Files:

• init.c (modified) (1 diff)
• irq.cpp (modified) (1 diff)
• irq.h (modified) (1 diff)
• rm.cpp (modified) (1 diff)

GPL/trunk/drv32/init.c

@@ -44 +44 @@
 #include "parse.h"
 
-#pragma comment(copyright,"@#Netlabs: Universal audio driver for OS/2 v.1.1.3#@ (c) Netlabs 2005")
+char copyright[]="@#Netlabs:1.13#@.Universal audio driver for OS/2 (c) Netlabs 2005\0x0\0x0\0xb";
 
 const char ERR_ERROR[]   = "ERROR: ";

GPL/trunk/drv32/irq.cpp

@@ -51 +51 @@
    &ISR13,
    &ISR14,
-   &ISR15
+   &ISR15,
 };
 

GPL/trunk/drv32/irq.h

@@ -25 +25 @@
 #define __IRQ_H__
 
-#define NUM_IRQLEVELS           16
+//#define NUM_IRQLEVELS         16
+#define NUM_IRQLEVELS           256 //ACPI
 
 extern "C" FARPTR16 ISR03;

GPL/trunk/drv32/rm.cpp

@@ -212 +212 @@
    //Fill in resources read from PCI Configuration space
    detectedResources.uIRQLevel[0]  = pciConfigData->InterruptLine;
-   if(detectedResources.uIRQLevel[0] == 0 || detectedResources.uIRQLevel[0] > 15)  {
+   if(detectedResources.uIRQLevel[0] == 0 || detectedResources.uIRQLevel[0] > 255)  {
        //Does not matter if device doesn't have any resources (like a PCI bus controller)
        dprintf(("Invalid PCI irq %x", (int)detectedResources.uIRQLevel[0]));