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

Commit 96dab77e authored by Olivier Bornet's avatar Olivier Bornet Committed by Linus Torvalds
Browse files

tty: iuu_phoenix: set termios. 



set_termios can now be used for setting the parity and the stopbits. This is
needed to use with cards which use a different parity then the parity used at
start (even).

If the iuu_uart_baud function return an error, we will return the old_termios
instead of the new one.

Signed-off-by: default avatarOlivier Bornet <Olivier.Bornet@puck.ch>

This was then revamped to use the various helpers, not copy non-hardware
bits any to add mark/space parity and csize reporting

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cc3447d1

drivers/usb/serial/iuu_phoenix.c

+50 −0
Original line number Diff line number Diff line
@@ -942,6 +942,55 @@ static int iuu_uart_baud(struct usb_serial_port *port, u32 baud, 
	return status;

}



static void iuu_set_termios(struct tty_struct *tty,

		struct usb_serial_port *port, struct ktermios *old_termios)

{

	const u32 supported_mask = CMSPAR|PARENB|PARODD;



	unsigned int cflag = tty->termios->c_cflag;

	int status;

	u32 actual;

	u32 parity;

	int csize = CS7;

	int baud = 9600;	/* Fixed for the moment */

	u32 newval = cflag & supported_mask;



	/* compute the parity parameter */

	parity = 0;

	if (cflag & CMSPAR) {	/* Using mark space */

		if (cflag & PARODD)

			parity |= IUU_PARITY_SPACE;

		else

			parity |= IUU_PARITY_MARK;

	} else if (!(cflag & PARENB)) {

		parity |= IUU_PARITY_NONE;

		csize = CS8;

	} else if (cflag & PARODD)

		parity |= IUU_PARITY_ODD;

	else

		parity |= IUU_PARITY_EVEN;



	parity |= (cflag & CSTOPB ? IUU_TWO_STOP_BITS : IUU_ONE_STOP_BIT);



	/* set it */

	status = iuu_uart_baud(port,

			(clockmode == 2) ? 16457 : 9600 * boost / 100,

			&actual, parity);



	/* set the termios value to the real one, so the user now what has

	 * changed. We support few fields so its easies to copy the old hw

	 * settings back over and then adjust them

	 */

 	if (old_termios)

 		tty_termios_copy_hw(tty->termios, old_termios);

	if (status != 0)	/* Set failed - return old bits */

		return;

	/* Re-encode speed, parity and csize */

	tty_encode_baud_rate(tty, baud, baud);

	tty->termios->c_cflag &= ~(supported_mask|CSIZE);

	tty->termios->c_cflag |= newval | csize;

}



static void iuu_close(struct usb_serial_port *port)

{

	/* iuu_led (port,255,0,0,0); */
@@ -1151,6 +1200,7 @@ static struct usb_serial_driver iuu_device = { 
	.read_bulk_callback = iuu_uart_read_callback,

	.tiocmget = iuu_tiocmget,

	.tiocmset = iuu_tiocmset,

	.set_termios = iuu_set_termios,

	.attach = iuu_startup,

	.shutdown = iuu_shutdown,

};