X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=src%2Fcp210x.c.karmic;h=764b8bbb45fc957e6587715ad7fe167cc325d85f;hb=071e179a4dabb59c72590fee3ea53ccbe7a69e72;hp=707665782103b02ad8597c86c77c839a45b32e91;hpb=adcc360e576188af96b2dd22be2bed75e151d769;p=cp210x.git diff --git a/src/cp210x.c.karmic b/src/cp210x.c.karmic index 7076657..764b8bb 100644 --- a/src/cp210x.c.karmic +++ b/src/cp210x.c.karmic @@ -151,10 +151,6 @@ static struct usb_serial_driver cp210x_device = { .disconnect = cp210x_disconnect, }; -/* Config request types */ -#define REQTYPE_HOST_TO_DEVICE 0x41 -#define REQTYPE_DEVICE_TO_HOST 0xc1 - /* Config request codes */ #define CP210X_IFC_ENABLE 0x00 #define CP210X_SET_BAUDDIV 0x01 @@ -228,8 +224,11 @@ static struct usb_serial_driver cp210x_device = { #define CP210x_PART_CP2102 0x02 #define CP210x_PART_CP2103 0x03 -/* Helper to make usb string size */ -#define USBSTRLEN(x) (x * 2 + 2) +/* Return the size of the buffer needed to hold a string of len x formatted + * for send to CP210X, and its reverse. + */ +#define USBSTRLEN(strlen) (strlen * 2 + 2) + /* Populates usbstr with: (len) + (0x03) + unicode(str). Each char in str * takes two bytes in unicode format. @@ -269,37 +268,26 @@ static int make_usb_string(char *usbstr, size_t usblen, char *src, * is the size of the buffer at kbuf. * Returns the number of bytes used in kbuf. */ -static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf, size_t klen) +static size_t cp210x_usbstr_from_user(char *kbuf, + struct cp210x_buffer __user *ubuf, size_t klen) { struct cp210x_buffer t; - char* str; + char *str; size_t slen; - if (!kbuf || !ubuf || !klen) - return 0; - if (copy_from_user(&t, (struct cp210x_buffer __user *)ubuf, sizeof(t))) - return 0; - if (!t.buf || !t.len || USBSTRLEN(t.len) > klen) + if (copy_from_user(&t, ubuf, sizeof(t))) return 0; slen = (klen - 2) / 2; + if (!t.buf || !t.len || t.len > slen) + return 0; if (t.len < slen) slen = t.len; str = kbuf + klen - slen; - if (copy_from_user(str, (u8 __user *)t.buf, slen)) + if (copy_from_user(str, (__u8 __user *)t.buf, slen)) return 0; 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 @@ -314,9 +302,10 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request, u8 *tbuf; int ret; - if (!(tbuf = kmalloc(size, GFP_KERNEL))) + 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) @@ -329,8 +318,9 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request, } kfree(tbuf); if (ret < 0 && ret != -EPIPE) { - dev_printk(KERN_DEBUG, &dev->dev, "cp210x: control failed cmd rqt %u " - "rq %u len %u ret %d\n", requestype, request, size, ret); + dev_printk(KERN_DEBUG, &dev->dev, + "cp210x: ctl failed cmd rqt %u rq %u len %u ret %d\n", + requestype, request, size, ret); } return ret; } @@ -339,16 +329,11 @@ static int cp210x_reset(struct usb_serial_port *port) { dbg("%s", __func__); -#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, USB_TYPE_VENDOR, + 0x0008, 0x00, NULL, 0); return 0; } @@ -365,8 +350,9 @@ 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, + USB_DIR_IN|USB_TYPE_VENDOR, + 0x370b, 0x00, &_partnum, 1) != 1) _partnum = CP210x_PART_UNKNOWN; } } @@ -377,8 +363,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, USB_TYPE_VENDOR, + 0x3700 | (cmd & 0xff), value, NULL, 0); } /* @@ -390,8 +376,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, USB_TYPE_VENDOR, + 0x3700 | (cmd & 0xff), 0, usbstr, len); dbg("%s - cmd 0x%02x len %d ret %d", __func__, cmd, len, ret); return ret; } @@ -401,8 +387,8 @@ static int cp210x_gpioset(struct usb_serial_port *port, u8 gpio) { dbg("%s - port %d, gpio = 0x%.2x", __func__, port->number, gpio); - return cp210x_ctlmsg(port, 0xff, 0x40, 0x37e1, - ((uint16_t)gpio << 8) | GPIO_MASK, NULL, 0); + return cp210x_ctlmsg(port, 0xff, USB_TYPE_VENDOR, + 0x37e1, ((uint16_t)gpio << 8) | GPIO_MASK, NULL, 0); } /* Set select gpio bits */ @@ -430,8 +416,8 @@ static int cp210x_gpiosetb(struct usb_serial_port *port, u8 set, u8 clear) dbg("%s - port %d, gpiob = 0x%.4x", __func__, 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, USB_TYPE_VENDOR, + 0x37e1, gpio, NULL, 0); } static int cp210x_gpioget(struct usb_serial_port *port, u8 *gpio) @@ -440,8 +426,8 @@ static int cp210x_gpioget(struct usb_serial_port *port, u8 *gpio) dbg("%s - port %d", __func__, 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, USB_DIR_IN|USB_TYPE_VENDOR, + 0x00c2, 0, gpio, 1); dbg("%s - gpio = 0x%.2x (%d)", __func__, *gpio, ret); @@ -458,21 +444,17 @@ static int cp210x_portconfset(struct usb_serial_port *port, memcpy(&lconfig, config, sizeof(lconfig)); - /* Words from cp2103 are MSB */ + /* Words from cp210x are MSB */ lconfig.reset.mode = cpu_to_be16(config->reset.mode); 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, USB_TYPE_VENDOR, 0x370c, + 0, &lconfig, sizeof(struct cp210x_port_config)); if (ret == sizeof(struct cp210x_port_config)) return 0; else if (ret >= 0) @@ -488,10 +470,10 @@ static int cp210x_portconfget(struct usb_serial_port *port, dbg("%s", __func__); - ret = cp210x_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config, - sizeof(struct cp210x_port_config)); + ret = cp210x_ctlmsg(port, 0xff, USB_DIR_IN|USB_TYPE_VENDOR, + 0x370c, 0, config, sizeof(struct cp210x_port_config)); if (ret == sizeof(struct cp210x_port_config)) { - /* Words from cp2103 are MSB */ + /* Words from cp210x are MSB */ config->reset.mode = be16_to_cpu(config->reset.mode); config->reset.lowPower = be16_to_cpu(config->reset.lowPower); config->reset.latch = be16_to_cpu(config->reset.latch); @@ -537,8 +519,9 @@ static int cp210x_get_config(struct usb_serial_port *port, u8 request, /* Issue the request, attempting to read 'size' bytes */ result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), - request, REQTYPE_DEVICE_TO_HOST, 0x0000, - 0, buf, size, 300); + request, + USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, + 0x0000, 0, buf, size, 300); /* Convert data into an array of integers */ for (i = 0; i < length; i++) @@ -585,13 +568,13 @@ static int cp210x_set_config(struct usb_serial_port *port, u8 request, if (size > 2) { result = usb_control_msg(serial->dev, - usb_sndctrlpipe(serial->dev, 0), - request, REQTYPE_HOST_TO_DEVICE, 0x0000, + usb_sndctrlpipe(serial->dev, 0), request, + USB_TYPE_VENDOR|USB_RECIP_INTERFACE, 0x0000, 0, buf, size, 300); } else { result = usb_control_msg(serial->dev, - usb_sndctrlpipe(serial->dev, 0), - request, REQTYPE_HOST_TO_DEVICE, data[0], + usb_sndctrlpipe(serial->dev, 0), request, + USB_TYPE_VENDOR|USB_RECIP_INTERFACE, data[0], 0, NULL, 0, 300); } @@ -757,8 +740,8 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file, return -EFAULT; /* this looks wrong: TIOCMSET isn't going to work right */ - if (cp210x_tiocmset(tty, file, cmd==TIOCMBIC ? 0 : val, - cmd==TIOCMBIC ? val : 0)) + if (cp210x_tiocmset(tty, file, (cmd == TIOCMBIC) ? 0 : val, + (cmd == TIOCMBIC) ? val : 0)) return -EFAULT; return 0; } @@ -785,8 +768,8 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file, case CP210x_IOCTL_GPIOBIS: if (cp210x_get_partnum(port) == CP210x_PART_CP2103 && !cp210x_gpiosetb(port, - (cmd==CP210x_IOCTL_GPIOBIC) ? 0 : arg, - (cmd==CP210x_IOCTL_GPIOBIC) ? arg : 0)) + (cmd == CP210x_IOCTL_GPIOBIC) ? 0 : arg, + (cmd == CP210x_IOCTL_GPIOBIC) ? arg : 0)) return 0; return -EFAULT; break; @@ -839,21 +822,11 @@ static int cp210x_ioctl(struct tty_struct *tty, 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)]; - size_t len = cp210x_usbstr_from_user(usbstr, arg, + size_t len = cp210x_usbstr_from_user(usbstr, + (struct cp210x_buffer __user *)arg, sizeof(usbstr)); if (len && cp210x_setstr(port, 0x03, usbstr) == len) return 0; @@ -864,7 +837,8 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file, case CP210x_IOCTL_SETSERIAL: { char usbstr[USBSTRLEN(CP210x_MAX_SERIAL_STRLEN)]; - size_t len = cp210x_usbstr_from_user(usbstr, arg, + size_t len = cp210x_usbstr_from_user(usbstr, + (struct cp210x_buffer __user *)arg, sizeof(usbstr)); if (len && cp210x_setstr(port, 0x04, usbstr) == len) return 0;