From ee074dba8e79e5f405700ba7907b58572fbea8cb Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 11 Dec 2006 18:34:20 +0000 Subject: Merged revisions 1698 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r1698 | kpfleming | 2006-12-11 12:31:12 -0600 (Mon, 11 Dec 2006) | 10 lines Merged revisions 1697 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1697 | kpfleming | 2006-12-11 12:27:15 -0600 (Mon, 11 Dec 2006) | 2 lines kernel 2.6.19 API changes compatibility ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1699 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- wcusb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'wcusb.c') diff --git a/wcusb.c b/wcusb.c index 4465068..2d1f7fd 100644 --- a/wcusb.c +++ b/wcusb.c @@ -183,7 +183,7 @@ static int Wcusb_ReadWcRegs(struct usb_device *dev, unsigned char index, } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)); static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)); static void wcusb_async_control(struct urb *urb, struct pt_regs *regs); @@ -219,7 +219,7 @@ static void proslic_write_direct_async(struct wc_usb_pvt *p, unsigned char addre } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_async_control(struct urb *urb, struct pt_regs *regs) #else static void wcusb_async_control(struct urb *urb) @@ -311,7 +311,7 @@ static void wcusb_async_control(urb_t *urb) } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void keypad_check_done(struct urb *urb, struct pt_regs *regs) #else static void keypad_check_done(struct urb *urb) @@ -428,7 +428,7 @@ static void wcusb_check_interrupt(struct wc_usb_pvt *p) } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)) #else static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb)) @@ -476,7 +476,7 @@ static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)) #else static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb)) @@ -882,7 +882,7 @@ static char wc_dtmf(struct wc_usb_pvt *p) return ZT_LIN2MU(linsample); } -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_read_complete(struct urb *q, struct pt_regs *regs) #else static void wcusb_read_complete(struct urb *q) @@ -948,7 +948,7 @@ static void wcusb_read_complete(struct urb *q) return; } -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_write_complete(struct urb *q, struct pt_regs *regs) #else static void wcusb_write_complete(struct urb *q) -- cgit v1.2.3