Update of /cvsroot/alsa/alsa-driver/pci/mixart
In directory sc8-pr-cvs1:/tmp/cvs-serv29872
Modified Files:
mixart_core.c mixart_core.h mixart_hwdep.h
Log Message:
fixed the compilation on 2.2 and 2.6 kernels.
Index: mixart_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixart_core.c 22 Jul 2003 13:39:10 -0000 1.1
+++ mixart_core.c 24 Sep 2003 16:41:58 -0000 1.2
@@ -409,9 +409,9 @@
}
-void snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, dev_id, return);
+ mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, dev_id, return IRQ_NONE);
int err;
mixart_msg_t resp;
@@ -424,7 +424,7 @@
if( !(it_reg & MIXART_OIDI) ) {
/* this device did not cause the interrupt */
spin_unlock(&mgr->lock);
- return;
+ return IRQ_NONE;
}
/* mask all interrupts */
@@ -559,7 +559,7 @@
spin_unlock(&mgr->lock);
- return;
+ return IRQ_HANDLED;
}
Index: mixart_core.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_core.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mixart_core.h 28 Jul 2003 13:23:46 -0000 1.3
+++ mixart_core.h 24 Sep 2003 16:41:58 -0000 1.4
@@ -599,7 +599,7 @@
int snd_mixart_send_msg_wait_notif(mixart_mgr_t *mgr, mixart_msg_t *request, u32
notif_event);
int snd_mixart_send_msg_nonblock(mixart_mgr_t *mgr, mixart_msg_t *request);
-void snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
void snd_mixart_msg_tasklet( unsigned long arg);
void snd_mixart_reset_board(mixart_mgr_t *mgr);
Index: mixart_hwdep.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_hwdep.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixart_hwdep.h 22 Jul 2003 13:39:10 -0000 1.1
+++ mixart_hwdep.h 24 Sep 2003 16:41:58 -0000 1.2
@@ -25,6 +25,15 @@
#include <sound/hwdep.h>
+#ifdef LINUX_2_2
+#ifdef __i386__
+#define __raw_readl(x) readl(x)
+#define __raw_writel(x,y) writel(x,y)
+#else
+#warning This architecture will not work correctly!
+#endif
+#endif
+
#define readl_be(x) be32_to_cpu(__raw_readl(x))
#define writel_be(data,addr) __raw_writel(cpu_to_be32(data),addr)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
