riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/nimble: ipmrove host initialization

Browse Source
This commit is contained in:
Hauke Petersen 2018-10-19 13:59:28 +02:00
parent fa520a09cc
commit 8f2a825b58
3 changed files with 95 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/nimble/contrib/controller_init.c
View File

@ -1,46 +0,0 @@
/*
* Copyright (C) 2018 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup pkg_nimble
* @{
*
* @file
* @brief Initialization of the nimble controller
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
* @}
*/
#include "thread.h"
#include "nimble_riot.h"
#include "nimble/nimble_port.h"
#ifdef CPU_FAM_NRF52
#include "nrf_clock.h"
#endif
static char stack[THREAD_STACKSIZE_DEFAULT];
void nimble_riot_controller_init(void)
{
#ifdef CPU_FAM_NRF52
clock_start_lf();
#endif
/*
* Create task where NimBLE LL will run. This one is required as LL has its
* own event queue and should have highest priority.
*/
thread_create(stack, sizeof(stack), NIMBLE_CONTROLLER_PRIO,
THREAD_CREATE_STACKTEST,
(thread_task_func_t)nimble_port_ll_task_func, NULL,
"nimble_ctrl");
}

27
pkg/nimble/contrib/include/nimble_riot.h
View File

@ -24,7 +24,7 @@ extern "C" {
#endif
/**
* @brief Define the priority used for NimBLE's controller thread
* @brief Priority used for NimBLE's controller thread
*
* This should be as high as possible.
*/
@ -33,9 +33,30 @@ extern "C" {
#endif
/**
* @brief Starts a thread running NimBLE's controller
* @brief Stacksize used for NimBLE's controller thread
*/
void nimble_riot_controller_init(void);
#ifndef NIMBLE_CONTROLLER_STACKSIZE
#define NIMBLE_CONTROLLER_STACKSIZE (THREAD_STACKSIZE_DEFAULT)
#endif
/**
* @brief Priority used for NimBLE's host thread
*/
#ifndef NIMBLE_HOST_PRIO
#define NIMBLE_HOST_PRIO (THREAD_PRIORITY_MAIN - 2)
#endif
/**
* @brief Stacksize used for NimBLE's host thread
*/
#ifndef NIMBLE_HOST_STACKSIZE
#define NIMBLE_HOST_STACKSIZE (THREAD_STACKSIZE_DEFAULT)
#endif
/**
* @brief Setup and run NimBLE's controller and host threads
*/
void nimble_riot_init(void);
#ifdef __cplusplus
}

71
pkg/nimble/contrib/nimble_riot.c Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (C) 2018 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup pkg_nimble
* @{
*
* @file
* @brief Glue code for running NimBLE for RIOT
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
* @}
*/
#include "thread.h"
#include "nimble_riot.h"
#include "nimble/nimble_port.h"
#include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h"
#ifdef CPU_FAM_NRF52
#include "nrf_clock.h"
#endif
static char _stack_controller[NIMBLE_CONTROLLER_STACKSIZE];
static char _stack_host[NIMBLE_HOST_STACKSIZE];
static void *_host_thread(void *arg)
{
(void)arg;
nimble_port_init();
nimble_port_run();
/* never reached */
return NULL;
}
void nimble_riot_init(void)
{
/* XXX: NimBLE needs the nRF5x's LF clock to run */
#ifdef CPU_FAM_NRF52
clock_start_lf();
#endif
/* Run the controller
*
* Create task where NimBLE LL will run. This one is required as LL has its
* own event queue and should have highest priority.
*/
thread_create(_stack_controller, sizeof(_stack_controller),
NIMBLE_CONTROLLER_PRIO,
THREAD_CREATE_STACKTEST,
(thread_task_func_t)nimble_port_ll_task_func, NULL,
"nimble_ctrl");
/* and finally initialize and run the host */
thread_create(_stack_host, sizeof(_stack_host),
NIMBLE_HOST_PRIO,
THREAD_CREATE_STACKTEST,
_host_thread, NULL,
"nimble_host");
}