Skip to content

Commit

Permalink
zigbee: Change zigbee test macros
Browse files Browse the repository at this point in the history
This commit removes unnecessary conditional in Zigbee app utils library
and changes macro to more specific one in zb_nrf_platform.c

ref: KRKNWK-8643

Signed-off-by: Sebastian Draus <sebastian.draus@nordicsemi.no>
  • Loading branch information
sebastiandraus authored and rlubos committed Jan 22, 2021
1 parent dfb0394 commit 314ccaf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion subsys/zigbee/lib/zigbee_app_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

zephyr_library()
zephyr_library_sources_ifndef(CONFIG_ZB_TEST_MODE zigbee_app_utils.c)
zephyr_library_sources(zigbee_app_utils.c)

zephyr_library_link_libraries(zboss)
zephyr_library_link_libraries(zigbee)
4 changes: 2 additions & 2 deletions subsys/zigbee/osif/zb_nrf_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ int zigbee_init(void)
#endif /* CONFIG_ZBOSS_TRAF_DUMP */
#endif /* ZB_TRACE_LEVEL */

#ifndef CONFIG_ZB_TEST_MODE
#ifndef CONFIG_ZB_TEST_MODE_MAC
/* Initialize Zigbee stack. */
ZB_INIT("zigbee_thread");

Expand Down Expand Up @@ -298,7 +298,7 @@ int zigbee_init(void)
#error Zigbee device role undefined!
#endif

#endif /* CONFIG_ZB_TEST_MODE */
#endif /* CONFIG_ZB_TEST_MODE_MAC */

return 0;
}
Expand Down

0 comments on commit 314ccaf

Please sign in to comment.