Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e33b5a authored by Kurt Huwig's avatar Kurt Huwig Committed by Linus Torvalds
Browse files

[PATCH] n_r3964: fixed usage of HZ; removed bad include 



Fix n_r3964 timeouts (hardcoded for 100Hz)

Also the include of <asm/termios.h> in 'n_r3964.h' is unnecessary and
prevents using the header file in any application that has to include
<termios.h> due to duplicate definition of 'struct termio'.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cdcdb286

include/linux/n_r3964.h

+13 −7
Original line number Original line Diff line number Diff line
@@ -13,6 +13,10 @@ 
 * L. Haag

 * L. Haag

 *

 *

 * $Log: r3964.h,v $

 * $Log: r3964.h,v $

 * Revision 1.4  2005/12/21 19:54:24  Kurt Huwig <kurt huwig de>

 * Fixed HZ usage on 2.6 kernels

 * Removed unnecessary include

 *

 * Revision 1.3  2001/03/18 13:02:24  dwmw2

 * Revision 1.3  2001/03/18 13:02:24  dwmw2

 * Fix timer usage, use spinlocks properly.

 * Fix timer usage, use spinlocks properly.

 *

 *
@@ -45,9 +49,11 @@ 
#define __LINUX_N_R3964_H__

#define __LINUX_N_R3964_H__





/* line disciplines for r3964 protocol */

/* line disciplines for r3964 protocol */

#include <asm/termios.h>





#ifdef __KERNEL__

#ifdef __KERNEL__



#include <linux/param.h>



/*

/*

 * Common ascii handshake characters:

 * Common ascii handshake characters:

 */

 */
@@ -58,14 +64,14 @@ 
#define NAK 0x15

#define NAK 0x15





/*

/*

 * Timeouts (msecs/10 msecs per timer interrupt):

 * Timeouts (from milliseconds to jiffies)

 */

 */





#define R3964_TO_QVZ 550/10

#define R3964_TO_QVZ ((550)*HZ/1000)

#define R3964_TO_ZVZ 220/10

#define R3964_TO_ZVZ ((220)*HZ/1000)

#define R3964_TO_NO_BUF 400/10

#define R3964_TO_NO_BUF ((400)*HZ/1000)

#define R3964_NO_TX_ROOM 100/10

#define R3964_NO_TX_ROOM ((100)*HZ/1000)

#define R3964_TO_RX_PANIC 4000/10

#define R3964_TO_RX_PANIC ((4000)*HZ/1000)

#define R3964_MAX_RETRIES 5

#define R3964_MAX_RETRIES 5





#endif

#endif