Merge remote-tracking branch 'origin/090_dev'
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/95bd6db4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/95bd6db4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/95bd6db4 Branch: refs/heads/develop Commit: 95bd6db42cb97cae973519243732a94664d58cdb Parents: dcb21d9 62f6619 Author: Christopher Collins <ccoll...@apache.org> Authored: Tue May 17 13:44:53 2016 -0700 Committer: Christopher Collins <ccoll...@apache.org> Committed: Tue May 17 13:44:53 2016 -0700 ---------------------------------------------------------------------- apps/blehci/pkg.yml | 29 + apps/blehci/src/main.c | 392 +++++ apps/bleprph/src/main.c | 18 +- apps/bletest/pkg.yml | 1 + apps/bletest/src/bletest_hci.c | 6 +- apps/bletest/src/bletest_priv.h | 2 +- apps/bletest/src/main.c | 37 +- apps/bletiny/src/bletiny_priv.h | 9 +- apps/bletiny/src/cmd.c | 317 +++- apps/bletiny/src/main.c | 233 ++- apps/bletiny/src/parse.c | 67 +- apps/blinky/src/main.c | 7 - fs/nffs/src/crc16.c | 83 - fs/nffs/src/crc16.h | 35 - fs/nffs/src/nffs_block.c | 1 - fs/nffs/src/nffs_crc.c | 2 - fs/nffs/src/nffs_inode.c | 1 - fs/nffs/src/nffs_misc.c | 1 - fs/nffs/src/nffs_priv.h | 1 + fs/nffs/src/nffs_write.c | 1 - .../nrf51-arduino_101/boot-nrf51-arduino_101.ld | 177 ++ hw/bsp/nrf51-arduino_101/include/bsp/bsp.h | 48 + .../nrf51-arduino_101/include/bsp/bsp_sysid.h | 36 + .../nrf51-arduino_101/include/bsp/cmsis_nvic.h | 30 + hw/bsp/nrf51-arduino_101/nrf51-arduino_101.ld | 183 ++ .../nrf51-arduino_101/nrf51dk-16kbram_debug.sh | 45 + .../nrf51dk-16kbram_download.sh | 103 ++ .../nrf51dk-16kbram_no_boot.ld | 178 ++ hw/bsp/nrf51-arduino_101/pkg.yml | 40 + .../src/arch/cortex_m0/gcc_startup_nrf51.s | 267 +++ hw/bsp/nrf51-arduino_101/src/hal_bsp.c | 46 + hw/bsp/nrf51-arduino_101/src/libc_stubs.c | 85 + hw/bsp/nrf51-arduino_101/src/os_bsp.c | 141 ++ hw/bsp/nrf51-arduino_101/src/sbrk.c | 53 + hw/bsp/nrf51-arduino_101/src/system_nrf51.c | 121 ++ .../nrf51dk-16kbram/nrf51dk-16kbram_no_boot.ld | 8 +- hw/hal/include/hal/flash_map.h | 10 +- hw/hal/include/hal/hal_adc.h | 55 +- hw/hal/include/hal/hal_adc_int.h | 33 +- hw/hal/include/hal/hal_cputime.h | 139 +- hw/hal/include/hal/hal_dac.h | 63 +- hw/hal/include/hal/hal_dac_int.h | 47 +- hw/hal/include/hal/hal_flash.h | 10 +- hw/hal/include/hal/hal_flash_int.h | 18 +- hw/hal/include/hal/hal_gpio.h | 19 +- hw/hal/include/hal/hal_i2c.h | 57 +- hw/hal/include/hal/hal_i2c_int.h | 9 +- hw/hal/include/hal/hal_os_tick.h | 15 +- hw/hal/include/hal/hal_pwm.h | 47 +- hw/hal/include/hal/hal_pwm_int.h | 28 +- hw/hal/include/hal/hal_spi.h | 29 +- hw/hal/include/hal/hal_spi_int.h | 53 +- hw/hal/include/hal/hal_system.h | 11 +- hw/hal/include/hal/hal_uart.h | 12 +- hw/mcu/native/src/hal_cputime.c | 2 +- libs/bootutil/pkg.yml | 5 +- libs/bootutil/src/bootutil_misc.c | 61 +- libs/bootutil/src/bootutil_priv.h | 4 +- libs/bootutil/src/test/boot_test.c | 3 + libs/imgmgr/src/imgmgr.c | 4 +- libs/imgmgr/src/imgmgr_fs.c | 6 +- libs/json/include/json/json.h | 28 +- libs/json/src/json_decode.c | 20 +- libs/json/src/json_encode.c | 1 + libs/json/src/test/test_json_simple.c | 4 +- libs/newtmgr/include/newtmgr/newtmgr.h | 14 +- libs/newtmgr/pkg.yml | 1 + libs/newtmgr/src/newtmgr.c | 20 +- libs/newtmgr/src/newtmgr_os.c | 27 +- libs/newtmgr/src/newtmgr_priv.h | 31 + libs/os/include/os/os_callout.h | 9 +- libs/os/include/os/os_eventq.h | 2 + libs/os/src/os.c | 41 +- libs/os/src/os_callout.c | 48 +- libs/os/src/os_eventq.c | 108 +- libs/shell/src/shell.c | 48 +- libs/util/include/util/crc16.h | 36 + libs/util/include/util/crc8.h | 32 + libs/util/src/cbmem.c | 11 +- libs/util/src/crc16.c | 83 + libs/util/src/crc8.c | 74 + .../controller/include/controller/ble_ll.h | 14 +- .../controller/include/controller/ble_ll_conn.h | 6 +- .../controller/include/controller/ble_phy.h | 16 + net/nimble/controller/src/ble_ll.c | 23 +- net/nimble/controller/src/ble_ll_adv.c | 83 +- net/nimble/controller/src/ble_ll_conn.c | 95 +- net/nimble/controller/src/ble_ll_conn_hci.c | 4 +- net/nimble/controller/src/ble_ll_ctrl.c | 20 +- net/nimble/controller/src/ble_ll_hci.c | 14 +- net/nimble/controller/src/ble_ll_hci_ev.c | 2 +- net/nimble/controller/src/ble_ll_rng.c | 2 +- net/nimble/controller/src/ble_ll_scan.c | 2 +- net/nimble/controller/src/ble_ll_sched.c | 10 +- net/nimble/controller/src/ble_ll_supp_cmd.c | 4 +- net/nimble/drivers/nrf51/src/ble_phy.c | 82 +- net/nimble/drivers/nrf52/src/ble_phy.c | 49 +- net/nimble/host/include/host/ble_att.h | 1 + net/nimble/host/include/host/ble_eddystone.h | 56 + net/nimble/host/include/host/ble_gap.h | 64 +- net/nimble/host/include/host/ble_gatt.h | 3 + net/nimble/host/include/host/ble_hs.h | 11 +- net/nimble/host/include/host/ble_hs_adv.h | 2 +- net/nimble/host/include/host/ble_l2cap.h | 46 +- net/nimble/host/include/host/host_hci.h | 5 +- net/nimble/host/src/ble_att_clt.c | 42 +- net/nimble/host/src/ble_att_cmd.c | 2 +- net/nimble/host/src/ble_att_priv.h | 6 +- net/nimble/host/src/ble_att_svr.c | 134 +- net/nimble/host/src/ble_eddystone.c | 197 +++ net/nimble/host/src/ble_gap.c | 183 +- net/nimble/host/src/ble_gap_priv.h | 13 +- net/nimble/host/src/ble_gatt_priv.h | 7 +- net/nimble/host/src/ble_gattc.c | 420 +++-- net/nimble/host/src/ble_gatts.c | 178 +- net/nimble/host/src/ble_hci_cmd.c | 2 + net/nimble/host/src/ble_hs.c | 40 +- net/nimble/host/src/ble_hs_atomic.c | 31 +- net/nimble/host/src/ble_hs_atomic_priv.h | 2 + net/nimble/host/src/ble_hs_cfg.c | 4 +- net/nimble/host/src/ble_hs_conn.c | 12 +- net/nimble/host/src/ble_hs_conn_priv.h | 3 +- net/nimble/host/src/ble_hs_priv.h | 1 - net/nimble/host/src/ble_ibeacon.c | 4 +- net/nimble/host/src/ble_l2cap.c | 8 +- net/nimble/host/src/ble_l2cap_priv.h | 2 + net/nimble/host/src/ble_l2cap_sig.c | 143 +- net/nimble/host/src/ble_l2cap_sig_cmd.c | 80 +- net/nimble/host/src/ble_l2cap_sig_priv.h | 16 +- net/nimble/host/src/ble_l2cap_sm.c | 1483 +++++++++++++--- net/nimble/host/src/ble_l2cap_sm_cmd.c | 245 ++- net/nimble/host/src/ble_l2cap_sm_priv.h | 113 +- net/nimble/host/src/host_hci_cmd.c | 30 + net/nimble/host/src/test/ble_att_clt_test.c | 177 +- net/nimble/host/src/test/ble_att_svr_test.c | 680 +++---- net/nimble/host/src/test/ble_gap_test.c | 60 +- net/nimble/host/src/test/ble_gatt_conn_test.c | 508 +++++- net/nimble/host/src/test/ble_gatt_disc_c_test.c | 34 +- net/nimble/host/src/test/ble_gatt_disc_d_test.c | 22 +- net/nimble/host/src/test/ble_gatt_disc_s_test.c | 46 +- net/nimble/host/src/test/ble_gatt_find_s_test.c | 65 +- net/nimble/host/src/test/ble_gatt_read_test.c | 115 +- net/nimble/host/src/test/ble_gatt_write_test.c | 90 +- .../host/src/test/ble_gatts_notify_test.c | 109 +- net/nimble/host/src/test/ble_hs_conn_test.c | 40 +- net/nimble/host/src/test/ble_hs_test.c | 4 +- net/nimble/host/src/test/ble_hs_test_util.c | 173 +- net/nimble/host/src/test/ble_hs_test_util.h | 26 +- net/nimble/host/src/test/ble_l2cap_sm_test.c | 1653 +++++++++++++++--- net/nimble/host/src/test/ble_l2cap_test.c | 280 +-- net/nimble/host/src/test/ble_os_test.c | 10 +- net/nimble/include/nimble/ble.h | 9 + net/nimble/include/nimble/hci_common.h | 9 +- net/nimble/include/nimble/nimble_opt.h | 80 + net/nimble/src/util.c | 84 + sys/fcb/src/fcb_elem_info.c | 2 + sys/fcb/src/fcb_priv.h | 12 - 157 files changed, 9879 insertions(+), 2606 deletions(-) ----------------------------------------------------------------------