[int][new][zbt] Add more Zephyr function support.

Project: Bluetooth

redmine: #5146, REDMINE-id

ext-redmine: bug|feat#id

[Description in detail]

Affected branch: [master]

Change-Id: Ibb78d978779124fbb45282eac8a9953325b6ba75

Author: ganghe

zephyr_bt/host/conn.c

@@ -513,7 +513,7 @@ void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags)
      * Always do so from the same context for sanity. In this case that will
      * be either a dedicated Bluetooth connection TX workqueue or system workqueue.
      */
-#if 0
+#if 1
     bt_conn_tx_notify(conn, true);
 #else
     bt_conn_tx_notify(conn, false);

zephyr_bt/include/rtt4zephyr.h

@@ -411,12 +411,13 @@ int k_work_submit(struct k_work *work);
 
 #define k_work_cancel_delayable_sync(dwork,sync) rt_workqueue_cancel_work_sync(rt_workqueue_sysq(),(struct rt_work *)dwork)
 #define k_work_delayable_is_pending(dwork) ((dwork)->work.flags&RT_WORK_STATE_PENDING)
-#define k_work_schedule(dwork,delay) rt_work_submit((struct rt_work*)dwork,delay.ticks)
 #define k_work_init(work,handler) rt_work_init(work, (void(*)(struct rt_work*, void*))handler, NULL)
 #define k_work_delayable_busy_get(dwork) ((dwork)->work.flags&RT_WORK_STATE_RUNNING)
 #define k_work_reschedule(dwork,delay) k_work_reschedule2(dwork,delay.ticks)
 rt_tick_t k_work_delayable_remaining_get(const struct rt_delayed_work *dwork);
 int k_work_reschedule2(struct k_work_delayable *dwork, rt_tick_t delay);
+int k_work_schedule(struct k_work_delayable *dwork, k_timeout_t delay);
+
 bool k_work_flush(struct k_work *work, struct k_work_sync *sync);
 #define k_work_busy_get(work) (work)->flags
 static inline bool k_work_is_pending(const struct k_work *work)
@@ -519,6 +520,7 @@ void *k_lifo_get(struct k_lifo *lifo, k_timeout_t timeout);
 int k_poll_signal_raise(struct k_poll_signal *sig, int result);
 #define K_POLL_SIGNAL_INITIALIZER(obj) {}
 
+
 /*********** mem_slab -> rt_mempool ********************/
 #define k_mem_slab rt_mempool
 #define K_MEM_SLAB_DEFINE(name, slab_block_size, slab_num_blocks, slab_align) \
@@ -812,5 +814,15 @@ __syscall int k_poll(struct k_poll_event *events, int num_events,
  */
 __syscall void k_poll_signal_reset(struct k_poll_signal *sig);
 
+/**
+ * @brief Initialize a poll signal object.
+ *
+ * Ready a poll signal object to be signaled via k_poll_signal_raise().
+ *
+ * @param sig A poll signal.
+ */
+
+__syscall void k_poll_signal_init(struct k_poll_signal *sig);
+
 #endif
 

zephyr_bt/include/zbt_rtt.h

@@ -365,14 +365,9 @@
     #define CONFIG_BT_BUF_CMD_TX_COUNT BT_BUF_CMD_TX_COUNT
 #endif
 
-//BT_BUF_CMD_TX_SIZE
-#ifdef BT_BUF_CMD_TX_SIZE2
-    #define CONFIG_BT_BUF_CMD_TX_SIZE BT_BUF_CMD_TX_SIZE2
-#endif
-
 //BT_BUF_CMD_TX_SIZE2
 #ifdef BT_BUF_CMD_TX_SIZE2
-    #define CONFIG_BT_BUF_CMD_TX_SIZE2 BT_BUF_CMD_TX_SIZE2
+    #define CONFIG_BT_BUF_CMD_TX_SIZE BT_BUF_CMD_TX_SIZE2
 #endif
 
 //BT_BUF_EVT_DISCARDABLE_COUNT
@@ -390,14 +385,9 @@
     #define CONFIG_BT_BUF_EVT_RX_COUNT BT_BUF_EVT_RX_COUNT
 #endif
 
-//BT_BUF_EVT_RX_SIZE
-#ifdef BT_BUF_EVT_RX_SIZE2
-    #define CONFIG_BT_BUF_EVT_RX_SIZE BT_BUF_EVT_RX_SIZE2
-#endif
-
 //BT_BUF_EVT_RX_SIZE2
 #ifdef BT_BUF_EVT_RX_SIZE2
-    #define CONFIG_BT_BUF_EVT_RX_SIZE2 BT_BUF_EVT_RX_SIZE2
+    #define CONFIG_BT_BUF_EVT_RX_SIZE BT_BUF_EVT_RX_SIZE2
 #endif
 
 //BT_CAP
@@ -1460,11 +1450,31 @@
     #define CONFIG_BT_MESH_CDB BT_MESH_CDB
 #endif
 
+//BT_MESH_CDB_APP_KEY_COUNT
+#ifdef BT_MESH_CDB_APP_KEY_COUNT
+    #define CONFIG_BT_MESH_CDB_APP_KEY_COUNT BT_MESH_CDB_APP_KEY_COUNT
+#endif
+
+//BT_MESH_CDB_NODE_COUNT
+#ifdef BT_MESH_CDB_NODE_COUNT
+    #define CONFIG_BT_MESH_CDB_NODE_COUNT BT_MESH_CDB_NODE_COUNT
+#endif
+
+//BT_MESH_CDB_SUBNET_COUNT
+#ifdef BT_MESH_CDB_SUBNET_COUNT
+    #define CONFIG_BT_MESH_CDB_SUBNET_COUNT BT_MESH_CDB_SUBNET_COUNT
+#endif
+
 //BT_MESH_CFG_CLI
 #ifdef BT_MESH_CFG_CLI
     #define CONFIG_BT_MESH_CFG_CLI BT_MESH_CFG_CLI
 #endif
 
+//BT_MESH_CFG_CLI_TIMEOUT
+#ifdef BT_MESH_CFG_CLI_TIMEOUT
+    #define CONFIG_BT_MESH_CFG_CLI_TIMEOUT BT_MESH_CFG_CLI_TIMEOUT
+#endif
+
 //BT_MESH_COMP_PAGE_1
 #ifdef BT_MESH_COMP_PAGE_1
     #define CONFIG_BT_MESH_COMP_PAGE_1 BT_MESH_COMP_PAGE_1
@@ -1595,6 +1605,11 @@
     #define CONFIG_BT_MESH_HEALTH_CLI BT_MESH_HEALTH_CLI
 #endif
 
+//BT_MESH_HEALTH_CLI_TIMEOUT
+#ifdef BT_MESH_HEALTH_CLI_TIMEOUT
+    #define CONFIG_BT_MESH_HEALTH_CLI_TIMEOUT BT_MESH_HEALTH_CLI_TIMEOUT
+#endif
+
 //BT_MESH_IVU_DIVIDER
 #ifdef BT_MESH_IVU_DIVIDER
     #define CONFIG_BT_MESH_IVU_DIVIDER BT_MESH_IVU_DIVIDER
@@ -1770,6 +1785,11 @@
     #define CONFIG_BT_MESH_PROVISIONEE BT_MESH_PROVISIONEE
 #endif
 
+//BT_MESH_PROVISIONER
+#ifdef BT_MESH_PROVISIONER
+    #define CONFIG_BT_MESH_PROVISIONER BT_MESH_PROVISIONER
+#endif
+
 //BT_MESH_PROV_DEVICE
 #ifdef BT_MESH_PROV_DEVICE
     #define CONFIG_BT_MESH_PROV_DEVICE BT_MESH_PROV_DEVICE
@@ -1845,6 +1865,11 @@
     #define CONFIG_BT_MESH_RPR_AD_TYPES_MAX BT_MESH_RPR_AD_TYPES_MAX
 #endif
 
+//BT_MESH_RPR_CLI
+#ifdef BT_MESH_RPR_CLI
+    #define CONFIG_BT_MESH_RPR_CLI BT_MESH_RPR_CLI
+#endif
+
 //BT_MESH_RPR_SRV
 #ifdef BT_MESH_RPR_SRV
     #define CONFIG_BT_MESH_RPR_SRV BT_MESH_RPR_SRV
@@ -1887,7 +1912,7 @@
 
 //BT_MESH_SAR_RX_ACK_RETRANS_COUNT2
 #ifdef BT_MESH_SAR_RX_ACK_RETRANS_COUNT2
-    #define CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT2 BT_MESH_SAR_RX_ACK_RETRANS_COUNT2
+    #define CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT BT_MESH_SAR_RX_ACK_RETRANS_COUNT2
 #endif
 
 //BT_MESH_SAR_RX_DISCARD_TIMEOUT
@@ -1902,7 +1927,7 @@
 
 //BT_MESH_SAR_RX_SEG_THRESHOLD2
 #ifdef BT_MESH_SAR_RX_SEG_THRESHOLD2
-    #define CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD2 BT_MESH_SAR_RX_SEG_THRESHOLD2
+    #define CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD BT_MESH_SAR_RX_SEG_THRESHOLD2
 #endif
 
 //BT_MESH_SAR_TX_MULTICAST_RETRANS_COUNT
@@ -2185,14 +2210,9 @@
     #define CONFIG_BT_PACS_SUPPORTED_CONTEXT_NOTIFIABLE BT_PACS_SUPPORTED_CONTEXT_NOTIFIABLE
 #endif
 
-//BT_PAC_SNK
-#ifdef BT_PAC_SNK2
-    #define CONFIG_BT_PAC_SNK BT_PAC_SNK2
-#endif
-
 //BT_PAC_SNK2
 #ifdef BT_PAC_SNK2
-    #define CONFIG_BT_PAC_SNK2 BT_PAC_SNK2
+    #define CONFIG_BT_PAC_SNK BT_PAC_SNK2
 #endif
 
 //BT_PAC_SNK_LOC
@@ -2215,14 +2235,9 @@
     #define CONFIG_BT_PAC_SNK_NOTIFIABLE BT_PAC_SNK_NOTIFIABLE
 #endif
 
-//BT_PAC_SRC
-#ifdef BT_PAC_SRC2
-    #define CONFIG_BT_PAC_SRC BT_PAC_SRC2
-#endif
-
 //BT_PAC_SRC2
 #ifdef BT_PAC_SRC2
-    #define CONFIG_BT_PAC_SRC2 BT_PAC_SRC2
+    #define CONFIG_BT_PAC_SRC BT_PAC_SRC2
 #endif
 
 //BT_PAC_SRC_LOC

zephyr_bt/include/zephyr/random/random.h

@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2013-2014 Wind River Systems, Inc.
+ * Copyright (c) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Random number generator header file
+ *
+ * This header file declares prototypes for the kernel's random number
+ * generator APIs.
+ *
+ * Typically, a platform enables the appropriate source for the random
+ * number generation based on the hardware platform's capabilities or
+ * (for testing purposes only) enables the TEST_RANDOM_GENERATOR
+ * configuration option.
+ */
+
+#ifndef ZEPHYR_INCLUDE_RANDOM_RANDOM_H_
+#define ZEPHYR_INCLUDE_RANDOM_RANDOM_H_
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <zephyr/kernel.h>
+
+/**
+ * @brief Random Function APIs
+ * @defgroup random_api Random Function APIs
+ * @since 1.0
+ * @version 1.0.0
+ * @ingroup crypto
+ * @{
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @brief Fill the destination buffer with random data values that should
+ * pass general randomness tests.
+ *
+ * @note The random values returned are not considered cryptographically
+ * secure random number values.
+ *
+ * @param [out] dst destination buffer to fill with random data.
+ * @param len size of the destination buffer.
+ *
+ */
+__syscall void sys_rand_get(void *dst, size_t len);
+
+/**
+ * @brief Fill the destination buffer with cryptographically secure
+ * random data values.
+ *
+ * @note If the random values requested do not need to be cryptographically
+ * secure then use sys_rand_get() instead.
+ *
+ * @param [out] dst destination buffer to fill.
+ * @param len size of the destination buffer.
+ *
+ * @return 0 if success, -EIO if entropy reseed error
+ *
+ */
+__syscall int sys_csrand_get(void *dst, size_t len);
+
+/**
+ * @brief Return a 8-bit random value that should pass general
+ * randomness tests.
+ *
+ * @note The random value returned is not a cryptographically secure
+ * random number value.
+ *
+ * @return 8-bit random value.
+ */
+static inline uint8_t sys_rand8_get(void)
+{
+    uint8_t ret;
+
+    sys_rand_get(&ret, sizeof(ret));
+
+    return ret;
+}
+
+/**
+ * @brief Return a 16-bit random value that should pass general
+ * randomness tests.
+ *
+ * @note The random value returned is not a cryptographically secure
+ * random number value.
+ *
+ * @return 16-bit random value.
+ */
+static inline uint16_t sys_rand16_get(void)
+{
+    uint16_t ret;
+
+    sys_rand_get(&ret, sizeof(ret));
+
+    return ret;
+}
+
+/**
+ * @brief Return a 32-bit random value that should pass general
+ * randomness tests.
+ *
+ * @note The random value returned is not a cryptographically secure
+ * random number value.
+ *
+ * @return 32-bit random value.
+ */
+static inline uint32_t sys_rand32_get(void)
+{
+    uint32_t ret;
+
+    sys_rand_get(&ret, sizeof(ret));
+
+    return ret;
+}
+
+/**
+ * @brief Return a 64-bit random value that should pass general
+ * randomness tests.
+ *
+ * @note The random value returned is not a cryptographically secure
+ * random number value.
+ *
+ * @return 64-bit random value.
+ */
+static inline uint64_t sys_rand64_get(void)
+{
+    uint64_t ret;
+
+    sys_rand_get(&ret, sizeof(ret));
+
+    return ret;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* ZEPHYR_INCLUDE_RANDOM_RANDOM_H_ */

zephyr_bt/mesh/sar_cfg_internal.h

@@ -31,11 +31,11 @@
 /** SAR Receiver Configuration state initializer */
 #define BT_MESH_SAR_RX_INIT                                                    \
     {                                                                      \
-        CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD2,                           \
+        CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD,                           \
             CONFIG_BT_MESH_SAR_RX_ACK_DELAY_INC,                   \
             CONFIG_BT_MESH_SAR_RX_DISCARD_TIMEOUT,                 \
             CONFIG_BT_MESH_SAR_RX_SEG_INT_STEP,                    \
-            CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT2,               \
+            CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT,               \
     }
 
 #define BT_MESH_SAR_TX_SEG_INT_MS ((bt_mesh.sar_tx.seg_int_step + 1) * 10)

zephyr_bt/rtt4zephyr.c

@@ -290,7 +290,13 @@ int k_work_submit(struct k_work *work)
     return rt_work_submit(work, 0);
 }
 
-/***********************Not implemented*********************************/
+int k_work_schedule(struct k_work_delayable *dwork,
+                    k_timeout_t delay)
+{
+    if (dwork->work.list.next == NULL && dwork->work.list.prev == NULL)
+        rt_delayed_work_init(dwork, dwork->work.work_func, dwork->work.work_data);
+    rt_work_submit((struct rt_work *)dwork, delay.ticks);
+}
 
 void k_work_queue_start(struct k_work_q *queue,
                         void *stack,
@@ -368,6 +374,20 @@ void k_fifo_cancel_wait(struct k_fifo *queue)
     // TODO
 }
 
+/**
+ * @brief Initialize a poll signal object.
+ *
+ * Ready a poll signal object to be signaled via k_poll_signal_raise().
+ *
+ * @param sig A poll signal.
+ */
+
+__syscall void k_poll_signal_init(struct k_poll_signal *sig)
+{
+    rt_wqueue_init(sig);
+}
+
+
 int k_work_cancel_delayable(struct k_work_delayable *dwork)
 {
     struct rt_work *work = (struct rt_work *)dwork;