X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=src%2Fcp210x.c;h=c670ea5cf2ff0721275505c4b599f85826b208df;hb=62f7ab54a8973d9de7a76e79fed81347908505c4;hp=d1fbf26753346a7a4a7351dab590fdac21c3fb07;hpb=e1a0c29481c23a33bdf7dcbfb052cd5b9b440286;p=cp210x.git diff --git a/src/cp210x.c b/src/cp210x.c index d1fbf26..c670ea5 100644 --- a/src/cp210x.c +++ b/src/cp210x.c @@ -147,9 +147,13 @@ static struct usb_serial_driver cp210x_device = { .shutdown = cp210x_shutdown, }; +/* Control request types */ +#define REQTYPE_CTL_TO_DEVICE USB_TYPE_VENDOR +#define REQTYPE_CTL_TO_HOST (USB_DIR_IN|REQTYPE_CTL_TO_DEVICE) + /* Config request types */ -#define REQTYPE_HOST_TO_DEVICE 0x41 -#define REQTYPE_DEVICE_TO_HOST 0xc1 +#define REQTYPE_HOST_TO_DEVICE (USB_TYPE_VENDOR|USB_RECIP_INTERFACE) +#define REQTYPE_DEVICE_TO_HOST (USB_DIR_IN|REQTYPE_HOST_TO_DEVICE) /* Config SET requests. To GET, add 1 to the request number */ #define CP2101_UART 0x00 /* Enable / Disable */ @@ -270,17 +274,6 @@ static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf, return make_usb_string(kbuf, klen, str, slen); } -/* cp210x_has_setmfg - * Returns 1 if the CP210X part includes firmware that allows setting the - * USB MFG descriptor, else 0. As of this writing, no CP210X firmware allows - * this. SiLabs has suggested this may change in future firmware versions or - * parts. - */ -static inline int cp210x_has_setmfg(void) -{ - return 0; -} - /* * cp210x_ctlmsg * A generic usb control message interface. @@ -297,7 +290,7 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request, tbuf = kmalloc(size, GFP_KERNEL); if (!tbuf) return -ENOMEM; - if (requestype & 0x80) { + if (requestype & USB_DIR_IN) { ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request, requestype, value, index, tbuf, size, 300); if (ret > 0 && size) @@ -321,16 +314,11 @@ static int cp210x_reset(struct usb_serial_port *port) { dbg("%s", __FUNCTION__); -#if 1 - /* Is this better than usb_device_reset? It may be. Once a client - * issues the reset ioctl, it must disconnect and reconnect, since the - * USB connections are torn down. We also ignore the error return, - * since the part resets and doesn't send one... + /* Instructing the CP210X to reset seems to work more reliably than + * calling usb_reset_device(). */ - cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0); -#else - usb_reset_device(port->serial->dev); -#endif + cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, + 0x0008, 0x00, NULL, 0); return 0; } @@ -347,8 +335,8 @@ static int cp210x_get_partnum(struct usb_serial_port *port) _partnum = CP210x_PART_CP2101; else if (addr == 0x01) { /* Must query part to determine part number */ - if (cp210x_ctlmsg(port, 0xff, 0xc0, 0x370b, 0x00, - &_partnum, 1) != 1) + if (cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_HOST, + 0x370b, 0x00, &_partnum, 1) != 1) _partnum = CP210x_PART_UNKNOWN; } } @@ -359,8 +347,8 @@ static int cp210x_get_partnum(struct usb_serial_port *port) static inline int cp210x_setu16(struct usb_serial_port *port, int cmd, unsigned int value) { - return cp210x_ctlmsg(port, 0xff, 0x40, 0x3700 | (cmd & 0xff), - value, NULL, 0); + return cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, + 0x3700 | (cmd & 0xff), value, NULL, 0); } /* @@ -372,8 +360,8 @@ static inline int cp210x_setu16(struct usb_serial_port *port, int cmd, static int cp210x_setstr(struct usb_serial_port *port, int cmd, char *usbstr) { unsigned len = usbstr[0]; - int ret = cp210x_ctlmsg(port, 0xff, 0x40, 0x3700 | (cmd & 0xff), 0, - usbstr, len); + int ret = cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, + 0x3700 | (cmd & 0xff), 0, usbstr, len); dbg("%s - cmd 0x%02x len %d ret %d", __FUNCTION__, cmd, len, ret); return ret; } @@ -383,8 +371,8 @@ static int cp210x_gpioset(struct usb_serial_port *port, u8 gpio) { dbg("%s - port %d, gpio = 0x%.2x", __FUNCTION__, port->number, gpio); - return cp210x_ctlmsg(port, 0xff, 0x40, 0x37e1, - ((uint16_t)gpio << 8) | GPIO_MASK, NULL, 0); + return cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, + 0x37e1, ((uint16_t)gpio << 8) | GPIO_MASK, NULL, 0); } /* Set select gpio bits */ @@ -412,8 +400,8 @@ static int cp210x_gpiosetb(struct usb_serial_port *port, u8 set, u8 clear) dbg("%s - port %d, gpiob = 0x%.4x", __FUNCTION__, port->number, gpio); - /* FIXME: how about REQTYPE_HOST_TO_DEVICE instead of 0x40? */ - return cp210x_ctlmsg(port, 0xff, 0x40, 0x37e1, gpio, NULL, 0); + return cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, + 0x37e1, gpio, NULL, 0); } static int cp210x_gpioget(struct usb_serial_port *port, u8 *gpio) @@ -422,8 +410,8 @@ static int cp210x_gpioget(struct usb_serial_port *port, u8 *gpio) dbg("%s - port %d", __FUNCTION__, port->number); - /* FIXME: how about REQTYPE_DEVICE_TO_HOST instead of 0xc0? */ - ret = cp210x_ctlmsg(port, 0xff, 0xc0, 0x00c2, 0, gpio, 1); + ret = cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_HOST, + 0x00c2, 0, gpio, 1); dbg("%s - gpio = 0x%.2x (%d)", __FUNCTION__, *gpio, ret); @@ -445,16 +433,12 @@ static int cp210x_portconfset(struct usb_serial_port *port, lconfig.reset.latch = cpu_to_be16(config->reset.latch); lconfig.suspend.mode = cpu_to_be16(config->suspend.mode); lconfig.suspend.latch = cpu_to_be16(config->suspend.latch); -#if 0 /* apparently not implemented by CP210X firmware */ - lconfig.reset.lowPower = cpu_to_be16(config->reset.lowPower); - lconfig.suspend.lowPower = cpu_to_be16(config->suspend.lowPower); -#else + /* apparently not implemented by CP210X firmware */ lconfig.suspend.lowPower = 0; lconfig.reset.lowPower = 0; -#endif - ret = cp210x_ctlmsg(port, 0xff, 0x40, 0x370c, 0, &lconfig, - sizeof(struct cp210x_port_config)); + ret = cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE, 0x370c, + 0, &lconfig, sizeof(struct cp210x_port_config)); if (ret == sizeof(struct cp210x_port_config)) return 0; else if (ret >= 0) @@ -470,8 +454,8 @@ static int cp210x_portconfget(struct usb_serial_port *port, dbg("%s", __FUNCTION__); - ret = cp210x_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config, - sizeof(struct cp210x_port_config)); + ret = cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_HOST, + 0x370c, 0, config, sizeof(struct cp210x_port_config)); if (ret == sizeof(struct cp210x_port_config)) { /* Words from cp210x are MSB */ config->reset.mode = be16_to_cpu(config->reset.mode); @@ -775,17 +759,6 @@ static int cp210x_ioctl(struct usb_serial_port *port, struct file *file, } break; - case CP210x_IOCTL_SETMFG: - if (cp210x_has_setmfg()) { - char usbstr[USBSTRLEN(CP210x_MAX_MFG_STRLEN)]; - size_t len = cp210x_usbstr_from_user(usbstr, arg, - sizeof(usbstr)); - if (len && cp210x_setstr(port, 0x00, usbstr) == len) - return 0; - } - return -EFAULT; - break; - case CP210x_IOCTL_SETPRODUCT: { char usbstr[USBSTRLEN(CP210x_MAX_PRODUCT_STRLEN)];