Use usb definitions for bmRequestType.

diff --git a/src/cp210x.c b/src/cp210x.c
index 81e2e9136d4b58a088c6e5fd1511645a942df35c..4b1a29d606e7dae38e26d2bd6ccf41c99477e146 100644 (file)
--- a/src/cp210x.c
+++ b/src/cp210x.c
@@ -147,9 +147,13 @@ static struct usb_serial_driver cp210x_device = {
        .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 */
@@ -297,7 +301,7 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
        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)
@@ -324,7 +328,8 @@ static int cp210x_reset(struct usb_serial_port *port)
        /* Instructing the CP210X to reset seems to work more reliably than
         * calling usb_reset_device().
         */
-       cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0);
+       cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE,
+                       0x0008, 0x00, NULL, 0);
        return 0;
 }
 
@@ -341,8 +346,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;
                }
        }
@@ -353,8 +358,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, REQTYPE_CTL_TO_DEVICE,
+                       0x3700 | (cmd & 0xff), value, NULL, 0);
 }
 
 /*
@@ -366,8 +371,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, 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;
 }
@@ -377,8 +382,8 @@ static int cp210x_gpioset(struct usb_serial_port *port, u8 gpio)
 {
        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 */
@@ -406,8 +411,8 @@ static int cp210x_gpiosetb(struct usb_serial_port *port, u8 set, u8 clear)
 
        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)
@@ -416,8 +421,8 @@ 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);
 
@@ -443,8 +448,8 @@ static int cp210x_portconfset(struct usb_serial_port *port,
        lconfig.suspend.lowPower = 0;
        lconfig.reset.lowPower = 0;
 
-       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)
@@ -460,8 +465,8 @@ static int cp210x_portconfget(struct usb_serial_port *port,
 
        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 cp210x are MSB */
                config->reset.mode = be16_to_cpu(config->reset.mode);

diff --git a/src/cp210x.c.karmic b/src/cp210x.c.karmic
index 84d1b93d528e4f969600cbc98cb82adac5d57fa5..d418849fc02269bd5cc986715b81e3e8a4caad77 100644 (file)
--- 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
@@ -318,7 +322,7 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
        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)
@@ -345,7 +349,8 @@ static int cp210x_reset(struct usb_serial_port *port)
        /* Instructing the CP210X to reset seems to work more reliably than
         * calling usb_reset_device().
         */
-       cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0);
+       cp210x_ctlmsg(port, 0xff, REQTYPE_CTL_TO_DEVICE,
+                       0x0008, 0x00, NULL, 0);
        return 0;
 }
 
@@ -362,8 +367,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;
                }
        }
@@ -374,8 +379,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, REQTYPE_CTL_TO_DEVICE,
+                       0x3700 | (cmd & 0xff), value, NULL, 0);
 }
 
 /*
@@ -387,8 +392,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, 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;
 }
@@ -398,8 +403,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 */
@@ -427,8 +432,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)
@@ -437,8 +442,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);
 
@@ -464,8 +469,8 @@ static int cp210x_portconfset(struct usb_serial_port *port,
        lconfig.suspend.lowPower = 0;
        lconfig.reset.lowPower = 0;
 
-       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)
@@ -481,8 +486,8 @@ 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 cp210x are MSB */
                config->reset.mode = be16_to_cpu(config->reset.mode);