Re: [PATCH V8 05/10] USB: f81232: implement MCR/MSR function
On Thu, Feb 26, 2015 at 06:02:11PM +0800, Peter Hung wrote: > This patch implement relative MCR/MSR function, such like > tiocmget()/tiocmset()/dtr_rts()/carrier_raised() > > original f81232_carrier_raised() compared with wrong value UART_DCD. > It's should compared with UART_MSR_DCD. > > Signed-off-by: Peter Hung > --- > drivers/usb/serial/f81232.c | 139 > +--- > 1 file changed, 117 insertions(+), 22 deletions(-) > +static int f81232_set_mctrl(struct usb_serial_port *port, > +unsigned int set, unsigned int clear) > +{ > + u8 urb_value; Minor nit: could you just call this "val" as it's unrelated to any urb. Also looks good otherwise. Johan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V8 05/10] USB: f81232: implement MCR/MSR function
On Thu, Feb 26, 2015 at 06:02:11PM +0800, Peter Hung wrote: This patch implement relative MCR/MSR function, such like tiocmget()/tiocmset()/dtr_rts()/carrier_raised() original f81232_carrier_raised() compared with wrong value UART_DCD. It's should compared with UART_MSR_DCD. Signed-off-by: Peter Hung hpeter+linux_ker...@gmail.com --- drivers/usb/serial/f81232.c | 139 +--- 1 file changed, 117 insertions(+), 22 deletions(-) +static int f81232_set_mctrl(struct usb_serial_port *port, +unsigned int set, unsigned int clear) +{ + u8 urb_value; Minor nit: could you just call this val as it's unrelated to any urb. Also looks good otherwise. Johan -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH V8 05/10] USB: f81232: implement MCR/MSR function
This patch implement relative MCR/MSR function, such like tiocmget()/tiocmset()/dtr_rts()/carrier_raised() original f81232_carrier_raised() compared with wrong value UART_DCD. It's should compared with UART_MSR_DCD. Signed-off-by: Peter Hung --- drivers/usb/serial/f81232.c | 139 +--- 1 file changed, 117 insertions(+), 22 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 46a81ef..b70f9b9 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -34,8 +34,10 @@ MODULE_DEVICE_TABLE(usb, id_table); /* USB Control EP parameter */ #define F81232_REGISTER_REQUEST0xa0 #define F81232_GET_REGISTER0xc0 +#define F81232_SET_REGISTER0x40 #define SERIAL_BASE_ADDRESS0x0120 +#define MODEM_CONTROL_REGISTER (0x04 + SERIAL_BASE_ADDRESS) #define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS) #define CONTROL_DTR0x01 @@ -54,7 +56,7 @@ MODULE_DEVICE_TABLE(usb, id_table); struct f81232_private { struct mutex lock; - u8 line_control; + u8 modem_control; u8 modem_status; struct work_struct interrupt_work; struct usb_serial_port *port; @@ -95,6 +97,42 @@ static int f81232_get_register(struct usb_serial_port *port, u16 reg, u8 *val) return status; } +static int f81232_set_register(struct usb_serial_port *port, u16 reg, u8 val) +{ + int status; + u8 *tmp; + struct usb_device *dev = port->serial->dev; + + tmp = kmalloc(sizeof(val), GFP_KERNEL); + if (!tmp) + return -ENOMEM; + + *tmp = val; + + status = usb_control_msg(dev, + usb_sndctrlpipe(dev, 0), + F81232_REGISTER_REQUEST, + F81232_SET_REGISTER, + reg, + 0, + tmp, + sizeof(u8), + USB_CTRL_SET_TIMEOUT); + if (status != sizeof(val)) { + dev_err(>dev, "%s failed status: %d\n", __func__, status); + + if (status == 0) + status = -EIO; + else + status = usb_translate_errors(status); + } else { + status = 0; + } + + kfree(tmp); + return status; +} + static void f81232_read_msr(struct usb_serial_port *port) { int status; @@ -139,6 +177,51 @@ static void f81232_read_msr(struct usb_serial_port *port) mutex_unlock(>lock); } +static int f81232_set_mctrl(struct usb_serial_port *port, + unsigned int set, unsigned int clear) +{ + u8 urb_value; + int status; + struct f81232_private *priv = usb_get_serial_port_data(port); + + if (((set | clear) & (TIOCM_DTR | TIOCM_RTS)) == 0) + return 0; /* no change */ + + /* 'set' takes precedence over 'clear' */ + clear &= ~set; + + /* force enable interrupt with OUT2 */ + mutex_lock(>lock); + urb_value = UART_MCR_OUT2 | priv->modem_control; + + if (clear & TIOCM_DTR) + urb_value &= ~UART_MCR_DTR; + + if (clear & TIOCM_RTS) + urb_value &= ~UART_MCR_RTS; + + if (set & TIOCM_DTR) + urb_value |= UART_MCR_DTR; + + if (set & TIOCM_RTS) + urb_value |= UART_MCR_RTS; + + dev_dbg(>dev, "%s new:%02x old:%02x\n", __func__, + urb_value, priv->modem_control); + + status = f81232_set_register(port, MODEM_CONTROL_REGISTER, urb_value); + if (status) { + dev_err(>dev, "%s set MCR status < 0\n", __func__); + mutex_unlock(>lock); + return status; + } + + priv->modem_control = urb_value; + mutex_unlock(>lock); + + return 0; +} + static void f81232_update_line_status(struct usb_serial_port *port, unsigned char *data, size_t actual_length) @@ -250,12 +333,6 @@ static void f81232_process_read_urb(struct urb *urb) tty_flip_buffer_push(>port); } -static int set_control_lines(struct usb_device *dev, u8 value) -{ - /* FIXME - Stubbed out for now */ - return 0; -} - static void f81232_break_ctl(struct tty_struct *tty, int break_state) { /* FIXME - Stubbed out for now */ @@ -283,15 +360,35 @@ static void f81232_set_termios(struct tty_struct *tty, static int f81232_tiocmget(struct tty_struct *tty) { - /* FIXME - Stubbed out for now */ - return 0; + int r; + struct usb_serial_port *port = tty->driver_data; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + u8 mcr, msr; + + /* force get current MSR changed state */ + f81232_read_msr(port); + +
[PATCH V8 05/10] USB: f81232: implement MCR/MSR function
This patch implement relative MCR/MSR function, such like tiocmget()/tiocmset()/dtr_rts()/carrier_raised() original f81232_carrier_raised() compared with wrong value UART_DCD. It's should compared with UART_MSR_DCD. Signed-off-by: Peter Hung hpeter+linux_ker...@gmail.com --- drivers/usb/serial/f81232.c | 139 +--- 1 file changed, 117 insertions(+), 22 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 46a81ef..b70f9b9 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -34,8 +34,10 @@ MODULE_DEVICE_TABLE(usb, id_table); /* USB Control EP parameter */ #define F81232_REGISTER_REQUEST0xa0 #define F81232_GET_REGISTER0xc0 +#define F81232_SET_REGISTER0x40 #define SERIAL_BASE_ADDRESS0x0120 +#define MODEM_CONTROL_REGISTER (0x04 + SERIAL_BASE_ADDRESS) #define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS) #define CONTROL_DTR0x01 @@ -54,7 +56,7 @@ MODULE_DEVICE_TABLE(usb, id_table); struct f81232_private { struct mutex lock; - u8 line_control; + u8 modem_control; u8 modem_status; struct work_struct interrupt_work; struct usb_serial_port *port; @@ -95,6 +97,42 @@ static int f81232_get_register(struct usb_serial_port *port, u16 reg, u8 *val) return status; } +static int f81232_set_register(struct usb_serial_port *port, u16 reg, u8 val) +{ + int status; + u8 *tmp; + struct usb_device *dev = port-serial-dev; + + tmp = kmalloc(sizeof(val), GFP_KERNEL); + if (!tmp) + return -ENOMEM; + + *tmp = val; + + status = usb_control_msg(dev, + usb_sndctrlpipe(dev, 0), + F81232_REGISTER_REQUEST, + F81232_SET_REGISTER, + reg, + 0, + tmp, + sizeof(u8), + USB_CTRL_SET_TIMEOUT); + if (status != sizeof(val)) { + dev_err(port-dev, %s failed status: %d\n, __func__, status); + + if (status == 0) + status = -EIO; + else + status = usb_translate_errors(status); + } else { + status = 0; + } + + kfree(tmp); + return status; +} + static void f81232_read_msr(struct usb_serial_port *port) { int status; @@ -139,6 +177,51 @@ static void f81232_read_msr(struct usb_serial_port *port) mutex_unlock(priv-lock); } +static int f81232_set_mctrl(struct usb_serial_port *port, + unsigned int set, unsigned int clear) +{ + u8 urb_value; + int status; + struct f81232_private *priv = usb_get_serial_port_data(port); + + if (((set | clear) (TIOCM_DTR | TIOCM_RTS)) == 0) + return 0; /* no change */ + + /* 'set' takes precedence over 'clear' */ + clear = ~set; + + /* force enable interrupt with OUT2 */ + mutex_lock(priv-lock); + urb_value = UART_MCR_OUT2 | priv-modem_control; + + if (clear TIOCM_DTR) + urb_value = ~UART_MCR_DTR; + + if (clear TIOCM_RTS) + urb_value = ~UART_MCR_RTS; + + if (set TIOCM_DTR) + urb_value |= UART_MCR_DTR; + + if (set TIOCM_RTS) + urb_value |= UART_MCR_RTS; + + dev_dbg(port-dev, %s new:%02x old:%02x\n, __func__, + urb_value, priv-modem_control); + + status = f81232_set_register(port, MODEM_CONTROL_REGISTER, urb_value); + if (status) { + dev_err(port-dev, %s set MCR status 0\n, __func__); + mutex_unlock(priv-lock); + return status; + } + + priv-modem_control = urb_value; + mutex_unlock(priv-lock); + + return 0; +} + static void f81232_update_line_status(struct usb_serial_port *port, unsigned char *data, size_t actual_length) @@ -250,12 +333,6 @@ static void f81232_process_read_urb(struct urb *urb) tty_flip_buffer_push(port-port); } -static int set_control_lines(struct usb_device *dev, u8 value) -{ - /* FIXME - Stubbed out for now */ - return 0; -} - static void f81232_break_ctl(struct tty_struct *tty, int break_state) { /* FIXME - Stubbed out for now */ @@ -283,15 +360,35 @@ static void f81232_set_termios(struct tty_struct *tty, static int f81232_tiocmget(struct tty_struct *tty) { - /* FIXME - Stubbed out for now */ - return 0; + int r; + struct usb_serial_port *port = tty-driver_data; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + u8 mcr, msr; + + /* force get current MSR changed state */ +