diff options
Diffstat (limited to 'src/libs/mynewt-nimble/porting/nimble')
8 files changed, 134 insertions, 32 deletions
diff --git a/src/libs/mynewt-nimble/porting/nimble/Makefile.defs b/src/libs/mynewt-nimble/porting/nimble/Makefile.defs index ffb531fb..5bab893f 100644 --- a/src/libs/mynewt-nimble/porting/nimble/Makefile.defs +++ b/src/libs/mynewt-nimble/porting/nimble/Makefile.defs @@ -30,6 +30,7 @@ NIMBLE_INCLUDE := \ $(NIMBLE_ROOT)/nimble/host/services/gap/include \ $(NIMBLE_ROOT)/nimble/host/services/gatt/include \ $(NIMBLE_ROOT)/nimble/host/services/ias/include \ + $(NIMBLE_ROOT)/nimble/host/services/dis/include \ $(NIMBLE_ROOT)/nimble/host/services/lls/include \ $(NIMBLE_ROOT)/nimble/host/services/tps/include \ $(NIMBLE_ROOT)/nimble/host/store/ram/include \ @@ -46,6 +47,7 @@ NIMBLE_SRC := \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/bas/src/*.c)) \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/gap/src/*.c)) \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/gatt/src/*.c)) \ + $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/dis/src/*.c)) \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/ias/src/*.c)) \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/lls/src/*.c)) \ $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/tps/src/*.c)) \ diff --git a/src/libs/mynewt-nimble/porting/nimble/include/log/log.h b/src/libs/mynewt-nimble/porting/nimble/include/log/log.h index 004667cc..b50c5b17 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/log/log.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/log/log.h @@ -30,11 +30,13 @@ log_dummy(void *log, ...) (void)log; } -#define LOG_DEBUG(_log, _mod, ...) NRF_LOG_DEBUG(## __VA_ARGS__) +#if MYNEWT +#define LOG_DEBUG(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_INFO(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_WARN(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_ERROR(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_CRITICAL(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) +#endif struct log { }; diff --git a/src/libs/mynewt-nimble/porting/nimble/include/log_common/log_common.h b/src/libs/mynewt-nimble/porting/nimble/include/log_common/log_common.h index 106d02d7..ed590b6b 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/log_common/log_common.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/log_common/log_common.h @@ -20,20 +20,123 @@ #ifndef H_LOG_COMMON_ #define H_LOG_COMMON_ +#include <stdint.h> #include "log_common/ignore.h" #ifdef __cplusplus extern "C" { #endif +struct log; + +#define LOG_VERSION_V3 3 + +#define LOG_TYPE_STREAM (0) +#define LOG_TYPE_MEMORY (1) +#define LOG_TYPE_STORAGE (2) + #define LOG_LEVEL_DEBUG (0) #define LOG_LEVEL_INFO (1) #define LOG_LEVEL_WARN (2) #define LOG_LEVEL_ERROR (3) #define LOG_LEVEL_CRITICAL (4) -/* Up to 7 custom log levels. */ +/* Up to 10 custom log levels. */ #define LOG_LEVEL_MAX (15) +#define LOG_LEVEL_STR(level) \ + (LOG_LEVEL_DEBUG == level ? "DEBUG" :\ + (LOG_LEVEL_INFO == level ? "INFO" :\ + (LOG_LEVEL_WARN == level ? "WARN" :\ + (LOG_LEVEL_ERROR == level ? "ERROR" :\ + (LOG_LEVEL_CRITICAL == level ? "CRITICAL" :\ + "UNKNOWN"))))) + +/* XXX: These module IDs are defined for backwards compatibility. Application + * code should use the syscfg settings directly. These defines will be removed + * in a future release. + */ +#define LOG_MODULE_DEFAULT 0 +#define LOG_MODULE_OS 1 +#define LOG_MODULE_NEWTMGR 2 +#define LOG_MODULE_NIMBLE_CTLR 3 +#define LOG_MODULE_NIMBLE_HOST 4 +#define LOG_MODULE_NFFS 5 +#define LOG_MODULE_REBOOT 6 +#define LOG_MODULE_IOTIVITY 7 +#define LOG_MODULE_TEST 8 + +#define LOG_MODULE_PERUSER 64 +#define LOG_MODULE_MAX (255) + +#define LOG_ETYPE_STRING (0) +#define LOG_ETYPE_CBOR (1) +#define LOG_ETYPE_BINARY (2) + +/* UTC Timestamp for Jan 2016 00:00:00 */ +#define UTC01_01_2016 1451606400 + +#define LOG_NAME_MAX_LEN (64) + +#ifndef MYNEWT_VAL_LOG_LEVEL +#define LOG_SYSLEVEL ((uint8_t)LOG_LEVEL_MAX) +#else +#define LOG_SYSLEVEL ((uint8_t)MYNEWT_VAL_LOG_LEVEL) +#endif + +/** + * @brief Determines if a log module will accept an entry with a given level. + * + * A log entry is only accepted if its level is less than or equal to both: + * o Global log level setting (LOG_LEVEL), and + * o The specified module log level + * + * @param mod_level The module's minimum log level. + * @param entry_level The level of the entry to be logged. + * + * @return true if the entry would be logged; + * false otherwise. + */ +#define LOG_MOD_LEVEL_IS_ACTIVE(mod_level, entry_level) \ + (LOG_LEVEL <= (entry_level) && (mod_level) <= (entry_level)) + +/* Newtmgr Log opcodes */ +#define LOGS_NMGR_OP_READ (0) +#define LOGS_NMGR_OP_CLEAR (1) +#define LOGS_NMGR_OP_APPEND (2) +#define LOGS_NMGR_OP_MODULE_LIST (3) +#define LOGS_NMGR_OP_LEVEL_LIST (4) +#define LOGS_NMGR_OP_LOGS_LIST (5) +#define LOGS_NMGR_OP_SET_WATERMARK (6) +#define LOGS_NMGR_OP_MODLEVEL (8) + +#define LOG_PRINTF_MAX_ENTRY_LEN (128) + +/* Global log info */ +struct log_info { +#if MYNEWT_VAL(LOG_GLOBAL_IDX) + uint32_t li_next_index; +#endif + uint8_t li_version; +}; + +extern struct log_info g_log_info; + +/** @typedef log_append_cb + * @brief Callback that is executed each time the corresponding log is appended + * to. + * + * @param log The log that was just appended to. + * @param idx The index of newly appended log entry. + */ +typedef void log_append_cb(struct log *log, uint32_t idx); + +/** @typdef log_notify_rotate_cb + * @brief Callback that is executed each time we are about to rotate a log. + * + * @param log The log that is about to rotate + */ +typedef void log_notify_rotate_cb(const struct log *log); + #ifdef __cplusplus } #endif diff --git a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h index 983f419f..837cdeac 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_LOGCFG_ @@ -7,24 +7,14 @@ #include "modlog/modlog.h" #include "log_common/log_common.h" -#include <libraries/log/nrf_log.h> -#if 1 -#define BLE_HS_LOG_DEBUG(...) NRF_LOG_DEBUG(__VA_ARGS__) -#define BLE_HS_LOG_INFO(...) NRF_LOG_INFO(__VA_ARGS__) -#define BLE_HS_LOG_WARN(...) NRF_LOG_WARNING( __VA_ARGS__) -#define BLE_HS_LOG_ERROR(...) NRF_LOG_ERROR(__VA_ARGS__) -#define BLE_HS_LOG_CRITICAL(...) NRF_LOG_ERROR(__VA_ARGS__) -#define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__) -#endif -#if 0 #define BLE_HS_LOG_DEBUG(...) IGNORE(__VA_ARGS__) #define BLE_HS_LOG_INFO(...) MODLOG_INFO(4, __VA_ARGS__) #define BLE_HS_LOG_WARN(...) MODLOG_WARN(4, __VA_ARGS__) #define BLE_HS_LOG_ERROR(...) MODLOG_ERROR(4, __VA_ARGS__) #define BLE_HS_LOG_CRITICAL(...) MODLOG_CRITICAL(4, __VA_ARGS__) #define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__) -#endif + #define DFLT_LOG_DEBUG(...) IGNORE(__VA_ARGS__) #define DFLT_LOG_INFO(...) MODLOG_INFO(0, __VA_ARGS__) #define DFLT_LOG_WARN(...) MODLOG_WARN(0, __VA_ARGS__) diff --git a/src/libs/mynewt-nimble/porting/nimble/include/modlog/modlog.h b/src/libs/mynewt-nimble/porting/nimble/include/modlog/modlog.h index 29b1e8f0..03904610 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/modlog/modlog.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/modlog/modlog.h @@ -22,6 +22,7 @@ #include <stdio.h> +#include "log_common/log_common.h" #include "log/log.h" #define MODLOG_MODULE_DFLT 255 diff --git a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h index 6efa3f28..94b72cb6 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -15,10 +15,6 @@ #define MYNEWT_VAL(_name) MYNEWT_VAL_ ## _name #define MYNEWT_VAL_CHOICE(_name, _val) MYNEWT_VAL_ ## _name ## __ ## _val -#ifndef OS_TICKS_PER_SEC -#define OS_TICKS_PER_SEC 1024 -#endif - /*** @apache-mynewt-core/crypto/tinycrypt */ #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200) @@ -369,6 +365,14 @@ #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31) #endif +#ifndef MYNEWT_VAL_BLE_ISO +#define MYNEWT_VAL_BLE_ISO (0) +#endif + +#ifndef MYNEWT_VAL_BLE_ISO_TEST +#define MYNEWT_VAL_BLE_ISO_TEST (0) +#endif + #ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS #define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1) #endif @@ -1264,4 +1268,10 @@ #define MYNEWT_VAL_TIMER_5 (1) #endif +/* Value copied from BLE_LL_OUR_SCA */ +#ifndef MYNEWT_VAL_BLE_LL_SCA +#define MYNEWT_VAL_BLE_LL_SCA (60) +#endif + + #endif diff --git a/src/libs/mynewt-nimble/porting/nimble/include/sysflash/sysflash.h b/src/libs/mynewt-nimble/porting/nimble/include/sysflash/sysflash.h index 413cb267..ab1341b2 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/sysflash/sysflash.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ diff --git a/src/libs/mynewt-nimble/porting/nimble/src/nimble_port.c b/src/libs/mynewt-nimble/porting/nimble/src/nimble_port.c index ff350a89..06b5f6df 100644 --- a/src/libs/mynewt-nimble/porting/nimble/src/nimble_port.c +++ b/src/libs/mynewt-nimble/porting/nimble/src/nimble_port.c @@ -24,34 +24,28 @@ #include "nimble/nimble_port.h" #if NIMBLE_CFG_CONTROLLER #include "controller/ble_ll.h" +#include "transport/ram/ble_hci_ram.h" #endif static struct ble_npl_eventq g_eventq_dflt; +extern void os_msys_init(void); + void nimble_port_init(void) { - void os_msys_init(void); - void ble_store_ram_init(void); -#if NIMBLE_CFG_CONTROLLER - void ble_hci_ram_init(void); -#endif - /* Initialize default event queue */ ble_npl_eventq_init(&g_eventq_dflt); - + /* Initialize the global memory pool */ os_msys_init(); - + /* Initialize the host */ ble_hs_init(); - /* XXX Need to have template for store */ - ble_store_ram_init(); - #if NIMBLE_CFG_CONTROLLER + ble_hci_ram_init(); hal_timer_init(5, NULL); os_cputime_init(32768); ble_ll_init(); - ble_hci_ram_init(); #endif } |