clean up virtual com example

3 files changed, 22 insertions, 163 deletions

diff --git a/examples/device/device_virtual_com/src/cdc_device_app.c b/examples/device/device_virtual_com/src/cdc_device_app.c
deleted file mode 100644
index 866249ac0..000000000
--- a/examples/device/device_virtual_com/src/cdc_device_app.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     cdc_device_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_device_app.h"
-#include "common/fifo.h" // TODO refractor
-
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// MACRO CONSTANT TYPEDEF
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// INTERNAL OBJECT & FUNCTION DECLARATION
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// tinyusb callbacks
-//--------------------------------------------------------------------+
-void tud_cdc_rx_cb(uint8_t coreid)
-{
-}
-
-//--------------------------------------------------------------------+
-// APPLICATION CODE
-//--------------------------------------------------------------------+
-void cdc_serial_app_init(void)
-{
-}
-
-void cdc_serial_app_mount(uint8_t coreid)
-{
-}
-
-void cdc_serial_app_umount(uint8_t coreid)
-{
-
-}
-
-void cdc_serial_app_task(void)
-{
-  if ( tud_mounted(0) && tud_cdc_available(0) )
-  {
-    uint8_t buf[64];
-
-    uint32_t count = tud_cdc_read(0, buf, sizeof(buf));
-
-    tud_cdc_write(0, buf, count);
-  }
-}
diff --git a/examples/device/device_virtual_com/src/cdc_device_app.h b/examples/device/device_virtual_com/src/cdc_device_app.h
deleted file mode 100644
index 08c2a1f9e..000000000
--- a/examples/device/device_virtual_com/src/cdc_device_app.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     cdc_device_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_CDCD_DEVICE_APP_H_
-#define _TUSB_CDCD_DEVICE_APP_H_
-
-#include "bsp/board.h"
-#include "tusb.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-void cdc_serial_app_init(void);
-void cdc_serial_app_task(void);
-
-void cdc_serial_app_mount(uint8_t coreid);
-void cdc_serial_app_umount(uint8_t coreid);
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_CDCD_DEVICE_APP_H_ */
-
-/** @} */
diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c
index baf946a56..25f78ebd2 100644
--- a/examples/device/device_virtual_com/src/main.c
+++ b/examples/device/device_virtual_com/src/main.c
@@ -46,8 +46,6 @@
 #include "bsp/board.h"
 #include "tusb.h"
 
-#include "cdc_device_app.h"
-
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
@@ -57,6 +55,7 @@
 //--------------------------------------------------------------------+
 void print_greeting(void);
 void led_blinking_task(void);
+void virtual_com_task(void);
 
 /*------------- MAIN -------------*/
 int main(void)
@@ -66,31 +65,46 @@ int main(void)
 
   tusb_init();
 
-  //------------- application task init -------------//
-  cdc_serial_app_init();
-
   while (1)
   {
     tusb_task();
 
     led_blinking_task();
-    cdc_serial_app_task();
+    virtual_com_task();
   }
 
   return 0;
 }
 
+void virtual_com_task(void)
+{
+  // connected and there are data available
+  if ( tud_mounted(0) && tud_cdc_available(0) )
+  {
+    uint8_t buf[64];
+
+    // read and echo back
+    uint32_t count = tud_cdc_read(0, buf, sizeof(buf));
+
+    tud_cdc_write(0, buf, count);
+  }
+}
+
+
 //--------------------------------------------------------------------+
 // tinyusb callbacks
 //--------------------------------------------------------------------+
 void tud_mount_cb(uint8_t coreid)
 {
-  cdc_serial_app_mount(coreid);
+
 }
 
 void tud_umount_cb(uint8_t coreid)
 {
-  cdc_serial_app_umount(coreid);
+}
+
+void tud_cdc_rx_cb(uint8_t coreid)
+{
 }
 
 //--------------------------------------------------------------------+