microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

TTY: ircomm, use flags from tty_port 

Switch to tty_port->flags. And while at it, remove redefined flags for
them.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-06-04 13:35:19 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель 580d27b449
Коммит 849d5a997f
4 изменённых файлов: 31 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
include/net/irda/ircomm_tty.h
Просмотреть файл

@ -52,11 +52,6 @@
/* Same for payload size. See qos.c for the smallest max data size */ /* Same for payload size. See qos.c for the smallest max data size */
#define IRCOMM_TTY_DATA_UNINITIALISED (64 - IRCOMM_TTY_HDR_UNINITIALISED) #define IRCOMM_TTY_DATA_UNINITIALISED (64 - IRCOMM_TTY_HDR_UNINITIALISED)
/* Those are really defined in include/linux/serial.h - Jean II */
#define ASYNC_B_INITIALIZED 31 /* Serial port was initialized */
#define ASYNC_B_NORMAL_ACTIVE 29 /* Normal device is active */
#define ASYNC_B_CLOSING 27 /* Serial port is closing */
/* /*
* IrCOMM TTY driver state * IrCOMM TTY driver state
*/ */
@ -81,7 +76,6 @@ struct ircomm_tty_cb {
LOCAL_FLOW flow; /* IrTTP flow status */ LOCAL_FLOW flow; /* IrTTP flow status */
int line; int line;
unsigned long flags;
__u8 dlsap_sel; __u8 dlsap_sel;
__u8 slsap_sel; __u8 slsap_sel;

46
net/irda/ircomm/ircomm_tty.c
Просмотреть файл

@ -194,7 +194,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
/* Check if already open */ /* Check if already open */
if (test_and_set_bit(ASYNC_B_INITIALIZED, &self->flags)) { if (test_and_set_bit(ASYNCB_INITIALIZED, &self->port.flags)) {
IRDA_DEBUG(2, "%s(), already open so break out!\n", __func__ ); IRDA_DEBUG(2, "%s(), already open so break out!\n", __func__ );
return 0; return 0;
} }
@ -231,7 +231,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
return 0; return 0;
err: err:
clear_bit(ASYNC_B_INITIALIZED, &self->flags); clear_bit(ASYNCB_INITIALIZED, &self->port.flags);
return ret; return ret;
} }
@ -260,7 +260,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
*/ */
if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){ if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
/* nonblock mode is set or port is not enabled */ /* nonblock mode is set or port is not enabled */
self->flags |= ASYNC_NORMAL_ACTIVE; self->port.flags |= ASYNC_NORMAL_ACTIVE;
IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ ); IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ );
return 0; return 0;
} }
@ -306,8 +306,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
if (tty_hung_up_p(filp) || if (tty_hung_up_p(filp) ||
!test_bit(ASYNC_B_INITIALIZED, &self->flags)) { !test_bit(ASYNCB_INITIALIZED, &self->port.flags)) {
retval = (self->flags & ASYNC_HUP_NOTIFY) ? retval = (self->port.flags & ASYNC_HUP_NOTIFY) ?
-EAGAIN : -ERESTARTSYS; -EAGAIN : -ERESTARTSYS;
break; break;
} }
@ -317,7 +317,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
* specified, we cannot return before the IrCOMM link is * specified, we cannot return before the IrCOMM link is
* ready * ready
*/ */
if (!test_bit(ASYNC_B_CLOSING, &self->flags) && if (!test_bit(ASYNCB_CLOSING, &self->port.flags) &&
(do_clocal || (self->settings.dce & IRCOMM_CD)) && (do_clocal || (self->settings.dce & IRCOMM_CD)) &&
self->state == IRCOMM_TTY_READY) self->state == IRCOMM_TTY_READY)
{ {
@ -350,7 +350,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
__FILE__, __LINE__, tty->driver->name, self->port.count); __FILE__, __LINE__, tty->driver->name, self->port.count);
if (!retval) if (!retval)
self->flags |= ASYNC_NORMAL_ACTIVE; self->port.flags |= ASYNC_NORMAL_ACTIVE;
return retval; return retval;
} }
@ -420,13 +420,13 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
self->line, self->port.count); self->line, self->port.count);
/* Not really used by us, but lets do it anyway */ /* Not really used by us, but lets do it anyway */
self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0; tty->low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
/* /*
* If the port is the middle of closing, bail out now * If the port is the middle of closing, bail out now
*/ */
if (tty_hung_up_p(filp) || if (tty_hung_up_p(filp) ||
test_bit(ASYNC_B_CLOSING, &self->flags)) { test_bit(ASYNCB_CLOSING, &self->port.flags)) {
/* Hm, why are we blocking on ASYNC_CLOSING if we /* Hm, why are we blocking on ASYNC_CLOSING if we
* do return -EAGAIN/-ERESTARTSYS below anyway? * do return -EAGAIN/-ERESTARTSYS below anyway?
@ -437,14 +437,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
*/ */
if (wait_event_interruptible(self->port.close_wait, if (wait_event_interruptible(self->port.close_wait,
!test_bit(ASYNC_B_CLOSING, &self->flags))) { !test_bit(ASYNCB_CLOSING, &self->port.flags))) {
IRDA_WARNING("%s - got signal while blocking on ASYNC_CLOSING!\n", IRDA_WARNING("%s - got signal while blocking on ASYNC_CLOSING!\n",
__func__); __func__);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
#ifdef SERIAL_DO_RESTART #ifdef SERIAL_DO_RESTART
return (self->flags & ASYNC_HUP_NOTIFY) ? return (self->port.flags & ASYNC_HUP_NOTIFY) ?
-EAGAIN : -ERESTARTSYS; -EAGAIN : -ERESTARTSYS;
#else #else
return -EAGAIN; return -EAGAIN;
@ -531,7 +531,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
} }
/* Hum... Should be test_and_set_bit ??? - Jean II */ /* Hum... Should be test_and_set_bit ??? - Jean II */
set_bit(ASYNC_B_CLOSING, &self->flags); set_bit(ASYNCB_CLOSING, &self->port.flags);
/* We need to unlock here (we were unlocking at the end of this /* We need to unlock here (we were unlocking at the end of this
* function), because tty_wait_until_sent() may schedule. * function), because tty_wait_until_sent() may schedule.
@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
wake_up_interruptible(&self->port.open_wait); wake_up_interruptible(&self->port.open_wait);
} }
self->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); self->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&self->port.close_wait); wake_up_interruptible(&self->port.close_wait);
} }
@ -954,7 +954,7 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
IRDA_DEBUG(0, "%s()\n", __func__ ); IRDA_DEBUG(0, "%s()\n", __func__ );
if (!test_and_clear_bit(ASYNC_B_INITIALIZED, &self->flags)) if (!test_and_clear_bit(ASYNCB_INITIALIZED, &self->port.flags))
return; return;
ircomm_tty_detach_cable(self); ircomm_tty_detach_cable(self);
@ -1005,7 +1005,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
/* I guess we need to lock here - Jean II */ /* I guess we need to lock here - Jean II */
spin_lock_irqsave(&self->spinlock, flags); spin_lock_irqsave(&self->spinlock, flags);
self->flags &= ~ASYNC_NORMAL_ACTIVE; self->port.flags &= ~ASYNC_NORMAL_ACTIVE;
self->tty = NULL; self->tty = NULL;
self->port.count = 0; self->port.count = 0;
spin_unlock_irqrestore(&self->spinlock, flags); spin_unlock_irqrestore(&self->spinlock, flags);
@ -1077,7 +1077,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
if (status & IRCOMM_DCE_DELTA_ANY) { if (status & IRCOMM_DCE_DELTA_ANY) {
/*wake_up_interruptible(&self->delta_msr_wait);*/ /*wake_up_interruptible(&self->delta_msr_wait);*/
} }
if ((self->flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) { if ((self->port.flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
IRDA_DEBUG(2, IRDA_DEBUG(2,
"%s(), ircomm%d CD now %s...\n", __func__ , self->line, "%s(), ircomm%d CD now %s...\n", __func__ , self->line,
(status & IRCOMM_CD) ? "on" : "off"); (status & IRCOMM_CD) ? "on" : "off");
@ -1094,7 +1094,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
return; return;
} }
} }
if (self->flags & ASYNC_CTS_FLOW) { if (self->port.flags & ASYNC_CTS_FLOW) {
if (tty->hw_stopped) { if (tty->hw_stopped) {
if (status & IRCOMM_CTS) { if (status & IRCOMM_CTS) {
IRDA_DEBUG(2, IRDA_DEBUG(2,
@ -1327,27 +1327,27 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
seq_puts(m, "Flags:"); seq_puts(m, "Flags:");
sep = ' '; sep = ' ';
if (self->flags & ASYNC_CTS_FLOW) { if (self->port.flags & ASYNC_CTS_FLOW) {
seq_printf(m, "%cASYNC_CTS_FLOW", sep); seq_printf(m, "%cASYNC_CTS_FLOW", sep);
sep = '|'; sep = '|';
} }
if (self->flags & ASYNC_CHECK_CD) { if (self->port.flags & ASYNC_CHECK_CD) {
seq_printf(m, "%cASYNC_CHECK_CD", sep); seq_printf(m, "%cASYNC_CHECK_CD", sep);
sep = '|'; sep = '|';
} }
if (self->flags & ASYNC_INITIALIZED) { if (self->port.flags & ASYNC_INITIALIZED) {
seq_printf(m, "%cASYNC_INITIALIZED", sep); seq_printf(m, "%cASYNC_INITIALIZED", sep);
sep = '|'; sep = '|';
} }
if (self->flags & ASYNC_LOW_LATENCY) { if (self->port.flags & ASYNC_LOW_LATENCY) {
seq_printf(m, "%cASYNC_LOW_LATENCY", sep); seq_printf(m, "%cASYNC_LOW_LATENCY", sep);
sep = '|'; sep = '|';
} }
if (self->flags & ASYNC_CLOSING) { if (self->port.flags & ASYNC_CLOSING) {
seq_printf(m, "%cASYNC_CLOSING", sep); seq_printf(m, "%cASYNC_CLOSING", sep);
sep = '|'; sep = '|';
} }
if (self->flags & ASYNC_NORMAL_ACTIVE) { if (self->port.flags & ASYNC_NORMAL_ACTIVE) {
seq_printf(m, "%cASYNC_NORMAL_ACTIVE", sep); seq_printf(m, "%cASYNC_NORMAL_ACTIVE", sep);
sep = '|'; sep = '|';
} }

5
net/irda/ircomm/ircomm_tty_attach.c
Просмотреть файл

@ -566,7 +566,8 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self)
* will have to wait for the peer device (DCE) to raise the CTS * will have to wait for the peer device (DCE) to raise the CTS
* line. * line.
*/ */
if ((self->flags & ASYNC_CTS_FLOW) && ((self->settings.dce & IRCOMM_CTS) == 0)) { if ((self->port.flags & ASYNC_CTS_FLOW) &&
((self->settings.dce & IRCOMM_CTS) == 0)) {
IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __func__ ); IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __func__ );
return; return;
} else { } else {
@ -977,7 +978,7 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH); ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH);
ircomm_tty_start_watchdog_timer(self, 3*HZ); ircomm_tty_start_watchdog_timer(self, 3*HZ);
if (self->flags & ASYNC_CHECK_CD) { if (self->port.flags & ASYNC_CHECK_CD) {
/* Drop carrier */ /* Drop carrier */
self->settings.dce = IRCOMM_DELTA_CD; self->settings.dce = IRCOMM_DELTA_CD;
ircomm_tty_check_modem_status(self); ircomm_tty_check_modem_status(self);

10
net/irda/ircomm/ircomm_tty_ioctl.c
Просмотреть файл

@ -90,19 +90,19 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
/* CTS flow control flag and modem status interrupts */ /* CTS flow control flag and modem status interrupts */
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
self->flags |= ASYNC_CTS_FLOW; self->port.flags |= ASYNC_CTS_FLOW;
self->settings.flow_control |= IRCOMM_RTS_CTS_IN; self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
/* This got me. Bummer. Jean II */ /* This got me. Bummer. Jean II */
if (self->service_type == IRCOMM_3_WIRE_RAW) if (self->service_type == IRCOMM_3_WIRE_RAW)
IRDA_WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __func__); IRDA_WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __func__);
} else { } else {
self->flags &= ~ASYNC_CTS_FLOW; self->port.flags &= ~ASYNC_CTS_FLOW;
self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN; self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
} }
if (cflag & CLOCAL) if (cflag & CLOCAL)
self->flags &= ~ASYNC_CHECK_CD; self->port.flags &= ~ASYNC_CHECK_CD;
else else
self->flags |= ASYNC_CHECK_CD; self->port.flags |= ASYNC_CHECK_CD;
#if 0 #if 0
/* /*
* Set up parity check flag * Set up parity check flag
@ -270,7 +270,7 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.line = self->line; info.line = self->line;
info.flags = self->flags; info.flags = self->port.flags;
info.baud_base = self->settings.data_rate; info.baud_base = self->settings.data_rate;
info.close_delay = self->port.close_delay; info.close_delay = self->port.close_delay;
info.closing_wait = self->port.closing_wait; info.closing_wait = self->port.closing_wait;