Repository: incubator-mynewt-core Updated Branches: refs/heads/develop 528cbcba5 -> 59a095b56
Fix crash in bletiny (stack overflow). Get 16K working Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/59a095b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/59a095b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/59a095b5 Branch: refs/heads/develop Commit: 59a095b56357d87e562cb4b4b9d5494802558021 Parents: 528cbcb Author: wes3 <w...@micosa.io> Authored: Fri Mar 18 17:14:55 2016 -0700 Committer: wes3 <w...@micosa.io> Committed: Fri Mar 18 17:14:55 2016 -0700 ---------------------------------------------------------------------- apps/bletiny/src/cmd.c | 2 +- apps/bletiny/src/main.c | 5 ++--- hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld | 2 +- hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld | 2 +- hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh | 2 +- hw/bsp/nrf51dk-16kbram/src/os_bsp.c | 10 +++++----- net/nimble/controller/include/controller/ble_ll.h | 2 +- net/nimble/host/src/ble_hs.c | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/apps/bletiny/src/cmd.c ---------------------------------------------------------------------- diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c index ce66a8e..a9cde09 100644 --- a/apps/bletiny/src/cmd.c +++ b/apps/bletiny/src/cmd.c @@ -891,7 +891,7 @@ cmd_show(int argc, char **argv) #define CMD_ADV_DATA_MAX_UUIDS16 8 #define CMD_ADV_DATA_MAX_UUIDS32 8 -#define CMD_ADV_DATA_MAX_UUIDS128 8 +#define CMD_ADV_DATA_MAX_UUIDS128 2 #define CMD_ADV_DATA_MAX_PUBLIC_TGT_ADDRS 8 #define CMD_ADV_DATA_SVC_DATA_UUID16_MAX_LEN 32 #define CMD_ADV_DATA_SVC_DATA_UUID32_MAX_LEN 32 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/apps/bletiny/src/main.c ---------------------------------------------------------------------- diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c index 7e92e0e..caa5d4a 100755 --- a/apps/bletiny/src/main.c +++ b/apps/bletiny/src/main.c @@ -53,7 +53,7 @@ #define SHELL_TASK_PRIO (3) #define SHELL_MAX_INPUT_LEN (64) -#define SHELL_TASK_STACK_SIZE (OS_STACK_ALIGN(216)) +#define SHELL_TASK_STACK_SIZE (OS_STACK_ALIGN(210)) static bssnz_t os_stack_t shell_stack[SHELL_TASK_STACK_SIZE]; static struct os_mutex bletiny_mutex; @@ -65,7 +65,6 @@ uint8_t g_dev_addr[BLE_DEV_ADDR_LEN]; uint8_t g_random_addr[BLE_DEV_ADDR_LEN]; /* A buffer for host advertising data */ -uint8_t g_host_adv_data[BLE_HCI_MAX_ADV_DATA_LEN]; uint8_t g_host_adv_len; static uint8_t bletiny_addr[6] = {0x03, 0x02, 0x01, 0x50, 0x13, 0x00}; @@ -82,7 +81,7 @@ struct os_mbuf_pool default_mbuf_pool; struct os_mempool default_mbuf_mpool; /* BLETINY variables */ -#define BLETINY_STACK_SIZE (OS_STACK_ALIGN(200)) +#define BLETINY_STACK_SIZE (OS_STACK_ALIGN(210)) #define BLETINY_TASK_PRIO (HOST_TASK_PRIO + 1) #if NIMBLE_OPT_ROLE_CENTRAL http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld b/hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld index 8643065..ce95980 100755 --- a/hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld +++ b/hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld @@ -19,7 +19,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") MEMORY { - FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7000 + FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x8000 RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x4000 } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld index 8f588da..043af42 100755 --- a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld +++ b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld @@ -19,7 +19,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") MEMORY { - FLASH (rx) : ORIGIN = 0x00007000, LENGTH = 0x1c000 + FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 0x1b800 RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x4000 } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh index 5ce4bfa..46b2481 100755 --- a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh +++ b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh @@ -48,7 +48,7 @@ if [ $IS_BOOTLOADER -eq 1 ]; then FLASH_OFFSET=0x0 FILE_NAME=$BASENAME.elf.bin else - FLASH_OFFSET=0x7000 + FLASH_OFFSET=0x8000 FILE_NAME=$BASENAME.img fi http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/hw/bsp/nrf51dk-16kbram/src/os_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf51dk-16kbram/src/os_bsp.c b/hw/bsp/nrf51dk-16kbram/src/os_bsp.c index e09bdee..906bc81 100644 --- a/hw/bsp/nrf51dk-16kbram/src/os_bsp.c +++ b/hw/bsp/nrf51dk-16kbram/src/os_bsp.c @@ -28,17 +28,17 @@ static struct flash_area bsp_flash_areas[] = { [FLASH_AREA_BOOTLOADER] = { .fa_flash_id = 0, /* internal flash */ .fa_off = 0x00000000, /* beginning */ - .fa_size = (28 * 1024) + .fa_size = (32 * 1024) }, [FLASH_AREA_IMAGE_0] = { .fa_flash_id = 0, - .fa_off = 0x00007000, - .fa_size = (112 * 1024) + .fa_off = 0x00008000, + .fa_size = (110 * 1024) }, [FLASH_AREA_IMAGE_1] = { .fa_flash_id = 0, - .fa_off = 0x00023000, - .fa_size = (112 * 1024) + .fa_off = 0x00023800, + .fa_size = (110 * 1024) }, [FLASH_AREA_IMAGE_SCRATCH] = { .fa_flash_id = 0, http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/net/nimble/controller/include/controller/ble_ll.h ---------------------------------------------------------------------- diff --git a/net/nimble/controller/include/controller/ble_ll.h b/net/nimble/controller/include/controller/ble_ll.h index d520427..f210dac 100644 --- a/net/nimble/controller/include/controller/ble_ll.h +++ b/net/nimble/controller/include/controller/ble_ll.h @@ -342,7 +342,7 @@ uint8_t ble_ll_read_supp_features(void); * XXX: temporary LL debug log. Will get removed once we transition to real * log */ -#define BLE_LL_LOG +#undef BLE_LL_LOG #define BLE_LL_LOG_ID_PHY_SETCHAN (1) #define BLE_LL_LOG_ID_RX_START (2) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/59a095b5/net/nimble/host/src/ble_hs.c ---------------------------------------------------------------------- diff --git a/net/nimble/host/src/ble_hs.c b/net/nimble/host/src/ble_hs.c index 678cde3..0681998 100644 --- a/net/nimble/host/src/ble_hs.c +++ b/net/nimble/host/src/ble_hs.c @@ -33,7 +33,7 @@ #ifdef ARCH_sim #define BLE_HS_STACK_SIZE (1024) #else -#define BLE_HS_STACK_SIZE (240) +#define BLE_HS_STACK_SIZE (250) #endif static struct log_handler ble_hs_log_console_handler;
