Changeset 421 for GPL/branches/uniaud32-2.0/lib32

Timestamp:

Mar 23, 2009, 9:13:00 AM (17 years ago)

Author:

Paul Smedley

Message:

Updates from Pasha to improve IRQ handling and resolve long delays at startup in APIC mode when using ACPI

Location:

GPL/branches/uniaud32-2.0/lib32

Files:

• debug.c (modified) (4 diffs)
• pci.c (modified) (3 diffs)

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

@@ -41 +41 @@
 extern int max_buf_size;
 
-#ifdef DEBUG
-short int MAGIC_COMM_PORT =  0x3f8;           // pulled from word ptr 40:0
-
-
-#define UART_DATA               0x00            // UART Data port
-#define UART_INT_ENAB           0x01            // UART Interrupt enable
-#define UART_INT_ID             0x02            // interrupt ID
-#define UART_LINE_CTRL          0x03            // line control registers
-#define UART_MODEM_CTRL         0x04            // modem control register
-#define UART_LINE_STAT          0x05            // line status register
-#define UART_MODEM_STAT         0x06            // modem status regiser
-#define UART_DIVISOR_LO         0x00            // divisor latch least sig
-#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
-
-#define DELAY   nop
-#else
-short int MAGIC_COMM_PORT =  0x0;           // pulled from word ptr 40:0
-#endif
-
 char hextab[]="0123456789ABCDEF";
 
@@ -565 +546 @@
     return psz - pszC;
 }
+//PS+++ Changes for right debug output
+#ifdef DEBUG
+short int MAGIC_COMM_PORT =  0;           // pulled from word ptr 40:0
+
+
+#define UART_DATA               0x00            // UART Data port
+#define UART_INT_ENAB           0x01            // UART Interrupt enable
+#define UART_INT_ID             0x02            // interrupt ID
+#define UART_LINE_CTRL          0x03            // line control registers
+#define UART_MODEM_CTRL         0x04            // modem control register
+#define UART_LINE_STAT          0x05            // line status register
+#define UART_MODEM_STAT         0x06            // modem status regiser
+#define UART_DIVISOR_LO         0x00            // divisor latch least sig
+#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
+
+#define DELAY   nop
+#else
+short int MAGIC_COMM_PORT =  0x0;           // pulled from word ptr 40:0
+#endif
 
 void StringOut(char *DbgStr)
@@ -579 +579 @@
       */
 #ifdef DEBUG
-   if (MAGIC_COMM_PORT)
+   if (MAGIC_COMM_PORT)   //PS+++ If have comport - out to it
    {
        for( i= 0; i < len; i++ )
-          CharOut( DbgStr[i] );
+           CharOut( DbgStr[i] );
+
        if (fLineTerminate)
        {
@@ -630 +631 @@
 #endif
 
+
 #ifdef DEBUG                            //--------------------------- CharOut -
 void CharOut(char c)

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

@@ -135 +135 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef ACPI 
+struct SaveIRQForSlot
+{
+    ULONG  ulSlotNo;
+    BYTE   LowIRQ;
+    BYTE   HighIRQ;
+    BYTE   Pin;   
+};
+extern struct SaveIRQForSlot sISRHigh[];
+extern int  SaveIRQCounter;
+#endif
+
 static int pci_query_device(unsigned int vendor, unsigned int device,
                             struct pci_dev near *pcidev, int idx)
@@ -230 +242 @@
                         // IRQ and PIN
                         pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &temp);
+                        sISRHigh[SaveIRQCounter].Pin  = (temp >> 8) & 0xf;
 #ifdef ACPI 
                         temp2 = temp3 = 0; 
@@ -242 +255 @@
                         { 
                         // Check APIC IRQ, if we have /SMP /APIC, must be set 
-                        if (temp3) 
-                           temp = (temp & (~0xff)) | (temp3 & 0xff); 
+                        if (temp1) 
+                           temp = (temp & (~0xff)) | (temp1 & 0xff); 
                         // Check PIC IRQ 
-                        else if (temp1) 
-                                 temp = (temp & (~0xff)) | (temp1 & 0xff); 
+                        else if (temp3) 
+                                 temp = (temp & (~0xff)) | (temp3 & 0xff); 
                         dprintf(("pci_query_device: IRQs ACPI PIC%d APIC%d", temp1, temp3)); 
+                        sISRHigh[SaveIRQCounter].LowIRQ  = temp1;
+                        sISRHigh[SaveIRQCounter].HighIRQ = temp3;
                         } 
 #endif /* ACPI */