Skip to content

L
linux
Commit 48decc1c authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files
Options

TTY: isdn, add tty_port 

And use tty_port->flags now. Other members will follow.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed722ead
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 30 deletions
drivers/isdn/i4l/isdn_tty.c
View file @ 48decc1c
...@@ -1046,20 +1046,20 @@ isdn_tty_change_speed(modem_info *info) ...@@ -1046,20 +1046,20 @@ isdn_tty_change_speed(modem_info *info)
/* CTS flow control flag and modem status interrupts */ /* CTS flow control flag and modem status interrupts */
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
info->flags |= ASYNC_CTS_FLOW; info->port.flags |= ASYNC_CTS_FLOW;
} else } else
info->flags &= ~ASYNC_CTS_FLOW; info->port.flags &= ~ASYNC_CTS_FLOW;
if (cflag & CLOCAL) if (cflag & CLOCAL)
info->flags &= ~ASYNC_CHECK_CD; info->port.flags &= ~ASYNC_CHECK_CD;
else { else {
info->flags |= ASYNC_CHECK_CD; info->port.flags |= ASYNC_CHECK_CD;
} }
} }
static int static int
isdn_tty_startup(modem_info *info) isdn_tty_startup(modem_info *info)
{ {
if (info->flags & ASYNC_INITIALIZED) if (info->port.flags & ASYNC_INITIALIZED)
return 0; return 0;
isdn_lock_drivers(); isdn_lock_drivers();
#ifdef ISDN_DEBUG_MODEM_OPEN #ifdef ISDN_DEBUG_MODEM_OPEN
...@@ -1076,7 +1076,7 @@ isdn_tty_startup(modem_info *info) ...@@ -1076,7 +1076,7 @@ isdn_tty_startup(modem_info *info)
*/ */
isdn_tty_change_speed(info); isdn_tty_change_speed(info);
info->flags |= ASYNC_INITIALIZED; info->port.flags |= ASYNC_INITIALIZED;
info->msr |= (UART_MSR_DSR | UART_MSR_CTS); info->msr |= (UART_MSR_DSR | UART_MSR_CTS);
info->send_outstanding = 0; info->send_outstanding = 0;
return 0; return 0;
...@@ -1089,7 +1089,7 @@ isdn_tty_startup(modem_info *info) ...@@ -1089,7 +1089,7 @@ isdn_tty_startup(modem_info *info)
static void static void
isdn_tty_shutdown(modem_info *info) isdn_tty_shutdown(modem_info *info)
{ {
if (!(info->flags & ASYNC_INITIALIZED)) if (!(info->port.flags & ASYNC_INITIALIZED))
return; return;
#ifdef ISDN_DEBUG_MODEM_OPEN #ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "Shutting down isdnmodem port %d ....\n", info->line); printk(KERN_DEBUG "Shutting down isdnmodem port %d ....\n", info->line);
...@@ -1109,7 +1109,7 @@ isdn_tty_shutdown(modem_info *info) ...@@ -1109,7 +1109,7 @@ isdn_tty_shutdown(modem_info *info)
if (info->tty) if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags); set_bit(TTY_IO_ERROR, &info->tty->flags);
info->flags &= ~ASYNC_INITIALIZED; info->port.flags &= ~ASYNC_INITIALIZED;
} }
/* isdn_tty_write() is the main send-routine. It is called from the upper /* isdn_tty_write() is the main send-routine. It is called from the upper
...@@ -1496,11 +1496,11 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * ...@@ -1496,11 +1496,11 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
* 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) ||
(info->flags & ASYNC_CLOSING)) { (info->port.flags & ASYNC_CLOSING)) {
if (info->flags & ASYNC_CLOSING) if (info->port.flags & ASYNC_CLOSING)
interruptible_sleep_on(&info->close_wait); interruptible_sleep_on(&info->close_wait);
#ifdef MODEM_DO_RESTART #ifdef MODEM_DO_RESTART
if (info->flags & ASYNC_HUP_NOTIFY) if (info->port.flags & ASYNC_HUP_NOTIFY)
return -EAGAIN; return -EAGAIN;
else else
return -ERESTARTSYS; return -ERESTARTSYS;
...@@ -1514,7 +1514,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * ...@@ -1514,7 +1514,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
*/ */
if ((filp->f_flags & O_NONBLOCK) || if ((filp->f_flags & O_NONBLOCK) ||
(tty->flags & (1 << TTY_IO_ERROR))) { (tty->flags & (1 << TTY_IO_ERROR))) {
info->flags |= ASYNC_NORMAL_ACTIVE; info->port.flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
if (tty->termios->c_cflag & CLOCAL) if (tty->termios->c_cflag & CLOCAL)
...@@ -1538,9 +1538,9 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * ...@@ -1538,9 +1538,9 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (tty_hung_up_p(filp) || if (tty_hung_up_p(filp) ||
!(info->flags & ASYNC_INITIALIZED)) { !(info->port.flags & ASYNC_INITIALIZED)) {
#ifdef MODEM_DO_RESTART #ifdef MODEM_DO_RESTART
if (info->flags & ASYNC_HUP_NOTIFY) if (info->port.flags & ASYNC_HUP_NOTIFY)
retval = -EAGAIN; retval = -EAGAIN;
else else
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
...@@ -1549,7 +1549,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * ...@@ -1549,7 +1549,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
#endif #endif
break; break;
} }
if (!(info->flags & ASYNC_CLOSING) && if (!(info->port.flags & ASYNC_CLOSING) &&
(do_clocal || (info->msr & UART_MSR_DCD))) { (do_clocal || (info->msr & UART_MSR_DCD))) {
break; break;
} }
...@@ -1574,7 +1574,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * ...@@ -1574,7 +1574,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
#endif #endif
if (retval) if (retval)
return retval; return retval;
info->flags |= ASYNC_NORMAL_ACTIVE; info->port.flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
...@@ -1600,6 +1600,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp) ...@@ -1600,6 +1600,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
info->count++; info->count++;
tty->driver_data = info; tty->driver_data = info;
info->tty = tty; info->tty = tty;
tty->port = &info->port;
/* /*
* Start up serial port * Start up serial port
*/ */
...@@ -1664,7 +1665,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp) ...@@ -1664,7 +1665,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
#endif #endif
return; return;
} }
info->flags |= ASYNC_CLOSING; info->port.flags |= ASYNC_CLOSING;
tty->closing = 1; tty->closing = 1;
/* /*
...@@ -1673,7 +1674,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp) ...@@ -1673,7 +1674,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
* interrupt driver to stop checking the data ready bit in the * interrupt driver to stop checking the data ready bit in the
* line status register. * line status register.
*/ */
if (info->flags & ASYNC_INITIALIZED) { if (info->port.flags & ASYNC_INITIALIZED) {
tty_wait_until_sent_from_close(tty, 3000); /* 30 seconds timeout */ tty_wait_until_sent_from_close(tty, 3000); /* 30 seconds timeout */
/* /*
* Before we drop DTR, make sure the UART transmitter * Before we drop DTR, make sure the UART transmitter
...@@ -1698,7 +1699,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp) ...@@ -1698,7 +1699,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
msleep_interruptible(500); msleep_interruptible(500);
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
} }
info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING); info->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
wake_up_interruptible(&info->close_wait); wake_up_interruptible(&info->close_wait);
#ifdef ISDN_DEBUG_MODEM_OPEN #ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "isdn_tty_close normal exit\n"); printk(KERN_DEBUG "isdn_tty_close normal exit\n");
...@@ -1717,7 +1718,7 @@ isdn_tty_hangup(struct tty_struct *tty) ...@@ -1717,7 +1718,7 @@ isdn_tty_hangup(struct tty_struct *tty)
return; return;
isdn_tty_shutdown(info); isdn_tty_shutdown(info);
info->count = 0; info->count = 0;
info->flags &= ~ASYNC_NORMAL_ACTIVE; info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
info->tty = NULL; info->tty = NULL;
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
} }
...@@ -1881,6 +1882,7 @@ isdn_tty_modem_init(void) ...@@ -1881,6 +1882,7 @@ isdn_tty_modem_init(void)
goto err_unregister; goto err_unregister;
} }
#endif #endif
tty_port_init(&info->port);
spin_lock_init(&info->readlock); spin_lock_init(&info->readlock);
sprintf(info->last_cause, "0000"); sprintf(info->last_cause, "0000");
sprintf(info->last_num, "none"); sprintf(info->last_num, "none");
...@@ -2055,12 +2057,12 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup) ...@@ -2055,12 +2057,12 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
#ifdef ISDN_DEBUG_MODEM_ICALL #ifdef ISDN_DEBUG_MODEM_ICALL
printk(KERN_DEBUG "m_fi: match1 wret=%d\n", wret); printk(KERN_DEBUG "m_fi: match1 wret=%d\n", wret);
printk(KERN_DEBUG "m_fi: idx=%d flags=%08lx drv=%d ch=%d usg=%d\n", idx, printk(KERN_DEBUG "m_fi: idx=%d flags=%08lx drv=%d ch=%d usg=%d\n", idx,
info->flags, info->isdn_driver, info->isdn_channel, info->port.flags, info->isdn_driver,
dev->usage[idx]); info->isdn_channel, dev->usage[idx]);
#endif #endif
if ( if (
#ifndef FIX_FILE_TRANSFER #ifndef FIX_FILE_TRANSFER
(info->flags & ASYNC_NORMAL_ACTIVE) && (info->port.flags & ASYNC_NORMAL_ACTIVE) &&
#endif #endif
(info->isdn_driver == -1) && (info->isdn_driver == -1) &&
(info->isdn_channel == -1) && (info->isdn_channel == -1) &&
...@@ -2099,7 +2101,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup) ...@@ -2099,7 +2101,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
return (wret == 2) ? 3 : 0; return (wret == 2) ? 3 : 0;
} }
#define TTY_IS_ACTIVE(info) (info->flags & ASYNC_NORMAL_ACTIVE) #define TTY_IS_ACTIVE(info) (info->port.flags & ASYNC_NORMAL_ACTIVE)
int int
isdn_tty_stat_callback(int i, isdn_ctrl *c) isdn_tty_stat_callback(int i, isdn_ctrl *c)
...@@ -2318,7 +2320,7 @@ isdn_tty_at_cout(char *msg, modem_info *info) ...@@ -2318,7 +2320,7 @@ isdn_tty_at_cout(char *msg, modem_info *info)
spin_lock_irqsave(&info->readlock, flags); spin_lock_irqsave(&info->readlock, flags);
tty = info->tty; tty = info->tty;
if ((info->flags & ASYNC_CLOSING) || (!tty)) { if ((info->port.flags & ASYNC_CLOSING) || (!tty)) {
spin_unlock_irqrestore(&info->readlock, flags); spin_unlock_irqrestore(&info->readlock, flags);
return; return;
} }
...@@ -2468,13 +2470,13 @@ isdn_tty_modem_result(int code, modem_info *info) ...@@ -2468,13 +2470,13 @@ isdn_tty_modem_result(int code, modem_info *info)
case RESULT_NO_CARRIER: case RESULT_NO_CARRIER:
#ifdef ISDN_DEBUG_MODEM_HUP #ifdef ISDN_DEBUG_MODEM_HUP
printk(KERN_DEBUG "modem_result: NO CARRIER %d %d\n", printk(KERN_DEBUG "modem_result: NO CARRIER %d %d\n",
(info->flags & ASYNC_CLOSING), (info->port.flags & ASYNC_CLOSING),
(!info->tty)); (!info->tty));
#endif #endif
m->mdmreg[REG_RINGCNT] = 0; m->mdmreg[REG_RINGCNT] = 0;
del_timer(&info->nc_timer); del_timer(&info->nc_timer);
info->ncarrier = 0; info->ncarrier = 0;
if ((info->flags & ASYNC_CLOSING) || (!info->tty)) if ((info->port.flags & ASYNC_CLOSING) || (!info->tty))
return; return;
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
...@@ -2607,10 +2609,10 @@ isdn_tty_modem_result(int code, modem_info *info) ...@@ -2607,10 +2609,10 @@ isdn_tty_modem_result(int code, modem_info *info)
} }
} }
if (code == RESULT_NO_CARRIER) { if (code == RESULT_NO_CARRIER) {
if ((info->flags & ASYNC_CLOSING) || (!info->tty)) if ((info->port.flags & ASYNC_CLOSING) || (!info->tty))
return; return;
if (info->flags & ASYNC_CHECK_CD) if (info->port.flags & ASYNC_CHECK_CD)
tty_hangup(info->tty); tty_hangup(info->tty);
} }
} }
......
include/linux/isdn.h
View file @ 48decc1c
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#define __ISDN_H__ #define __ISDN_H__
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/tty.h>
#define ISDN_MAX_DRIVERS 32 #define ISDN_MAX_DRIVERS 32
#define ISDN_MAX_CHANNELS 64 #define ISDN_MAX_CHANNELS 64
...@@ -435,7 +436,7 @@ typedef struct atemu { ...@@ -435,7 +436,7 @@ typedef struct atemu {
/* Private data (similar to async_struct in <linux/serial.h>) */ /* Private data (similar to async_struct in <linux/serial.h>) */
typedef struct modem_info { typedef struct modem_info {
int magic; int magic;
int flags; /* defined in tty.h */ struct tty_port port;
int x_char; /* xon/xoff character */ int x_char; /* xon/xoff character */
int mcr; /* Modem control register */ int mcr; /* Modem control register */
int msr; /* Modem status register */ int msr; /* Modem status register */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7