From 60b51b0b80ae4335e0391d4b2d1161c031658523 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 5 Sep 2022 09:36:41 +0200 Subject: [PATCH] nimble/ports: Refresh syscfg --- .../examples/linux/include/logcfg/logcfg.h | 2 +- .../examples/linux/include/syscfg/syscfg.h | 117 ++++++++------- .../linux/include/sysflash/sysflash.h | 25 +++- .../linux_blemesh/include/logcfg/logcfg.h | 2 +- .../linux_blemesh/include/syscfg/syscfg.h | 119 ++++++++------- .../linux_blemesh/include/sysflash/sysflash.h | 25 +++- .../examples/nuttx/include/logcfg/logcfg.h | 2 +- .../examples/nuttx/include/syscfg/syscfg.h | 117 ++++++++------- .../nuttx/include/sysflash/sysflash.h | 25 +++- porting/nimble/include/logcfg/logcfg.h | 2 +- porting/nimble/include/syscfg/syscfg.h | 117 ++++++++------- porting/nimble/include/sysflash/sysflash.h | 25 +++- porting/npl/riot/include/logcfg/logcfg.h | 2 +- porting/npl/riot/include/syscfg/syscfg.h | 136 +++++++++++------- porting/npl/riot/include/sysflash/sysflash.h | 25 +++- 15 files changed, 461 insertions(+), 280 deletions(-) diff --git a/porting/examples/linux/include/logcfg/logcfg.h b/porting/examples/linux/include/logcfg/logcfg.h index fab4d812f..89af35309 100644 --- a/porting/examples/linux/include/logcfg/logcfg.h +++ b/porting/examples/linux/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h index 65aa24ebb..3ba53c20e 100644 --- a/porting/examples/linux/include/syscfg/syscfg.h +++ b/porting/examples/linux/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -20,7 +20,7 @@ #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME ("trng") +#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME "trng" #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG @@ -315,7 +315,7 @@ #endif #ifndef MYNEWT_VAL_CONSOLE_UART_DEV -#define MYNEWT_VAL_CONSOLE_UART_DEV ("uart0") +#define MYNEWT_VAL_CONSOLE_UART_DEV "uart0" #endif #ifndef MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL @@ -474,6 +474,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) #endif +#ifndef MYNEWT_VAL_BLE_POWER_CONTROL +#define MYNEWT_VAL_BLE_POWER_CONTROL (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -498,10 +502,6 @@ #define MYNEWT_VAL_BLE_WHITELIST (1) #endif -#ifndef MYNEWT_VAL_BLE_POWER_CONTROL -#define MYNEWT_VAL_BLE_POWER_CONTROL (0) -#endif - /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -743,42 +743,6 @@ #define MYNEWT_VAL_BLE_MESH (0) #endif -#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT -#define MYNEWT_VAL_BLE_MONITOR_RTT (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME ("btmonitor") -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART -#define MYNEWT_VAL_BLE_MONITOR_UART (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE -#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV -#define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0") -#endif - #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300) #endif @@ -799,6 +763,10 @@ #define MYNEWT_VAL_BLE_SM_LEGACY (1) #endif +#ifndef MYNEWT_VAL_BLE_SM_LVL +#define MYNEWT_VAL_BLE_SM_LVL (0) +#endif + #ifndef MYNEWT_VAL_BLE_SM_MAX_PROCS #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1) #endif @@ -823,10 +791,6 @@ #define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0) #endif -#ifndef MYNEWT_VAL_BLE_SM_LVL -#define MYNEWT_VAL_BLE_SM_LVL (0) -#endif - #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #define MYNEWT_VAL_BLE_SM_SC_ONLY (0) #endif @@ -902,7 +866,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT -#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT ("Apache Mynewt NimBLE") +#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT "Apache Mynewt NimBLE" #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_READ_PERM @@ -954,7 +918,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME -#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("nimble") +#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble" #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH @@ -1025,6 +989,42 @@ #undef MYNEWT_VAL_BLE_HCI_TRANSPORT +#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT +#define MYNEWT_VAL_BLE_MONITOR_RTT (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME "btmonitor" +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART +#define MYNEWT_VAL_BLE_MONITOR_UART (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE +#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV +#define MYNEWT_VAL_BLE_MONITOR_UART_DEV "uart0" +#endif + #ifndef MYNEWT_VAL_BLE_TRANSPORT #define MYNEWT_VAL_BLE_TRANSPORT (1) #endif @@ -1044,7 +1044,7 @@ #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (255) +#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT @@ -1060,6 +1060,9 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc +#define MYNEWT_VAL_BLE_TRANSPORT_HS__cdc (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__custom #define MYNEWT_VAL_BLE_TRANSPORT_HS__custom (0) #endif @@ -1083,12 +1086,18 @@ #endif /* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 +#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__custom #define MYNEWT_VAL_BLE_TRANSPORT_LL__custom (0) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac #define MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac (0) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__emspi +#define MYNEWT_VAL_BLE_TRANSPORT_LL__emspi (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__native #define MYNEWT_VAL_BLE_TRANSPORT_LL__native (0) #endif @@ -1141,7 +1150,7 @@ /*** newt */ #ifndef MYNEWT_VAL_APP_NAME -#define MYNEWT_VAL_APP_NAME ("dummy_app") +#define MYNEWT_VAL_APP_NAME "dummy_app" #endif #ifndef MYNEWT_VAL_APP_dummy_app @@ -1149,7 +1158,7 @@ #endif #ifndef MYNEWT_VAL_ARCH_NAME -#define MYNEWT_VAL_ARCH_NAME ("sim") +#define MYNEWT_VAL_ARCH_NAME "sim" #endif #ifndef MYNEWT_VAL_ARCH_sim @@ -1157,7 +1166,7 @@ #endif #ifndef MYNEWT_VAL_BSP_NAME -#define MYNEWT_VAL_BSP_NAME ("native") +#define MYNEWT_VAL_BSP_NAME "native" #endif #ifndef MYNEWT_VAL_BSP_native @@ -1173,7 +1182,7 @@ #endif #ifndef MYNEWT_VAL_TARGET_NAME -#define MYNEWT_VAL_TARGET_NAME ("linux") +#define MYNEWT_VAL_TARGET_NAME "linux" #endif #ifndef MYNEWT_VAL_TARGET_linux diff --git a/porting/examples/linux/include/sysflash/sysflash.h b/porting/examples/linux/include/sysflash/sysflash.h index 28391ca66..8d358ac99 100644 --- a/porting/examples/linux/include/sysflash/sysflash.h +++ b/porting/examples/linux/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ @@ -15,10 +15,33 @@ extern const struct flash_area sysflash_map_dflt[6]; #define FLASH_AREA_BOOTLOADER 0 +#define FLASH_AREA_BOOTLOADER_DEVICE 0 +#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000 +#define FLASH_AREA_BOOTLOADER_SIZE 16384 + #define FLASH_AREA_IMAGE_0 1 +#define FLASH_AREA_IMAGE_0_DEVICE 0 +#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000 +#define FLASH_AREA_IMAGE_0_SIZE 393216 + #define FLASH_AREA_IMAGE_1 2 +#define FLASH_AREA_IMAGE_1_DEVICE 0 +#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000 +#define FLASH_AREA_IMAGE_1_SIZE 393216 + #define FLASH_AREA_IMAGE_SCRATCH 3 +#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0 +#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000 +#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072 + #define FLASH_AREA_REBOOT_LOG 16 +#define FLASH_AREA_REBOOT_LOG_DEVICE 0 +#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000 +#define FLASH_AREA_REBOOT_LOG_SIZE 16384 + #define FLASH_AREA_NFFS 17 +#define FLASH_AREA_NFFS_DEVICE 0 +#define FLASH_AREA_NFFS_OFFSET 0x00008000 +#define FLASH_AREA_NFFS_SIZE 32768 #endif diff --git a/porting/examples/linux_blemesh/include/logcfg/logcfg.h b/porting/examples/linux_blemesh/include/logcfg/logcfg.h index c3b5cdf40..520c658c6 100644 --- a/porting/examples/linux_blemesh/include/logcfg/logcfg.h +++ b/porting/examples/linux_blemesh/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h index 9fdaff3df..019cafac7 100644 --- a/porting/examples/linux_blemesh/include/syscfg/syscfg.h +++ b/porting/examples/linux_blemesh/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -20,7 +20,7 @@ #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME ("trng") +#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME "trng" #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG @@ -316,7 +316,7 @@ #endif #ifndef MYNEWT_VAL_CONSOLE_UART_DEV -#define MYNEWT_VAL_CONSOLE_UART_DEV ("uart0") +#define MYNEWT_VAL_CONSOLE_UART_DEV "uart0" #endif #ifndef MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL @@ -475,6 +475,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) #endif +#ifndef MYNEWT_VAL_BLE_POWER_CONTROL +#define MYNEWT_VAL_BLE_POWER_CONTROL (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -499,10 +503,6 @@ #define MYNEWT_VAL_BLE_WHITELIST (1) #endif -#ifndef MYNEWT_VAL_BLE_POWER_CONTROL -#define MYNEWT_VAL_BLE_POWER_CONTROL (0) -#endif - /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -745,42 +745,6 @@ #define MYNEWT_VAL_BLE_MESH (1) #endif -#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT -#define MYNEWT_VAL_BLE_MONITOR_RTT (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME ("btmonitor") -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART -#define MYNEWT_VAL_BLE_MONITOR_UART (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE -#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV -#define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0") -#endif - #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300) #endif @@ -801,6 +765,10 @@ #define MYNEWT_VAL_BLE_SM_LEGACY (1) #endif +#ifndef MYNEWT_VAL_BLE_SM_LVL +#define MYNEWT_VAL_BLE_SM_LVL (0) +#endif + #ifndef MYNEWT_VAL_BLE_SM_MAX_PROCS #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1) #endif @@ -826,10 +794,6 @@ #define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0) #endif -#ifndef MYNEWT_VAL_BLE_SM_LVL -#define MYNEWT_VAL_BLE_SM_LVL (0) -#endif - #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #define MYNEWT_VAL_BLE_SM_SC_ONLY (0) #endif @@ -959,7 +923,7 @@ #endif #ifndef MYNEWT_VAL_BLE_MESH_DEVICE_NAME -#define MYNEWT_VAL_BLE_MESH_DEVICE_NAME ("nimble-mesh-node") +#define MYNEWT_VAL_BLE_MESH_DEVICE_NAME "nimble-mesh-node" #endif #ifndef MYNEWT_VAL_BLE_MESH_DEV_UUID @@ -1477,7 +1441,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT -#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT ("Apache Mynewt NimBLE") +#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT "Apache Mynewt NimBLE" #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_READ_PERM @@ -1529,7 +1493,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME -#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("nimble") +#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble" #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH @@ -1600,6 +1564,42 @@ #undef MYNEWT_VAL_BLE_HCI_TRANSPORT +#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT +#define MYNEWT_VAL_BLE_MONITOR_RTT (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME "btmonitor" +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART +#define MYNEWT_VAL_BLE_MONITOR_UART (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE +#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV +#define MYNEWT_VAL_BLE_MONITOR_UART_DEV "uart0" +#endif + #ifndef MYNEWT_VAL_BLE_TRANSPORT #define MYNEWT_VAL_BLE_TRANSPORT (1) #endif @@ -1619,7 +1619,7 @@ #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (255) +#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT @@ -1635,6 +1635,9 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc +#define MYNEWT_VAL_BLE_TRANSPORT_HS__cdc (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__custom #define MYNEWT_VAL_BLE_TRANSPORT_HS__custom (0) #endif @@ -1658,12 +1661,18 @@ #endif /* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 +#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__custom #define MYNEWT_VAL_BLE_TRANSPORT_LL__custom (0) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac #define MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac (0) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__emspi +#define MYNEWT_VAL_BLE_TRANSPORT_LL__emspi (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__native #define MYNEWT_VAL_BLE_TRANSPORT_LL__native (0) #endif @@ -1716,7 +1725,7 @@ /*** newt */ #ifndef MYNEWT_VAL_APP_NAME -#define MYNEWT_VAL_APP_NAME ("dummy_app") +#define MYNEWT_VAL_APP_NAME "dummy_app" #endif #ifndef MYNEWT_VAL_APP_dummy_app @@ -1724,7 +1733,7 @@ #endif #ifndef MYNEWT_VAL_ARCH_NAME -#define MYNEWT_VAL_ARCH_NAME ("sim") +#define MYNEWT_VAL_ARCH_NAME "sim" #endif #ifndef MYNEWT_VAL_ARCH_sim @@ -1732,7 +1741,7 @@ #endif #ifndef MYNEWT_VAL_BSP_NAME -#define MYNEWT_VAL_BSP_NAME ("native") +#define MYNEWT_VAL_BSP_NAME "native" #endif #ifndef MYNEWT_VAL_BSP_native @@ -1748,7 +1757,7 @@ #endif #ifndef MYNEWT_VAL_TARGET_NAME -#define MYNEWT_VAL_TARGET_NAME ("linux_blemesh") +#define MYNEWT_VAL_TARGET_NAME "linux_blemesh" #endif #ifndef MYNEWT_VAL_TARGET_linux_blemesh diff --git a/porting/examples/linux_blemesh/include/sysflash/sysflash.h b/porting/examples/linux_blemesh/include/sysflash/sysflash.h index 28391ca66..8d358ac99 100644 --- a/porting/examples/linux_blemesh/include/sysflash/sysflash.h +++ b/porting/examples/linux_blemesh/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ @@ -15,10 +15,33 @@ extern const struct flash_area sysflash_map_dflt[6]; #define FLASH_AREA_BOOTLOADER 0 +#define FLASH_AREA_BOOTLOADER_DEVICE 0 +#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000 +#define FLASH_AREA_BOOTLOADER_SIZE 16384 + #define FLASH_AREA_IMAGE_0 1 +#define FLASH_AREA_IMAGE_0_DEVICE 0 +#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000 +#define FLASH_AREA_IMAGE_0_SIZE 393216 + #define FLASH_AREA_IMAGE_1 2 +#define FLASH_AREA_IMAGE_1_DEVICE 0 +#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000 +#define FLASH_AREA_IMAGE_1_SIZE 393216 + #define FLASH_AREA_IMAGE_SCRATCH 3 +#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0 +#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000 +#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072 + #define FLASH_AREA_REBOOT_LOG 16 +#define FLASH_AREA_REBOOT_LOG_DEVICE 0 +#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000 +#define FLASH_AREA_REBOOT_LOG_SIZE 16384 + #define FLASH_AREA_NFFS 17 +#define FLASH_AREA_NFFS_DEVICE 0 +#define FLASH_AREA_NFFS_OFFSET 0x00008000 +#define FLASH_AREA_NFFS_SIZE 32768 #endif diff --git a/porting/examples/nuttx/include/logcfg/logcfg.h b/porting/examples/nuttx/include/logcfg/logcfg.h index fab4d812f..89af35309 100644 --- a/porting/examples/nuttx/include/logcfg/logcfg.h +++ b/porting/examples/nuttx/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h index fd9f45613..040a1b3d6 100644 --- a/porting/examples/nuttx/include/syscfg/syscfg.h +++ b/porting/examples/nuttx/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -20,7 +20,7 @@ #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME ("trng") +#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME "trng" #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG @@ -315,7 +315,7 @@ #endif #ifndef MYNEWT_VAL_CONSOLE_UART_DEV -#define MYNEWT_VAL_CONSOLE_UART_DEV ("uart0") +#define MYNEWT_VAL_CONSOLE_UART_DEV "uart0" #endif #ifndef MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL @@ -474,6 +474,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) #endif +#ifndef MYNEWT_VAL_BLE_POWER_CONTROL +#define MYNEWT_VAL_BLE_POWER_CONTROL (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -498,10 +502,6 @@ #define MYNEWT_VAL_BLE_WHITELIST (1) #endif -#ifndef MYNEWT_VAL_BLE_POWER_CONTROL -#define MYNEWT_VAL_BLE_POWER_CONTROL (0) -#endif - /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -743,42 +743,6 @@ #define MYNEWT_VAL_BLE_MESH (0) #endif -#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT -#define MYNEWT_VAL_BLE_MONITOR_RTT (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME ("btmonitor") -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART -#define MYNEWT_VAL_BLE_MONITOR_UART (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE -#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV -#define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0") -#endif - #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300) #endif @@ -800,6 +764,10 @@ #define MYNEWT_VAL_BLE_SM_LEGACY (1) #endif +#ifndef MYNEWT_VAL_BLE_SM_LVL +#define MYNEWT_VAL_BLE_SM_LVL (0) +#endif + #ifndef MYNEWT_VAL_BLE_SM_MAX_PROCS #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1) #endif @@ -825,10 +793,6 @@ #define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0) #endif -#ifndef MYNEWT_VAL_BLE_SM_LVL -#define MYNEWT_VAL_BLE_SM_LVL (0) -#endif - #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #define MYNEWT_VAL_BLE_SM_SC_ONLY (0) #endif @@ -904,7 +868,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT -#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT ("Apache Mynewt NimBLE") +#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT "Apache Mynewt NimBLE" #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_READ_PERM @@ -956,7 +920,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME -#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("nimble") +#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble" #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH @@ -1027,6 +991,42 @@ #undef MYNEWT_VAL_BLE_HCI_TRANSPORT +#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT +#define MYNEWT_VAL_BLE_MONITOR_RTT (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME "btmonitor" +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART +#define MYNEWT_VAL_BLE_MONITOR_UART (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE +#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV +#define MYNEWT_VAL_BLE_MONITOR_UART_DEV "uart0" +#endif + #ifndef MYNEWT_VAL_BLE_TRANSPORT #define MYNEWT_VAL_BLE_TRANSPORT (1) #endif @@ -1046,7 +1046,7 @@ #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (255) +#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT @@ -1062,6 +1062,9 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc +#define MYNEWT_VAL_BLE_TRANSPORT_HS__cdc (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__custom #define MYNEWT_VAL_BLE_TRANSPORT_HS__custom (0) #endif @@ -1085,12 +1088,18 @@ #endif /* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 +#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__custom #define MYNEWT_VAL_BLE_TRANSPORT_LL__custom (0) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac #define MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac (0) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__emspi +#define MYNEWT_VAL_BLE_TRANSPORT_LL__emspi (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__native #define MYNEWT_VAL_BLE_TRANSPORT_LL__native (0) #endif @@ -1143,7 +1152,7 @@ /*** newt */ #ifndef MYNEWT_VAL_APP_NAME -#define MYNEWT_VAL_APP_NAME ("dummy_app") +#define MYNEWT_VAL_APP_NAME "dummy_app" #endif #ifndef MYNEWT_VAL_APP_dummy_app @@ -1151,7 +1160,7 @@ #endif #ifndef MYNEWT_VAL_ARCH_NAME -#define MYNEWT_VAL_ARCH_NAME ("sim") +#define MYNEWT_VAL_ARCH_NAME "sim" #endif #ifndef MYNEWT_VAL_ARCH_sim @@ -1159,7 +1168,7 @@ #endif #ifndef MYNEWT_VAL_BSP_NAME -#define MYNEWT_VAL_BSP_NAME ("native") +#define MYNEWT_VAL_BSP_NAME "native" #endif #ifndef MYNEWT_VAL_BSP_native @@ -1175,7 +1184,7 @@ #endif #ifndef MYNEWT_VAL_TARGET_NAME -#define MYNEWT_VAL_TARGET_NAME ("nuttx") +#define MYNEWT_VAL_TARGET_NAME "nuttx" #endif #ifndef MYNEWT_VAL_TARGET_nuttx diff --git a/porting/examples/nuttx/include/sysflash/sysflash.h b/porting/examples/nuttx/include/sysflash/sysflash.h index 28391ca66..8d358ac99 100644 --- a/porting/examples/nuttx/include/sysflash/sysflash.h +++ b/porting/examples/nuttx/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ @@ -15,10 +15,33 @@ extern const struct flash_area sysflash_map_dflt[6]; #define FLASH_AREA_BOOTLOADER 0 +#define FLASH_AREA_BOOTLOADER_DEVICE 0 +#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000 +#define FLASH_AREA_BOOTLOADER_SIZE 16384 + #define FLASH_AREA_IMAGE_0 1 +#define FLASH_AREA_IMAGE_0_DEVICE 0 +#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000 +#define FLASH_AREA_IMAGE_0_SIZE 393216 + #define FLASH_AREA_IMAGE_1 2 +#define FLASH_AREA_IMAGE_1_DEVICE 0 +#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000 +#define FLASH_AREA_IMAGE_1_SIZE 393216 + #define FLASH_AREA_IMAGE_SCRATCH 3 +#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0 +#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000 +#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072 + #define FLASH_AREA_REBOOT_LOG 16 +#define FLASH_AREA_REBOOT_LOG_DEVICE 0 +#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000 +#define FLASH_AREA_REBOOT_LOG_SIZE 16384 + #define FLASH_AREA_NFFS 17 +#define FLASH_AREA_NFFS_DEVICE 0 +#define FLASH_AREA_NFFS_OFFSET 0x00008000 +#define FLASH_AREA_NFFS_SIZE 32768 #endif diff --git a/porting/nimble/include/logcfg/logcfg.h b/porting/nimble/include/logcfg/logcfg.h index fab4d812f..89af35309 100644 --- a/porting/nimble/include/logcfg/logcfg.h +++ b/porting/nimble/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h index a3602308f..7eb0856da 100644 --- a/porting/nimble/include/syscfg/syscfg.h +++ b/porting/nimble/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -20,7 +20,7 @@ #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME ("trng") +#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME "trng" #endif #ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG @@ -315,7 +315,7 @@ #endif #ifndef MYNEWT_VAL_CONSOLE_UART_DEV -#define MYNEWT_VAL_CONSOLE_UART_DEV ("uart0") +#define MYNEWT_VAL_CONSOLE_UART_DEV "uart0" #endif #ifndef MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL @@ -473,6 +473,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) #endif +#ifndef MYNEWT_VAL_BLE_POWER_CONTROL +#define MYNEWT_VAL_BLE_POWER_CONTROL (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -497,10 +501,6 @@ #define MYNEWT_VAL_BLE_WHITELIST (1) #endif -#ifndef MYNEWT_VAL_BLE_POWER_CONTROL -#define MYNEWT_VAL_BLE_POWER_CONTROL (0) -#endif - /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -742,42 +742,6 @@ #define MYNEWT_VAL_BLE_MESH (0) #endif -#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT -#define MYNEWT_VAL_BLE_MONITOR_RTT (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME ("btmonitor") -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART -#define MYNEWT_VAL_BLE_MONITOR_UART (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE -#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV -#define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0") -#endif - #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300) #endif @@ -798,6 +762,10 @@ #define MYNEWT_VAL_BLE_SM_LEGACY (1) #endif +#ifndef MYNEWT_VAL_BLE_SM_LVL +#define MYNEWT_VAL_BLE_SM_LVL (0) +#endif + #ifndef MYNEWT_VAL_BLE_SM_MAX_PROCS #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1) #endif @@ -822,10 +790,6 @@ #define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0) #endif -#ifndef MYNEWT_VAL_BLE_SM_LVL -#define MYNEWT_VAL_BLE_SM_LVL (0) -#endif - #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #define MYNEWT_VAL_BLE_SM_SC_ONLY (0) #endif @@ -901,7 +865,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT -#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT ("Apache Mynewt NimBLE") +#define MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_DEFAULT "Apache Mynewt NimBLE" #endif #ifndef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_READ_PERM @@ -953,7 +917,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME -#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("nimble") +#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble" #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH @@ -1024,6 +988,42 @@ #undef MYNEWT_VAL_BLE_HCI_TRANSPORT +#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT +#define MYNEWT_VAL_BLE_MONITOR_RTT (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME "btmonitor" +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART +#define MYNEWT_VAL_BLE_MONITOR_UART (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE +#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV +#define MYNEWT_VAL_BLE_MONITOR_UART_DEV "uart0" +#endif + #ifndef MYNEWT_VAL_BLE_TRANSPORT #define MYNEWT_VAL_BLE_TRANSPORT (1) #endif @@ -1043,7 +1043,7 @@ #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (255) +#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT @@ -1059,6 +1059,9 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc +#define MYNEWT_VAL_BLE_TRANSPORT_HS__cdc (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__custom #define MYNEWT_VAL_BLE_TRANSPORT_HS__custom (0) #endif @@ -1082,12 +1085,18 @@ #endif /* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 +#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__custom #define MYNEWT_VAL_BLE_TRANSPORT_LL__custom (0) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac #define MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac (0) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__emspi +#define MYNEWT_VAL_BLE_TRANSPORT_LL__emspi (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__native #define MYNEWT_VAL_BLE_TRANSPORT_LL__native (0) #endif @@ -1138,7 +1147,7 @@ /*** newt */ #ifndef MYNEWT_VAL_APP_NAME -#define MYNEWT_VAL_APP_NAME ("dummy_app") +#define MYNEWT_VAL_APP_NAME "dummy_app" #endif #ifndef MYNEWT_VAL_APP_dummy_app @@ -1146,7 +1155,7 @@ #endif #ifndef MYNEWT_VAL_ARCH_NAME -#define MYNEWT_VAL_ARCH_NAME ("sim") +#define MYNEWT_VAL_ARCH_NAME "sim" #endif #ifndef MYNEWT_VAL_ARCH_sim @@ -1154,7 +1163,7 @@ #endif #ifndef MYNEWT_VAL_BSP_NAME -#define MYNEWT_VAL_BSP_NAME ("native") +#define MYNEWT_VAL_BSP_NAME "native" #endif #ifndef MYNEWT_VAL_BSP_native @@ -1170,7 +1179,7 @@ #endif #ifndef MYNEWT_VAL_TARGET_NAME -#define MYNEWT_VAL_TARGET_NAME ("porting_default") +#define MYNEWT_VAL_TARGET_NAME "porting_default" #endif #ifndef MYNEWT_VAL_TARGET_porting_default diff --git a/porting/nimble/include/sysflash/sysflash.h b/porting/nimble/include/sysflash/sysflash.h index 28391ca66..8d358ac99 100644 --- a/porting/nimble/include/sysflash/sysflash.h +++ b/porting/nimble/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ @@ -15,10 +15,33 @@ extern const struct flash_area sysflash_map_dflt[6]; #define FLASH_AREA_BOOTLOADER 0 +#define FLASH_AREA_BOOTLOADER_DEVICE 0 +#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000 +#define FLASH_AREA_BOOTLOADER_SIZE 16384 + #define FLASH_AREA_IMAGE_0 1 +#define FLASH_AREA_IMAGE_0_DEVICE 0 +#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000 +#define FLASH_AREA_IMAGE_0_SIZE 393216 + #define FLASH_AREA_IMAGE_1 2 +#define FLASH_AREA_IMAGE_1_DEVICE 0 +#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000 +#define FLASH_AREA_IMAGE_1_SIZE 393216 + #define FLASH_AREA_IMAGE_SCRATCH 3 +#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0 +#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000 +#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072 + #define FLASH_AREA_REBOOT_LOG 16 +#define FLASH_AREA_REBOOT_LOG_DEVICE 0 +#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000 +#define FLASH_AREA_REBOOT_LOG_SIZE 16384 + #define FLASH_AREA_NFFS 17 +#define FLASH_AREA_NFFS_DEVICE 0 +#define FLASH_AREA_NFFS_OFFSET 0x00008000 +#define FLASH_AREA_NFFS_SIZE 32768 #endif diff --git a/porting/npl/riot/include/logcfg/logcfg.h b/porting/npl/riot/include/logcfg/logcfg.h index fab4d812f..89af35309 100644 --- a/porting/npl/riot/include/logcfg/logcfg.h +++ b/porting/npl/riot/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h index 2d5f4b2ee..c4055db29 100644 --- a/porting/npl/riot/include/syscfg/syscfg.h +++ b/porting/npl/riot/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -676,7 +676,7 @@ #endif #ifndef MYNEWT_VAL_CONSOLE_UART_DEV -#define MYNEWT_VAL_CONSOLE_UART_DEV ("uart0") +#define MYNEWT_VAL_CONSOLE_UART_DEV "uart0" #endif #ifndef MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL @@ -834,6 +834,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) #endif +#ifndef MYNEWT_VAL_BLE_POWER_CONTROL +#define MYNEWT_VAL_BLE_POWER_CONTROL (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -858,10 +862,6 @@ #define MYNEWT_VAL_BLE_WHITELIST (1) #endif -#ifndef MYNEWT_VAL_BLE_POWER_CONTROL -#define MYNEWT_VAL_BLE_POWER_CONTROL (0) -#endif - /*** @apache-mynewt-nimble/nimble/controller */ #ifndef MYNEWT_VAL_BLE_CONTROLLER #define MYNEWT_VAL_BLE_CONTROLLER (1) @@ -915,6 +915,10 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_PING (MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION) #endif +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ENHANCED_CONN_UPDATE +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ENHANCED_CONN_UPDATE (0) +#endif + /* Value copied from BLE_EXT_ADV */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (0) @@ -1075,6 +1079,15 @@ #define MYNEWT_VAL_BLE_LL_LNA_GPIO (-1) #endif +#ifndef MYNEWT_VAL_BLE_LL_LNA_TURN_ON_US +#define MYNEWT_VAL_BLE_LL_LNA_TURN_ON_US (1) +#endif + +/* Value copied from BLE_LL_MFRG_ID */ +#ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID +#define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (0x0B65) +#endif + #ifndef MYNEWT_VAL_BLE_LL_MASTER_SCA #define MYNEWT_VAL_BLE_LL_MASTER_SCA (4) #endif @@ -1084,7 +1097,7 @@ #endif #ifndef MYNEWT_VAL_BLE_LL_MFRG_ID -#define MYNEWT_VAL_BLE_LL_MFRG_ID (0xFFFF) +#define MYNEWT_VAL_BLE_LL_MFRG_ID (0x0B65) #endif #ifndef MYNEWT_VAL_BLE_LL_NUM_COMP_PKT_ITVL_MS @@ -1111,6 +1124,10 @@ #define MYNEWT_VAL_BLE_LL_PA_GPIO (-1) #endif +#ifndef MYNEWT_VAL_BLE_LL_PA_TURN_ON_US +#define MYNEWT_VAL_BLE_LL_PA_TURN_ON_US (1) +#endif + #ifndef MYNEWT_VAL_BLE_LL_PRIO #define MYNEWT_VAL_BLE_LL_PRIO (0) #endif @@ -1178,6 +1195,10 @@ #define MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN (32) #endif +#ifndef MYNEWT_VAL_BLE_LL_STACK_SIZE +#define MYNEWT_VAL_BLE_LL_STACK_SIZE (120) +#endif + #ifndef MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING #define MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING (0) #endif @@ -1502,42 +1523,6 @@ #define MYNEWT_VAL_BLE_MESH (0) #endif -#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT -#define MYNEWT_VAL_BLE_MONITOR_RTT (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME ("btmonitor") -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART -#define MYNEWT_VAL_BLE_MONITOR_UART (0) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE -#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE -#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) -#endif - -#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV -#define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0") -#endif - #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300) #endif @@ -1559,6 +1544,10 @@ #define MYNEWT_VAL_BLE_SM_LEGACY (0) #endif +#ifndef MYNEWT_VAL_BLE_SM_LVL +#define MYNEWT_VAL_BLE_SM_LVL (0) +#endif + #ifndef MYNEWT_VAL_BLE_SM_MAX_PROCS #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1) #endif @@ -1584,10 +1573,6 @@ #define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0) #endif -#ifndef MYNEWT_VAL_BLE_SM_LVL -#define MYNEWT_VAL_BLE_SM_LVL (0) -#endif - #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY #define MYNEWT_VAL_BLE_SM_SC_ONLY (0) #endif @@ -1618,7 +1603,7 @@ #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME -#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("nimble") +#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble" #endif #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH @@ -1669,6 +1654,42 @@ #undef MYNEWT_VAL_BLE_HCI_TRANSPORT +#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT +#define MYNEWT_VAL_BLE_MONITOR_RTT (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFERED (1) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_NAME "btmonitor" +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_RTT_BUFFER_SIZE (256) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART +#define MYNEWT_VAL_BLE_MONITOR_UART (0) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE +#define MYNEWT_VAL_BLE_MONITOR_UART_BAUDRATE (1000000) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE +#define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64) +#endif + +#ifndef MYNEWT_VAL_BLE_MONITOR_UART_DEV +#define MYNEWT_VAL_BLE_MONITOR_UART_DEV "uart0" +#endif + #ifndef MYNEWT_VAL_BLE_TRANSPORT #define MYNEWT_VAL_BLE_TRANSPORT (1) #endif @@ -1689,7 +1710,7 @@ #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (255) +#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251) #endif /* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport) */ @@ -1706,6 +1727,9 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc +#define MYNEWT_VAL_BLE_TRANSPORT_HS__cdc (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__custom #define MYNEWT_VAL_BLE_TRANSPORT_HS__custom (0) #endif @@ -1728,12 +1752,18 @@ #define MYNEWT_VAL_BLE_TRANSPORT_HS (1) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 +#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__custom #define MYNEWT_VAL_BLE_TRANSPORT_LL__custom (0) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac #define MYNEWT_VAL_BLE_TRANSPORT_LL__dialog_cmac (0) #endif +#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__emspi +#define MYNEWT_VAL_BLE_TRANSPORT_LL__emspi (0) +#endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__native #define MYNEWT_VAL_BLE_TRANSPORT_LL__native (1) #endif @@ -1749,7 +1779,7 @@ /*** newt */ #ifndef MYNEWT_VAL_APP_NAME -#define MYNEWT_VAL_APP_NAME ("dummy_app") +#define MYNEWT_VAL_APP_NAME "dummy_app" #endif #ifndef MYNEWT_VAL_APP_dummy_app @@ -1757,7 +1787,7 @@ #endif #ifndef MYNEWT_VAL_ARCH_NAME -#define MYNEWT_VAL_ARCH_NAME ("cortex_m4") +#define MYNEWT_VAL_ARCH_NAME "cortex_m4" #endif #ifndef MYNEWT_VAL_ARCH_cortex_m4 @@ -1765,7 +1795,7 @@ #endif #ifndef MYNEWT_VAL_BSP_NAME -#define MYNEWT_VAL_BSP_NAME ("nordic_pca10056") +#define MYNEWT_VAL_BSP_NAME "nordic_pca10056" #endif #ifndef MYNEWT_VAL_BSP_nordic_pca10056 @@ -1781,7 +1811,7 @@ #endif #ifndef MYNEWT_VAL_TARGET_NAME -#define MYNEWT_VAL_TARGET_NAME ("riot") +#define MYNEWT_VAL_TARGET_NAME "riot" #endif #ifndef MYNEWT_VAL_TARGET_riot diff --git a/porting/npl/riot/include/sysflash/sysflash.h b/porting/npl/riot/include/sysflash/sysflash.h index 28391ca66..05324aaab 100644 --- a/porting/npl/riot/include/sysflash/sysflash.h +++ b/porting/npl/riot/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.10.0-dev + * This file was generated by Apache newt version: 1.11.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ @@ -15,10 +15,33 @@ extern const struct flash_area sysflash_map_dflt[6]; #define FLASH_AREA_BOOTLOADER 0 +#define FLASH_AREA_BOOTLOADER_DEVICE 0 +#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000 +#define FLASH_AREA_BOOTLOADER_SIZE 32768 + #define FLASH_AREA_IMAGE_0 1 +#define FLASH_AREA_IMAGE_0_DEVICE 0 +#define FLASH_AREA_IMAGE_0_OFFSET 0x0000c000 +#define FLASH_AREA_IMAGE_0_SIZE 483328 + #define FLASH_AREA_IMAGE_1 2 +#define FLASH_AREA_IMAGE_1_DEVICE 0 +#define FLASH_AREA_IMAGE_1_OFFSET 0x00082000 +#define FLASH_AREA_IMAGE_1_SIZE 483328 + #define FLASH_AREA_IMAGE_SCRATCH 3 +#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0 +#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000f8000 +#define FLASH_AREA_IMAGE_SCRATCH_SIZE 16384 + #define FLASH_AREA_REBOOT_LOG 16 +#define FLASH_AREA_REBOOT_LOG_DEVICE 0 +#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00008000 +#define FLASH_AREA_REBOOT_LOG_SIZE 16384 + #define FLASH_AREA_NFFS 17 +#define FLASH_AREA_NFFS_DEVICE 0 +#define FLASH_AREA_NFFS_OFFSET 0x000fc000 +#define FLASH_AREA_NFFS_SIZE 16384 #endif