#define CP210x_PART_CP2102 0x02
#define CP210x_PART_CP2103 0x03
+/* 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 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;
+}
+
/*
- * 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.
+ * 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 size_t cp210x_buf_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;
+ size_t slen;
- if (!kbuf || !ubuf || !klen ||
- copy_from_user(&t, (struct cp210x_buffer __user *)ubuf,
- sizeof(t)))
+ if (!kbuf || !ubuf || !klen)
+ return 0;
+ if (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))
+ if (!t.buf || !t.len || USBSTRLEN(t.len) > klen)
return 0;
- return 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, slen);
}
/* cp210x_has_setmfg
u8 *tbuf;
int ret;
- if (!(tbuf = kmalloc(size, GFP_KERNEL)))
+ tbuf = kmalloc(size, GFP_KERNEL);
+ if (!tbuf)
return -ENOMEM;
if (requestype & 0x80) {
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 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;
}
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...
+ /* 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...
*/
cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0);
#else
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;
-}
-
/*
* cp210x_setstr
*
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);
ret = cp210x_ctlmsg(port, 0xff, 0xc0, 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(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(
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:
+ case CP210x_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);
+ 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[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,
projects / cp210x.git / blobdiff