Remove set functionality for Manufacturer descriptor.

Current cp210x firmware doesn't allow it to be set anyway.

diff --git a/src/cp210x.c b/src/cp210x.c
index 4b1a29d606e7dae38e26d2bd6ccf41c99477e146..c670ea5cf2ff0721275505c4b599f85826b208df 100644 (file)
--- a/src/cp210x.c
+++ b/src/cp210x.c
@@ -274,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.
@@ -770,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)];

diff --git a/src/cp210x.c.karmic b/src/cp210x.c.karmic
index d418849fc02269bd5cc986715b81e3e8a4caad77..4f74b1b97f33a8d47b3f9e2cadb4e3af4828dc40 100644 (file)
--- a/src/cp210x.c.karmic
+++ b/src/cp210x.c.karmic
@@ -295,17 +295,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.
@@ -837,17 +826,6 @@ 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)];

diff --git a/src/cp210x.h b/src/cp210x.h
index 14a13f422da4291f7585774d9acf8ac815907b0c..315e2039f9c7d8d1dc847fcfda6a6007900513e9 100644 (file)
--- a/src/cp210x.h
+++ b/src/cp210x.h
@@ -33,10 +33,9 @@
 #define CP210x_IOCTL_PORTCONFSET       (SIOCDEVPRIVATE + 6)
 #define CP210x_IOCTL_SETVID            (SIOCDEVPRIVATE + 7)
 #define CP210x_IOCTL_SETPID            (SIOCDEVPRIVATE + 8)
-#define CP210x_IOCTL_SETMFG            (SIOCDEVPRIVATE + 9)
-#define CP210x_IOCTL_SETPRODUCT                (SIOCDEVPRIVATE + 10)
-#define CP210x_IOCTL_SETSERIAL         (SIOCDEVPRIVATE + 11)
-#define CP210x_IOCTL_SETDEVVER         (SIOCDEVPRIVATE + 12)
+#define CP210x_IOCTL_SETPRODUCT                (SIOCDEVPRIVATE + 9)
+#define CP210x_IOCTL_SETSERIAL         (SIOCDEVPRIVATE + 10)
+#define CP210x_IOCTL_SETDEVVER         (SIOCDEVPRIVATE + 11)
 
 /* CP2103 GPIO bit positions */
 #define GPIO_0                 0x01
@@ -46,7 +45,6 @@
 #define GPIO_MASK              (GPIO_3|GPIO_2|GPIO_1|GPIO_0)
 
 /* USB descriptor sizes */
-#define        CP210x_MAX_MFG_STRLEN           255
 #define        CP210x_MAX_PRODUCT_STRLEN       126
 #define        CP210x_MAX_SERIAL_STRLEN        63