diff options
| author | ChunfengMu <[email protected]> | 2018-01-23 23:53:44 +0800 |
|---|---|---|
| committer | ChunfengMu <[email protected]> | 2018-01-24 00:27:11 +0800 |
| commit | 0b0cbaf9aa8ea9cbe9feb2f23399867ff43260df (patch) | |
| tree | f46b81523e3427ca08dd4727e415482308de11f6 /components/drivers/usb/usbdevice | |
| parent | 17afd478444809f6c9702aa8af90037654c202cf (diff) | |
[Components][Drivers][USB]fix compiling errors
Diffstat (limited to 'components/drivers/usb/usbdevice')
| -rw-r--r-- | components/drivers/usb/usbdevice/class/cdc_vcom.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c index 989de152e7..7940e4c059 100644 --- a/components/drivers/usb/usbdevice/class/cdc_vcom.c +++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c @@ -49,7 +49,7 @@ #ifdef RT_VCOM_TX_USE_DMA #define VCOM_TX_USE_DMA -#endif /*RT_VCOM_TASK_STK_SIZE*/ +#endif /*RT_VCOM_TX_USE_DMA*/ #ifdef RT_VCOM_SERNO #define _SER_NO RT_VCOM_SERNO @@ -58,9 +58,9 @@ #endif /*RT_VCOM_SERNO*/ #ifdef RT_VCOM_SER_LEN -#define __SER_NO_LEN RT_VCOM_SER_LEN +#define _SER_NO_LEN RT_VCOM_SER_LEN #else /*!RT_VCOM_SER_LEN*/ -#define __SER_NO_LEN rt_strlen("32021919830108") +#define _SER_NO_LEN 14 /*rt_strlen("32021919830108")*/ #endif /*RT_VCOM_SER_LEN*/ ALIGN(RT_ALIGN_SIZE) @@ -209,11 +209,14 @@ const static struct ucdc_data_descriptor _data_desc = 0x00, }; -static char serno[_SER_NO_LEN + 1] = {'\0',}; -RT_WEAK rt_err_t vcom_get_stored_serno(char *serno, int size) +static char serno[_SER_NO_LEN + 1] = {'\0'}; +RT_WEAK rt_err_t vcom_get_stored_serno(char *serno, int size); + +rt_err_t vcom_get_stored_serno(char *serno, int size) { return RT_ERROR; } + const static char* _ustring[] = { "Language", @@ -544,8 +547,6 @@ ufunction_t rt_usbd_function_cdc_create(udevice_t device) /* parameter check */ RT_ASSERT(device != RT_NULL); - extern rt_err_t vcom_get_stored_serno(char *serno, int size); - rt_memset(serno, 0, _SER_NO_LEN + 1); if(vcom_get_stored_serno(serno, _SER_NO_LEN) != RT_EOK) { @@ -672,14 +673,14 @@ static rt_size_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_s struct ufunction *func; struct vcom *data; - - func = (struct ufunction*)serial->parent.user_data; - data = (struct vcom*)func->user_data; rt_uint32_t baksize = size; rt_size_t ptr = 0; int empty = 0; rt_uint8_t crlf[2] = {'\r', '\n',}; + func = (struct ufunction*)serial->parent.user_data; + data = (struct vcom*)func->user_data; + RT_ASSERT(serial != RT_NULL); RT_ASSERT(buf != RT_NULL); |