Review corrections

artokin · Apr 3, 2019 · 708a7d5 · 708a7d5
1 parent db2e2cd
commit 708a7d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/source/6LoWPAN/Thread/thread_joiner_application.c b/source/6LoWPAN/Thread/thread_joiner_application.c
@@ -519,8 +519,8 @@ static void device_configuration_validate(device_configuration_s *this)
         this->vendor_stack_version[1] = (uint8_t)(THREAD_ARM_OUI >> 8);
         this->vendor_stack_version[2] = (uint8_t)(THREAD_ARM_OUI);
         this->vendor_stack_version[3] = (uint8_t)(THREAD_BUILD_NUMBER >> 4);
-        this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) + THREAD_REVISION_NUMBER);
-        this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN  << 4) + THREAD_VERSION_MAJ);
+        this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) | THREAD_REVISION_NUMBER);
+        this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN  << 4) | THREAD_VERSION_MAJ);
     }
 }
 

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
@@ -72,7 +72,7 @@
     #define FNET_COMP_PACKED_VAR    __packed
 #endif
 
-#if FNET_CFG_COMP_UV6
+#if FNET_CFG_COMP_CLANG
     #define FNET_COMP_PACKED_BEGIN  _Pragma("pack(1)")
     #define FNET_COMP_PACKED_END    _Pragma("pack()")
 #endif

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
@@ -41,7 +41,7 @@
  *           Current version of the FNET supports the following compiler definitions:
  *            - @c FNET_CFG_COMP_IAR = Used compiler is IAR.
  *            - @c FNET_CFG_COMP_GNUC = Used compiler is GCC.
- *            - @c FNET_CFG_COMP_UV6 = Used compiler is Keil uVision with armclang.
+ *            - @c FNET_CFG_COMP_CLANG = Used compiler is Keil uVision with Clang.
  *            - @c FNET_CFG_COMP_UV  = Used compiler is Keil uVision with armcc.
  *            - @c FNET_CFG_COMP_GHS = Used compiler is Green Hills.
  *            - @c FNET_CFG_COMP_DCC = Used compiler is Diab.
@@ -64,8 +64,8 @@
 #elif (defined(FNET_CFG_COMP_GHS) && FNET_CFG_COMP_GHS)
     #define FNET_COMP_STR       "GHS"
     /* Keil uVision compiler with armclang. */
-#elif (defined(FNET_CFG_COMP_UV6) && FNET_CFG_COMP_UV6)
-    #define FNET_COMP_STR       "UV6"
+#elif (defined(FNET_CFG_COMP_CLANG) && FNET_CFG_COMP_CLANG)
+    #define FNET_COMP_STR       "CLANG"
     /* Keil uVision compiler with armcc. */
 #elif (defined(FNET_CFG_COMP_UV) && FNET_CFG_COMP_UV)
     #define FNET_COMP_STR       "UV"
@@ -90,12 +90,12 @@
     #elif defined(__ghs__)
         #define FNET_CFG_COMP_GHS   (1)
         #define FNET_COMP_STR       "GHS"
-        /* Keil uVision compiler using armclang. */
-    #elif defined(__CC_ARM) || defined(__ARMCC_VERSION) && defined(__GNUC__)
-        #define FNET_CFG_COMP_UV6   (1)
-        #define FNET_COMP_STR       "UV6"
+        /* Keil uVision compiler using Clang. */
+    #elif defined(__clang__)
+        #define FNET_CFG_COMP_CLANG (1)
+        #define FNET_COMP_STR       "CLANG"
         /* Keil uVision compiler using armcc. */
-    #elif defined(__CC_ARM) || defined(__ARMCC_VERSION)
+    #elif defined(__CC_ARM)
         #define FNET_CFG_COMP_UV    (1)
         #define FNET_COMP_STR       "UV"
         /* GNU GCC */
@@ -118,8 +118,8 @@
 #ifndef FNET_CFG_COMP_CW
     #define FNET_CFG_COMP_CW    (0)
 #endif
-#ifndef FNET_CFG_COMP_UV6
-    #define FNET_CFG_COMP_UV6   (0)
+#ifndef FNET_CFG_COMP_CLANG
+    #define FNET_CFG_COMP_CLANG (0)
 #endif
 #ifndef FNET_CFG_COMP_UV
     #define FNET_CFG_COMP_UV    (0)