clean up

3 files changed, 31 insertions, 38 deletions

diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h
index e687b8983..1f55a0fc0 100644
--- a/src/common/tusb_common.h
+++ b/src/common/tusb_common.h
@@ -67,34 +67,6 @@
 

 #define ENDIAN_BE16(le16) ((uint16_t) ((U16_LOW_U8(le16) << 8) | U16_HIGH_U8(le16)) )

 

-//------------- Binary constant -------------//

-#if defined(__GNUC__) && !defined(__CC_ARM)

-

-#define TU_BIN8(x)               ((uint8_t)  (0b##x))

-#define TU_BIN16(b1, b2)         ((uint16_t) (0b##b1##b2))

-#define TU_BIN32(b1, b2, b3, b4) ((uint32_t) (0b##b1##b2##b3##b4))

-

-#else

-

-//  internal macro of B8, B16, B32

-#define _B8__(x) (((x&0x0000000FUL)?1:0) \

-                +((x&0x000000F0UL)?2:0) \

-                +((x&0x00000F00UL)?4:0) \

-                +((x&0x0000F000UL)?8:0) \

-                +((x&0x000F0000UL)?16:0) \

-                +((x&0x00F00000UL)?32:0) \

-                +((x&0x0F000000UL)?64:0) \

-                +((x&0xF0000000UL)?128:0))

-

-#define TU_BIN8(d) ((uint8_t) _B8__(0x##d##UL))

-#define TU_BIN16(dmsb,dlsb) (((uint16_t)TU_BIN8(dmsb)<<8) + TU_BIN8(dlsb))

-#define TU_BIN32(dmsb,db2,db3,dlsb) \

-            (((uint32_t)TU_BIN8(dmsb)<<24) \

-            + ((uint32_t)TU_BIN8(db2)<<16) \

-            + ((uint32_t)TU_BIN8(db3)<<8) \

-            + TU_BIN8(dlsb))

-#endif

-

 // for declaration of reserved field, make use of _TU_COUNTER_

 #define TU_RESERVED   XSTRING_CONCAT_(reserved, _TU_COUNTER_)

 

@@ -190,7 +162,7 @@ static inline bool tu_within(uint32_t lower, uint32_t value, uint32_t upper)
 }

 

 // log2 of a value is its MSB's position

-// TODO use clz

+// TODO use clz TODO remove

 static inline uint8_t tu_log2(uint32_t value)

 {

   uint8_t result = 0;

@@ -237,6 +209,35 @@ static inline bool tu_bit_test(uint32_t value, uint8_t n) { return (value & TU_B
          9,8,7,6,5,4,3,2,1,0

 #endif

 

+// To be removed

+//------------- Binary constant -------------//

+#if defined(__GNUC__) && !defined(__CC_ARM)

+

+#define TU_BIN8(x)               ((uint8_t)  (0b##x))

+#define TU_BIN16(b1, b2)         ((uint16_t) (0b##b1##b2))

+#define TU_BIN32(b1, b2, b3, b4) ((uint32_t) (0b##b1##b2##b3##b4))

+

+#else

+

+//  internal macro of B8, B16, B32

+#define _B8__(x) (((x&0x0000000FUL)?1:0) \

+                +((x&0x000000F0UL)?2:0) \

+                +((x&0x00000F00UL)?4:0) \

+                +((x&0x0000F000UL)?8:0) \

+                +((x&0x000F0000UL)?16:0) \

+                +((x&0x00F00000UL)?32:0) \

+                +((x&0x0F000000UL)?64:0) \

+                +((x&0xF0000000UL)?128:0))

+

+#define TU_BIN8(d) ((uint8_t) _B8__(0x##d##UL))

+#define TU_BIN16(dmsb,dlsb) (((uint16_t)TU_BIN8(dmsb)<<8) + TU_BIN8(dlsb))

+#define TU_BIN32(dmsb,db2,db3,dlsb) \

+            (((uint32_t)TU_BIN8(dmsb)<<24) \

+            + ((uint32_t)TU_BIN8(db2)<<16) \

+            + ((uint32_t)TU_BIN8(db3)<<8) \

+            + TU_BIN8(dlsb))

+#endif

+

 #ifdef __cplusplus

  }

 #endif

diff --git a/src/common/tusb_compiler.h b/src/common/tusb_compiler.h
index 613db4d3d..c0813e8ef 100644
--- a/src/common/tusb_compiler.h
+++ b/src/common/tusb_compiler.h
@@ -52,14 +52,6 @@
   #define TU_VERIFY_STATIC(const_expr, _mess) enum { XSTRING_CONCAT_(_verify_static_, _TU_COUNTER_) = 1/(!!(const_expr)) }

 #endif

 

-// allow debugger to watch any module-wide variables anywhere

-#if CFG_TUSB_DEBUG

-#define STATIC_VAR

-#else

-#define STATIC_VAR static

-#endif

-

-

 #if defined(__GNUC__)

   #include "compiler/tusb_compiler_gcc.h"

 #elif defined __ICCARM__

diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h
index 74bc41230..05af66205 100644
--- a/src/common/tusb_verify.h
+++ b/src/common/tusb_verify.h
@@ -50,7 +50,7 @@
 //--------------------------------------------------------------------+
 // TU_VERIFY Helper
 //--------------------------------------------------------------------+
-#if CFG_TUSB_DEBUG >= 1
+#if CFG_TUSB_DEBUG
   #include <stdio.h>
   #define _MESS_ERR(_err)         printf("%s: %d: failed, error = %s\n", __func__, __LINE__, tusb_strerr[_err])
   #define _MESS_FAILED()          printf("%s: %d: failed\n", __func__, __LINE__)