From 6ce90e2bd8d1599df22af8dc670d4187a1ec6dc5 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 2 Jul 2013 16:41:13 +0700 Subject: [PATCH] add tusbh_cdc_send, t usbh_cdc_receive add cdc_serial_app for virtual com demo --- demos/bsp/boards/board.h | 2 + demos/host/src/cdc_serial_app.c | 89 +++++++++++++++++++ demos/host/src/cdc_serial_app.h | 66 ++++++++++++++ demos/host/src/keyboard_app.h | 3 - demos/host/src/main.c | 8 +- .../test/host/cdc/descriptor_cdc.h | 2 +- tinyusb/class/cdc_host.c | 37 +++++++- tinyusb/class/cdc_host.h | 6 +- tinyusb/class/custom_class.h | 2 +- tinyusb/common/errors.h | 1 + 10 files changed, 204 insertions(+), 12 deletions(-) create mode 100644 demos/host/src/cdc_serial_app.c create mode 100644 demos/host/src/cdc_serial_app.h diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 0cac209a7..371dc6b34 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -57,6 +57,8 @@ #endif #include +#include + #include "tusb.h" //--------------------------------------------------------------------+ diff --git a/demos/host/src/cdc_serial_app.c b/demos/host/src/cdc_serial_app.c new file mode 100644 index 000000000..2a20b01d0 --- /dev/null +++ b/demos/host/src/cdc_serial_app.c @@ -0,0 +1,89 @@ +/**************************************************************************/ +/*! + @file cdc_serial_app.c + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This file is part of the tinyusb stack. +*/ +/**************************************************************************/ + +#include "cdc_serial_app.h" + +#if TUSB_CFG_OS != TUSB_OS_NONE +#include "app_os_prio.h" +#endif + +#if TUSB_CFG_HOST_CDC + +#define QUEUE_SERIAL_DEPTH 100 + +//--------------------------------------------------------------------+ +// MACRO CONSTANT TYPEDEF +//--------------------------------------------------------------------+ +OSAL_TASK_DEF(cdc_serial_task_def, "cdc serial app", cdc_serial_app_task, 128, CDC_SERIAL_APP_TASK_PRIO); +OSAL_QUEUE_DEF(queue_def, QUEUE_SERIAL_DEPTH, uint8_t); + +static osal_queue_handle_t queue_hdl; +static uint8_t buffer_in[64] TUSB_CFG_ATTR_USBRAM; + +//--------------------------------------------------------------------+ +// INTERNAL OBJECT & FUNCTION DECLARATION +//--------------------------------------------------------------------+ + +//--------------------------------------------------------------------+ +// APPLICATION +//--------------------------------------------------------------------+ +void cdc_serial_app_init(void) +{ + memclr_(buffer_in, sizeof(buffer_in)); + + ASSERT( TUSB_ERROR_NONE == osal_task_create(&cdc_serial_task_def), (void) 0 ); + queue_hdl = osal_queue_create(&queue_def); + ASSERT_PTR( queue_hdl, (void) 0 ); +} + +//------------- main task -------------// +OSAL_TASK_FUNCTION( cdc_serial_app_task ) (void* p_task_para) +{ + tusb_error_t error; + uint8_t c; + + OSAL_TASK_LOOP_BEGIN + + osal_queue_receive(queue_hdl, &c, OSAL_TIMEOUT_WAIT_FOREVER, &error); + + printf("%c", c); + + OSAL_TASK_LOOP_END +} + +#endif diff --git a/demos/host/src/cdc_serial_app.h b/demos/host/src/cdc_serial_app.h new file mode 100644 index 000000000..2ea7adf4b --- /dev/null +++ b/demos/host/src/cdc_serial_app.h @@ -0,0 +1,66 @@ +/**************************************************************************/ +/*! + @file cdc_serial_app.h + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This file is part of the tinyusb stack. +*/ +/**************************************************************************/ + +/** \ingroup TBD + * \defgroup TBD + * \brief TBD + * + * @{ + */ + +#ifndef _TUSB_CDC_SERIAL_APP_H_ +#define _TUSB_CDC_SERIAL_APP_H_ + +#include "boards/board.h" +#include "tusb.h" + +#ifdef __cplusplus + extern "C" { +#endif + +void cdc_serial_app_init(void); +OSAL_TASK_FUNCTION( cdc_serial_app_task ) (void* p_task_para); + + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_CDC_SERIAL_APP_H_ */ + +/** @} */ diff --git a/demos/host/src/keyboard_app.h b/demos/host/src/keyboard_app.h index a98313472..2b7a27e79 100644 --- a/demos/host/src/keyboard_app.h +++ b/demos/host/src/keyboard_app.h @@ -52,9 +52,6 @@ #ifndef _TUSB_KEYBOARD_APP_H_ #define _TUSB_KEYBOARD_APP_H_ -#include -#include - #include "boards/board.h" #include "tusb.h" diff --git a/demos/host/src/main.c b/demos/host/src/main.c index b8faa033a..51148d052 100644 --- a/demos/host/src/main.c +++ b/demos/host/src/main.c @@ -88,6 +88,7 @@ void os_none_start_scheduler(void) tusb_task_runner(); keyboard_app_task(NULL); mouse_app_task(NULL); + cdc_serial_app_task(NULL); led_blinking_task(NULL); } } @@ -117,6 +118,10 @@ int main(void) mouse_app_init(); #endif +#if TUSB_CFG_HOST_CDC + cdc_serial_app_init(); +#endif + //------------- start OS scheduler (never return) -------------// #if TUSB_CFG_OS == TUSB_OS_FREERTOS vTaskStartScheduler(); @@ -142,8 +147,7 @@ int main(void) //--------------------------------------------------------------------+ OSAL_TASK_FUNCTION( led_blinking_task ) (void* p_task_para) { - // task init, only executed exactly one time, real RTOS does not need this but none OS does - { + {// task init, only executed exactly one time, real RTOS does not need this but none OS does static bool is_init = false; if (!is_init) { diff --git a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h index 685e629ce..b21d64acc 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h +++ b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h @@ -46,7 +46,7 @@ #ifndef _TUSB_DESCRIPTOR_CDC_H_ #define _TUSB_DESCRIPTOR_CDC_H_ -#include "tusb.h" +#include "common/common.h" #include "class/cdc.h" #ifdef __cplusplus diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c index ce1f67e20..1520656fe 100644 --- a/tinyusb/class/cdc_host.c +++ b/tinyusb/class/cdc_host.c @@ -57,18 +57,51 @@ //--------------------------------------------------------------------+ /*STATIC_*/ cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; +STATIC_ INLINE_ bool tusbh_cdc_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; +STATIC_ INLINE_ bool tusbh_cdc_is_mounted(uint8_t dev_addr) +{ + return (tusbh_device_get_mounted_class_flag(dev_addr) & BIT_(TUSB_CLASS_CDC)) != 0; +} + //--------------------------------------------------------------------+ // APPLICATION API (parameter validation needed) //--------------------------------------------------------------------+ bool tusbh_cdc_serial_is_mounted(uint8_t dev_addr) { // TODO consider all AT Command as serial candidate - return - (tusbh_device_get_mounted_class_flag(dev_addr) & BIT_(TUSB_CLASS_CDC) ) && + return tusbh_cdc_is_mounted(dev_addr) && (CDC_COMM_PROTOCOL_ATCOMMAND <= cdch_data[dev_addr-1].interface_protocol) && (cdch_data[dev_addr-1].interface_protocol <= CDC_COMM_PROTOCOL_ATCOMMAND_CDMA); } +tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify) +{ + ASSERT( tusbh_cdc_is_mounted(dev_addr), TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED); + ASSERT( p_data != NULL && length, TUSB_ERROR_INVALID_PARA); + + pipe_handle_t pipe_out = cdch_data[dev_addr-1].pipe_out; + if ( !hcd_pipe_is_idle(pipe_out) ) + { + return TUSB_ERROR_INTERFACE_IS_BUSY; + } + + return hcd_pipe_xfer( pipe_out, (void *) p_data, length, is_notify); +} + +tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify) +{ + ASSERT( tusbh_cdc_is_mounted(dev_addr), TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED); + ASSERT( p_buffer != NULL && length, TUSB_ERROR_INVALID_PARA); + + pipe_handle_t pipe_in = cdch_data[dev_addr-1].pipe_in; + if ( !hcd_pipe_is_idle(pipe_in) ) + { + return TUSB_ERROR_INTERFACE_IS_BUSY; + } + + return hcd_pipe_xfer( pipe_in, p_buffer, length, is_notify); +} + //--------------------------------------------------------------------+ // USBH-CLASS DRIVER API //--------------------------------------------------------------------+ diff --git a/tinyusb/class/cdc_host.h b/tinyusb/class/cdc_host.h index 2b39a6fd7..fde2e2e11 100644 --- a/tinyusb/class/cdc_host.h +++ b/tinyusb/class/cdc_host.h @@ -57,12 +57,12 @@ //--------------------------------------------------------------------+ // APPLICATION PUBLIC API //--------------------------------------------------------------------+ -//bool tusbh_cdc_acm_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; bool tusbh_cdc_serial_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; bool tusbh_cdc_rndis_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; -tusb_interface_status_t tusbh_cdc_send(void const * p_data, uint32_t length, bool is_notify); - +void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; +tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify); +tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify); //--------------------------------------------------------------------+ // USBH-CLASS API //--------------------------------------------------------------------+ diff --git a/tinyusb/class/custom_class.h b/tinyusb/class/custom_class.h index 1d226d489..9bc4046fe 100644 --- a/tinyusb/class/custom_class.h +++ b/tinyusb/class/custom_class.h @@ -61,7 +61,7 @@ typedef struct { //--------------------------------------------------------------------+ // USBH-CLASS DRIVER API //--------------------------------------------------------------------+ -STATIC_ INLINE_ bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id); +STATIC_ INLINE_ bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; STATIC_ INLINE_ bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id) { (void) vendor_id; // TODO check this later diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h index 6118242ad..61ac3998d 100644 --- a/tinyusb/common/errors.h +++ b/tinyusb/common/errors.h @@ -83,6 +83,7 @@ ENTRY(TUSB_ERROR_CDCH_DESCRIPTOR_CORRUPTED )\ ENTRY(TUSB_ERROR_CDCH_UNSUPPORTED_SUBCLASS )\ ENTRY(TUSB_ERROR_CDCH_UNSUPPORTED_PROTOCOL )\ + ENTRY(TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED )\ ENTRY(TUSB_ERROR_NOT_SUPPORTED_YET )\ ENTRY(TUSB_ERROR_FAILED )\