UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Char: moxa, timer cleanup 

- schedule timer even after some card is installed, not after insmod
- cleanup timer functions

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2008-04-30 00:53:42 -07:00 committed by Linus Torvalds
parent 810ab09b2f
commit 0bcc4caadc
1 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/char/moxa.c
View File

@ -215,7 +215,6 @@ static void moxa_receive_data(struct moxa_port *);
*/ */
static int MoxaDriverIoctl(struct tty_struct *, unsigned int, unsigned long); static int MoxaDriverIoctl(struct tty_struct *, unsigned int, unsigned long);
static int MoxaDriverPoll(void); static int MoxaDriverPoll(void);
static int MoxaPortsOfCard(int);
static void MoxaPortEnable(struct moxa_port *); static void MoxaPortEnable(struct moxa_port *);
static void MoxaPortDisable(struct moxa_port *); static void MoxaPortDisable(struct moxa_port *);
static int MoxaPortSetTermio(struct moxa_port *, struct ktermios *, speed_t); static int MoxaPortSetTermio(struct moxa_port *, struct ktermios *, speed_t);
@ -715,6 +714,9 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
brd->ready = 1; brd->ready = 1;
if (!timer_pending(&moxaTimer))
mod_timer(&moxaTimer, jiffies + HZ / 50);
return 0; return 0;
err_free: err_free:
kfree(brd->ports); kfree(brd->ports);
@ -856,8 +858,6 @@ static int __init moxa_init(void)
return -1; return -1;
} }
mod_timer(&moxaTimer, jiffies + HZ / 50);
/* Find the boards defined from module args. */ /* Find the boards defined from module args. */
#ifdef MODULE #ifdef MODULE
{ {
@ -1285,10 +1285,10 @@ static void moxa_hangup(struct tty_struct *tty)
static void moxa_poll(unsigned long ignored) static void moxa_poll(unsigned long ignored)
{ {
register int card;
struct moxa_port *ch; struct moxa_port *ch;
struct tty_struct *tp; struct tty_struct *tty;
int i, ports; unsigned int card;
int i;
del_timer(&moxaTimer); del_timer(&moxaTimer);
@ -1296,36 +1296,38 @@ static void moxa_poll(unsigned long ignored)
mod_timer(&moxaTimer, jiffies + HZ / 50); mod_timer(&moxaTimer, jiffies + HZ / 50);
return; return;
} }
for (card = 0; card < MAX_BOARDS; card++) { for (card = 0; card < MAX_BOARDS; card++) {
if ((ports = MoxaPortsOfCard(card)) <= 0) if (!moxa_boards[card].ready)
continue; continue;
ch = moxa_boards[card].ports; ch = moxa_boards[card].ports;
for (i = 0; i < ports; i++, ch++) { for (i = 0; i < moxa_boards[card].numPorts; i++, ch++) {
if ((ch->asyncflags & ASYNC_INITIALIZED) == 0) if ((ch->asyncflags & ASYNC_INITIALIZED) == 0)
continue; continue;
if (!(ch->statusflags & THROTTLE) && if (!(ch->statusflags & THROTTLE) &&
(MoxaPortRxQueue(ch) > 0)) (MoxaPortRxQueue(ch) > 0))
moxa_receive_data(ch); moxa_receive_data(ch);
if ((tp = ch->tty) == 0) tty = ch->tty;
if (tty == NULL)
continue; continue;
if (ch->statusflags & LOWWAIT) { if (ch->statusflags & LOWWAIT) {
if (MoxaPortTxQueue(ch) <= WAKEUP_CHARS) { if (MoxaPortTxQueue(ch) <= WAKEUP_CHARS) {
if (!tp->stopped) { if (!tty->stopped) {
ch->statusflags &= ~LOWWAIT; ch->statusflags &= ~LOWWAIT;
tty_wakeup(tp); tty_wakeup(tty);
} }
} }
} }
if (!I_IGNBRK(tp) && (MoxaPortResetBrkCnt(ch) > 0)) { if (!I_IGNBRK(tty) && (MoxaPortResetBrkCnt(ch) > 0)) {
tty_insert_flip_char(tp, 0, TTY_BREAK); tty_insert_flip_char(tty, 0, TTY_BREAK);
tty_schedule_flip(tp); tty_schedule_flip(tty);
} }
if (MoxaPortDCDChange(ch)) { if (MoxaPortDCDChange(ch)) {
if (ch->asyncflags & ASYNC_CHECK_CD) { if (ch->asyncflags & ASYNC_CHECK_CD) {
if (MoxaPortDCDON(ch)) if (MoxaPortDCDON(ch))
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->open_wait);
else { else {
tty_hangup(tp); tty_hangup(tty);
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->open_wait);
ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE; ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
} }
@ -1671,15 +1673,14 @@ copy:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
int MoxaDriverPoll(void) static int MoxaDriverPoll(void)
{ {
struct moxa_board_conf *brd; struct moxa_board_conf *brd;
struct moxa_port *p; struct moxa_port *p;
register ushort temp;
register int card;
void __iomem *ofsAddr; void __iomem *ofsAddr;
void __iomem *ip; void __iomem *ip;
int port, ports; unsigned int port, ports, card;
ushort temp;
for (card = 0; card < MAX_BOARDS; card++) { for (card = 0; card < MAX_BOARDS; card++) {
brd = &moxa_boards[card]; brd = &moxa_boards[card];
@ -1729,19 +1730,8 @@ int MoxaDriverPoll(void)
} }
} }
moxaLowWaterChk = 0; moxaLowWaterChk = 0;
return (0);
}
/***************************************************************************** return 0;
* Card level function: *
* 1. MoxaPortsOfCard(int cardno); *
*****************************************************************************/
int MoxaPortsOfCard(int cardno)
{
if (moxa_boards[cardno].boardType == 0)
return (0);
return (moxa_boards[cardno].numPorts);
} }
/***************************************************************************** /*****************************************************************************
@ -1812,16 +1802,6 @@ int MoxaPortsOfCard(int cardno)
* -1 : no any Moxa card. * -1 : no any Moxa card.
* *
* *
* Function 4: Get the ports of this card.
* Syntax:
* int MoxaPortsOfCard(int cardno);
*
* int cardno : card number (0 - 3)
*
* return: 0 : this card is invalid
* 8/16/24/32
*
*
* Function 6: Enable this port to start Tx/Rx data. * Function 6: Enable this port to start Tx/Rx data.
* Syntax: * Syntax:
* void MoxaPortEnable(int port); * void MoxaPortEnable(int port);