hathach 6 жил өмнө
parent
commit
2d041aaa1d

+ 6 - 8
src/common/tusb_verify.h

@@ -60,15 +60,13 @@
 
 
 // Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
 // Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
 #if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
 #if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
-
-#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)
-
+  #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
 #else
-#define TU_BREAKPOINT()
+  #define TU_BREAKPOINT()
 #endif
 #endif
 
 
 /*------------------------------------------------------------------*/
 /*------------------------------------------------------------------*/

+ 1 - 1
src/portable/nxp/lpc_usbd/dcd_lpc_usbd.c

@@ -69,7 +69,7 @@
  * - M3/M4 can transfer nbytes = 1023 (maximum)
  * - M3/M4 can transfer nbytes = 1023 (maximum)
  */
  */
 enum {
 enum {
-  #ifdef __ARM_ARCH_6M__  // Cortex M0/M0+
+  #if __ARM_ARCH_6M__  == 1 // Cortex M0/M0+
     DMA_NBYTES_MAX = 64
     DMA_NBYTES_MAX = 64
   #else
   #else
     DMA_NBYTES_MAX = 1023
     DMA_NBYTES_MAX = 1023