From 03582f74b8ac7fd83c9bb695777713f781e8f1a1 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Mar 2018 13:25:14 +0700 Subject: [PATCH] more rename --- tinyusb/common/assertion.h | 2 +- tinyusb/common/binary.h | 2 +- tinyusb/common/compiler/compiler_gcc.h | 2 -- tinyusb/common/compiler/{compiler.h => tusb_compiler.h} | 8 ++++---- tinyusb/common/timeout_timer.h | 2 +- tinyusb/common/tusb_common.h | 2 +- tinyusb/common/tusb_types.h | 2 +- tinyusb/common/verify.h | 2 +- tinyusb/tusb_option.h | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) rename tinyusb/common/compiler/{compiler.h => tusb_compiler.h} (90%) diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h index f91f0030..edb3f69f 100644 --- a/tinyusb/common/assertion.h +++ b/tinyusb/common/assertion.h @@ -52,7 +52,7 @@ extern "C" #include "tusb_option.h" #include #include -#include "compiler/compiler.h" +#include "compiler/tusb_compiler.h" #include "tusb_hal.h" // TODO find a way to break hal dependency diff --git a/tinyusb/common/binary.h b/tinyusb/common/binary.h index ed7eecb2..4f2c8178 100644 --- a/tinyusb/common/binary.h +++ b/tinyusb/common/binary.h @@ -49,7 +49,7 @@ #include #include -#include "compiler/compiler.h" +#include "compiler/tusb_compiler.h" //------------- Bit manipulation -------------// #define BIT_(n) (1U << (n)) ///< n-th Bit diff --git a/tinyusb/common/compiler/compiler_gcc.h b/tinyusb/common/compiler/compiler_gcc.h index 681940af..c9f716d4 100644 --- a/tinyusb/common/compiler/compiler_gcc.h +++ b/tinyusb/common/compiler/compiler_gcc.h @@ -75,10 +75,8 @@ /** \defgroup Group_FuncAttr Function Attributes * @{ */ -#ifndef ATTR_ALWAYS_INLINE /// Generally, functions are not inlined unless optimization is specified. For functions declared inline, this attribute inlines the function even if no optimization level is specified #define ATTR_ALWAYS_INLINE __attribute__ ((always_inline)) -#endif /// The nonnull attribute specifies that some function parameters should be non-null pointers. f the compiler determines that a null pointer is passed in an argument slot marked as non-null, and the -Wnonnull option is enabled, a warning is issued. All pointer arguments are marked as non-null #define ATTR_NON_NULL __attribute__ ((nonull)) diff --git a/tinyusb/common/compiler/compiler.h b/tinyusb/common/compiler/tusb_compiler.h similarity index 90% rename from tinyusb/common/compiler/compiler.h rename to tinyusb/common/compiler/tusb_compiler.h index bbdd6e50..40cd5ea6 100644 --- a/tinyusb/common/compiler/compiler.h +++ b/tinyusb/common/compiler/tusb_compiler.h @@ -44,9 +44,9 @@ #ifndef _TUSB_COMPILER_H_ #define _TUSB_COMPILER_H_ -#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 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 //--------------------------------------------------------------------+ @@ -74,7 +74,7 @@ #if defined(__GNUC__) #include "compiler_gcc.h" -#elif defined __ICCARM__ // IAR compiler +#elif defined __ICCARM__ #include "compiler_iar.h" #endif diff --git a/tinyusb/common/timeout_timer.h b/tinyusb/common/timeout_timer.h index 885b3901..d8dcc87e 100644 --- a/tinyusb/common/timeout_timer.h +++ b/tinyusb/common/timeout_timer.h @@ -44,7 +44,7 @@ #ifndef _TUSB_TIMEOUT_TTIMER_H_ #define _TUSB_TIMEOUT_TTIMER_H_ -#include "compiler/compiler.h" +#include "compiler/tusb_compiler.h" #ifdef __cplusplus extern "C" { diff --git a/tinyusb/common/tusb_common.h b/tinyusb/common/tusb_common.h index bde0ffa9..0b39621e 100644 --- a/tinyusb/common/tusb_common.h +++ b/tinyusb/common/tusb_common.h @@ -62,7 +62,7 @@ #include "tusb_option.h" //------------- General Header -------------// -#include "compiler/compiler.h" +#include "compiler/tusb_compiler.h" #include "assertion.h" #include "verify.h" #include "binary.h" diff --git a/tinyusb/common/tusb_types.h b/tinyusb/common/tusb_types.h index 96daccdd..a74b5876 100644 --- a/tinyusb/common/tusb_types.h +++ b/tinyusb/common/tusb_types.h @@ -43,9 +43,9 @@ #ifndef _TUSB_TYPES_H_ #define _TUSB_TYPES_H_ +#include "compiler/tusb_compiler.h" #include #include -#include "compiler/compiler.h" #ifdef __cplusplus extern "C" { diff --git a/tinyusb/common/verify.h b/tinyusb/common/verify.h index 69c2a805..7d71c255 100644 --- a/tinyusb/common/verify.h +++ b/tinyusb/common/verify.h @@ -39,7 +39,7 @@ #include "tusb_option.h" #include #include -#include "compiler/compiler.h" +#include "compiler/tusb_compiler.h" #ifdef __cplusplus extern "C" { diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index 77e56e35..4ddc288a 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -106,7 +106,7 @@ /** determines the debug level for the stack - Level 3: TBD - - Level 2: ATTR_ALWAYS_INLINE is null --> no function is inline + - Level 2: TBD - Level 1: Print out if Assert failed. STATIC_VAR is NULL --> accessible when debugging - Level 0: no debug information is generated */