From: Alan S. <sw...@us...> - 2006-12-01 13:55:53
|
Update of /cvsroot/openadsl/src/linux In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18584 Modified Files: pulsar.c Log Message: Update for changes in Linux 2.6.19 to the request_irq interrupt handler function. Index: pulsar.c =================================================================== RCS file: /cvsroot/openadsl/src/linux/pulsar.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pulsar.c 18 Jun 2006 21:55:48 -0000 1.15 --- pulsar.c 1 Dec 2006 13:55:47 -0000 1.16 *************** *** 105,127 **** //*************************************************************** ! #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) ! void isr(int irq, void *dev_id, struct pt_regs *regs) { ! MODEM_PTR pmodem = (MODEM_PTR)dev_id; ! if (adsl_irq_pending(pmodem)) ! adsl_irq_service(pmodem); } ! #else irqreturn_t isr(int irq, void *dev_id, struct pt_regs *regs) { MODEM_PTR pmodem = (MODEM_PTR)dev_id; if (adsl_irq_pending(pmodem)) - { adsl_irq_service(pmodem); - return IRQ_HANDLED; - } - return IRQ_NONE; } #endif --- 105,139 ---- //*************************************************************** ! #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ! irqreturn_t isr(int irq, void *dev_id) { ! MODEM_PTR pmodem = (MODEM_PTR)dev_id; ! if (adsl_irq_pending(pmodem)) ! { ! adsl_irq_service(pmodem); ! return IRQ_HANDLED; ! } ! return IRQ_NONE; } ! #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) irqreturn_t isr(int irq, void *dev_id, struct pt_regs *regs) { + MODEM_PTR pmodem = (MODEM_PTR)dev_id; + + if (adsl_irq_pending(pmodem)) + { + adsl_irq_service(pmodem); + return IRQ_HANDLED; + } + return IRQ_NONE; + } + #else + void isr(int irq, void *dev_id, struct pt_regs *regs) + { MODEM_PTR pmodem = (MODEM_PTR)dev_id; if (adsl_irq_pending(pmodem)) adsl_irq_service(pmodem); } #endif |