Merge branch 'develop'

5 files changed, 820 insertions, 0 deletions

diff --git a/src/osal/osal.c b/src/osal/osal.c
new file mode 100644
index 000000000..f5105d4d1
--- /dev/null
+++ b/src/osal/osal.c
@@ -0,0 +1,60 @@
+/**************************************************************************/
+/*!
+    @file     osal.c
+    @author   hathach
+
+    @section LICENSE
+
+    Software License Agreement (BSD License)
+
+    Copyright (c) 2018, 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 "tusb_option.h"
+#include "osal.h"
+
+//--------------------------------------------------------------------+
+// TICK API
+//--------------------------------------------------------------------+
+#if CFG_TUSB_OS == OPT_OS_FREERTOS
+
+uint32_t tusb_hal_millis(void)
+{
+  return ( ( ((uint64_t) xTaskGetTickCount()) * 1000) / configTICK_RATE_HZ );
+}
+
+#elif CFG_TUSB_OS == OPT_OS_MYNEWT
+
+uint32_t tusb_hal_millis(void)
+{
+  return os_time_ticks_to_ms32( os_time_get() );
+}
+
+#endif
+
diff --git a/src/osal/osal.h b/src/osal/osal.h
new file mode 100644
index 000000000..55e3e077c
--- /dev/null
+++ b/src/osal/osal.h
@@ -0,0 +1,127 @@
+/**************************************************************************/

+/*!

+    @file     osal.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.

+*/

+/**************************************************************************/

+

+#ifndef _TUSB_OSAL_H_

+#define _TUSB_OSAL_H_

+

+#ifdef __cplusplus

+ extern "C" {

+#endif

+

+/** \addtogroup group_osal

+ *  @{ */

+

+#include "tusb_option.h"

+#include "common/tusb_common.h"

+

+enum

+{

+  OSAL_TIMEOUT_NOTIMEOUT    = 0,      // return immediately

+  OSAL_TIMEOUT_NORMAL       = 10,     // default timeout

+  OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL

+};

+

+#define OSAL_TIMEOUT_CONTROL_XFER  OSAL_TIMEOUT_WAIT_FOREVER

+

+typedef void (*osal_task_func_t)( void * );

+

+#if CFG_TUSB_OS == OPT_OS_NONE

+  #include "osal_none.h"

+#else

+  /* RTOS Porting API

+   *

+   * uint32_t tusb_hal_millis(void)

+   *

+   * Task

+   *    osal_task_def_t

+   *    bool osal_task_create(osal_task_def_t* taskdef)

+   *    void osal_task_delay(uint32_t msec)

+   *

+   * Queue

+   *     osal_queue_def_t, osal_queue_t

+   *     osal_queue_t osal_queue_create(osal_queue_def_t* qdef)

+   *     osal_queue_receive (osal_queue_t const queue_hdl, void *p_data, uint32_t msec, uint32_t *p_error)

+   *     bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)

+   *     osal_queue_reset()

+   *

+   * Semaphore

+   *    osal_semaphore_def_t, osal_semaphore_t

+   *    osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)

+   *    bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)

+ *    bool osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec)

+   *    void osal_semaphore_reset(osal_semaphore_t const sem_hdl)

+   *

+   * Mutex

+   *    osal_mutex_t

+   *    osal_mutex_create(osal_mutex_def_t* mdef)

+   *    bool osal_mutex_unlock(osal_mutex_t mutex_hdl)

+   *    void osal_mutex_lock(osal_mutex_t mutex_hdl, uint32_t msec, uint32_t *p_error)

+   */

+

+  #if CFG_TUSB_OS == OPT_OS_FREERTOS

+    #include "osal_freertos.h"

+  #elif CFG_TUSB_OS == OPT_OS_MYNEWT

+    #include "osal_mynewt.h"

+  #else

+    #error CFG_TUSB_OS is not defined or OS is not supported yet

+  #endif

+

+  // TODO remove subtask related macros later

+

+  //------------- Sub Task -------------//

+  #define OSAL_SUBTASK_BEGIN

+  #define OSAL_SUBTASK_END                    return TUSB_ERROR_NONE;

+

+  #define STASK_RETURN(_error)                return _error;

+  #define STASK_INVOKE(_subtask, _status)     (_status) = _subtask

+

+  //------------- Sub Task Assert -------------//

+  #define STASK_ASSERT_ERR(_err)              TU_VERIFY_ERR(_err)

+  #define STASK_ASSERT_ERR_HDLR(_err, _func)  TU_VERIFY_ERR_HDLR(_err, _func)

+

+  #define STASK_ASSERT(_cond)                 TU_VERIFY(_cond, TUSB_ERROR_OSAL_TASK_FAILED)

+  #define STASK_ASSERT_HDLR(_cond, _func)     TU_VERIFY_HDLR(_cond, _func)

+#endif

+

+#ifdef __cplusplus

+ }

+#endif

+

+/** @} */

+

+#endif /* _TUSB_OSAL_H_ */

diff --git a/src/osal/osal_freertos.h b/src/osal/osal_freertos.h
new file mode 100644
index 000000000..acec4a95d
--- /dev/null
+++ b/src/osal/osal_freertos.h
@@ -0,0 +1,186 @@
+/**************************************************************************/
+/*!
+    @file     osal_freeRTOS.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 group_osal
+ * @{
+ *  \defgroup Group_FreeRTOS  FreeRTOS
+ *  @{ */
+
+#ifndef _TUSB_OSAL_FREERTOS_H_
+#define _TUSB_OSAL_FREERTOS_H_
+
+//------------- FreeRTOS Headers -------------//
+#include "FreeRTOS.h"
+#include "semphr.h"
+#include "queue.h"
+#include "task.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if 0
+// Helper to determine if we are in ISR to use ISR API (only cover ARM Cortex)
+static inline bool in_isr(void)
+{
+  return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk);
+}
+#endif
+
+//--------------------------------------------------------------------+
+// TASK API
+//--------------------------------------------------------------------+
+#define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz) \
+  static uint8_t _name##_##buf[_stack_sz*sizeof(StackType_t)]; \
+  osal_task_def_t _name = { .func = _func, .prio = _prio, .stack_sz = _stack_sz, .buf = _name##_##buf, .strname = _str };
+
+typedef struct
+{
+  osal_task_func_t func;
+
+  uint16_t prio;
+  uint16_t stack_sz;
+  void*    buf;
+  const char* strname;
+
+  StaticTask_t stask;
+}osal_task_def_t;
+
+static inline bool osal_task_create(osal_task_def_t* taskdef)
+{
+  return NULL != xTaskCreateStatic(taskdef->func, taskdef->strname, taskdef->stack_sz, NULL, taskdef->prio, (StackType_t*) taskdef->buf, &taskdef->stask);
+}
+
+static inline void osal_task_delay(uint32_t msec)
+{
+  vTaskDelay( pdMS_TO_TICKS(msec) );
+}
+
+//--------------------------------------------------------------------+
+// Semaphore API
+//--------------------------------------------------------------------+
+typedef StaticSemaphore_t osal_semaphore_def_t;
+typedef SemaphoreHandle_t osal_semaphore_t;
+
+static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
+{
+  return xSemaphoreCreateBinaryStatic(semdef);
+}
+
+static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
+{
+  return in_isr ?  xSemaphoreGiveFromISR(sem_hdl, NULL) : xSemaphoreGive(sem_hdl);
+}
+
+static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
+{
+  uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? portMAX_DELAY : pdMS_TO_TICKS(msec);
+  return xSemaphoreTake(sem_hdl, ticks);
+}
+
+static inline void osal_semaphore_reset(osal_semaphore_t const sem_hdl)
+{
+  xQueueReset(sem_hdl);
+}
+
+//--------------------------------------------------------------------+
+// MUTEX API (priority inheritance)
+//--------------------------------------------------------------------+
+typedef StaticSemaphore_t osal_mutex_def_t;
+typedef SemaphoreHandle_t osal_mutex_t;
+
+static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
+{
+  return xSemaphoreCreateMutexStatic(mdef);
+}
+
+#define osal_mutex_lock     osal_semaphore_wait
+
+static inline bool osal_mutex_unlock(osal_mutex_t mutex_hdl)
+{
+  return xSemaphoreGive(mutex_hdl);
+}
+
+//--------------------------------------------------------------------+
+// QUEUE API
+//--------------------------------------------------------------------+
+
+// role device/host is used by OS NONE for mutex (disable usb isr) only
+#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \
+  static _type _name##_##buf[_depth];\
+  osal_queue_def_t _name = { .depth = _depth, .item_sz = sizeof(_type), .buf = _name##_##buf };
+
+typedef struct
+{
+  uint16_t depth;
+  uint16_t item_sz;
+  void*    buf;
+
+  StaticQueue_t sq;
+}osal_queue_def_t;
+
+typedef QueueHandle_t osal_queue_t;
+
+static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
+{
+  return xQueueCreateStatic(qdef->depth, qdef->item_sz, (uint8_t*) qdef->buf, &qdef->sq);
+}
+
+static inline bool osal_queue_receive(osal_queue_t const queue_hdl, void* data)
+{
+  return xQueueReceive(queue_hdl, data, portMAX_DELAY);
+}
+
+static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
+{
+  return in_isr ? xQueueSendToBackFromISR(queue_hdl, data, NULL) : xQueueSendToBack(queue_hdl, data, OSAL_TIMEOUT_WAIT_FOREVER);
+}
+
+static inline void osal_queue_reset(osal_queue_t const queue_hdl)
+{
+  xQueueReset(queue_hdl);
+}
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_OSAL_FREERTOS_H_ */
+
+/** @} */
+/** @} */
diff --git a/src/osal/osal_mynewt.h b/src/osal/osal_mynewt.h
new file mode 100644
index 000000000..62b5b45e8
--- /dev/null
+++ b/src/osal/osal_mynewt.h
@@ -0,0 +1,216 @@
+/**************************************************************************/
+/*!
+    @file     osal_mynewt.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.
+*/
+/**************************************************************************/
+
+#ifndef OSAL_MYNEWT_H_
+#define OSAL_MYNEWT_H_
+
+#include "os/os.h"
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+//--------------------------------------------------------------------+
+// TASK API
+//--------------------------------------------------------------------+
+#define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz) \
+  static os_stack_t _name##_##buf[_stack_sz]; \
+  osal_task_def_t _name = { .func = _func, .prio = _prio, .stack_sz = _stack_sz, .buf = _name##_##buf, .strname = _str };
+
+typedef struct
+{
+  struct os_task mynewt_task;
+  osal_task_func_t func;
+
+  uint16_t prio;
+  uint16_t stack_sz;
+  void*    buf;
+  const char* strname;
+}osal_task_def_t;
+
+static inline bool osal_task_create(osal_task_def_t* taskdef)
+{
+  return OS_OK == os_task_init(&taskdef->mynewt_task, taskdef->strname, taskdef->func, NULL, taskdef->prio, OS_WAIT_FOREVER,
+                               (os_stack_t*) taskdef->buf, taskdef->stack_sz);
+}
+
+static inline void osal_task_delay(uint32_t msec)
+{
+  os_time_delay( os_time_ms_to_ticks32(msec) );
+}
+
+//--------------------------------------------------------------------+
+// QUEUE API
+//--------------------------------------------------------------------+
+
+// role device/host is used by OS NONE for mutex (disable usb isr) only
+#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \
+  static _type _name##_##buf[_depth];\
+  static struct os_event* _name##_##evbuf[_depth];\
+  osal_queue_def_t _name = { .depth = _depth, .item_sz = sizeof(_type), .buf = _name##_##buf, .evbuf =  _name##_##evbuf};\
+
+typedef struct
+{
+  uint16_t depth;
+  uint16_t item_sz;
+  void*    buf;
+  void*    evbuf;
+
+  struct os_mempool mpool;
+  struct os_mempool epool;
+
+  struct os_eventq  evq;
+}osal_queue_def_t;
+
+typedef osal_queue_def_t* osal_queue_t;
+
+static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
+{
+  if ( OS_OK != os_mempool_init(&qdef->mpool, qdef->depth, qdef->item_sz, qdef->buf, "usbd queue") ) return NULL;
+  if ( OS_OK != os_mempool_init(&qdef->epool, qdef->depth, sizeof(struct os_event), qdef->evbuf, "usbd evqueue") ) return NULL;
+
+  os_eventq_init(&qdef->evq);
+  return (osal_queue_t) qdef;
+}
+
+static inline void osal_queue_receive (osal_queue_t const queue_hdl, void *p_data, uint32_t msec, tusb_error_t *p_error)
+{
+  (void) msec;
+  struct os_event* ev;
+
+  if ( msec == 0 )
+  {
+    ev = os_eventq_get_no_wait(&queue_hdl->evq);
+    if ( !ev )
+    {
+      *p_error = TUSB_ERROR_OSAL_TIMEOUT;
+      return;
+    }
+  }else
+  {
+    ev = os_eventq_get(&queue_hdl->evq);
+  }
+
+  memcpy(p_data, ev->ev_arg, queue_hdl->item_sz); // copy message
+  os_memblock_put(&queue_hdl->mpool, ev->ev_arg); // put back mem block
+  os_memblock_put(&queue_hdl->epool, ev);         // put back ev block
+
+  *p_error = TUSB_ERROR_NONE;
+}
+
+static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
+{
+  (void) in_isr;
+
+  // get a block from mem pool for data
+  void* ptr = os_memblock_get(&queue_hdl->mpool);
+  if (!ptr) return false;
+  memcpy(ptr, data, queue_hdl->item_sz);
+
+  // get a block from event pool to put into queue
+  struct os_event* ev = (struct os_event*) os_memblock_get(&queue_hdl->epool);
+  if (!ev)
+  {
+    os_memblock_put(&queue_hdl->mpool, ptr);
+    return false;
+  }
+  tu_memclr(ev, sizeof(struct os_event));
+  ev->ev_arg = ptr;
+
+  os_eventq_put(&queue_hdl->evq, ev);
+
+  return true;
+}
+
+static inline void osal_queue_flush(osal_queue_t const queue_hdl)
+{
+
+}
+
+//--------------------------------------------------------------------+
+// Semaphore API
+//--------------------------------------------------------------------+
+typedef struct os_sem  osal_semaphore_def_t;
+typedef struct os_sem* osal_semaphore_t;
+
+static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
+{
+  return (os_sem_init(semdef, 0) == OS_OK) ? (osal_semaphore_t) semdef : NULL;
+}
+
+static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
+{
+  (void) in_isr;
+  return os_sem_release(sem_hdl) == OS_OK;
+}
+
+static inline void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, tusb_error_t *p_error)
+{
+  uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? OS_TIMEOUT_NEVER : os_time_ms_to_ticks32(msec);
+  (*p_error) = ( (os_sem_pend(sem_hdl, ticks) == OS_OK) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT );
+}
+
+static inline void osal_semaphore_reset_isr(osal_semaphore_t const sem_hdl)
+{
+//  xSemaphoreTakeFromISR(sem_hdl, NULL);
+}
+
+#if 0
+//--------------------------------------------------------------------+
+// MUTEX API (priority inheritance)
+//--------------------------------------------------------------------+
+typedef struct os_mutex osal_mutex_t;
+
+#define osal_mutex_create(x) xSemaphoreCreateMutex()
+
+static inline bool osal_mutex_release(osal_mutex_t mutex_hdl)
+{
+  return xSemaphoreGive(mutex_hdl);
+}
+
+static inline void osal_mutex_wait(osal_mutex_t mutex_hdl, uint32_t msec, tusb_error_t *p_error)
+{
+  uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? portMAX_DELAY : pdMS_TO_TICKS(msec);
+  (*p_error) = (xSemaphoreTake(mutex_hdl, ticks) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT);
+}
+#endif
+
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* OSAL_MYNEWT_H_ */
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
new file mode 100644
index 000000000..ff37113c6
--- /dev/null
+++ b/src/osal/osal_none.h
@@ -0,0 +1,231 @@
+/**************************************************************************/

+/*!

+    @file     osal_none.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 group_osal

+ * \defgroup Group_OSNone None OS

+ *  @{ */

+

+#ifndef _TUSB_OSAL_NONE_H_

+#define _TUSB_OSAL_NONE_H_

+

+#include "tusb_hal.h"

+

+#ifdef __cplusplus

+ extern "C" {

+#endif

+

+//--------------------------------------------------------------------+

+// TASK API

+// Virtually do nothing in osal none

+//--------------------------------------------------------------------+

+#define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz)  osal_task_def_t _name;

+typedef uint8_t osal_task_def_t;

+

+static inline bool osal_task_create(osal_task_def_t* taskdef)

+{

+  (void) taskdef;

+  return true;

+}

+

+static inline void osal_task_delay(uint32_t msec)

+{

+  uint32_t start = tusb_hal_millis();

+  while ( ( tusb_hal_millis() - start ) < msec ) {}

+}

+

+//--------------------------------------------------------------------+

+// Binary Semaphore API

+//--------------------------------------------------------------------+

+typedef struct

+{

+  volatile uint16_t count;

+}osal_semaphore_def_t;

+

+typedef osal_semaphore_def_t* osal_semaphore_t;

+

+static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)

+{

+  semdef->count = 0;

+  return semdef;

+}

+

+static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)

+{

+  (void) in_isr;

+  sem_hdl->count++;

+  return true;

+}

+

+static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl)

+{

+  sem_hdl->count = 0;

+}

+

+// TODO blocking for now

+static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)

+{

+  (void) msec;

+

+  while (sem_hdl->count == 0) { }

+  sem_hdl->count--;

+

+  return true;

+}

+

+//--------------------------------------------------------------------+

+// MUTEX API

+// Within tinyusb, mutex is never used in ISR context

+//--------------------------------------------------------------------+

+typedef osal_semaphore_def_t osal_mutex_def_t;

+typedef osal_semaphore_t osal_mutex_t;

+

+static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)

+{

+  mdef->count = 1;

+  return mdef;

+}

+

+#define osal_mutex_unlock(_mutex_hdl)   osal_semaphore_post(_mutex_hdl, false)

+#define osal_mutex_lock                 osal_semaphore_wait

+

+//--------------------------------------------------------------------+

+// QUEUE API

+//--------------------------------------------------------------------+

+#include "common/tusb_fifo.h"

+

+// extern to avoid including dcd.h and hcd.h

+#if TUSB_OPT_DEVICE_ENABLED

+extern void dcd_int_disable(uint8_t rhport);

+extern void dcd_int_enable(uint8_t rhport);

+#endif

+

+#if TUSB_OPT_HOST_ENABLED

+extern void hcd_int_disable(uint8_t rhport);

+extern void hcd_int_enable(uint8_t rhport);

+#endif

+

+typedef struct

+{

+    uint8_t role; // device or host

+    tu_fifo_t ff;

+}osal_queue_def_t;

+

+typedef osal_queue_def_t* osal_queue_t;

+

+// role device/host is used by OS NONE for mutex (disable usb isr) only

+#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \

+  uint8_t _name##_buf[_depth*sizeof(_type)];        \

+  osal_queue_def_t _name = {                        \

+    .role = _role,                                  \

+    .ff = {                                         \

+      .buffer       = _name##_buf,                  \

+      .depth        = _depth,                       \

+      .item_size    = sizeof(_type),                \

+      .overwritable = false,                        \

+    }\

+  }

+

+// lock queue by disable usb isr

+static inline void _osal_q_lock(osal_queue_t qhdl)

+{

+#if TUSB_OPT_DEVICE_ENABLED

+  if (qhdl->role == OPT_MODE_DEVICE) dcd_int_disable(TUD_OPT_RHPORT);

+#endif

+

+#if TUSB_OPT_HOST_ENABLED

+  if (qhdl->role == OPT_MODE_HOST) hcd_int_disable(TUH_OPT_RHPORT);

+#endif

+}

+

+// unlock queue

+static inline void _osal_q_unlock(osal_queue_t qhdl)

+{

+#if TUSB_OPT_DEVICE_ENABLED

+  if (qhdl->role == OPT_MODE_DEVICE) dcd_int_enable(TUD_OPT_RHPORT);

+#endif

+

+#if TUSB_OPT_HOST_ENABLED

+  if (qhdl->role == OPT_MODE_HOST) hcd_int_enable(TUH_OPT_RHPORT);

+#endif

+}

+

+static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)

+{

+  tu_fifo_clear(&qdef->ff);

+  return (osal_queue_t) qdef;

+}

+

+static inline bool osal_queue_send(osal_queue_t const qhdl, void const * data, bool in_isr)

+{

+  if (!in_isr) {

+    _osal_q_lock(qhdl);

+  }

+

+  bool success = tu_fifo_write(&qhdl->ff, data);

+

+  if (!in_isr) {

+    _osal_q_unlock(qhdl);

+  }

+

+  return success;

+}

+

+static inline void osal_queue_reset(osal_queue_t const qhdl)

+{

+  // tusb_hal_int_disable_all();

+  tu_fifo_clear(&qhdl->ff);

+  // tusb_hal_int_enable_all();

+}

+

+// non blocking

+static inline bool osal_queue_receive(osal_queue_t const qhdl, void* data)

+{

+  _osal_q_lock(qhdl);

+  bool success = tu_fifo_read(&qhdl->ff, data);

+  _osal_q_unlock(qhdl);

+

+  return success;

+}

+

+#ifdef __cplusplus

+ }

+#endif

+

+#endif /* _TUSB_OSAL_NONE_H_ */

+

+/** @} */