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

Commit 0f608f89 authored by Kees Schoenmakers's avatar Kees Schoenmakers Committed by Live-CD User
Browse files

MOS7720 has no tiocmget method 



Fix the tiocmget/mset handling on the mos7720 USB serial port.

[Minor space reformatting for coding style - Alan]

Signed-off-by: default avatarKees Schoenmakers <k.schoenmakers@sigmae.nl>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f8a7c1a9

drivers/usb/serial/mos7720.c

+64 −37
Original line number Original line Diff line number Diff line
@@ -1264,6 +1264,67 @@ static int get_lsr_info(struct tty_struct *tty, 
	return 0;

	return 0;

}

}





static int mos7720_tiocmget(struct tty_struct *tty, struct file *file)

{

	struct usb_serial_port *port = tty->driver_data;

	struct moschip_port *mos7720_port = usb_get_serial_port_data(port);

	unsigned int result = 0;

	unsigned int mcr ;

	unsigned int msr ;



	dbg("%s - port %d", __func__, port->number);



	mcr = mos7720_port->shadowMCR;

	msr = mos7720_port->shadowMSR;



	result = ((mcr & UART_MCR_DTR)  ? TIOCM_DTR : 0)   /* 0x002 */

	  | ((mcr & UART_MCR_RTS)   ? TIOCM_RTS : 0)   /* 0x004 */

	  | ((msr & UART_MSR_CTS)   ? TIOCM_CTS : 0)   /* 0x020 */

	  | ((msr & UART_MSR_DCD)   ? TIOCM_CAR : 0)   /* 0x040 */

	  | ((msr & UART_MSR_RI)    ? TIOCM_RI :  0)   /* 0x080 */

	  | ((msr & UART_MSR_DSR)   ? TIOCM_DSR : 0);  /* 0x100 */



	dbg("%s -- %x", __func__, result);



	return result;

}



static int mos7720_tiocmset(struct tty_struct *tty, struct file *file,

					unsigned int set, unsigned int clear)

{

	struct usb_serial_port *port = tty->driver_data;

	struct moschip_port *mos7720_port = usb_get_serial_port_data(port);

	unsigned int mcr ;

	unsigned char lmcr;



	dbg("%s - port %d", __func__, port->number);

	dbg("he was at tiocmget");



	mcr = mos7720_port->shadowMCR;



	if (set & TIOCM_RTS)

		mcr |= UART_MCR_RTS;

	if (set & TIOCM_DTR)

		mcr |= UART_MCR_DTR;

	if (set & TIOCM_LOOP)

		mcr |= UART_MCR_LOOP;



	if (clear & TIOCM_RTS)

		mcr &= ~UART_MCR_RTS;

	if (clear & TIOCM_DTR)

		mcr &= ~UART_MCR_DTR;

	if (clear & TIOCM_LOOP)

		mcr &= ~UART_MCR_LOOP;



	mos7720_port->shadowMCR = mcr;

	lmcr = mos7720_port->shadowMCR;



	send_mos_cmd(port->serial, MOS_WRITE,

		port->number - port->serial->minor, UART_MCR, &lmcr);



	return 0;

}



static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,

static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,

			  unsigned int __user *value)

			  unsigned int __user *value)

{

{
@@ -1301,14 +1362,6 @@ static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd, 
			mcr &= ~UART_MCR_LOOP;

			mcr &= ~UART_MCR_LOOP;

		break;

		break;





	case TIOCMSET:

		/* turn off the RTS and DTR and LOOPBACK

		 * and then only turn on what was asked to */

		mcr &=  ~(UART_MCR_RTS | UART_MCR_DTR | UART_MCR_LOOP);

		mcr |= ((arg & TIOCM_RTS) ? UART_MCR_RTS : 0);

		mcr |= ((arg & TIOCM_DTR) ? UART_MCR_DTR : 0);

		mcr |= ((arg & TIOCM_LOOP) ? UART_MCR_LOOP : 0);

		break;

	}

	}





	mos7720_port->shadowMCR = mcr;

	mos7720_port->shadowMCR = mcr;
@@ -1320,28 +1373,6 @@ static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd, 
	return 0;

	return 0;

}

}





static int get_modem_info(struct moschip_port *mos7720_port,

			  unsigned int __user *value)

{

	unsigned int result = 0;

	unsigned int msr = mos7720_port->shadowMSR;

	unsigned int mcr = mos7720_port->shadowMCR;



	result = ((mcr & UART_MCR_DTR)	? TIOCM_DTR: 0)	  /* 0x002 */

		  | ((mcr & UART_MCR_RTS)	? TIOCM_RTS: 0)   /* 0x004 */

		  | ((msr & UART_MSR_CTS)	? TIOCM_CTS: 0)   /* 0x020 */

		  | ((msr & UART_MSR_DCD)	? TIOCM_CAR: 0)   /* 0x040 */

		  | ((msr & UART_MSR_RI)	? TIOCM_RI:  0)   /* 0x080 */

		  | ((msr & UART_MSR_DSR)	? TIOCM_DSR: 0);  /* 0x100 */





	dbg("%s -- %x", __func__, result);



	if (copy_to_user(value, &result, sizeof(int)))

		return -EFAULT;

	return 0;

}



static int get_serial_info(struct moschip_port *mos7720_port,

static int get_serial_info(struct moschip_port *mos7720_port,

			   struct serial_struct __user *retinfo)

			   struct serial_struct __user *retinfo)

{

{
@@ -1392,17 +1423,11 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file, 
	/* FIXME: These should be using the mode methods */

	/* FIXME: These should be using the mode methods */

	case TIOCMBIS:

	case TIOCMBIS:

	case TIOCMBIC:

	case TIOCMBIC:

	case TIOCMSET:

		dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET",

		dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET",

					__func__, port->number);

					__func__, port->number);

		return set_modem_info(mos7720_port, cmd,

		return set_modem_info(mos7720_port, cmd,

				      (unsigned int __user *)arg);

				      (unsigned int __user *)arg);





	case TIOCMGET:

		dbg("%s (%d) TIOCMGET", __func__,  port->number);

		return get_modem_info(mos7720_port,

				      (unsigned int __user *)arg);



	case TIOCGSERIAL:

	case TIOCGSERIAL:

		dbg("%s (%d) TIOCGSERIAL", __func__,  port->number);

		dbg("%s (%d) TIOCGSERIAL", __func__,  port->number);

		return get_serial_info(mos7720_port,

		return get_serial_info(mos7720_port,
@@ -1557,6 +1582,8 @@ static struct usb_serial_driver moschip7720_2port_driver = { 
	.attach			= mos7720_startup,

	.attach			= mos7720_startup,

	.release		= mos7720_release,

	.release		= mos7720_release,

	.ioctl			= mos7720_ioctl,

	.ioctl			= mos7720_ioctl,

	.tiocmget		= mos7720_tiocmget,

	.tiocmset		= mos7720_tiocmset,

	.set_termios		= mos7720_set_termios,

	.set_termios		= mos7720_set_termios,

	.write			= mos7720_write,

	.write			= mos7720_write,

	.write_room		= mos7720_write_room,

	.write_room		= mos7720_write_room,