diff options
| author | [email protected] <[email protected]> | 2012-12-30 09:43:19 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-12-30 09:43:19 +0000 |
| commit | aa49ca9db38bdb623d69b050c807dbeb2d99ed24 (patch) | |
| tree | 15c1573adb493f71478ba70bb538cc27b4f89405 /components/drivers/usb/usbdevice | |
| parent | 454455e8589697e5eb3a5a50131518c054ac9fa9 (diff) | |
change inferface handler parameter; add a protocol define
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2564 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/drivers/usb/usbdevice')
| -rw-r--r-- | components/drivers/usb/usbdevice/class/cdc.h | 1 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/class/cdc_vcom.c | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/class/mstorage.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/components/drivers/usb/usbdevice/class/cdc.h b/components/drivers/usb/usbdevice/class/cdc.h index 8ab689b98f..859148ae43 100644 --- a/components/drivers/usb/usbdevice/class/cdc.h +++ b/components/drivers/usb/usbdevice/class/cdc.h @@ -44,6 +44,7 @@ #define USB_CDC_PROTOCOL_CAPI20 0x93
#define USB_CDC_PROTOCOL_HOST 0xFD
#define USB_CDC_PROTOCOL_PUFD 0xFE
+#define USB_CDC_PROTOCOL_VENDOR 0xFF
#define USB_CDC_CS_INTERFACE 0x24
#define USB_CDC_CS_ENDPOINT 0x25
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c index 781cd185cb..ac558c9e32 100644 --- a/components/drivers/usb/usbdevice/class/cdc_vcom.c +++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c @@ -275,7 +275,7 @@ static rt_err_t _cdc_set_line_coding(udevice_t device, ureq_t setup) *
* @return RT_EOK on successful.
*/
-static rt_err_t _interface_handler(udevice_t device, ureq_t setup)
+static rt_err_t _interface_handler(udevice_t device, uclass_t cls, ureq_t setup)
{
RT_ASSERT(device != RT_NULL);
RT_ASSERT(setup != RT_NULL);
diff --git a/components/drivers/usb/usbdevice/class/mstorage.c b/components/drivers/usb/usbdevice/class/mstorage.c index e72f770682..000bad5b62 100644 --- a/components/drivers/usb/usbdevice/class/mstorage.c +++ b/components/drivers/usb/usbdevice/class/mstorage.c @@ -456,7 +456,7 @@ static rt_err_t _ep_out_handler(udevice_t device, uclass_t cls, rt_size_t size) *
* @return RT_EOK on successful.
*/
-static rt_err_t _interface_handler(udevice_t device, ureq_t setup)
+static rt_err_t _interface_handler(udevice_t device, uclass_t cls, ureq_t setup)
{
rt_uint8_t lun = 0;
|