Address CI failures and Gemini review feedback

Author: suveshpratapa

etc/cmake/options.cmake

@@ -243,7 +243,7 @@ ot_option(OT_NETDIAG_CLIENT OPENTHREAD_CONFIG_TMF_NETDIAG_CLIENT_ENABLE "Network
 ot_option(OT_NETDIAG_VENDOR_INFO OPENTHREAD_CONFIG_NET_DIAG_VENDOR_INFO_SET_API_ENABLE "Allow setting vendor info at runtime")
 ot_option(OT_OPERATIONAL_DATASET_AUTO_INIT OPENTHREAD_CONFIG_OPERATIONAL_DATASET_AUTO_INIT "operational dataset auto init")
 ot_option(OT_OTNS OPENTHREAD_CONFIG_OTNS_ENABLE "OTNS")
-ot_option(OT_P2P OPENTHREAD_CONFIG_P2P_ENABLE "peer to peer")
+
 ot_option(OT_PING_SENDER OPENTHREAD_CONFIG_PING_SENDER_ENABLE "ping sender" ${OT_APP_CLI})
 ot_option(OT_PLATFORM_BOOTLOADER_MODE OPENTHREAD_CONFIG_PLATFORM_BOOTLOADER_MODE_ENABLE "platform bootloader mode")
 ot_option(OT_PLATFORM_DNSSD OPENTHREAD_CONFIG_PLATFORM_DNSSD_ENABLE "platform dnssd")
@@ -267,13 +267,14 @@ ot_option(OT_TCP OPENTHREAD_CONFIG_TCP_ENABLE "TCP")
 ot_option(OT_TIME_SYNC OPENTHREAD_CONFIG_TIME_SYNC_ENABLE "time synchronization service")
 ot_option(OT_TREL OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE "TREL radio link for Thread over Infrastructure feature")
 ot_option(OT_TREL_MANAGE_DNSSD OPENTHREAD_CONFIG_TREL_MANAGE_DNSSD_ENABLE "TREL to manage DNSSD and peer discovery")
+ot_option(OT_THREAD_DIRECT_WAKE_INITIATOR OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE "Thread Direct wake initiator")
+ot_option(OT_THREAD_DIRECT_WAKE_LISTENER OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE "Thread Direct wake listener")
 ot_option(OT_TX_BEACON_PAYLOAD OPENTHREAD_CONFIG_MAC_OUTGOING_BEACON_PAYLOAD_ENABLE "tx beacon payload")
 ot_option(OT_TX_QUEUE_STATS OPENTHREAD_CONFIG_TX_QUEUE_STATISTICS_ENABLE "tx queue statistics")
 ot_option(OT_UDP_FORWARD OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE "UDP forward")
 ot_option(OT_UPTIME OPENTHREAD_CONFIG_UPTIME_ENABLE "uptime")
 ot_option(OT_VERHOEFF_CHECKSUM OPENTHREAD_CONFIG_VERHOEFF_CHECKSUM_ENABLE "verhoeff checksum")
-ot_option(OT_WAKEUP_COORDINATOR OPENTHREAD_CONFIG_WAKEUP_COORDINATOR_ENABLE "wake-up coordinator")
-ot_option(OT_WAKEUP_END_DEVICE OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE "wake-up end device")
+
 ot_option(OT_SPINEL_CP_RESET_FAIL_CALLBACK_ENABLE OPENTHREAD_SPINEL_CONFIG_COPROCESSOR_RESET_FAILURE_CALLBACK_ENABLE "CP reset failure callback")
 
 option(OT_DOC "build OpenThread documentation")

examples/platforms/simulation/openthread-core-simulation-config.h

@@ -151,14 +151,4 @@
 #define OPENTHREAD_CONFIG_PLATFORM_ASSERT_MANAGEMENT 1
 #endif
 
-#if !OPENTHREAD_RADIO
-#ifndef OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE
-#define OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE 1
-#endif
-
-#ifndef OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE
-#define OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE 1
-#endif
-#endif
-
 #endif // OPENTHREAD_CORE_SIMULATION_CONFIG_H_

include/openthread/BUILD.gn

@@ -112,12 +112,11 @@ source_set("openthread") {
     "platform/radio.h",
     "platform/settings.h",
     "platform/spi-slave.h",
+    "platform/thread_direct.h",
     "platform/time.h",
     "platform/toolchain.h",
     "platform/trel.h",
     "platform/udp.h",
-    "provisional/link.h",
-    "provisional/p2p.h",
     "radio_stats.h",
     "random_crypto.h",
     "random_noncrypto.h",
@@ -133,6 +132,7 @@ source_set("openthread") {
     "tcp.h",
     "tcp_ext.h",
     "thread.h",
+    "thread_direct.h",
     "thread_ftd.h",
     "trel.h",
     "udp.h",

include/openthread/platform/thread_direct.h

@@ -96,7 +96,7 @@ otError otPlatRadioConfigureThreadDirectEnhAckIe(otInstance         *aInstance,
  * @retval OT_ERROR_NONE             SLW schedule updated.
  * @retval OT_ERROR_NOT_IMPLEMENTED  Feature is not implemented.
  */
-otError otPlatRadioEnableThreadDirectSlw(otInstance *aInstance, uint32_t aSlwPeriod, const otExtAddress *aWiExtAddress);
+otError otPlatRadioEnableThreadDirectSlw(otInstance *aInstance, uint16_t aSlwPeriod, const otExtAddress *aWiExtAddress);
 
 /**
  * Updates the next SLW sample time for the Thread Direct link with @p aWiExtAddress.

include/openthread/thread_direct.h

@@ -69,7 +69,7 @@ typedef struct otThreadDirectWakeKey
 typedef struct otThreadDirectPeerInfo
 {
     otExtAddress mExtAddress;            ///< Peer extended address.
-    uint16_t     mTdShortAddress;        ///< TD short address [0xFE00, 0xFFFE], or kShortAddrInvalid.
+    uint16_t     mTdShortAddress;        ///< TD short address [0xFE00, 0xFFFE], or OT_RADIO_INVALID_SHORT_ADDR.
     uint16_t     mSlwPeriodSlots;        ///< Peer's SLW period in 160 us slots (0 = not configured).
     uint16_t     mSlwPhaseSlots;         ///< Peer's SLW phase in 160 us slots.
     uint16_t     mSupervisionIntervalMs; ///< Supervision interval from TD Link Command, in milliseconds.

script/test

@@ -138,9 +138,6 @@ build_simulation()
         options+=("-DOT_LINK_METRICS_INITIATOR=ON")
         options+=("-DOT_LINK_METRICS_SUBJECT=ON")
         options+=("-DOT_LINK_METRICS_MANAGER=ON")
-        options+=("-DOT_P2P=ON")
-        options+=("-DOT_WAKEUP_COORDINATOR=ON")
-        options+=("-DOT_WAKEUP_END_DEVICE=ON")
     fi
 
     if [[ ${OT_NODE_TYPE} == cli* ]]; then
@@ -189,9 +186,6 @@ build_posix()
         options+=("-DOT_LINK_METRICS_INITIATOR=ON")
         options+=("-DOT_LINK_METRICS_SUBJECT=ON")
         options+=("-DOT_LINK_METRICS_MANAGER=ON")
-        options+=("-DOT_P2P=ON")
-        options+=("-DOT_WAKEUP_COORDINATOR=ON")
-        options+=("-DOT_WAKEUP_END_DEVICE=ON")
     fi
 
     if [[ ${FULL_LOGS} == 1 ]]; then