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

Commit 0ba9ff84 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: ircomm, define carrier routines 



These will be used by the tty_port wait_til_ready later. (Now they are
used by our code.)

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38c58032

net/irda/ircomm/ircomm_tty.c

+33 −10
Original line number Diff line number Diff line
@@ -104,6 +104,35 @@ static const struct tty_operations ops = { 
#endif /* CONFIG_PROC_FS */

};



static void ircomm_port_raise_dtr_rts(struct tty_port *port, int raise)

{

	struct ircomm_tty_cb *self = container_of(port, struct ircomm_tty_cb,

			port);

	/*

	 * Here, we use to lock those two guys, but as ircomm_param_request()

	 * does it itself, I don't see the point (and I see the deadlock).

	 * Jean II

	 */

	if (raise)

		self->settings.dte |= IRCOMM_RTS | IRCOMM_DTR;

	else

		self->settings.dte &= ~(IRCOMM_RTS | IRCOMM_DTR);



	ircomm_param_request(self, IRCOMM_DTE, TRUE);

}



static int ircomm_port_carrier_raised(struct tty_port *port)

{

	struct ircomm_tty_cb *self = container_of(port, struct ircomm_tty_cb,

			port);

	return self->settings.dce & IRCOMM_CD;

}



static const struct tty_port_operations ircomm_port_ops = {

	.dtr_rts = ircomm_port_raise_dtr_rts,

	.carrier_raised = ircomm_port_carrier_raised,

};



/*

 * Function ircomm_tty_init()

 *
@@ -290,15 +319,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, 
	port->blocked_open++;



	while (1) {

		if (tty->termios->c_cflag & CBAUD) {

			/* Here, we use to lock those two guys, but

			 * as ircomm_param_request() does it itself,

			 * I don't see the point (and I see the deadlock).

			 * Jean II */

			self->settings.dte |= IRCOMM_RTS + IRCOMM_DTR;



			ircomm_param_request(self, IRCOMM_DTE, TRUE);

		}

		if (tty->termios->c_cflag & CBAUD)

			tty_port_raise_dtr_rts(port);



		current->state = TASK_INTERRUPTIBLE;
@@ -315,7 +337,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, 
		 * ready

		 */

		if (!test_bit(ASYNCB_CLOSING, &port->flags) &&

		    (do_clocal || (self->settings.dce & IRCOMM_CD)) &&

		    (do_clocal || tty_port_carrier_raised(port)) &&

		    self->state == IRCOMM_TTY_READY)

		{

			break;
@@ -379,6 +401,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp) 
		}



		tty_port_init(&self->port);

		self->port.ops = &ircomm_port_ops;

		self->magic = IRCOMM_TTY_MAGIC;

		self->flow = FLOW_STOP;