mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-26 06:53:52 +01:00
Merge pull request #7419 from miri64/gnrc_netif2/feat/nordic-ble-softdev
pkg: port nordic_softdevice_ble to gnrc_netif2
This commit is contained in:
GitHub
commit
2154420b12
@ -35,6 +35,7 @@
|
||||
* @brief Glue for Nordic's SoftDevice BLE 6lowpan blob to netapi
|
||||
*
|
||||
* @author Kaspar Schleiser <kaspar@schleiser.de>
|
||||
* @author Martine Lenders <m.lenders@fu-berlin.de>
|
||||
* @}
|
||||
*/
|
||||
|
||||
@ -45,6 +46,7 @@
|
||||
#include "thread.h"
|
||||
|
||||
#include "net/gnrc.h"
|
||||
#include "net/gnrc/netif2.h"
|
||||
#include "net/gnrc/nettype.h"
|
||||
|
||||
#include "ble-core.h"
|
||||
@ -59,13 +61,11 @@
|
||||
#include "od.h"
|
||||
#endif
|
||||
|
||||
#define BLE_NETAPI_MSG_QUEUE_SIZE (8U)
|
||||
#define BLE_PRIO (THREAD_PRIORITY_MAIN - 1)
|
||||
#define BLE_PRIO (GNRC_NETIF2_PRIO)
|
||||
|
||||
kernel_pid_t gnrc_nordic_ble_6lowpan_pid;
|
||||
static char _stack[(THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE)];
|
||||
|
||||
static uint8_t _own_mac_addr[BLE_SIXLOWPAN_L2_ADDR_LEN];
|
||||
static gnrc_netif2_t *_ble_netif = NULL;
|
||||
|
||||
static uint8_t _sendbuf[BLE_SIXLOWPAN_MTU];
|
||||
|
||||
@ -73,7 +73,7 @@ static void _ble_mac_callback(ble_mac_event_enum_t event, void* arg)
|
||||
{
|
||||
msg_t m = { .type=event, .content.ptr=arg };
|
||||
|
||||
if (!msg_send_int(&m, gnrc_nordic_ble_6lowpan_pid)) {
|
||||
if ((_ble_netif != NULL) || !msg_send_int(&m, _ble_netif->pid)) {
|
||||
puts("_ble_mac_callback(): possibly lost interrupt");
|
||||
}
|
||||
}
|
||||
@ -103,8 +103,8 @@ static void _handle_raw_sixlowpan(ble_mac_inbuf_t *inbuf)
|
||||
|
||||
gnrc_netif_hdr_init(netif_hdr->data, BLE_SIXLOWPAN_L2_ADDR_LEN, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
gnrc_netif_hdr_set_src_addr(netif_hdr->data, inbuf->src, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
gnrc_netif_hdr_set_dst_addr(netif_hdr->data, _own_mac_addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid = gnrc_nordic_ble_6lowpan_pid;
|
||||
gnrc_netif_hdr_set_dst_addr(netif_hdr->data, _ble_netif->l2addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid = _ble_netif->pid;
|
||||
|
||||
DEBUG("_handle_raw_sixlowpan(): received packet from %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x "
|
||||
"of length %d\n",
|
||||
@ -188,7 +188,7 @@ static int _handle_get(gnrc_netapi_opt_t *_opt)
|
||||
break;
|
||||
case NETOPT_ADDRESS_LONG:
|
||||
assert(_opt->data_len >= BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
memcpy(value, _own_mac_addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
memcpy(value, _ble_netif->l2addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
value[0] = IPV6_IID_FLIP_VALUE;
|
||||
res = BLE_SIXLOWPAN_L2_ADDR_LEN;
|
||||
break;
|
||||
@ -211,7 +211,7 @@ static int _handle_get(gnrc_netapi_opt_t *_opt)
|
||||
res = sizeof(uint16_t);
|
||||
break;*/
|
||||
case NETOPT_IPV6_IID:
|
||||
memcpy(value, _own_mac_addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
memcpy(value, _ble_netif->l2addr, BLE_SIXLOWPAN_L2_ADDR_LEN);
|
||||
value[0] = IPV6_IID_FLIP_VALUE;
|
||||
res = BLE_SIXLOWPAN_L2_ADDR_LEN;
|
||||
break;
|
||||
@ -221,97 +221,69 @@ static int _handle_get(gnrc_netapi_opt_t *_opt)
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Startup code and event loop of the gnrc_nordic_ble_6lowpan layer
|
||||
*
|
||||
* @return never returns
|
||||
*/
|
||||
static void *_gnrc_nordic_ble_6lowpan_thread(void *args)
|
||||
static void _netif_init(gnrc_netif2_t *netif)
|
||||
{
|
||||
(void)args;
|
||||
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: starting thread\n");
|
||||
|
||||
gnrc_nordic_ble_6lowpan_pid = thread_getpid();
|
||||
|
||||
gnrc_netapi_opt_t *opt;
|
||||
int res;
|
||||
msg_t msg, reply, msg_queue[BLE_NETAPI_MSG_QUEUE_SIZE];
|
||||
|
||||
/* setup the message queue */
|
||||
msg_init_queue(msg_queue, BLE_NETAPI_MSG_QUEUE_SIZE);
|
||||
|
||||
/* initialize BLE stack */
|
||||
assert((unsigned)softdevice_handler_isEnabled());
|
||||
|
||||
ble_stack_init();
|
||||
ble_get_mac(_own_mac_addr);
|
||||
|
||||
ble_mac_init(_ble_mac_callback);
|
||||
|
||||
netif->l2addr_len = BLE_SIXLOWPAN_L2_ADDR_LEN;
|
||||
ble_get_mac(netif->l2addr);
|
||||
ble_advertising_init("RIOT BLE");
|
||||
ble_advertising_start();
|
||||
}
|
||||
|
||||
/* register the device to the network stack*/
|
||||
gnrc_netif_add(thread_getpid());
|
||||
static int _netif_send(gnrc_netif2_t *netif, gnrc_pktsnip_t *pkt)
|
||||
{
|
||||
(void)netif;
|
||||
assert(netif != _ble_netif);
|
||||
return _send(pkt);
|
||||
}
|
||||
|
||||
/* start the event loop */
|
||||
while (1) {
|
||||
// DEBUG("gnrc_nordic_ble_6lowpan: waiting for incoming messages\n");
|
||||
msg_receive(&msg);
|
||||
/* dispatch NETDEV and NETAPI messages */
|
||||
switch (msg.type) {
|
||||
case BLE_EVENT_RX_DONE:
|
||||
{
|
||||
DEBUG("ble rx:\n");
|
||||
_handle_raw_sixlowpan(msg.content.ptr);
|
||||
ble_mac_busy_rx = 0;
|
||||
break;
|
||||
}
|
||||
case GNRC_NETAPI_MSG_TYPE_SND:
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: GNRC_NETAPI_MSG_TYPE_SND received\n");
|
||||
_send(msg.content.ptr);
|
||||
break;
|
||||
case GNRC_NETAPI_MSG_TYPE_SET:
|
||||
/* read incoming options */
|
||||
opt = msg.content.ptr;
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: GNRC_NETAPI_MSG_TYPE_SET received. opt=%s\n",
|
||||
netopt2str(opt->opt));
|
||||
/* set option for device driver */
|
||||
res = ENOTSUP;
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: response of netdev->set: %i\n", res);
|
||||
/* send reply to calling thread */
|
||||
reply.type = GNRC_NETAPI_MSG_TYPE_ACK;
|
||||
reply.content.value = (uint32_t)res;
|
||||
msg_reply(&msg, &reply);
|
||||
break;
|
||||
case GNRC_NETAPI_MSG_TYPE_GET:
|
||||
/* read incoming options */
|
||||
opt = msg.content.ptr;
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: GNRC_NETAPI_MSG_TYPE_GET received. opt=%s\n",
|
||||
netopt2str(opt->opt));
|
||||
res = _handle_get(opt);
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: response of netdev->get: %i\n", res);
|
||||
/* send reply to calling thread */
|
||||
reply.type = GNRC_NETAPI_MSG_TYPE_ACK;
|
||||
reply.content.value = (uint32_t)res;
|
||||
msg_reply(&msg, &reply);
|
||||
break;
|
||||
default:
|
||||
DEBUG("gnrc_nordic_ble_6lowpan: Unknown command %" PRIu16 "\n", msg.type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* never reached */
|
||||
static gnrc_pktsnip_t *_netif_recv(gnrc_netif2_t *netif)
|
||||
{
|
||||
(void)netif;
|
||||
/* not supported */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _netif_get(gnrc_netif2_t *netif, gnrc_netapi_opt_t *opt)
|
||||
{
|
||||
(void)netif;
|
||||
assert(netif != _ble_netif);
|
||||
return _handle_get(opt);
|
||||
}
|
||||
|
||||
static int _netif_set(gnrc_netif2_t *netif, const gnrc_netapi_opt_t *opt)
|
||||
{
|
||||
(void)netif;
|
||||
(void)opt;
|
||||
/* not supported */
|
||||
return -ENOTSUP;
|
||||
}
|
||||
|
||||
static void _netif_msg_handler(gnrc_netif2_t *netif, msg_t *msg)
|
||||
{
|
||||
switch (msg->type) {
|
||||
case BLE_EVENT_RX_DONE:
|
||||
{
|
||||
DEBUG("ble rx:\n");
|
||||
_handle_raw_sixlowpan(msg->content.ptr);
|
||||
ble_mac_busy_rx = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const gnrc_netif2_ops_t _ble_ops = {
|
||||
.init = _netif_init,
|
||||
.send = _netif_send,
|
||||
.recv = _netif_recv,
|
||||
.get = _netif_get,
|
||||
.set = _netif_set,
|
||||
.msg_handler = _netif_msg_handler,
|
||||
};
|
||||
|
||||
void gnrc_nordic_ble_6lowpan_init(void)
|
||||
{
|
||||
kernel_pid_t res = thread_create(_stack, sizeof(_stack), BLE_PRIO,
|
||||
THREAD_CREATE_STACKTEST,
|
||||
_gnrc_nordic_ble_6lowpan_thread, NULL,
|
||||
"ble");
|
||||
assert(res > 0);
|
||||
(void)res;
|
||||
_ble_netif = gnrc_netif2_create(_stack, sizeof(_stack), BLE_PRIO,
|
||||
"ble", NULL, &_ble_ops);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user