Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9db276f8 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Use termios c_*flag macros 



Expressions of the form "tty->termios.c_*flag & FLAG"
are more clearly expressed with the termios flags macros,
I_FLAG(), C_FLAG(), O_FLAG(), and L_FLAG().

Convert treewide.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Acked-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5823323e

drivers/char/pcmcia/synclink_cs.c

+8 −13
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty) 
	/* TODO:disable interrupts instead of reset to preserve signal states */

	reset_device(info);



	if (!tty || tty->termios.c_cflag & HUPCL) {

	if (!tty || C_HUPCL(tty)) {

		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);

		set_signals(info);

	}
@@ -1390,7 +1390,7 @@ static void mgslpc_program_hw(MGSLPC_INFO *info, struct tty_struct *tty) 
	port_irq_enable(info, (unsigned char) PVR_DSR | PVR_RI);

	get_signals(info);



	if (info->netcount || (tty && (tty->termios.c_cflag & CREAD)))

	if (info->netcount || (tty && C_CREAD(tty)))

		rx_start(info);



	spin_unlock_irqrestore(&info->lock, flags);
@@ -1733,7 +1733,7 @@ static void mgslpc_throttle(struct tty_struct * tty) 
	if (I_IXOFF(tty))

		mgslpc_send_xchar(tty, STOP_CHAR(tty));



	if (tty->termios.c_cflag & CRTSCTS) {

	if (C_CRTSCTS(tty)) {

		spin_lock_irqsave(&info->lock, flags);

		info->serial_signals &= ~SerialSignal_RTS;

		set_signals(info);
@@ -1762,7 +1762,7 @@ static void mgslpc_unthrottle(struct tty_struct * tty) 
			mgslpc_send_xchar(tty, START_CHAR(tty));

	}



	if (tty->termios.c_cflag & CRTSCTS) {

	if (C_CRTSCTS(tty)) {

		spin_lock_irqsave(&info->lock, flags);

		info->serial_signals |= SerialSignal_RTS;

		set_signals(info);
@@ -2306,8 +2306,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term 
	mgslpc_change_params(info, tty);



	/* Handle transition to B0 status */

	if (old_termios->c_cflag & CBAUD &&

	    !(tty->termios.c_cflag & CBAUD)) {

	if ((old_termios->c_cflag & CBAUD) && !C_BAUD(tty)) {

		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);

		spin_lock_irqsave(&info->lock, flags);

		set_signals(info);
@@ -2315,21 +2314,17 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term 
	}



	/* Handle transition away from B0 status */

	if (!(old_termios->c_cflag & CBAUD) &&

	    tty->termios.c_cflag & CBAUD) {

	if (!(old_termios->c_cflag & CBAUD) && C_BAUD(tty)) {

		info->serial_signals |= SerialSignal_DTR;

		if (!(tty->termios.c_cflag & CRTSCTS) ||

		    !test_bit(TTY_THROTTLED, &tty->flags)) {

		if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))

			info->serial_signals |= SerialSignal_RTS;

		}

		spin_lock_irqsave(&info->lock, flags);

		set_signals(info);

		spin_unlock_irqrestore(&info->lock, flags);

	}



	/* Handle turning off CRTSCTS */

	if (old_termios->c_cflag & CRTSCTS &&

	    !(tty->termios.c_cflag & CRTSCTS)) {

	if (old_termios->c_cflag & CRTSCTS && !C_CRTSCTS(tty)) {

		tty->hw_stopped = 0;

		tx_release(tty);

	}

drivers/mmc/card/sdio_uart.c

+7 −7
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static void sdio_uart_check_modem_status(struct sdio_uart_port *port) 
	if (status & UART_MSR_DCTS) {

		port->icount.cts++;

		tty = tty_port_tty_get(&port->port);

		if (tty && (tty->termios.c_cflag & CRTSCTS)) {

		if (tty && C_CRTSCTS(tty)) {

			int cts = (status & UART_MSR_CTS);

			if (tty->hw_stopped) {

				if (cts) {
@@ -648,10 +648,10 @@ static int sdio_uart_activate(struct tty_port *tport, struct tty_struct *tty) 


	sdio_uart_change_speed(port, &tty->termios, NULL);



	if (tty->termios.c_cflag & CBAUD)

	if (C_BAUD(tty))

		sdio_uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);



	if (tty->termios.c_cflag & CRTSCTS)

	if (C_CRTSCTS(tty))

		if (!(sdio_uart_get_mctrl(port) & TIOCM_CTS))

			tty->hw_stopped = 1;
@@ -833,7 +833,7 @@ static void sdio_uart_throttle(struct tty_struct *tty) 
{

	struct sdio_uart_port *port = tty->driver_data;



	if (!I_IXOFF(tty) && !(tty->termios.c_cflag & CRTSCTS))

	if (!I_IXOFF(tty) && !C_CRTSCTS(tty))

		return;



	if (sdio_uart_claim_func(port) != 0)
@@ -844,7 +844,7 @@ static void sdio_uart_throttle(struct tty_struct *tty) 
		sdio_uart_start_tx(port);

	}



	if (tty->termios.c_cflag & CRTSCTS)

	if (C_CRTSCTS(tty))

		sdio_uart_clear_mctrl(port, TIOCM_RTS);



	sdio_uart_irq(port->func);
@@ -855,7 +855,7 @@ static void sdio_uart_unthrottle(struct tty_struct *tty) 
{

	struct sdio_uart_port *port = tty->driver_data;



	if (!I_IXOFF(tty) && !(tty->termios.c_cflag & CRTSCTS))

	if (!I_IXOFF(tty) && !C_CRTSCTS(tty))

		return;



	if (sdio_uart_claim_func(port) != 0)
@@ -870,7 +870,7 @@ static void sdio_uart_unthrottle(struct tty_struct *tty) 
		}

	}



	if (tty->termios.c_cflag & CRTSCTS)

	if (C_CRTSCTS(tty))

		sdio_uart_set_mctrl(port, TIOCM_RTS);



	sdio_uart_irq(port->func);

drivers/staging/dgap/dgap.c

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ static void dgap_input(struct channel_t *ch) 
	if ((bd->state != BOARD_READY) || !tp  ||

	    (tp->magic != TTY_MAGIC) ||

	    !(ch->ch_tun.un_flags & UN_ISOPEN) ||

	    !(tp->termios.c_cflag & CREAD) ||

	    !C_CREAD(tp) ||

	    (ch->ch_tun.un_flags & UN_CLOSING)) {

		writew(head, &bs->rx_tail);

		writeb(1, &bs->idata);

drivers/staging/dgnc/dgnc_tty.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ void dgnc_input(struct channel_t *ch) 
	 */

	if (!tp || (tp->magic != TTY_MAGIC) ||

	    !(ch->ch_tun.un_flags & UN_ISOPEN) ||

	    !(tp->termios.c_cflag & CREAD) ||

	    !C_CREAD(tp) ||

	    (ch->ch_tun.un_flags & UN_CLOSING)) {

		ch->ch_r_head = tail;

drivers/tty/amiserial.c

+8 −14
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info) 
	custom.adkcon = AC_UARTBRK;

	mb();



	if (tty->termios.c_cflag & HUPCL)

	if (C_HUPCL(tty))

		info->MCR &= ~(SER_DTR|SER_RTS);

	rtsdtr_ctrl(info->MCR);
@@ -974,7 +974,7 @@ static void rs_throttle(struct tty_struct * tty) 
	if (I_IXOFF(tty))

		rs_send_xchar(tty, STOP_CHAR(tty));



	if (tty->termios.c_cflag & CRTSCTS)

	if (C_CRTSCTS(tty))

		info->MCR &= ~SER_RTS;



	local_irq_save(flags);
@@ -999,7 +999,7 @@ static void rs_unthrottle(struct tty_struct * tty) 
		else

			rs_send_xchar(tty, START_CHAR(tty));

	}

	if (tty->termios.c_cflag & CRTSCTS)

	if (C_CRTSCTS(tty))

		info->MCR |= SER_RTS;

	local_irq_save(flags);

	rtsdtr_ctrl(info->MCR);
@@ -1332,8 +1332,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
	change_speed(tty, info, old_termios);



	/* Handle transition to B0 status */

	if ((old_termios->c_cflag & CBAUD) &&

	    !(cflag & CBAUD)) {

	if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD)) {

		info->MCR &= ~(SER_DTR|SER_RTS);

		local_irq_save(flags);

		rtsdtr_ctrl(info->MCR);
@@ -1341,21 +1340,17 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
	}



	/* Handle transition away from B0 status */

	if (!(old_termios->c_cflag & CBAUD) &&

	    (cflag & CBAUD)) {

	if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {

		info->MCR |= SER_DTR;

		if (!(tty->termios.c_cflag & CRTSCTS) || 

		    !test_bit(TTY_THROTTLED, &tty->flags)) {

		if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))

			info->MCR |= SER_RTS;

		}

		local_irq_save(flags);

		rtsdtr_ctrl(info->MCR);

		local_irq_restore(flags);

	}



	/* Handle turning off CRTSCTS */

	if ((old_termios->c_cflag & CRTSCTS) &&

	    !(tty->termios.c_cflag & CRTSCTS)) {

	if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {

		tty->hw_stopped = 0;

		rs_start(tty);

	}
@@ -1367,8 +1362,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
	 * XXX  It's not clear whether the current behavior is correct

	 * or not.  Hence, this may change.....

	 */

	if (!(old_termios->c_cflag & CLOCAL) &&

	    (tty->termios.c_cflag & CLOCAL))

	if (!(old_termios->c_cflag & CLOCAL) && C_CLOCAL(tty))

		wake_up_interruptible(&info->open_wait);

#endif

}