zboss: version v3_3_0_5+10_06_2020

- ZBOSS sources: 4c971a7c222064f81641184c25a0b7d70c739802 Signed-off-by: Tomasz Chyrowicz <[email protected]>
wiba-nordic · Oct 26, 2020 · 50ef192 · 50ef192
1 parent 4c06139
commit 50ef192
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 742 deletions.
diff --git a/zboss/CHANGELOG.rst b/zboss/CHANGELOG.rst
@@ -24,3 +24,4 @@ Changes
 * Unified OSIF layer for LEDs and buttons.
 * Updated the ZBOSS release naming convention for nrfxlib commit.
 * Changed MAC LL API.
+* ZBOSS IO buffer size reconfigured to allow for sending 802.15.4 MAC frame with maximum payload.
diff --git a/zboss/include/osif/build_info.h b/zboss/include/osif/build_info.h
@@ -11,39 +11,39 @@
  * Please use release scripts to update it's contents.
  *
  * Repositories:
- * platform_ncs       090fb637f0a62ccbe651d5a3307c0ea31d97dacb https://bitbucket-zoi.dsr-corporation.com/scm/ZOI/platform_ncs.git
- * zboss-stack-src    4c971a7c222064f81641184c25a0b7d70c739802 https://bitbucket-zoi.dsr-corporation.com/scm/zoi/zboss_stable
- * zboss-stack-doc    639a0cda809df2ac8289828239c267fc4d4feae4 https://bitbucket-zoi.dsr-corporation.com/scm/zoi/zboss_doc
- * nrf                14ee6d1f52124fd1538421ef09e780af735d0234 https://github.com/nrfconnect/sdk-nrf
- * zephyr             247f9af846a29c4ffcefccb24b2a2348a2e9257f https://github.com/nrfconnect/sdk-zephyr
- * mcuboot            50eec26a462d8cbc171dbbdca623979294a6227b https://github.com/nrfconnect/sdk-mcuboot
- * mcumgr             cfe5eb98a9493017448846fd1a44a9340bd0a22f https://github.com/nrfconnect/sdk-mcumgr
- * nrfxlib            721f19da2be9e2848e507b9a12b6a504e227f2b7 https://github.com/nrfconnect/sdk-nrfxlib
+ * platform_ncs       9289c5a9e3aaec964f46fff7636d089ca152f55e https://bitbucket.dsr-corporation.com/scm/ZOI/platform_ncs.git
+ * zboss-stack-src    4c971a7c222064f81641184c25a0b7d70c739802 https://bitbucket.dsr-corporation.com/scm/zoi/zboss_stable
+ * zboss-stack-doc    e535c07286d1c0c93b6139d0929f289a12ab819a https://bitbucket.dsr-corporation.com/scm/zoi/zboss_doc
+ * nrf                af141a27d757dabf66e8d7ec1853e326ff66ca6b https://github.com/nrfconnect/sdk-nrf
+ * zephyr             41ce8e165a9af4171ef52a73aede89da6ce60920 https://github.com/nrfconnect/sdk-zephyr
+ * mcuboot            c74627b65540fdb4105216361688199b6eceff4d https://github.com/nrfconnect/sdk-mcuboot
+ * mcumgr             b3716c64bde95ea5911a36001fd8f8d4b46eb310 https://github.com/nrfconnect/sdk-mcumgr
+ * nrfxlib            9dbc0e786924ea1e42e6f732d0d19a58265f4559 https://github.com/nrfconnect/sdk-nrfxlib
  * cmock              c243b9a7a7b3c471023193992b46cf1bd1910450 https://github.com/ThrowTheSwitch/cmock
  * unity              031f3bbe45f8adf504ca3d13e6f093869920b091 https://github.com/ThrowTheSwitch/unity
- * mbedtls-nrf        2a1d9332d55d1270084232e42df08fdb08129f1b https://github.com/ARMmbed/mbedtls
+ * mbedtls-nrf        3ede1737dc471199bf8d5d3824ee2545c11a497e https://github.com/ARMmbed/mbedtls
  * nanopb             df0e92f474f9cca704fe2b31483f0b4d1b1715a4 https://github.com/nanopb/nanopb
  * Alexa-Gadgets-Embedded-Sample-Code face92d8c62184832793f518bb1f19379538c5c1 https://github.com/alexa/Alexa-Gadgets-Embedded-Sample-Code
  * cmsis              542b2296e6d515b265e25c6b7208e8fea3014f90 https://github.com/zephyrproject-rtos/cmsis
- * canopennode        5c6b0566d56264efd4bf23ed58bc7cb8b32fe063 https://github.com/zephyrproject-rtos/canopennode
+ * canopennode        468d350028a975b96563e58344de48281a0ab371 https://github.com/zephyrproject-rtos/canopennode
  * ci-tools           da9a2df574094f52d87a03f6393928bdc7dce17c https://github.com/zephyrproject-rtos/ci-tools
  * civetweb           99129c5efc907ea613c4b73ccff07581feb58a7a https://github.com/zephyrproject-rtos/civetweb
  * fatfs              13697783bf653dfdf17c57129ce8e181634e5970 https://github.com/zephyrproject-rtos/fatfs
- * hal_nordic         b69c5a7c25007fbc111a0cbda6e2a6a945a6ae9a https://github.com/zephyrproject-rtos/hal_nordic
+ * hal_nordic         8c45524fb7b0742f46b41b0c9e65a46a8e0eae29 https://github.com/zephyrproject-rtos/hal_nordic
  * hal_st             5b3ec3e182d4310e8943cc34c6c70ae57d9711da https://github.com/zephyrproject-rtos/hal_st
- * libmetal           87e9e7f2c5b4e238236fe703db61ba23e48dc2ef https://github.com/zephyrproject-rtos/libmetal
+ * libmetal           0b23894a041bd00a0d3a2288bb34751bbbef790d https://github.com/zephyrproject-rtos/libmetal
  * lvgl               928b61c7c8ef5f770f10e6fd36d4fea0cf375b5e https://github.com/zephyrproject-rtos/lvgl
- * mbedtls            4bf099f1254332d16dcd931ccea0a88d24a7d3c7 https://github.com/zephyrproject-rtos/mbedtls
+ * mbedtls            aef137b1af8aa7a0f43345c82459254b8832262e https://github.com/zephyrproject-rtos/mbedtls
  * net-tools          1c4fdba512b268033a4cf926bddd323866c3261a https://github.com/zephyrproject-rtos/net-tools
  * open-amp           724f7e2a4519d7e1d40ef330042682dea950c991 https://github.com/zephyrproject-rtos/open-amp
- * loramac-node       170a2579dd890f78f5056f0959cdb9c9bea259a1 https://github.com/zephyrproject-rtos/loramac-node
- * openthread         f23165fde96ae8bd710b08c6d77879465ed92cac https://github.com/zephyrproject-rtos/openthread
- * segger             6fcf61606d6012d2c44129edc033f59331e268bc https://github.com/zephyrproject-rtos/segger
+ * loramac-node       3f545d76a2e6d1db83a470ccdb5bebd1f484e137 https://github.com/zephyrproject-rtos/loramac-node
+ * openthread         07f430dac6c400abdd358ba1173c0f94b94a5a80 https://github.com/zephyrproject-rtos/openthread
+ * segger             874d9e9696b00c09f9eeefe839028dc25fe44983 https://github.com/zephyrproject-rtos/segger
  * tinycbor           40daca97b478989884bffb5226e9ab73ca54b8c4 https://github.com/zephyrproject-rtos/tinycbor
  * tinycrypt          3e9a49d2672ec01435ffbf0d788db6d95ef28de0 https://github.com/zephyrproject-rtos/tinycrypt
  * littlefs           9e4498d1c73009acd84bb36036ee5e2869112a6c https://github.com/zephyrproject-rtos/littlefs
  * mipi-sys-t         957d46bc3ce0d5f628f0d525196bb4db207672ee https://github.com/zephyrproject-rtos/mipi-sys-t
- * nrf_hw_models      9e594dace1af29252903938064b8ecb1b8b77678 https://github.com/zephyrproject-rtos/nrf_hw_models
+ * nrf_hw_models      f86079a7333968f0ba71fe1266e241295a4e9943 https://github.com/zephyrproject-rtos/nrf_hw_models
  * edtt               c39888ff74acf421eeff9a7514fa9b172c3373f7 https://github.com/zephyrproject-rtos/edtt
  */
 
@@ -52,10 +52,10 @@
 #define ZBOSS_BUILD_TAG "10_06_2020"
 
 /** ZBOSS build date (UTC) */
-#define ZBOSS_BUILD_DATE 20201007
+#define ZBOSS_BUILD_DATE 20201022
 
 /** ZBOSS build time (UTC) */
-#define ZBOSS_BUILD_TIME 104209
+#define ZBOSS_BUILD_TIME 093334
 
 
 #endif /* ZBOSS_BUILD_INFO_H__ */
diff --git a/zboss/include/osif/libzboss_config.ed.h b/zboss/include/osif/libzboss_config.ed.h
@@ -61,12 +61,17 @@
  *
  * Available modules are:
  *
+ * - 0x8000 SPI platform implementation
  * - 0x4000 Zigbee Green Power
+ * - 0x2000 Custom components
+ * - 0x1000 UART and NCP transport
  * - 0x0800 Application
+ * - 0x0400 MAC Lower Layer
  * - 0x0200 Zigbee Light Link
  * - 0x0100 Zigbee Cluster Library
  * - 0x0080 Security
  * - 0x0040 Zigbee Device Object
+ * - 0x0020 Zigbee Smart Energy
  * - 0x0010 Application Support layer
  * - 0x0008 Network layer
  * - 0x0004 MAC layer

diff --git a/zboss/include/osif/libzboss_config.h b/zboss/include/osif/libzboss_config.h
@@ -61,12 +61,17 @@
  *
  * Available modules are:
  *
+ * - 0x8000 SPI platform implementation
  * - 0x4000 Zigbee Green Power
+ * - 0x2000 Custom components
+ * - 0x1000 UART and NCP transport
  * - 0x0800 Application
+ * - 0x0400 MAC Lower Layer
  * - 0x0200 Zigbee Light Link
  * - 0x0100 Zigbee Cluster Library
  * - 0x0080 Security
  * - 0x0040 Zigbee Device Object
+ * - 0x0020 Zigbee Smart Energy
  * - 0x0010 Application Support layer
  * - 0x0008 Network layer
  * - 0x0004 MAC layer

diff --git a/zboss/include/osif/mac_platform.h b/zboss/include/osif/mac_platform.h
@@ -207,8 +207,8 @@ zb_transceiver_ctx_t;
 
 
 /*PHY tests specific API. Implement for PHY tests only.*/
-#define ZB_TRANSCEIVER_PERFORM_CCA()                     (0) /*Perform single CCA attempt. Used in TP_154_PHY24_RECEIVER_07 test*/
-#define ZB_TRANS_TX_CARRIER_DATA(channel, timeout_bi)    (0) /*Start continuous transmission. Used in TP_154_PHY24_TRANSMIT_02 test.*/
+#define ZB_TRANSCEIVER_PERFORM_CCA()                     zb_macll_cca()
+#define ZB_TRANS_TX_CARRIER_DATA(channel, timeout_bi)    zb_macll_tx_carrier(channel, timeout_bi)
 
 #define ZB_TRANSCEIVER_SET_TX_POWER(new_power)           zb_macll_set_tx_power(new_power)
 #define ZB_TRANSCEIVER_GET_TX_POWER(power)               zb_macll_get_tx_power(power)

diff --git a/zboss/include/osif/zb_macll.h b/zboss/include/osif/zb_macll.h
@@ -96,4 +96,6 @@ uint8_t zb_macll_metadata_get_lqi(zb_bufid_t bufid);
 void zb_macll_metadata_set_lqi(zb_bufid_t bufid, uint8_t lqi);
 void zb_macll_set_received_data_status(zb_bufid_t bufid, zb_bool_t pending_bit);
 
+zb_ret_t zb_macll_tx_carrier(zb_uint8_t channel, zb_time_t timeout_bi);
+
 #endif /* ZB_MACLL_H__ */
diff --git a/zboss/include/osif/zb_revision_r22.h b/zboss/include/osif/zb_revision_r22.h
@@ -7,4 +7,4 @@
  */
 
 /* Revision number of ZBOSS platform for NCS. */
-#define ZBOSS_SDK_REVISION 4
+#define ZBOSS_SDK_REVISION 5
diff --git a/zboss/include/osif/zb_transceiver.h b/zboss/include/osif/zb_transceiver.h
@@ -30,5 +30,8 @@ void zb_trans_src_match_tbl_drop(void);
 zb_time_t osif_sub_trans_timer(zb_time_t t2, zb_time_t t1);
 zb_bool_t zb_trans_rx_pending(void);
 zb_uint8_t zb_trans_get_next_packet(zb_bufid_t buf);
+zb_ret_t zb_trans_cca(void);
+zb_ret_t zb_trans_continuous_carrier(void);
+void zb_trans_set_crcpoly(zb_uint32_t iv, zb_uint32_t polynomial);
 
 #endif /* ZB_TRANSCEIVER_H__ */
diff --git a/zboss/include/osif/zb_vendor.h b/zboss/include/osif/zb_vendor.h
@@ -284,6 +284,11 @@
 /* Include Zigbee BDB implementation (always defined, except macsplit). */
 #define ZB_BDB_MODE
 
+#if defined NCP_MODE && !defined NCP_MODE_HOST
+/* Enable NCP SoC -specific BDB signal generation and handler. */
+#define ZB_NCP_SOC_BDB
+#endif /* NCP_MODE && !NCP_MODE_HOST */
+
 /* Include Zigbee HA clusters implementation (always defined, except macsplit). */
 #define ZB_ENABLE_HA
 
@@ -311,4 +316,11 @@
 /* Include all test cases in the certification firmware builds. */
 #define ZB_TEST_GROUP_ALL
 
+/* Set the ZBOSS buffer size according to the set of enabled MAC features. */
+#ifdef ZB_MAC_SECURITY
+#define ZB_IO_BUF_SIZE 164
+#else /* ZB_MAC_SECURITY */
+#define ZB_IO_BUF_SIZE 152
+#endif /* ZB_MAC_SECURITY */
+
 #endif /* ZB_VENDOR_H__ */