hathach 13 лет назад
Родитель
Сommit
54e5289b73
2 измененных файлов с 29 добавлено и 1 удалено
  1. 29 0
      tinyusb/common/common.h
  2. 0 1
      tinyusb/device/dcd.c

+ 29 - 0
tinyusb/common/common.h

@@ -42,10 +42,39 @@
  extern "C" {
 #endif
 
+#include <stddef.h>
 #include "arch/arch.h"
 #include "compiler/compiler.h"
 #include "errors.h"
 
+//#if ( defined CFG_PRINTF_UART || defined CFG_PRINTF_USBCDC || defined CFG_PRINTF_DEBUG )
+#if 1
+  #define PRINTF_LOCATION(mess)	printf("Assert: %s at line %d: %s\n", __func__, __LINE__, mess)
+#else
+  #define PRINTF_LOCATION(mess)
+#endif
+
+#define ASSERT_MESSAGE(condition, value, message) \
+	do{\
+	  if (!(condition)) {\
+			PRINTF_LOCATION(message);\
+			return (value);\
+		}\
+	}while(0)
+
+#define ASSERT(condition, value)  ASSERT_MESSAGE(condition, value, NULL)
+
+#define ASSERT_STATUS_MESSAGE(sts, message) \
+	do{\
+	  ErrorCode_t status = (sts);\
+	  if (LPC_OK != status) {\
+	    PRINTF_LOCATION(message);\
+	    return status;\
+	  }\
+	}while(0)
+
+#define ASSERT_STATUS(sts)		ASSERT_STATUS_MESSAGE(sts, NULL)
+
 #ifdef __cplusplus
  }
 #endif

+ 0 - 1
tinyusb/device/dcd.c

@@ -38,7 +38,6 @@
 #include "dcd.h"
 #include "romdriver/power_api.h"
 #define USBD_API     ((*(ROM **)(0x1FFF1FF8))->pUSBD) // TODO HAL
-#define ASSERT_STATUS(x) x
 
 void dcd_init()
 {