rename verify_breakpoint to TU_BREAKPOINT

5 files changed, 15 insertions, 15 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index b050ea705..5a047b016 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -468,7 +468,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
         }else

         {

           // No other command take more than one transfer yet -> unlikely error

-          verify_breakpoint();

+          TU_BREAKPOINT();

         }

       }

     break;

diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h
index 41c2b5be1..1cb8443bc 100644
--- a/src/common/tusb_verify.h
+++ b/src/common/tusb_verify.h
@@ -74,14 +74,14 @@
 // Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
 #if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
 
-#define verify_breakpoint() \
+#define TU_BREAKPOINT() \
   do {\
     volatile uint32_t* ARM_CM_DHCSR =  ((volatile uint32_t*) 0xE000EDF0UL); /* Cortex M CoreDebug->DHCSR */ \
     if ( (*ARM_CM_DHCSR) & 1UL ) __asm("BKPT #0\n"); /* Only halt mcu if debugger is attached */\
   } while(0)
 
 #else
-#define verify_breakpoint()
+#define TU_BREAKPOINT()
 #endif
 
 /*------------------------------------------------------------------*/
@@ -157,21 +157,21 @@
 
 /*------------------------------------------------------------------*/
 /* ASSERT
- * basically TU_VERIFY with verify_breakpoint() as handler
+ * basically TU_VERIFY with TU_BREAKPOINT() as handler
  * - 1 arg : return false if failed
  * - 2 arg : return error if failed
  *------------------------------------------------------------------*/
-#define ASSERT_1ARGS(_cond)            TU_VERIFY_DEFINE(_cond, _MESS_FAILED(); verify_breakpoint(), false)
-#define ASSERT_2ARGS(_cond, _ret)      TU_VERIFY_DEFINE(_cond, _MESS_FAILED(); verify_breakpoint(), _ret)
+#define ASSERT_1ARGS(_cond)            TU_VERIFY_DEFINE(_cond, _MESS_FAILED(); TU_BREAKPOINT(), false)
+#define ASSERT_2ARGS(_cond, _ret)      TU_VERIFY_DEFINE(_cond, _MESS_FAILED(); TU_BREAKPOINT(), _ret)
 
 #define TU_ASSERT(...)             GET_3RD_ARG(__VA_ARGS__, ASSERT_2ARGS, ASSERT_1ARGS)(__VA_ARGS__)
 
 /*------------------------------------------------------------------*/
 /* ASSERT Error
- * basically TU_VERIFY Error with verify_breakpoint() as handler
+ * basically TU_VERIFY Error with TU_BREAKPOINT() as handler
  *------------------------------------------------------------------*/
-#define ASERT_ERR_1ARGS(_error)         TU_VERIFY_ERR_DEF2(_error, verify_breakpoint())
-#define ASERT_ERR_2ARGS(_error, _ret)   TU_VERIFY_ERR_DEF3(_error, verify_breakpoint(), _ret)
+#define ASERT_ERR_1ARGS(_error)         TU_VERIFY_ERR_DEF2(_error, TU_BREAKPOINT())
+#define ASERT_ERR_2ARGS(_error, _ret)   TU_VERIFY_ERR_DEF3(_error, TU_BREAKPOINT(), _ret)
 
 #define TU_ASSERT_ERR(...)         GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__)
 
diff --git a/src/device/usbd.c b/src/device/usbd.c
index f35671f17..1e96983b1 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -274,7 +274,7 @@ static tusb_error_t usbd_main_st(void)
     }

     else

     {

-      verify_breakpoint();

+      TU_BREAKPOINT();

     }

   }

 

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index 99e7fdb65..c7ff70d70 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -646,7 +646,7 @@ static void qhd_xfer_error_isr(ehci_qhd_t * p_qhd)
     p_qhd->total_xferred_bytes += p_qhd->p_qtd_list_head->expected_bytes - p_qhd->p_qtd_list_head->total_bytes;

 

 

-//    if ( TUSB_EVENT_XFER_ERROR == error_event )    verify_breakpoint(); // TODO skip unplugged device

+//    if ( TUSB_EVENT_XFER_ERROR == error_event )    TU_BREAKPOINT(); // TODO skip unplugged device

 

     p_qhd->p_qtd_list_head->used = 0; // free QTD

     qtd_remove_1st_from_qhd(p_qhd);

diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index 91848f221..783e4fd2e 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -113,11 +113,11 @@ static inline bool osal_task_create(osal_task_def_t* taskdef)
 //------------- Sub Task Assert -------------//

 #define STASK_RETURN(error)     do { TASK_RESTART; return error; } while(0)

 

-#define STASK_ASSERT_ERR(_err)                TU_VERIFY_ERR_HDLR(_err, verify_breakpoint(); TASK_RESTART, TUSB_ERROR_FAILED)

-#define STASK_ASSERT_ERR_HDLR(_err, _func)    TU_VERIFY_ERR_HDLR(_err, verify_breakpoint(); _func; TASK_RESTART, TUSB_ERROR_FAILED )

+#define STASK_ASSERT_ERR(_err)                TU_VERIFY_ERR_HDLR(_err, TU_BREAKPOINT(); TASK_RESTART, TUSB_ERROR_FAILED)

+#define STASK_ASSERT_ERR_HDLR(_err, _func)    TU_VERIFY_ERR_HDLR(_err, TU_BREAKPOINT(); _func; TASK_RESTART, TUSB_ERROR_FAILED )

 

-#define STASK_ASSERT(_cond)                   TU_VERIFY_HDLR(_cond, verify_breakpoint(); TASK_RESTART, TUSB_ERROR_FAILED)

-#define STASK_ASSERT_HDLR(_cond, _func)       TU_VERIFY_HDLR(_cond, verify_breakpoint(); _func; TASK_RESTART, TUSB_ERROR_FAILED)

+#define STASK_ASSERT(_cond)                   TU_VERIFY_HDLR(_cond, TU_BREAKPOINT(); TASK_RESTART, TUSB_ERROR_FAILED)

+#define STASK_ASSERT_HDLR(_cond, _func)       TU_VERIFY_HDLR(_cond, TU_BREAKPOINT(); _func; TASK_RESTART, TUSB_ERROR_FAILED)

 

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

 // QUEUE API