X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=src%2Fcp210x.c.karmic;h=4f74b1b97f33a8d47b3f9e2cadb4e3af4828dc40;hb=62f7ab54a8973d9de7a76e79fed81347908505c4;hp=78d6b62c1e0e1a84c0bae56825dd909ad6766224;hpb=a50a97ae61aefa7a7795e46c71c1eee09ac951b6;p=cp210x.git

diff --git a/src/cp210x.c.karmic b/src/cp210x.c.karmic
index 78d6b62..4f74b1b 100644
--- a/src/cp210x.c.karmic
+++ b/src/cp210x.c.karmic
@@ -151,9 +151,13 @@ static struct usb_serial_driver cp210x_device = {
 	.disconnect		= cp210x_disconnect,
 };
 
+/* 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 request codes */
 #define CP210X_IFC_ENABLE	0x00
@@ -228,36 +232,67 @@ static struct usb_serial_driver cp210x_device = {
 #define CP210x_PART_CP2102	0x02
 #define CP210x_PART_CP2103	0x03
 
-/*
- * cp210x_buf_from_user
- * Copy a buffer from user space, returning the number of bytes copied
- * from ubuf.buf into kbuf.  klen is the size of the buffer at kbuf.
+/* Helper to make usb string size */
+#define USBSTRLEN(x)		(x * 2 + 2)
+
+/* Populates usbstr with: (len) + (0x03) + unicode(str).  Each char in str
+ * takes two bytes in unicode format.
+ * Returns the resulting length of the string in usbstr.
+ * This function can accept overlapping usbstr and str as long as the overlap
+ * does not cause data written to usbstr to overwrite data not yet read from
+ * str.
  */
-static size_t cp210x_buf_from_user(char *kbuf, unsigned long ubuf, size_t klen)
+static int make_usb_string(char *usbstr, size_t usblen, char *src,
+		size_t srclen)
 {
-	struct cp210x_buffer t;
+	int len = 0;
 
-	if (!kbuf || !ubuf || !klen ||
-			copy_from_user(&t, (struct cp210x_buffer __user *)ubuf,
-			sizeof(t)))
-		return 0;
-	if (t.len < klen)
-		klen = t.len;
-	if (!t.buf || !t.len ||
-			copy_from_user(kbuf, (u8 __user *)t.buf, klen))
-		return 0;
-	return klen;
+	if (usbstr && usblen >= 2 && src && *src && srclen) {
+		char *p;
+
+		if (usblen > 255)
+			usblen = 255;
+
+		p = usbstr + 1;
+		*p++ = 0x03;
+		len = 2;
+		while (srclen && len < usblen) {
+			*p++ = *src++;
+			*p++ = 0;
+			len += 2;
+			srclen--;
+		}
+		*usbstr = (char)len;
+	}
+	return 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.
+/*
+ * cp210x_usbstr_from_user
+ * Populate kbuf with a usb string derived from a user space variable.  klen
+ * is the size of the buffer at kbuf.
+ * Returns the number of bytes used in kbuf.
  */
-static inline int cp210x_has_setmfg(void)
+static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf,
+		size_t klen)
 {
-	return 0;
+	struct cp210x_buffer t;
+	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)
+		return 0;
+	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, slen);
 }
 
 /*
@@ -273,9 +308,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)
@@ -288,8 +324,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;
 }
@@ -298,16 +335,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, REQTYPE_CTL_TO_DEVICE,
+			0x0008, 0x00, NULL, 0);
 	return 0;
 }
 
@@ -324,8 +356,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;
 		}
 	}
@@ -336,41 +368,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);
-}
-
-/* Populates usbstr with: (len) + (0x03) + unicode(str).  Each char in str
- * takes up two bytes in unicode format, so the resulting len(usbstr) is
- * 2 * len(str) + 2.
- * Returns the resulting length of the string in usbstr.
- * This function can accept overlapping usbstr and str as long as the overlap
- * does not cause data written to usbstr to overwrite data not yet read from
- * str.
- */
-static int make_usb_string(char *usbstr, size_t usblen, char *src,
-		size_t srclen)
-{
-	int len = 0;
-
-	if (usbstr && usblen >= 2 && src && *src && srclen) {
-		char *p;
-
-		if (usblen > 255)
-			usblen = 255;
-
-		p = usbstr + 1;
-		*p++ = 0x03;
-		len = 2;
-		while (srclen && len < usblen) {
-			*p++ = *src++;
-			*p++ = 0;
-			len += 2;
-			srclen--;
-		}
-		*usbstr = (char)len;
-	}
-	return len;
+	return cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE,
+			0x3700 | (cmd & 0xff), value, NULL, 0);
 }
 
 /*
@@ -382,8 +381,8 @@ static int make_usb_string(char *usbstr, size_t usblen, char *src,
 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", __func__, cmd, len, ret);
 	return ret;
 }
@@ -393,8 +392,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, REQTYPE_CTL_TO_DEVICE,
+			0x37e1, ((uint16_t)gpio << 8) | GPIO_MASK, NULL, 0);
 }
 
 /* Set select gpio bits */
@@ -422,8 +421,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, REQTYPE_CTL_TO_DEVICE,
+			0x37e1, gpio, NULL, 0);
 }
 
 static int cp210x_gpioget(struct usb_serial_port *port, u8 *gpio)
@@ -432,8 +431,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, REQTYPE_CTL_TO_HOST,
+			0x00c2, 0, gpio, 1);
 
 	dbg("%s - gpio = 0x%.2x (%d)", __func__, *gpio, ret);
 
@@ -450,21 +449,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, 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)
@@ -480,10 +475,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, 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);
@@ -749,14 +744,14 @@ 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;
 	}
 	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(
@@ -766,27 +761,28 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
 	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(
@@ -797,7 +793,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
 	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,
@@ -808,7 +804,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
 	}
 	break;
 
-	case IOCTL_SETVID:
+	case CP210x_IOCTL_SETVID:
 	{
 		unsigned int vid;
 		if (!copy_from_user(&vid, (unsigned int __user *)arg,
@@ -819,7 +815,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
 	}
 	break;
 
-	case IOCTL_SETPID:
+	case CP210x_IOCTL_SETPID:
 	{
 		unsigned int pid;
 		if (!copy_from_user(&pid, (unsigned int __user *)arg,
@@ -830,46 +826,29 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
 	}
 	break;
 
-	case IOCTL_SETMFG:
-	if (cp210x_has_setmfg()) {
-		char usbstr[CP210x_MAX_MFG_STRLEN * 2 + 2];
-		char *str = usbstr + sizeof(usbstr) - CP210x_MAX_MFG_STRLEN;
-		size_t len = cp210x_buf_from_user(str, arg,
-				CP210x_MAX_MFG_STRLEN);
-		len = make_usb_string(usbstr, sizeof(usbstr), str, len);
-		if (len && cp210x_setstr(port, 0x00, usbstr) == len)
-			return 0;
-	}
-	return -EFAULT;
-	break;
-
-	case IOCTL_SETPRODUCT:
+	case CP210x_IOCTL_SETPRODUCT:
 	{
-		char usbstr[CP210x_MAX_PRODUCT_STRLEN * 2 + 2];
-		char *str = usbstr + sizeof(usbstr) - CP210x_MAX_PRODUCT_STRLEN;
-		size_t len = cp210x_buf_from_user(str, arg,
-				CP210x_MAX_PRODUCT_STRLEN);
-		len = make_usb_string(usbstr, sizeof(usbstr), str, len);
+		char usbstr[USBSTRLEN(CP210x_MAX_PRODUCT_STRLEN)];
+		size_t len = cp210x_usbstr_from_user(usbstr, arg,
+				sizeof(usbstr));
 		if (len && cp210x_setstr(port, 0x03, usbstr) == len)
 			return 0;
 		return -EFAULT;
 	}
 	break;
 
-	case IOCTL_SETSERIAL:
+	case CP210x_IOCTL_SETSERIAL:
 	{
-		char usbstr[CP210x_MAX_SERIAL_STRLEN * 2 + 2];
-		char *str = usbstr + sizeof(usbstr) - CP210x_MAX_SERIAL_STRLEN;
-		size_t len = cp210x_buf_from_user(str, arg,
-				CP210x_MAX_SERIAL_STRLEN);
-		len = make_usb_string(usbstr, sizeof(usbstr), str, len);
+		char usbstr[USBSTRLEN(CP210x_MAX_SERIAL_STRLEN)];
+		size_t len = cp210x_usbstr_from_user(usbstr, arg,
+				sizeof(usbstr));
 		if (len && cp210x_setstr(port, 0x04, usbstr) == len)
 			return 0;
 		return -EFAULT;
 	}
 	break;
 
-	case IOCTL_SETDEVVER:
+	case CP210x_IOCTL_SETDEVVER:
 	{
 		unsigned int ver;
 		if (!copy_from_user(&ver, (unsigned int __user *)arg,