From: Russell King This patch fixes the ircomm_tty driver to use the tiocmget/set calls. Jozef Vesely kindly tested a similar patch and said it solved the problem. This patch adds the extra error checking which was missing in the previous patch. --- 25-akpm/net/irda/ircomm/ircomm_tty.c | 67 +++++++++++++++++++++ 25-akpm/net/irda/ircomm/ircomm_tty_ioctl.c | 91 ----------------------------- 2 files changed, 67 insertions(+), 91 deletions(-) diff -puN net/irda/ircomm/ircomm_tty.c~serial-01-fixups net/irda/ircomm/ircomm_tty.c --- 25/net/irda/ircomm/ircomm_tty.c~serial-01-fixups Tue Jan 13 11:44:04 2004 +++ 25-akpm/net/irda/ircomm/ircomm_tty.c Tue Jan 13 11:44:04 2004 @@ -75,6 +75,9 @@ static void ircomm_tty_flow_indication(v static int ircomm_tty_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *unused); #endif /* CONFIG_PROC_FS */ +static int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file); +static int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file, + unsigned int set, unsigned int clear); static struct tty_driver *driver; hashbin_t *ircomm_tty = NULL; @@ -98,6 +101,8 @@ static struct tty_operations ops = { #ifdef CONFIG_PROC_FS .read_proc = ircomm_tty_read_proc, #endif /* CONFIG_PROC_FS */ + .tiocmget = ircomm_tty_tiocmget, + .tiocmset = ircomm_tty_tiocmset, }; /* @@ -1409,6 +1414,68 @@ done: } #endif /* CONFIG_PROC_FS */ +/* + * Function ircomm_tty_tiocmget (tty, file) + * + * + * + */ +static int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file) +{ + struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; + + IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); + + if (tty->flags & (1 << TTY_IO_ERROR)) + return -EIO; + + return ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0) + | ((self->settings.dte & IRCOMM_DTR) ? TIOCM_DTR : 0) + | ((self->settings.dce & IRCOMM_CD) ? TIOCM_CAR : 0) + | ((self->settings.dce & IRCOMM_RI) ? TIOCM_RNG : 0) + | ((self->settings.dce & IRCOMM_DSR) ? TIOCM_DSR : 0) + | ((self->settings.dce & IRCOMM_CTS) ? TIOCM_CTS : 0); +} + +/* + * Function ircomm_tty_tiocmset (driver, cmd, value) + * + * + * + */ +static int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file, + unsigned int set, unsigned int clear) +{ + struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; + + IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); + + if (tty->flags & (1 << TTY_IO_ERROR)) + return -EIO; + + ASSERT(self != NULL, return -1;); + ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); + + if (set & TIOCM_RTS) + self->settings.dte |= IRCOMM_RTS; + if (set & TIOCM_DTR) + self->settings.dte |= IRCOMM_DTR; + + if (clear & TIOCM_RTS) + self->settings.dte &= ~IRCOMM_RTS; + if (clear & TIOCM_DTR) + self->settings.dte &= ~IRCOMM_DTR; + + if ((set|clear) & TIOCM_RTS) + self->settings.dte |= IRCOMM_DELTA_RTS; + if ((set|clear) & TIOCM_DTR) + self->settings.dte |= IRCOMM_DELTA_DTR; + + ircomm_param_request(self, IRCOMM_DTE, TRUE); + + return 0; +} + MODULE_AUTHOR("Dag Brattli "); MODULE_DESCRIPTION("IrCOMM serial TTY driver"); MODULE_LICENSE("GPL"); diff -puN net/irda/ircomm/ircomm_tty_ioctl.c~serial-01-fixups net/irda/ircomm/ircomm_tty_ioctl.c --- 25/net/irda/ircomm/ircomm_tty_ioctl.c~serial-01-fixups Tue Jan 13 11:44:04 2004 +++ 25-akpm/net/irda/ircomm/ircomm_tty_ioctl.c Tue Jan 13 11:44:04 2004 @@ -190,89 +190,6 @@ void ircomm_tty_set_termios(struct tty_s } /* - * Function ircomm_tty_get_modem_info (self, value) - * - * - * - */ -static int ircomm_tty_get_modem_info(struct ircomm_tty_cb *self, - unsigned int *value) -{ - unsigned int result; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - result = ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0) - | ((self->settings.dte & IRCOMM_DTR) ? TIOCM_DTR : 0) - | ((self->settings.dce & IRCOMM_CD) ? TIOCM_CAR : 0) - | ((self->settings.dce & IRCOMM_RI) ? TIOCM_RNG : 0) - | ((self->settings.dce & IRCOMM_DSR) ? TIOCM_DSR : 0) - | ((self->settings.dce & IRCOMM_CTS) ? TIOCM_CTS : 0); - - return put_user(result, value); -} - -/* - * Function set_modem_info (driver, cmd, value) - * - * - * - */ -static int ircomm_tty_set_modem_info(struct ircomm_tty_cb *self, - unsigned int cmd, unsigned int *value) -{ - unsigned int arg; - __u8 old_rts, old_dtr; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - ASSERT(self != NULL, return -1;); - ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); - - if (get_user(arg, value)) - return -EFAULT; - - old_rts = self->settings.dte & IRCOMM_RTS; - old_dtr = self->settings.dte & IRCOMM_DTR; - - switch (cmd) { - case TIOCMBIS: - if (arg & TIOCM_RTS) - self->settings.dte |= IRCOMM_RTS; - if (arg & TIOCM_DTR) - self->settings.dte |= IRCOMM_DTR; - break; - - case TIOCMBIC: - if (arg & TIOCM_RTS) - self->settings.dte &= ~IRCOMM_RTS; - if (arg & TIOCM_DTR) - self->settings.dte &= ~IRCOMM_DTR; - break; - - case TIOCMSET: - self->settings.dte = - ((self->settings.dte & ~(IRCOMM_RTS | IRCOMM_DTR)) - | ((arg & TIOCM_RTS) ? IRCOMM_RTS : 0) - | ((arg & TIOCM_DTR) ? IRCOMM_DTR : 0)); - break; - - default: - return -EINVAL; - } - - if ((self->settings.dte & IRCOMM_RTS) != old_rts) - self->settings.dte |= IRCOMM_DELTA_RTS; - - if ((self->settings.dte & IRCOMM_DTR) != old_dtr) - self->settings.dte |= IRCOMM_DELTA_DTR; - - ircomm_param_request(self, IRCOMM_DTE, TRUE); - - return 0; -} - -/* * Function get_serial_info (driver, retinfo) * * @@ -406,14 +323,6 @@ int ircomm_tty_ioctl(struct tty_struct * } switch (cmd) { - case TIOCMGET: - ret = ircomm_tty_get_modem_info(self, (unsigned int *) arg); - break; - case TIOCMBIS: - case TIOCMBIC: - case TIOCMSET: - ret = ircomm_tty_set_modem_info(self, cmd, (unsigned int *) arg); - break; case TIOCGSERIAL: ret = ircomm_tty_get_serial_info(self, (struct serial_struct *) arg); break; _