Merge pull request #45 from hathach/develop

Board uart rename and better support mynewt

6 files changed, 82 insertions, 156 deletions

diff --git a/src/osal/osal.h b/src/osal/osal.h
index 95067679b..413189b4e 100644
--- a/src/osal/osal.h
+++ b/src/osal/osal.h
@@ -69,7 +69,7 @@ typedef void (*osal_task_func_t)( void * );
    *    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)

+   *    bool osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec)

    *    void osal_semaphore_reset(osal_semaphore_t const sem_hdl)

    *

    * Mutex

diff --git a/src/osal/osal_freertos.h b/src/osal/osal_freertos.h
index 48b106160..639501bbf 100644
--- a/src/osal/osal_freertos.h
+++ b/src/osal/osal_freertos.h
@@ -24,15 +24,10 @@
  * 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 -------------//
+// FreeRTOS Headers
 #include "FreeRTOS.h"
 #include "semphr.h"
 #include "queue.h"
@@ -42,14 +37,6 @@
 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
 //--------------------------------------------------------------------+
@@ -148,6 +135,3 @@ static inline void osal_queue_reset(osal_queue_t const queue_hdl)
 #endif
 
 #endif /* _TUSB_OSAL_FREERTOS_H_ */
-
-/** @} */
-/** @} */
diff --git a/src/osal/osal_mynewt.h b/src/osal/osal_mynewt.h
index 304890d42..9fa9f541e 100644
--- a/src/osal/osal_mynewt.h
+++ b/src/osal/osal_mynewt.h
@@ -42,6 +42,56 @@ static inline void osal_task_delay(uint32_t msec)
 }
 
 //--------------------------------------------------------------------+
+// 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 bool osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec)
+{
+  uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? OS_TIMEOUT_NEVER : os_time_ms_to_ticks32(msec);
+  return os_sem_pend(sem_hdl, ticks) == OS_OK;
+}
+
+static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl)
+{
+  // TODO implement later
+}
+
+//--------------------------------------------------------------------+
+// MUTEX API (priority inheritance)
+//--------------------------------------------------------------------+
+typedef struct os_mutex osal_mutex_def_t;
+typedef struct os_mutex* osal_mutex_t;
+
+static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
+{
+  return (os_mutex_init(mdef) == OS_OK) ? (osal_mutex_t) mdef : NULL;
+}
+
+static inline bool osal_mutex_lock(osal_mutex_t mutex_hdl, uint32_t msec)
+{
+  uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? OS_TIMEOUT_NEVER : os_time_ms_to_ticks32(msec);
+  return os_mutex_pend(mutex_hdl, ticks) == OS_OK;
+}
+
+static inline bool osal_mutex_unlock(osal_mutex_t mutex_hdl)
+{
+  return os_mutex_release(mutex_hdl) == OS_OK;
+}
+
+//--------------------------------------------------------------------+
 // QUEUE API
 //--------------------------------------------------------------------+
 
@@ -75,109 +125,47 @@ static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
   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)
+static inline bool osal_queue_receive(osal_queue_t const qhdl, void* data)
 {
-  (void) msec;
   struct os_event* ev;
+  ev = os_eventq_get(&qhdl->evq);
 
-  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(data, ev->ev_arg, qhdl->item_sz); // copy message
+  os_memblock_put(&qhdl->mpool, ev->ev_arg); // put back mem block
+  os_memblock_put(&qhdl->epool, ev);         // put back ev block
 
-  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;
+  return true;
 }
 
-static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
+static inline bool osal_queue_send(osal_queue_t const qhdl, 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);
+  void* ptr = os_memblock_get(&qhdl->mpool);
   if (!ptr) return false;
-  memcpy(ptr, data, queue_hdl->item_sz);
+  memcpy(ptr, data, qhdl->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);
+  struct os_event* ev = (struct os_event*) os_memblock_get(&qhdl->epool);
   if (!ev)
   {
-    os_memblock_put(&queue_hdl->mpool, ptr);
+    os_memblock_put(&qhdl->mpool, ptr);
     return false;
   }
   tu_memclr(ev, sizeof(struct os_event));
   ev->ev_arg = ptr;
 
-  os_eventq_put(&queue_hdl->evq, ev);
+  os_eventq_put(&qhdl->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)
+static inline void osal_queue_reset(osal_queue_t const queue_hdl)
 {
-  return xSemaphoreGive(mutex_hdl);
+  // TODO implement later
 }
 
-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
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index 241234671..17a802ed8 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -24,10 +24,6 @@
  * 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_

 

@@ -69,11 +65,6 @@ static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
   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)

 {

@@ -85,6 +76,11 @@ static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
   return true;

 }

 

+static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl)

+{

+  sem_hdl->count = 0;

+}

+

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

 // MUTEX API

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

@@ -98,8 +94,8 @@ static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
   return mdef;

 }

 

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

 #define osal_mutex_lock                 osal_semaphore_wait

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

 

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

 // QUEUE API

@@ -168,6 +164,16 @@ static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
   return (osal_queue_t) qdef;

 }

 

+// 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;

+}

+

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

 {

   if (!in_isr) {

@@ -190,20 +196,8 @@ static inline void osal_queue_reset(osal_queue_t const qhdl)
   // 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_ */

-

-/** @} */

diff --git a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
index a6561ef72..c1a6f4a8b 100644
--- a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
+++ b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
@@ -30,7 +30,6 @@
 
 #include "chip.h"
 #include "device/dcd.h"
-#include "dcd_lpc11_13_15.h"
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
diff --git a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.h b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.h
deleted file mode 100644
index c944e9255..000000000
--- a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 

- * The MIT License (MIT)

- *

- * Copyright (c) 2018, hathach (tinyusb.org)

- *

- * Permission is hereby granted, free of charge, to any person obtaining a copy

- * of this software and associated documentation files (the "Software"), to deal

- * in the Software without restriction, including without limitation the rights

- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

- * THE SOFTWARE.

- *

- * This file is part of the TinyUSB stack.

- */

-

-#ifndef _TUSB_DCD_LPC11_13_15_H_

-#define _TUSB_DCD_LPC11_13_15_H_

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-

-#ifdef __cplusplus

- }

-#endif

-

-#endif /* _TUSB_DCD_LPC11_13_15_H_ */