[config] change macro define names for CSL feature (#4958)

etc/cmake/options.cmake

@@ -88,7 +88,7 @@ endif()
 
 option(OT_CSL_RECEIVER "enable csl receiver")
 if(OT_CSL_RECEIVER)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE=1")
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE=1")
 endif()
 
 option(OT_DHCP6_CLIENT "enable DHCP6 client support")

examples/common-switches.mk

@@ -124,7 +124,7 @@ COMMONCFLAGS                   += -DOPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE=1
 endif
 
 ifeq ($(CSL_RECEIVER),1)
-COMMONCFLAGS                   += -DOPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE=1
+COMMONCFLAGS                   += -DOPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE=1
 endif
 
 ifeq ($(DEBUG),1)

examples/platforms/utils/mac_frame.cpp

@@ -152,10 +152,10 @@ otError otMacFrameGenerateEnhAck(const otRadioFrame *aFrame,
                                                                   aIsFramePending, aIeData, aIeLength);
 }
 
-#if OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 void otMacFrameSetCslIe(otRadioFrame *aFrame, uint16_t aCslPeriod, uint16_t aCslPhase)
 {
     static_cast<Mac::Frame *>(aFrame)->SetCslIe(aCslPeriod, aCslPhase);
 }
-#endif // OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 #endif // OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT

src/core/config/mac.h

@@ -306,24 +306,23 @@
 #endif
 
 /**
- * @def OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE
  *
  * This setting configures the CSL transmitter feature in Thread 1.2.
  * This is compulsory for 1.2 FTD.
  *
  */
-#define OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE \
+#define OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE \
     (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) && OPENTHREAD_FTD
 
 /**
- * @def OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+ * @def OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
  *
  * This setting configures the CSL receiver feature in Thread 1.2.
  * This is compulsory for 1.2 MTD, optional for 1.2 FTD.
  *
  */
-#ifndef OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
-#define OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE \
+#ifndef OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
+#define OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE \
     (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) && OPENTHREAD_MTD
 #endif
 

src/core/config/openthread-core-config-check.h

@@ -502,20 +502,20 @@
 
 #endif // OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
-#if OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE
+#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
 #if (OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2)
-#error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE"
+#error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE"
 #endif
 #if (!OPENTHREAD_FTD)
-#error "FTD is required for OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE"
+#error "FTD is required for OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE"
 #endif
-#endif // OPENTHREAD_CONFIG_CSL_TRANSMITTER_ENABLE
+#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
 
-#if OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 #if (OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2)
-#error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE"
+#error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE"
 #endif
-#endif // OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 
 #if OPENTHREAD_CONFIG_DUA_ENABLE && (OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2)
 #error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_DUA_ENABLE"

src/core/mac/mac_frame.cpp

@@ -972,7 +972,7 @@ exit:
 }
 #endif // OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT
 
-#if OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 void Frame::SetCslIe(uint16_t aCslPeriod, uint16_t aCslPhase)
 {
     uint8_t *cur = GetHeaderIe(Frame::kHeaderIeCsl);
@@ -984,7 +984,7 @@ void Frame::SetCslIe(uint16_t aCslPeriod, uint16_t aCslPhase)
     csl->SetPeriod(aCslPeriod);
     csl->SetPhase(aCslPhase);
 }
-#endif // OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 
 #if OPENTHREAD_CONFIG_TIME_SYNC_ENABLE
 const TimeIe *Frame::GetTimeIe(void) const

src/core/mac/mac_frame.hpp

@@ -928,7 +928,7 @@ public:
      */
     const uint8_t *GetHeaderIe(uint8_t aIeId) const;
 
-#if OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
     /**
      * This method finds CSL IE in the frame and modify its content.
      *
@@ -937,7 +937,7 @@ public:
      *
      */
     void SetCslIe(uint16_t aCslPeriod, uint16_t aCslPhase);
-#endif // OPENTHREAD_CONFIG_CSL_RECEIVER_ENABLE
+#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 
 #endif // OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT