Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Telink] Enable -Wundef by default on Zephyr platform #29613

Merged
merged 24 commits into from
Oct 9, 2023
Merged

[Telink] Enable -Wundef by default on Zephyr platform #29613

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ca5479b
[Telink] Enable -Wundef by default on Zephyr platform
s07641069 Oct 6, 2023
280ce31
[Telink] Fix builds
s07641069 Oct 6, 2023
841c8f2
[Telink] Fix builds
s07641069 Oct 6, 2023
60d7e9e
Restyled by clang-format
restyled-commits Oct 6, 2023
e8ffdb5
[Telink] Fix builds
s07641069 Oct 6, 2023
8f8fdd2
Merge branch 'master' into zephyr_enable-wundef
s07641069 Oct 6, 2023
d7490f7
[Telink] Fix builds
s07641069 Oct 6, 2023
b992dc2
[Telink] add defines
s07641069 Oct 7, 2023
6837a15
Merge branch 'master' into zephyr_enable-wundef
s07641069 Oct 7, 2023
26052de
[Telink] add defines
s07641069 Oct 7, 2023
a8365f6
[Telink] add defines
s07641069 Oct 7, 2023
939e95b
[Telink] clean code
s07641069 Oct 7, 2023
c5044aa
[Telink] clean code
s07641069 Oct 7, 2023
7838c8d
[Telink] clean code
s07641069 Oct 8, 2023
5b27add
[Telink] fix builds
s07641069 Oct 8, 2023
142760e
[Telink] clean code
s07641069 Oct 8, 2023
9819348
[Telink] fix builds
s07641069 Oct 8, 2023
da127c4
[Telink] fix builds
s07641069 Oct 8, 2023
fd92f77
[Telink} Fix builds
s07641069 Oct 8, 2023
224294a
[Telink] Fix builds
s07641069 Oct 9, 2023
ad08589
[Telink] fix builds
s07641069 Oct 9, 2023
07f9cef
Merge branch 'master' into zephyr_enable-wundef
s07641069 Oct 9, 2023
68fae68
Merge branch 'master' into zephyr_enable-wundef
s07641069 Oct 9, 2023
a3325fc
Clean nrfconnect config
Damian-Nordic Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Telink] fix builds
  • Loading branch information
@s07641069
s07641069 committed Oct 8, 2023
commit 5b27adda2f3d49ec36a07e2ef07edfdbfb40d78f
16 changes: 8 additions & 8 deletions src/platform/Zephyr/PlatformManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
* for Zephyr platforms.
*/

#if !CONFIG_NORDIC_SECURITY_BACKEND
#if !defined(CONFIG_NORDIC_SECURITY_BACKEND)
#include <crypto/CHIPCryptoPAL.h> // nogncheck
#endif // !CONFIG_NORDIC_SECURITY_BACKEND
#endif // !defined(CONFIG_NORDIC_SECURITY_BACKEND)

#include <platform/internal/CHIPDeviceLayerInternal.h>

Expand All @@ -45,7 +45,7 @@ PlatformManagerImpl PlatformManagerImpl::sInstance{ sChipThreadStack };

static k_timer sOperationalHoursSavingTimer;

#if !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#if !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
{
const struct device * entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
Expand All @@ -71,7 +71,7 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s

return ret;
}
#endif // !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#endif // !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)

void PlatformManagerImpl::OperationalHoursSavingTimerEventHandler(k_timer * timer)
{
Expand Down Expand Up @@ -108,20 +108,20 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
{
CHIP_ERROR err;

#if !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#if !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
// Minimum required from source before entropy is released ( with mbedtls_entropy_func() ) (in bytes)
const size_t kThreshold = 16;
#endif // !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#endif // !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)

// Initialize the configuration system.
err = Internal::ZephyrConfig::Init();
SuccessOrExit(err);

#if !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#if !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
// Add entropy source based on Zephyr entropy driver
err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, kThreshold);
SuccessOrExit(err);
#endif // !CONFIG_NORDIC_SECURITY_BACKEND && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
#endif // !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)

// Call _InitChipStack() on the generic implementation base class to finish the initialization process.
err = Internal::GenericPlatformManagerImpl_Zephyr<PlatformManagerImpl>::_InitChipStack();
Expand Down
5 changes: 1 addition & 4 deletions src/system/SystemConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,11 +732,8 @@ struct LwIPEvent;
*
* Defaults to enabled on Zephyr platforms that do not enable Zephyr POSIX layer.
*/
#ifndef CONFIG_NET_SOCKETS_POSIX_NAMES
#define CONFIG_NET_SOCKETS_POSIX_NAMES 0
#endif
#ifndef CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS
#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && defined(__ZEPHYR__) && CONFIG_NET_SOCKETS_POSIX_NAMES
#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && defined(__ZEPHYR__) && defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
#define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS 1
#else
#define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS 0
Expand Down