mirror of
https://github.com/espressif/openthread.git
synced 2026-08-18 08:29:52 +00:00
[spinel] fix OPENTHREAD_ENABLE_SPINEL_VENDOR_HOOK (#9718)
`OPENTHREAD_ENABLE_SPINEL_VENDOR_HOOK` was not consistent with the intended `OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK`. Rename `OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK` to `OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE` for consistency with other configs.
This commit is contained in:
@@ -65,8 +65,8 @@ set(COMMON_SOURCES
|
||||
set(OT_SPINEL_VENDOR_HOOK_SOURCE "" CACHE STRING "set vendor hook source file for Spinel")
|
||||
set(OT_SPINEL_VENDOR_HOOK_HEADER "" CACHE STRING "set vendor hook header file for Spinel")
|
||||
if(OT_SPINEL_VENDOR_HOOK_SOURCE)
|
||||
target_compile_definitions(openthread-spinel-rcp PUBLIC "OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK=1")
|
||||
target_compile_definitions(openthread-spinel-ncp PUBLIC "OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK=1")
|
||||
target_compile_definitions(openthread-spinel-rcp PUBLIC "OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE=1")
|
||||
target_compile_definitions(openthread-spinel-ncp PUBLIC "OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE=1")
|
||||
target_compile_definitions(openthread-spinel-rcp PUBLIC "OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_HEADER=\"${OT_SPINEL_VENDOR_HOOK_HEADER}\"")
|
||||
target_compile_definitions(openthread-spinel-ncp PUBLIC "OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_HEADER=\"${OT_SPINEL_VENDOR_HOOK_HEADER}\"")
|
||||
list(APPEND COMMON_SOURCES ${OT_SPINEL_VENDOR_HOOK_SOURCE_DIR}${OT_SPINEL_VENDOR_HOOK_SOURCE})
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
* This file shows how to implement the Radio Spinel vendor hook.
|
||||
*/
|
||||
|
||||
#if OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
|
||||
#include OPENTRHEAD_SPINEL_CONFIG_VENDOR_HOOK_HEADER
|
||||
#include "common/log.hpp"
|
||||
@@ -64,4 +64,4 @@ exit:
|
||||
|
||||
extern ot::Spinel::RadioSpinel &GetRadioSpinel(void);
|
||||
|
||||
#endif // OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#endif // OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#ifndef SPINEL_EXTENSION_H
|
||||
#define SPINEL_EXTENSION_H
|
||||
|
||||
#if OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
|
||||
#include <openthread/thread_ftd.h>
|
||||
#include "lib/spinel/radio_spinel.hpp"
|
||||
@@ -55,5 +55,5 @@ public:
|
||||
} // namespace Spinel
|
||||
} // namespace ot
|
||||
|
||||
#endif // OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#endif // OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
#endif // SPINEL_EXTENSION_H
|
||||
|
||||
@@ -90,13 +90,13 @@
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @def OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
* @def OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
*
|
||||
* Enables compilation of vendor specific code for Spinel
|
||||
*
|
||||
*/
|
||||
#ifndef OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#define OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK 0
|
||||
#ifndef OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
#define OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
||||
@@ -747,7 +747,7 @@ void RadioSpinel::HandleValueIs(spinel_prop_key_t aKey, const uint8_t *aBuffer,
|
||||
break;
|
||||
}
|
||||
}
|
||||
#if OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
else if (aKey >= SPINEL_PROP_VENDOR__BEGIN && aKey < SPINEL_PROP_VENDOR__END)
|
||||
{
|
||||
error = VendorHandleValueIs(aKey);
|
||||
|
||||
@@ -1065,7 +1065,7 @@ public:
|
||||
*/
|
||||
void RestoreProperties(void);
|
||||
#endif
|
||||
#if OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
/**
|
||||
* Defines a vendor "set property handler" hook to process vendor spinel properties.
|
||||
*
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "posix/platform/radio_url.hpp"
|
||||
#include "posix/platform/spi_interface.hpp"
|
||||
#include "posix/platform/vendor_interface.hpp"
|
||||
#if OPENTHREAD_SPINEL_CONFIG_ENABLE_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
#ifdef OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_HEADER
|
||||
#include OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_HEADER
|
||||
#endif
|
||||
@@ -110,7 +110,7 @@ private:
|
||||
#endif
|
||||
|
||||
RadioUrl mRadioUrl;
|
||||
#if OPENTHREAD_ENABLE_SPINEL_VENDOR_HOOK
|
||||
#if OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
|
||||
Spinel::VendorRadioSpinel mRadioSpinel;
|
||||
#else
|
||||
Spinel::RadioSpinel mRadioSpinel;
|
||||
|
||||
Reference in New Issue
Block a user