Changeset 316 for GPL/branches

Timestamp:

Mar 24, 2008, 10:44:49 PM (17 years ago)

Author:

Paul Smedley

Message:

Fix more compiler warnings (Again)

Location:

GPL/branches/uniaud-2.0

Files:

• include/irqos2.h (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib32/irq.c (modified) (1 diff)

GPL/branches/uniaud-2.0/include/irqos2.h

@@ -29 +29 @@
 
 
-typedef int (NEAR * IRQHANDLER)(int, void *, struct pt_regs *);
+typedef int irqreturn_t;
+typedef irqreturn_t (*snd_irq_handler_t)(int, void *);
+#define irq_handler_t snd_irq_handler_t
+#undef irq_handler_t
+#define irq_handler_t snd_irq_handler_t
 
 typedef struct {
-  IRQHANDLER handler;
+  irq_handler_t handler;
   ULONG x0;
   char *x1;

GPL/branches/uniaud-2.0/include/version.h

@@ -13 +13 @@
 #define PRODUCT_NAME            "Universal Audio Driver for OS/2 and eComStation"
 #define VENDOR_NAME             "Netlabs"
-#define PRODUCT_TIMESTAMP       20080324L       // YYYYMMDD
+#define PRODUCT_TIMESTAMP       20080325L       // YYYYMMDD
 #define UNIAUD_VERSION          "1.9.0-"
 #define ALSA_VERSION            "1.0.16"

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

@@ -198 +198 @@
             {
                 fInInterrupt = TRUE;
+#if 0
                 rc = pSlot->irqHandlers[u].handler(pSlot->irqNo,
                                                    pSlot->irqHandlers[u].x2, 0);
+#else
+                rc = pSlot->irqHandlers[u].handler(pSlot->irqNo,
+                                                   pSlot->irqHandlers[u].x2);
+#endif
                 if (rc == 1) eoi_irq(pSlot->irqNo);
                 rc = (eoiIrq[pSlot->irqNo] > 0);