nimble/mesh: Use OS_TASK_STACK_DEFINE for stacks in mesh

X-Original-Commit: 5a97968cdfa5914ad14318051dcb7d6fbef928ea
This commit is contained in:
Łukasz Rymanowski
2018-03-08 22:08:08 +01:00
parent 7925ccfb83
commit 07a5d6965f
2 changed files with 6 additions and 10 deletions
+3 -6
View File
@@ -45,6 +45,7 @@ static s32_t adv_int_min = ADV_INT_DEFAULT_MS;
* an increased call stack whenever it's used.
*/
#define ADV_STACK_SIZE 768
OS_TASK_STACK_DEFINE(g_blemesh_stack, ADV_STACK_SIZE);
struct os_task adv_task;
static struct os_eventq adv_queue;
@@ -294,12 +295,8 @@ static void bt_mesh_scan_cb(const bt_addr_le_t *addr, s8_t rssi,
void bt_mesh_adv_init(void)
{
os_stack_t *pstack;
int rc;
pstack = malloc(sizeof(os_stack_t) * ADV_STACK_SIZE);
assert(pstack);
rc = os_mempool_init(&adv_buf_mempool, MYNEWT_VAL(BLE_MESH_ADV_BUF_COUNT),
BT_MESH_ADV_DATA_SIZE + BT_MESH_MBUF_HEADER_SIZE,
adv_buf_mem, "adv_buf_pool");
@@ -313,8 +310,8 @@ void bt_mesh_adv_init(void)
os_eventq_init(&adv_queue);
os_task_init(&adv_task, "mesh_adv", adv_thread, NULL,
MYNEWT_VAL(BLE_MESH_ADV_TASK_PRIO), OS_WAIT_FOREVER, pstack,
ADV_STACK_SIZE);
MYNEWT_VAL(BLE_MESH_ADV_TASK_PRIO), OS_WAIT_FOREVER,
g_blemesh_stack, ADV_STACK_SIZE);
/* For BT5 controllers we can have fast advertising interval */
if (ble_hs_hci_get_hci_version() >= BLE_HCI_VER_BCS_5_0) {
+3 -4
View File
@@ -36,6 +36,8 @@
#define BLE_MESH_SHELL_TASK_PRIO 126
#define BLE_MESH_SHELL_STACK_SIZE 768
OS_TASK_STACK_DEFINE(g_blemesh_shell_stack, BLE_MESH_SHELL_STACK_SIZE);
struct os_task mesh_shell_task;
static struct os_eventq mesh_shell_queue;
@@ -2249,13 +2251,10 @@ static void mesh_shell_thread(void *args)
static void bt_mesh_shell_task_init(void)
{
os_stack_t *pstack;
pstack = malloc(sizeof(os_stack_t) * BLE_MESH_SHELL_STACK_SIZE);
os_eventq_init(&mesh_shell_queue);
os_task_init(&mesh_shell_task, "mesh_sh", mesh_shell_thread, NULL,
BLE_MESH_SHELL_TASK_PRIO, OS_WAIT_FOREVER, pstack,
BLE_MESH_SHELL_TASK_PRIO, OS_WAIT_FOREVER, g_blemesh_shell_stack,
BLE_MESH_SHELL_STACK_SIZE);
}
#endif