korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kurt Huwig 2005-12-25 00:13:08 +01:00 committed by Linus Torvalds
parent cdcdb28623
commit 01e33b5a2a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/n_r3964.h
View File

@ -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