adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

tty: rocketport uses different port flags to everyone else

Browse source 
Normalise them so we can use the common helpers later on

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2009-01-02 13:45:44 +00:00 committed by Linus Torvalds
parent 510a304957
commit a129909ca9
3 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/char/rocket.c
View file

@ -499,7 +499,7 @@ static void rp_handle_port(struct r_port *info)
if (!info) if (!info)
return; return;
if ((info->flags & ROCKET_INITIALIZED) == 0) { if ((info->flags & ASYNC_INITIALIZED) == 0) {
printk(KERN_WARNING "rp: WARNING: rp_handle_port called with " printk(KERN_WARNING "rp: WARNING: rp_handle_port called with "
"info->flags & NOT_INIT\n"); "info->flags & NOT_INIT\n");
return; return;
@ -892,11 +892,11 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
* until it's done, and then try again. * until it's done, and then try again.
*/ */
if (tty_hung_up_p(filp)) if (tty_hung_up_p(filp))
return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS); return ((info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
if (info->flags & ROCKET_CLOSING) { if (info->flags & ASYNC_CLOSING) {
if (wait_for_completion_interruptible(&info->close_wait)) if (wait_for_completion_interruptible(&info->close_wait))
return -ERESTARTSYS; return -ERESTARTSYS;
return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS); return ((info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
} }
/* /*
@ -904,7 +904,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
* then make the check up front and then exit. * then make the check up front and then exit.
*/ */
if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) {
info->flags |= ROCKET_NORMAL_ACTIVE; info->flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
if (tty->termios->c_cflag & CLOCAL) if (tty->termios->c_cflag & CLOCAL)
@ -923,7 +923,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
#ifdef ROCKET_DISABLE_SIMUSAGE #ifdef ROCKET_DISABLE_SIMUSAGE
info->flags |= ROCKET_NORMAL_ACTIVE; info->flags |= ASYNC_NORMAL_ACTIVE;
#else #else
if (!tty_hung_up_p(filp)) { if (!tty_hung_up_p(filp)) {
extra_count = 1; extra_count = 1;
@ -938,14 +938,14 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
if (tty->termios->c_cflag & CBAUD) if (tty->termios->c_cflag & CBAUD)
tty_port_raise_dtr_rts(port); tty_port_raise_dtr_rts(port);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (tty_hung_up_p(filp) || !(info->flags & ROCKET_INITIALIZED)) { if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)) {
if (info->flags & ROCKET_HUP_NOTIFY) if (info->flags & ASYNC_HUP_NOTIFY)
retval = -EAGAIN; retval = -EAGAIN;
else else
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
break; break;
} }
if (!(info->flags & ROCKET_CLOSING) && if (!(info->flags & ASYNC_CLOSING) &&
(do_clocal || tty_port_carrier_raised(port))) (do_clocal || tty_port_carrier_raised(port)))
break; break;
if (signal_pending(current)) { if (signal_pending(current)) {
@ -975,7 +975,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
#endif #endif
if (retval) if (retval)
return retval; return retval;
info->flags |= ROCKET_NORMAL_ACTIVE; info->flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
@ -998,12 +998,12 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
if (info->flags & ROCKET_CLOSING) { if (info->flags & ASYNC_CLOSING) {
retval = wait_for_completion_interruptible(&info->close_wait); retval = wait_for_completion_interruptible(&info->close_wait);
free_page(page); free_page(page);
if (retval) if (retval)
return retval; return retval;
return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS); return ((info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
} }
/* /*
@ -1032,7 +1032,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
/* /*
* Info->count is now 1; so it's safe to sleep now. * Info->count is now 1; so it's safe to sleep now.
*/ */
if ((info->flags & ROCKET_INITIALIZED) == 0) { if ((info->flags & ASYNC_INITIALIZED) == 0) {
cp = &info->channel; cp = &info->channel;
sSetRxTrigger(cp, TRIG_1); sSetRxTrigger(cp, TRIG_1);
if (sGetChanStatus(cp) & CD_ACT) if (sGetChanStatus(cp) & CD_ACT)
@ -1056,7 +1056,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
sEnRxFIFO(cp); sEnRxFIFO(cp);
sEnTransmit(cp); sEnTransmit(cp);
info->flags |= ROCKET_INITIALIZED; info->flags |= ASYNC_INITIALIZED;
/* /*
* Set up the tty->alt_speed kludge * Set up the tty->alt_speed kludge
@ -1131,7 +1131,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
return; return;
} }
info->flags |= ROCKET_CLOSING; info->flags |= ASYNC_CLOSING;
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
cp = &info->channel; cp = &info->channel;
@ -1151,7 +1151,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
/* /*
* Wait for the transmit buffer to clear * Wait for the transmit buffer to clear
*/ */
if (info->port.closing_wait != ROCKET_CLOSING_WAIT_NONE) if (info->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)
tty_wait_until_sent(tty, info->port.closing_wait); tty_wait_until_sent(tty, info->port.closing_wait);
/* /*
* Before we drop DTR, make sure the UART transmitter * Before we drop DTR, make sure the UART transmitter
@ -1192,7 +1192,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
info->xmit_buf = NULL; info->xmit_buf = NULL;
} }
} }
info->flags &= ~(ROCKET_INITIALIZED | ROCKET_CLOSING | ROCKET_NORMAL_ACTIVE); info->flags &= ~(ASYNC_INITIALIZED | ASYNC_CLOSING | ASYNC_NORMAL_ACTIVE);
tty->closing = 0; tty->closing = 0;
complete_all(&info->close_wait); complete_all(&info->close_wait);
atomic_dec(&rp_num_ports_open); atomic_dec(&rp_num_ports_open);
@ -1649,14 +1649,14 @@ static void rp_hangup(struct tty_struct *tty)
printk(KERN_INFO "rp_hangup of ttyR%d...\n", info->line); printk(KERN_INFO "rp_hangup of ttyR%d...\n", info->line);
#endif #endif
rp_flush_buffer(tty); rp_flush_buffer(tty);
if (info->flags & ROCKET_CLOSING) if (info->flags & ASYNC_CLOSING)
return; return;
if (info->port.count) if (info->port.count)
atomic_dec(&rp_num_ports_open); atomic_dec(&rp_num_ports_open);
clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]); clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
info->port.count = 0; info->port.count = 0;
info->flags &= ~ROCKET_NORMAL_ACTIVE; info->flags &= ~ASYNC_NORMAL_ACTIVE;
info->port.tty = NULL; info->port.tty = NULL;
cp = &info->channel; cp = &info->channel;
@ -1666,7 +1666,7 @@ static void rp_hangup(struct tty_struct *tty)
sDisCTSFlowCtl(cp); sDisCTSFlowCtl(cp);
sDisTxSoftFlowCtl(cp); sDisTxSoftFlowCtl(cp);
sClrTxXOFF(cp); sClrTxXOFF(cp);
info->flags &= ~ROCKET_INITIALIZED; info->flags &= ~ASYNC_INITIALIZED;
wake_up_interruptible(&info->port.open_wait); wake_up_interruptible(&info->port.open_wait);
} }

2
drivers/char/rocket.h
View file

@ -39,7 +39,7 @@ struct rocket_version {
/* /*
* Rocketport flags * Rocketport flags
*/ */
#define ROCKET_CALLOUT_NOHUP 0x00000001 /*#define ROCKET_CALLOUT_NOHUP 0x00000001 */
#define ROCKET_FORCE_CD 0x00000002 #define ROCKET_FORCE_CD 0x00000002
#define ROCKET_HUP_NOTIFY 0x00000004 #define ROCKET_HUP_NOTIFY 0x00000004
#define ROCKET_SPLIT_TERMIOS 0x00000008 #define ROCKET_SPLIT_TERMIOS 0x00000008

5
drivers/char/rocket_int.h
View file

@ -1162,11 +1162,6 @@ struct r_port {
/* number of characters left in xmit buffer before we ask for more */ /* number of characters left in xmit buffer before we ask for more */
#define WAKEUP_CHARS 256 #define WAKEUP_CHARS 256
/* Internal flags used only by the rocketport driver */
#define ROCKET_INITIALIZED 0x80000000 /* Port is active */
#define ROCKET_CLOSING 0x40000000 /* Serial port is closing */
#define ROCKET_NORMAL_ACTIVE 0x20000000 /* Normal port is active */
/* /*
* Assigned major numbers for the Comtrol Rocketport * Assigned major numbers for the Comtrol Rocketport
*/ */