--- ch34x.c.orig 2014-04-14 10:38:44.000000000 +0200 +++ ch34x.c 2015-06-15 19:26:39.000000000 +0200 @@ -10,11 +10,7 @@ // Support linux kernel version 2.6.25 and later // -#include -#ifndef KERNEL_VERSION -#define KERNEL_VERSION(ver, rel, seq) ((ver << 16) | (rel << 8) | (seq)) -#endif - +#include #include #include #include @@ -380,7 +376,7 @@ unsigned char reg_value = 0; unsigned short value = 0; unsigned short index = 0; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -405,7 +401,7 @@ return; cflag = termios->c_cflag; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s (%d) cflag=0x%x\n", __func__, port->number, cflag); #else dbg_ch34x("%s (%d) cflag=0x%x\n", __func__, port->port_number, cflag); @@ -515,7 +511,7 @@ /*unsigned int msr;*/ unsigned int retval; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -561,7 +557,7 @@ long timeout; wait_queue_t wait; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -636,7 +632,7 @@ struct usb_serial *serial = port->serial; int retval; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number ); #else dbg_ch34x("%s - port:%d", __func__, port->port_number ); @@ -710,7 +706,7 @@ /*unsigned int mcr = priv->line_control;*/ u8 control; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -743,7 +739,7 @@ unsigned int status; unsigned int changed; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s -port:%d", __func__, port->number); #else dbg_ch34x("%s -port:%d", __func__, port->port_number); @@ -793,7 +789,7 @@ { //struct usb_serial_port *port = tty->driver_data; #endif -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d, cmd=0x%04x", __func__, port->number, cmd); #else dbg_ch34x("%s - port:%d, cmd=0x%04x", __func__, port->port_number, cmd); @@ -802,7 +798,7 @@ { // Note here case TIOCMIWAIT: -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d TIOCMIWAIT", __func__, port->number); #else dbg_ch34x("%s - port:%d TIOCMIWAIT", __func__, port->port_number); @@ -824,7 +820,7 @@ struct ch34x_private *priv = usb_get_serial_port_data( port ); unsigned long flags; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -877,7 +873,7 @@ struct ch34x_private *priv = usb_get_serial_port_data(port); unsigned long flags; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d, %d bytes", __func__, port->number, count); #else dbg_ch34x("%s - port:%d, %d bytes", __func__, port->port_number, count); @@ -907,7 +903,7 @@ int room = 0; unsigned long flags; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -933,7 +929,7 @@ int chars = 0; unsigned long flags; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -1043,7 +1039,7 @@ int status = urb->status; int retval; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s port:%d", __func__, port->number ); #else dbg_ch34x("%s port:%d", __func__, port->port_number ); @@ -1091,7 +1087,7 @@ u8 line_status; char tty_flag; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number ); #else dbg_ch34x("%s - port:%d", __func__, port->port_number); @@ -1197,7 +1193,7 @@ int retval; int status = urb->status; -#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) +#if(LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) dbg_ch34x("%s - port:%d", __func__, port->number ); #else dbg_ch34x("%s - port:%d", __func__, port->port_number );