.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 */
* 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, unsigned long 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)
+ if (!t.buf || !t.len || USBSTRLEN(t.len) > klen)
return 0;
- if (t.len < klen)
- klen = t.len;
- str = kbuf + klen - t.len;
- if (copy_from_user(kbuf + klen - t.len, (u8 __user *)t.buf, klen))
+ slen = (klen - 2) / 2;
+ if (t.len < slen)
+ slen = t.len;
+ str = kbuf + klen - slen;
+ if (copy_from_user(str, (u8 __user *)t.buf, slen))
return 0;
- return make_usb_string(kbuf, klen, str, t.len);
-}
-
-/* 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;
+ return make_usb_string(kbuf, klen, str, slen);
}
/*
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)
}
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;
}
{
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;
}
_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;
}
}
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);
}
/*
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;
}
{
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 */
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)
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);
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, 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)
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 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);
return -EFAULT;
/* this looks wrong: TIOCMSET isn't going to work right */
- if (cp210x_tiocmset(port, file, cmd==TIOCMBIC ? 0 : val,
- cmd==TIOCMBIC ? val : 0))
+ if (cp210x_tiocmset(port, file, (cmd == TIOCMBIC) ? 0 : val,
+ (cmd == TIOCMBIC) ? val : 0))
return -EFAULT;
return 0;
}
break;
- case IOCTL_GPIOGET:
+ case CP210x_IOCTL_GPIOGET:
if (cp210x_get_partnum(port) == CP210x_PART_CP2103) {
u8 gpio = 0;
if (!cp210x_gpioget(port, &gpio) && !copy_to_user(
return -EFAULT;
break;
- case IOCTL_GPIOSET:
+ case CP210x_IOCTL_GPIOSET:
if (cp210x_get_partnum(port) == CP210x_PART_CP2103 &&
!cp210x_gpioset(port, arg))
return 0;
return -EFAULT;
break;
- case IOCTL_GPIOBIC:
- case IOCTL_GPIOBIS:
+ case CP210x_IOCTL_GPIOBIC:
+ case CP210x_IOCTL_GPIOBIS:
if (cp210x_get_partnum(port) == CP210x_PART_CP2103 &&
- !cp210x_gpiosetb(port, (cmd==IOCTL_GPIOBIC) ? 0 : arg,
- (cmd==IOCTL_GPIOBIC) ? arg : 0))
+ !cp210x_gpiosetb(port,
+ (cmd == CP210x_IOCTL_GPIOBIC) ? 0 : arg,
+ (cmd == CP210x_IOCTL_GPIOBIC) ? arg : 0))
return 0;
return -EFAULT;
break;
- case IOCTL_DEVICERESET:
+ case CP210x_IOCTL_DEVICERESET:
return cp210x_reset(port);
break;
- case IOCTL_PORTCONFGET:
+ case CP210x_IOCTL_PORTCONFGET:
{
struct cp210x_port_config config;
if (!cp210x_portconfget(port, &config) && !copy_to_user(
return -EFAULT;
break;
- case IOCTL_PORTCONFSET:
+ case CP210x_IOCTL_PORTCONFSET:
{
struct cp210x_port_config config;
if (!copy_from_user(&config, (struct cp210x_port_config __user *)arg,
}
break;
- case IOCTL_SETVID:
+ case CP210x_IOCTL_SETVID:
{
unsigned int vid;
if (!copy_from_user(&vid, (unsigned int __user *)arg,
}
break;
- case IOCTL_SETPID:
+ case CP210x_IOCTL_SETPID:
{
unsigned int pid;
if (!copy_from_user(&pid, (unsigned int __user *)arg,
}
break;
- case 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 IOCTL_SETPRODUCT:
+ case CP210x_IOCTL_SETPRODUCT:
{
char usbstr[USBSTRLEN(CP210x_MAX_PRODUCT_STRLEN)];
size_t len = cp210x_usbstr_from_user(usbstr, arg,
}
break;
- case IOCTL_SETSERIAL:
+ case CP210x_IOCTL_SETSERIAL:
{
char usbstr[USBSTRLEN(CP210x_MAX_SERIAL_STRLEN)];
size_t len = cp210x_usbstr_from_user(usbstr, arg,
}
break;
- case IOCTL_SETDEVVER:
+ case CP210x_IOCTL_SETDEVVER:
{
unsigned int ver;
if (!copy_from_user(&ver, (unsigned int __user *)arg,