add nimble mesh example

need meshctl installed on raspberrypi. nimble offical samples have a lot of pit ...
This commit is contained in:
daishengdong
2019-11-28 11:12:16 +08:00
parent b2afa0c172
commit b2983383bb
192 changed files with 41667 additions and 279927 deletions

View File

@@ -21,7 +21,7 @@
#define _MESH_GLUE_
#include <assert.h>
#include <errno.h>
#include "errno.h"
#include "syscfg/syscfg.h"
#include "nimble/nimble_npl.h"

View File

@@ -6,7 +6,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <errno.h>
#include "errno.h"
#include <os/os_mbuf.h>
#include "mesh/mesh.h"

View File

@@ -14,6 +14,31 @@ extern "C"
{
#endif
/*
* Clang and recent GCC both provide predefined macros for the memory
* orderings. If we are using a compiler that doesn't define them, use the
* clang values - these will be ignored in the fallback path.
*/
#ifndef __ATOMIC_RELAXED
#define __ATOMIC_RELAXED 0
#endif
#ifndef __ATOMIC_CONSUME
#define __ATOMIC_CONSUME 1
#endif
#ifndef __ATOMIC_ACQUIRE
#define __ATOMIC_ACQUIRE 2
#endif
#ifndef __ATOMIC_RELEASE
#define __ATOMIC_RELEASE 3
#endif
#ifndef __ATOMIC_ACQ_REL
#define __ATOMIC_ACQ_REL 4
#endif
#ifndef __ATOMIC_SEQ_CST
#define __ATOMIC_SEQ_CST 5
#endif
typedef int atomic_t;
typedef atomic_t atomic_val_t;

View File

@@ -6,7 +6,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <errno.h>
#include "errno.h"
#include <assert.h>
#include "os/os_mbuf.h"
#include "mesh/mesh.h"

View File

@@ -13,7 +13,7 @@
#include "mesh/mesh.h"
#include <string.h>
#include <errno.h>
#include "errno.h"
#include <stdbool.h>
#include "net.h"

View File

@@ -7,7 +7,7 @@
*/
#include <string.h>
#include <errno.h>
#include "errno.h"
#include <stdbool.h>
#include "mesh/mesh.h"

View File

@@ -8,7 +8,7 @@
#include <string.h>
#include <stdbool.h>
#include <errno.h>
#include "errno.h"
#include <tinycrypt/constants.h>
#include <tinycrypt/utils.h>

View File

@@ -11,7 +11,7 @@
#if MYNEWT_VAL(BLE_MESH_FRIEND)
#include <stdint.h>
#include <errno.h>
#include "errno.h"
#include <assert.h>
#define BT_DBG_ENABLED (MYNEWT_VAL(BLE_MESH_DEBUG_FRIEND))

View File

@@ -7,7 +7,7 @@
*/
#include <string.h>
#include <errno.h>
#include "errno.h"
#include <stdbool.h>
#include "syscfg/syscfg.h"

View File

@@ -7,7 +7,7 @@
*/
#include <string.h>
#include <errno.h>
#include "errno.h"
#include <stdbool.h>
#include "syscfg/syscfg.h"

View File

@@ -8,7 +8,7 @@
#include "syscfg/syscfg.h"
#if MYNEWT_VAL(BLE_MESH_PROV)
#include <errno.h>
#include "errno.h"
#define BT_DBG_ENABLED (MYNEWT_VAL(BLE_MESH_DEBUG_PROV))
#include "host/ble_hs_log.h"

View File

@@ -15,8 +15,8 @@
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include "shell/shell.h"
#include "errno.h"
#include "shell.h"
#include "console/console.h"
#include "mesh/mesh.h"
#include "mesh/main.h"
@@ -43,10 +43,10 @@
#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);
BLE_NPL_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;
struct ble_npl_task mesh_shell_task;
static struct ble_npl_eventq mesh_shell_queue;
#define CID_NVAL 0xffff
#define CID_VENDOR 0x05C3
@@ -2720,17 +2720,28 @@ static const struct shell_cmd mesh_commands[] = {
static void mesh_shell_thread(void *args)
{
#if 0
while (1) {
os_eventq_run(&mesh_shell_queue);
}
#else
struct ble_npl_event *ev;
while (1) {
ev = ble_npl_eventq_get(&mesh_shell_queue, BLE_NPL_TIME_FOREVER);
ble_npl_event_run(ev);
}
#endif
}
static void bt_mesh_shell_task_init(void)
{
os_eventq_init(&mesh_shell_queue);
npl_tencentos_tiny_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, g_blemesh_shell_stack,
ble_npl_task_init(&mesh_shell_task, "mesh_sh", mesh_shell_thread, NULL,
BLE_MESH_SHELL_TASK_PRIO, BLE_NPL_TIME_FOREVER, g_blemesh_shell_stack,
BLE_MESH_SHELL_STACK_SIZE);
}
#endif

View File

@@ -1,6 +1,29 @@
#ifndef __SHELL_H__
#define __SHELL_H__
/** @brief Callback called when command is entered.
*
* @param argc Number of parameters passed.
* @param argv Array of option strings. First option is always command name.
*
* @return 0 in case of success or negative value in case of error.
*/
typedef int (*shell_cmd_func_t)(int argc, char *argv[]);
struct shell_cmd_help {
const char *summary;
const char *usage;
const struct shell_param *params;
};
struct shell_cmd {
uint8_t sc_ext : 1; /* 1 if this is an extended shell comand. */
shell_cmd_func_t sc_cmd_func;
const char *sc_cmd;
const struct shell_cmd_help *help;
};
void ble_mesh_shell_init(void);
#endif

View File

@@ -7,7 +7,7 @@
*/
#include <errno.h>
#include "errno.h"
#include <string.h>
#include "mesh/mesh.h"

View File

@@ -1,18 +1,6 @@
#ifndef _CONSOLE_H_
#define _CONSOLE_H_
#if 0
#include "tos.h"
#define console_printf tos_kprintf
// we need a console
#define console_init(...) -1
#define console_write(...) printf(__VA_ARGS__);
#define console_read(...) -1
#endif
#define console_init(...) -1
int console_printf(const char *fmt, ...);

View File

@@ -0,0 +1,136 @@
#ifndef _BLE_PORT_ERRNO_H_
#define _BLE_PORT_ERRNO_H_
#define EPERM 1 /* Operation not permitted */
#define ENOENT 2 /* No such file or directory */
#define ESRCH 3 /* No such process */
#define EINTR 4 /* Interrupted system call */
#define EIO 5 /* I/O error */
#define ENXIO 6 /* No such device or address */
#define E2BIG 7 /* Arg list too long */
#define ENOEXEC 8 /* Exec format error */
#define EBADF 9 /* Bad file number */
#define ECHILD 10 /* No child processes */
#define EAGAIN 11 /* Try again */
#define ENOMEM 12 /* Out of memory */
#define EACCES 13 /* Permission denied */
#define EFAULT 14 /* Bad address */
#define ENOTBLK 15 /* Block device required */
#define EBUSY 16 /* Device or resource busy */
#define EEXIST 17 /* File exists */
#define EXDEV 18 /* Cross-device link */
#define ENODEV 19 /* No such device */
#define ENOTDIR 20 /* Not a directory */
#define EISDIR 21 /* Is a directory */
#define EINVAL 22 /* Invalid argument */
#define ENFILE 23 /* File table overflow */
#define EMFILE 24 /* Too many open files */
#define ENOTTY 25 /* Not a typewriter */
#define ETXTBSY 26 /* Text file busy */
#define EFBIG 27 /* File too large */
#define ENOSPC 28 /* No space left on device */
#define ESPIPE 29 /* Illegal seek */
#define EROFS 30 /* Read-only file system */
#define EMLINK 31 /* Too many links */
#define EPIPE 32 /* Broken pipe */
#define EDOM 33 /* Math argument out of domain of func */
#define ERANGE 34 /* Math result not representable */
#define EDEADLK 35 /* Resource deadlock would occur */
#define ENAMETOOLONG 36 /* File name too long */
#define ENOLCK 37 /* No record locks available */
#define ENOSYS 38 /* Function not implemented */
#define ENOTEMPTY 39 /* Directory not empty */
#define ELOOP 40 /* Too many symbolic links encountered */
#define EWOULDBLOCK EAGAIN /* Operation would block */
#define ENOMSG 42 /* No message of desired type */
#define EIDRM 43 /* Identifier removed */
#define ECHRNG 44 /* Channel number out of range */
#define EL2NSYNC 45 /* Level 2 not synchronized */
#define EL3HLT 46 /* Level 3 halted */
#define EL3RST 47 /* Level 3 reset */
#define ELNRNG 48 /* Link number out of range */
#define EUNATCH 49 /* Protocol driver not attached */
#define ENOCSI 50 /* No CSI structure available */
#define EL2HLT 51 /* Level 2 halted */
#define EBADE 52 /* Invalid exchange */
#define EBADR 53 /* Invalid request descriptor */
#define EXFULL 54 /* Exchange full */
#define ENOANO 55 /* No anode */
#define EBADRQC 56 /* Invalid request code */
#define EBADSLT 57 /* Invalid slot */
#define EDEADLOCK EDEADLK
#define EBFONT 59 /* Bad font file format */
#define ENOSTR 60 /* Device not a stream */
#define ENODATA 61 /* No data available */
#define ETIME 62 /* Timer expired */
#define ENOSR 63 /* Out of streams resources */
#define ENONET 64 /* Machine is not on the network */
#define ENOPKG 65 /* Package not installed */
#define EREMOTE 66 /* Object is remote */
#define ENOLINK 67 /* Link has been severed */
#define EADV 68 /* Advertise error */
#define ESRMNT 69 /* Srmount error */
#define ECOMM 70 /* Communication error on send */
#define EPROTO 71 /* Protocol error */
#define EMULTIHOP 72 /* Multihop attempted */
#define EDOTDOT 73 /* RFS specific error */
#define EBADMSG 74 /* Not a data message */
#define EOVERFLOW 75 /* Value too large for defined data type */
#define ENOTUNIQ 76 /* Name not unique on network */
#define EBADFD 77 /* File descriptor in bad state */
#define EREMCHG 78 /* Remote address changed */
#define ELIBACC 79 /* Can not access a needed shared library */
#define ELIBBAD 80 /* Accessing a corrupted shared library */
#define ELIBSCN 81 /* .lib section in a.out corrupted */
#define ELIBMAX 82 /* Attempting to link in too many shared libraries */
#define ELIBEXEC 83 /* Cannot exec a shared library directly */
#define EILSEQ 84 /* Illegal byte sequence */
#define ERESTART 85 /* Interrupted system call should be restarted */
#define ESTRPIPE 86 /* Streams pipe error */
#define EUSERS 87 /* Too many users */
#define ENOTSOCK 88 /* Socket operation on non-socket */
#define EDESTADDRREQ 89 /* Destination address required */
#define EMSGSIZE 90 /* Message too long */
#define EPROTOTYPE 91 /* Protocol wrong type for socket */
#define ENOPROTOOPT 92 /* Protocol not available */
#define EPROTONOSUPPORT 93 /* Protocol not supported */
#define ESOCKTNOSUPPORT 94 /* Socket type not supported */
#define EOPNOTSUPP 95 /* Operation not supported on transport endpoint */
#define EPFNOSUPPORT 96 /* Protocol family not supported */
#define EAFNOSUPPORT 97 /* Address family not supported by protocol */
#define EADDRINUSE 98 /* Address already in use */
#define EADDRNOTAVAIL 99 /* Cannot assign requested address */
#define ENETDOWN 100 /* Network is down */
#define ENETUNREACH 101 /* Network is unreachable */
#define ENETRESET 102 /* Network dropped connection because of reset */
#define ECONNABORTED 103 /* Software caused connection abort */
#define ECONNRESET 104 /* Connection reset by peer */
#define ENOBUFS 105 /* No buffer space available */
#define EISCONN 106 /* Transport endpoint is already connected */
#define ENOTCONN 107 /* Transport endpoint is not connected */
#define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */
#define ETOOMANYREFS 109 /* Too many references: cannot splice */
#define ETIMEDOUT 110 /* Connection timed out */
#define ECONNREFUSED 111 /* Connection refused */
#define EHOSTDOWN 112 /* Host is down */
#define EHOSTUNREACH 113 /* No route to host */
#define EALREADY 114 /* Operation already in progress */
#define EINPROGRESS 115 /* Operation now in progress */
#define ESTALE 116 /* Stale NFS file handle */
#define EUCLEAN 117 /* Structure needs cleaning */
#define ENOTNAM 118 /* Not a XENIX named type file */
#define ENAVAIL 119 /* No XENIX semaphores available */
#define EISNAM 120 /* Is a named type file */
#define EREMOTEIO 121 /* Remote I/O error */
#define EDQUOT 122 /* Quota exceeded */
#define ENOMEDIUM 123 /* No medium found */
#define EMEDIUMTYPE 124 /* Wrong medium type */
#define ECANCELED 125
#define ENOTSUP 126
#endif

View File

@@ -34,14 +34,19 @@ extern "C" {
#define _Static_assert(...)
#endif
/* This should be compatible with k_tick_t */
typedef k_tick_t ble_npl_time_t;
typedef int64_t ble_npl_stime_t;
typedef void (*ble_npl_task_entry_t)(void *args);
typedef k_stack_t ble_npl_stack_t;
#define BLE_NPL_OS_TASK_STACK_DEFINE(stk, size) ble_npl_stack_t stk[size]
#define BLE_NPL_OS_ALIGNMENT 4
#define BLE_NPL_TIME_FOREVER TOS_TIME_FOREVER
/* This should be compatible with k_tick_t */
typedef uint64_t ble_npl_time_t;
typedef int64_t ble_npl_stime_t;
extern volatile int ble_npl_in_critical;
struct ble_npl_event {
@@ -68,6 +73,10 @@ struct ble_npl_sem {
k_sem_t handle;
};
struct ble_npl_task {
k_task_t handle;
};
/*
* Simple APIs are just defined as static inline below, but some are a bit more
* complex or require some global state variables and thus are defined in .c
@@ -237,6 +246,14 @@ ble_npl_callout_set_arg(struct ble_npl_callout *co, void *arg)
co->ev.arg = arg;
}
static inline ble_npl_error_t
ble_npl_task_init(struct ble_npl_task *task, char *name, ble_npl_task_entry_t entry,
void *arg, uint8_t prio, ble_npl_time_t sanity_itvl,
ble_npl_stack_t *stack_bottom, uint16_t stack_size)
{
return npl_tencentos_tiny_task_init(task, name, entry, arg, prio, sanity_itvl, stack_bottom, stack_size);
}
static inline ble_npl_time_t
ble_npl_time_get(void)
{

View File

@@ -71,6 +71,11 @@ ble_npl_time_t npl_tencentos_tiny_callout_get_ticks(struct ble_npl_callout *co);
ble_npl_time_t npl_tencentos_tiny_callout_remaining_ticks(struct ble_npl_callout *co,
ble_npl_time_t now);
ble_npl_error_t
npl_tencentos_tiny_task_init(struct ble_npl_task *task, char *name, ble_npl_task_entry_t entry,
void *arg, uint8_t prio, ble_npl_time_t sanity_itvl,
ble_npl_stack_t *stack_bottom, uint16_t stack_size);
ble_npl_error_t npl_tencentos_tiny_time_ms_to_ticks(uint32_t ms,
ble_npl_time_t *out_ticks);

View File

@@ -225,6 +225,19 @@ os_callout_timer_cb(void *arg)
}
}
ble_npl_error_t
npl_tencentos_tiny_task_init(struct ble_npl_task *task, char *name, ble_npl_task_entry_t entry,
void *arg, uint8_t prio, ble_npl_time_t sanity_itvl,
ble_npl_stack_t *stack_bottom, uint16_t stack_size)
{
k_err_t err;
err = tos_task_create(&task->handle, name, entry, arg, prio, stack_bottom, stack_size, 0);
assert(err == K_ERR_NONE);
return BLE_NPL_OK;
}
void
npl_tencentos_tiny_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq,
ble_npl_event_fn *ev_cb, void *ev_arg)