diff options
| author | hathach <[email protected]> | 2014-04-17 22:57:11 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-04-17 22:57:11 +0700 |
| commit | 06bb9ad7a797d5da58358a59fb874782e1c67b59 (patch) | |
| tree | 399b4e7108dc4ef2094468450865fcbbc2ae3dfa /tinyusb/common/common.h | |
| parent | 69c46b2f9a1b272392fe5fb26d6cbea1da530c13 (diff) | |
move STRING & XSTRING & STATIC_ASSERT to compiler.h
disable test for a class of cdc host
temporarily disable test for test_osal_none.c
change include in some core files
remove osal.h from common.h
Diffstat (limited to 'tinyusb/common/common.h')
| -rw-r--r-- | tinyusb/common/common.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index e1ff26e89..6bd12c391 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -48,14 +48,6 @@ #endif
//--------------------------------------------------------------------+
-// MACROS
-//--------------------------------------------------------------------+
-#define STRING_(x) #x // stringify without expand
-#define XSTRING_(x) STRING_(x) // expand then stringify
-#define STRING_CONCAT_(a, b) a##b // concat without expand
-#define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) // expand then concat
-
-//--------------------------------------------------------------------+
// INCLUDES
//--------------------------------------------------------------------+
@@ -79,16 +71,9 @@ #include "std_descriptors.h"
#include "std_request.h"
-#include "osal/osal.h"
-
//--------------------------------------------------------------------+
// MACROS
//--------------------------------------------------------------------+
-#define STRING_(x) #x ///< stringify without expand
-#define XSTRING_(x) STRING_(x) ///< expand then stringify
-#define STRING_CONCAT_(a, b) a##b ///< concat without expand
-#define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) ///< expand then concat
-
#define MAX_OF(a, b) ( (a) > (b) ? (a) : (b) )
#define MIN_OF(a, b) ( (a) < (b) ? (a) : (b) )
|