You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/08/24 00:54:04 UTC
[50/50] [abbrv] incubator-mynewt-core git commit: Merge branch
'develop' - in preparation for backwards-compatibility-breaking changes to
develop.
Merge branch 'develop' - in preparation for
backwards-compatibility-breaking changes to develop.
* develop: (290 commits)
sim compiler - replace objsize with size
Fix warnings reported by clang.
MYNEWT-329
MYNEWT-354
STM32f407 discovery board BSP
mbedtls; use smaller version of SHA256.
boot; boot loader does not need to call os_init() anymore, as bsp_init() has been exported.
boot; app does not need the dependency to mbedtls
slinky; time-based waits must use OS_TICKS_PER_SEC.
bootutil; adjust unit tests to work with status upkeep outside sys/config.
bootutil; was returning wrong image header in response when swithing images. Add boot_set_req() routine for unit test use.
boot/bootutil; remove debug console use from bootloader.
bootutil/imgmgr; output of boot now shows the fallback image.
imgmgr; automatically confirm image as good for now.
bootutil; add 'confirm' step, telling that image was confirmed as good. Otherwise next restart we'll go back to old image.
bootutil; make status element size depend on flash alignment restrictions.
boot, imgmgr; return the slot number for test image.
bootutil; move routines reading boot-copy-status from loader.c to bootutil_misc.c.
boot; return full flash location of status bytes, instead of just offset.
boot; don't use NFFS or FCB for keeping status. Interim commit.
...
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/70987f7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/70987f7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/70987f7d
Branch: refs/heads/master
Commit: 70987f7d2e3c791132509f08566fe77de34142ac
Parents: 0d9c8f3 665e22f
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Aug 23 17:35:28 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Aug 23 17:35:28 2016 -0700
----------------------------------------------------------------------
CODING_STANDARDS.md | 2 +
apps/blecent/pkg.yml | 39 +
apps/blecent/src/blecent.h | 117 +
apps/blecent/src/main.c | 620 +++++
apps/blecent/src/misc.c | 237 ++
apps/blecent/src/peer.c | 807 +++++++
apps/blehci/pkg.yml | 5 +-
apps/blehci/src/main.c | 314 +--
apps/bleprph/pkg.yml | 17 +
apps/bleprph/src/bleprph.h | 26 +-
apps/bleprph/src/gatt_svr.c | 337 +--
apps/bleprph/src/main.c | 203 +-
apps/bleprph/src/misc.c | 6 +-
apps/bleprph/src/store.c | 374 ---
apps/bletest/pkg.yml | 1 +
apps/bletest/src/bletest_hci.c | 133 +-
apps/bletest/src/main.c | 48 +-
apps/bletiny/pkg.yml | 14 +
apps/bletiny/src/bletiny.h | 83 +-
apps/bletiny/src/cmd.c | 393 ++--
apps/bletiny/src/gatt_svr.c | 343 +--
apps/bletiny/src/main.c | 515 +++--
apps/bletiny/src/misc.c | 37 +-
apps/bletiny/src/parse.c | 108 +-
apps/bletiny/src/store.c | 399 ----
apps/bleuart/pkg.yml | 43 +
apps/bleuart/src/main.c | 362 +++
apps/blinky/src/main.c | 2 -
apps/boot/pkg.yml | 2 -
apps/boot/src/boot.c | 96 +-
apps/ffs2native/src/main.c | 77 +-
apps/luatest/src/main.c | 1 -
apps/slinky/src/main.c | 37 +-
compiler/arm-none-eabi-m4/compiler.yml | 7 +-
compiler/sim/compiler.yml | 2 +-
.../include/uart_bitbang/uart_bitbang.h | 25 +
.../include/uart_bitbang/uart_bitbang_api.h | 33 +
drivers/uart_bitbang/pkg.yml | 27 +
drivers/uart_bitbang/src/uart_bitbang.c | 325 +++
fs/fs/src/fsutil.c | 2 +-
fs/nffs/src/nffs.c | 10 +
fs/nffs/src/nffs_block.c | 3 +
fs/nffs/src/nffs_cache.c | 8 +-
fs/nffs/src/nffs_hash.c | 2 +
fs/nffs/src/nffs_inode.c | 4 +
fs/nffs/src/nffs_priv.h | 4 +
fs/nffs/src/nffs_restore.c | 60 +-
hw/bsp/arduino_primo_nrf52/primo_debug.sh | 5 +-
hw/bsp/nrf51-blenano/src/os_bsp.c | 2 +-
.../olimex_stm32-e407_devboard_debug.sh | 1 -
hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c | 4 +-
.../stm32f4discovery/boot-stm32f4discovery.ld | 202 ++
hw/bsp/stm32f4discovery/f407.cfg | 82 +
hw/bsp/stm32f4discovery/include/bsp/bsp.h | 55 +
hw/bsp/stm32f4discovery/include/bsp/bsp_sysid.h | 36 +
.../stm32f4discovery/include/bsp/cmsis_nvic.h | 29 +
.../include/bsp/stm32f4xx_hal_conf.h | 413 ++++
hw/bsp/stm32f4discovery/pkg.yml | 39 +
hw/bsp/stm32f4discovery/run_from_flash.ld | 204 ++
hw/bsp/stm32f4discovery/run_from_loader.ld | 210 ++
hw/bsp/stm32f4discovery/run_from_sram.ld | 202 ++
.../src/arch/cortex_m4/startup_STM32F40x.s | 343 +++
hw/bsp/stm32f4discovery/src/hal_bsp.c | 77 +
hw/bsp/stm32f4discovery/src/libc_stubs.c | 84 +
hw/bsp/stm32f4discovery/src/os_bsp.c | 82 +
hw/bsp/stm32f4discovery/src/sbrk.c | 50 +
hw/bsp/stm32f4discovery/src/system_stm32f4xx.c | 351 +++
hw/bsp/stm32f4discovery/stm32f4discovery.ld | 213 ++
.../stm32f4discovery/stm32f4discovery_debug.sh | 47 +
.../stm32f4discovery_download.sh | 56 +
hw/hal/include/hal/hal_cputime.h | 16 +
hw/hal/include/hal/hal_uart.h | 6 +
hw/mcu/native/src/hal_uart.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/hal_gpio.c | 503 ++---
hw/mcu/nordic/nrf52xxx/src/hal_uart.c | 33 +-
hw/mcu/stm/stm32f4xx/src/hal_gpio.c | 2 +-
hw/mcu/stm/stm32f4xx/src/hal_uart.c | 16 +
libs/bleuart/include/bleuart/bleuart.h | 34 +
libs/bleuart/pkg.yml | 34 +
libs/bleuart/src/bleuart.c | 204 ++
libs/boot_serial/src/test/boot_test.c | 1 +
libs/bootutil/include/bootutil/bootutil_misc.h | 11 +-
libs/bootutil/include/bootutil/loader.h | 3 +
libs/bootutil/src/bootutil_misc.c | 382 ++--
libs/bootutil/src/bootutil_priv.h | 57 +-
libs/bootutil/src/loader.c | 387 ++--
libs/bootutil/src/test/boot_test.c | 215 +-
libs/console/full/src/cons_tty.c | 17 +-
libs/imgmgr/include/imgmgr/imgmgr.h | 2 +-
libs/imgmgr/src/imgmgr.c | 4 +
libs/imgmgr/src/imgmgr_boot.c | 30 +-
.../include/inet_def_service/inet_def_service.h | 25 +
libs/inet_def_service/pkg.yml | 38 +
libs/inet_def_service/src/inet_def_service.c | 333 +++
libs/mbedtls/include/mbedtls/config_mynewt.h | 2 +
libs/newtmgr/pkg.yml | 5 +-
libs/newtmgr/src/newtmgr.c | 1 -
.../transport/ble/include/nmgrble/newtmgr_ble.h | 28 +
libs/newtmgr/transport/ble/pkg.yml | 30 +
libs/newtmgr/transport/ble/src/newtmgr_ble.c | 237 ++
libs/os/include/os/arch/cortex_m0/os/os_arch.h | 12 +-
libs/os/include/os/arch/cortex_m4/os/os_arch.h | 12 +-
libs/os/include/os/os_mbuf.h | 12 +-
libs/os/include/os/os_mempool.h | 3 +
libs/os/src/arch/cortex_m0/m0/HAL_CM0.s | 1 -
libs/os/src/arch/cortex_m0/os_arch_arm.c | 34 +-
libs/os/src/arch/cortex_m4/m4/HAL_CM4.s | 2 +-
libs/os/src/arch/cortex_m4/os_arch_arm.c | 35 +-
libs/os/src/arch/sim/os_arch_sim.c | 2 +-
libs/os/src/os.c | 4 +
libs/os/src/os_callout.c | 4 +-
libs/os/src/os_eventq.c | 33 +-
libs/os/src/os_mbuf.c | 181 +-
libs/os/src/os_mempool.c | 74 +-
libs/os/src/os_priv.h | 10 +-
libs/os/src/os_task.c | 3 +-
libs/os/src/os_time.c | 12 +-
libs/os/src/test/callout_test.c | 330 +++
libs/os/src/test/eventq_test.c | 297 ++-
libs/os/src/test/os_test.c | 2 +-
libs/os/src/test/os_test_priv.h | 2 +-
libs/shell/src/shell.c | 2 +
libs/testutil/include/testutil/testutil.h | 8 +-
libs/testutil/src/case.c | 10 +
libs/testutil/src/suite.c | 24 +
libs/testutil/src/testutil_priv.h | 5 +
libs/util/include/util/mem.h | 38 +
libs/util/src/mem.c | 146 ++
libs/wifi_mgmt/include/wifi_mgmt/wifi_mgmt.h | 82 +
libs/wifi_mgmt/include/wifi_mgmt/wifi_mgmt_if.h | 47 +
libs/wifi_mgmt/pkg.yml | 35 +
libs/wifi_mgmt/src/wifi.c | 348 +++
libs/wifi_mgmt/src/wifi_cli.c | 89 +
libs/wifi_mgmt/src/wifi_priv.h | 27 +
.../controller/include/controller/ble_ll.h | 23 +-
.../controller/include/controller/ble_ll_hci.h | 3 +
.../include/controller/ble_ll_resolv.h | 7 +-
.../controller/include/controller/ble_ll_scan.h | 2 +-
.../controller/include/controller/ble_phy.h | 3 +
net/nimble/controller/pkg.yml | 6 +-
net/nimble/controller/src/ble_ll.c | 154 +-
net/nimble/controller/src/ble_ll_adv.c | 17 +
net/nimble/controller/src/ble_ll_conn.c | 143 +-
net/nimble/controller/src/ble_ll_conn_hci.c | 41 +-
net/nimble/controller/src/ble_ll_conn_priv.h | 12 +-
net/nimble/controller/src/ble_ll_hci.c | 16 +-
net/nimble/controller/src/ble_ll_hci_ev.c | 15 +-
net/nimble/controller/src/ble_ll_rand.c | 3 +-
net/nimble/controller/src/ble_ll_resolv.c | 175 +-
net/nimble/controller/src/ble_ll_scan.c | 15 +-
net/nimble/controller/src/ble_ll_sched.c | 14 +-
net/nimble/drivers/native/src/ble_phy.c | 161 +-
net/nimble/drivers/nrf51/src/ble_phy.c | 201 +-
net/nimble/drivers/nrf52/src/ble_phy.c | 203 +-
net/nimble/host/include/host/ble_att.h | 49 +-
net/nimble/host/include/host/ble_gap.h | 448 +++-
net/nimble/host/include/host/ble_gatt.h | 428 +++-
net/nimble/host/include/host/ble_hs.h | 93 +-
net/nimble/host/include/host/ble_hs_adv.h | 21 +-
net/nimble/host/include/host/ble_hs_id.h | 30 +
net/nimble/host/include/host/ble_hs_log.h | 39 +
net/nimble/host/include/host/ble_hs_mbuf.h | 31 +
net/nimble/host/include/host/ble_hs_test.h | 11 +-
net/nimble/host/include/host/ble_ibeacon.h | 25 +
net/nimble/host/include/host/ble_store.h | 72 +
net/nimble/host/include/host/ble_uuid.h | 4 +-
net/nimble/host/include/host/host_hci.h | 133 --
net/nimble/host/pkg.yml | 18 +-
.../gap/include/services/gap/ble_svc_gap.h | 39 +
net/nimble/host/services/gap/pkg.yml | 31 +
net/nimble/host/services/gap/src/ble_svc_gap.c | 167 ++
.../gatt/include/services/gatt/ble_svc_gatt.h | 29 +
net/nimble/host/services/gatt/pkg.yml | 31 +
.../host/services/gatt/src/ble_svc_gatt.c | 90 +
.../lls/include/services/lls/ble_svc_lls.h | 44 +
net/nimble/host/services/lls/pkg.yml | 31 +
net/nimble/host/services/lls/src/ble_svc_lls.c | 201 ++
net/nimble/host/src/ble_att.c | 109 +-
net/nimble/host/src/ble_att_clt.c | 868 +++----
net/nimble/host/src/ble_att_cmd.c | 236 +-
net/nimble/host/src/ble_att_cmd_priv.h | 127 +-
net/nimble/host/src/ble_att_priv.h | 97 +-
net/nimble/host/src/ble_att_svr.c | 899 ++++----
net/nimble/host/src/ble_eddystone.c | 15 +-
net/nimble/host/src/ble_gap.c | 2120 +++++++++++-------
net/nimble/host/src/ble_gap_priv.h | 25 +-
net/nimble/host/src/ble_gatt_priv.h | 24 +-
net/nimble/host/src/ble_gattc.c | 1131 ++++++----
net/nimble/host/src/ble_gatts.c | 1077 +++++++--
net/nimble/host/src/ble_hci_cmd.c | 298 ---
net/nimble/host/src/ble_hci_util.c | 159 --
net/nimble/host/src/ble_hci_util_priv.h | 30 -
net/nimble/host/src/ble_hs.c | 369 ++-
net/nimble/host/src/ble_hs_adv.c | 134 +-
net/nimble/host/src/ble_hs_adv_priv.h | 19 +-
net/nimble/host/src/ble_hs_atomic.c | 20 +
net/nimble/host/src/ble_hs_atomic_priv.h | 1 +
net/nimble/host/src/ble_hs_cfg.c | 34 +-
net/nimble/host/src/ble_hs_conn.c | 64 +-
net/nimble/host/src/ble_hs_conn_priv.h | 22 +-
net/nimble/host/src/ble_hs_dbg.c | 509 +++++
net/nimble/host/src/ble_hs_dbg_priv.h | 26 +
net/nimble/host/src/ble_hs_hci.c | 518 +++++
net/nimble/host/src/ble_hs_hci_cmd.c | 1375 ++++++++++++
net/nimble/host/src/ble_hs_hci_evt.c | 677 ++++++
net/nimble/host/src/ble_hs_hci_priv.h | 158 ++
net/nimble/host/src/ble_hs_hci_util.c | 196 ++
net/nimble/host/src/ble_hs_id.c | 248 ++
net/nimble/host/src/ble_hs_id_priv.h | 30 +
net/nimble/host/src/ble_hs_log.c | 47 +
net/nimble/host/src/ble_hs_mbuf.c | 198 ++
net/nimble/host/src/ble_hs_mbuf_priv.h | 11 +
net/nimble/host/src/ble_hs_misc.c | 73 +-
net/nimble/host/src/ble_hs_priv.h | 84 +-
net/nimble/host/src/ble_hs_pvcy.c | 146 +-
net/nimble/host/src/ble_hs_pvcy_priv.h | 31 +
net/nimble/host/src/ble_hs_startup.c | 66 +-
net/nimble/host/src/ble_ibeacon.c | 16 +-
net/nimble/host/src/ble_l2cap.c | 25 +-
net/nimble/host/src/ble_l2cap_priv.h | 7 +-
net/nimble/host/src/ble_l2cap_sig.c | 59 +-
net/nimble/host/src/ble_l2cap_sig_cmd.c | 22 +-
net/nimble/host/src/ble_l2cap_sig_priv.h | 2 +-
net/nimble/host/src/ble_sm.c | 162 +-
net/nimble/host/src/ble_sm_alg.c | 78 +-
net/nimble/host/src/ble_sm_cmd.c | 162 +-
net/nimble/host/src/ble_sm_lgcy.c | 7 +-
net/nimble/host/src/ble_sm_priv.h | 28 +-
net/nimble/host/src/ble_sm_sc.c | 91 +-
net/nimble/host/src/ble_uuid.c | 29 +-
net/nimble/host/src/ble_uuid_priv.h | 28 +
net/nimble/host/src/host_dbg.c | 503 -----
net/nimble/host/src/host_dbg_priv.h | 25 -
net/nimble/host/src/host_hci.c | 745 ------
net/nimble/host/src/host_hci_cmd.c | 1326 -----------
net/nimble/host/src/test/ble_att_clt_test.c | 58 +-
net/nimble/host/src/test/ble_att_svr_test.c | 460 ++--
net/nimble/host/src/test/ble_gap_test.c | 1327 ++++++++---
net/nimble/host/src/test/ble_gatt_conn_test.c | 126 +-
net/nimble/host/src/test/ble_gatt_disc_c_test.c | 22 +-
net/nimble/host/src/test/ble_gatt_disc_d_test.c | 93 +-
net/nimble/host/src/test/ble_gatt_disc_s_test.c | 24 +-
net/nimble/host/src/test/ble_gatt_find_s_test.c | 22 +-
net/nimble/host/src/test/ble_gatt_read_test.c | 248 +-
net/nimble/host/src/test/ble_gatt_write_test.c | 163 +-
.../host/src/test/ble_gatts_notify_test.c | 589 ++++-
net/nimble/host/src/test/ble_gatts_read_test.c | 261 +++
net/nimble/host/src/test/ble_gatts_reg_test.c | 292 ++-
net/nimble/host/src/test/ble_host_hci_test.c | 94 -
net/nimble/host/src/test/ble_hs_adv_test.c | 468 ++--
net/nimble/host/src/test/ble_hs_conn_test.c | 92 +-
net/nimble/host/src/test/ble_hs_hci_test.c | 99 +
net/nimble/host/src/test/ble_hs_test.c | 21 +-
net/nimble/host/src/test/ble_hs_test_util.c | 844 ++++++-
net/nimble/host/src/test/ble_hs_test_util.h | 103 +-
net/nimble/host/src/test/ble_l2cap_test.c | 17 +-
net/nimble/host/src/test/ble_os_test.c | 92 +-
net/nimble/host/src/test/ble_sm_lgcy_test.c | 3 +-
net/nimble/host/src/test/ble_sm_sc_test.c | 3 +-
net/nimble/host/src/test/ble_sm_test.c | 3 +-
net/nimble/host/src/test/ble_sm_test_util.c | 158 +-
net/nimble/host/src/test/ble_sm_test_util.h | 3 +-
net/nimble/host/src/test/ble_uuid_test.c | 5 +-
.../store/ram/include/store/ram/ble_store_ram.h | 30 +
net/nimble/host/store/ram/pkg.yml | 31 +
net/nimble/host/store/ram/src/ble_store_ram.c | 373 +++
net/nimble/include/nimble/ble.h | 21 +-
net/nimble/include/nimble/ble_hci_trans.h | 169 ++
net/nimble/include/nimble/hci_common.h | 9 +
net/nimble/include/nimble/hci_transport.h | 32 -
net/nimble/include/nimble/nimble_opt.h | 53 +-
net/nimble/src/ble_util.c | 43 +
net/nimble/src/util.c | 26 +-
.../ram/include/transport/ram/ble_hci_ram.h | 30 +
net/nimble/transport/ram/pkg.yml | 33 +
net/nimble/transport/ram/src/ble_hci_ram.c | 229 ++
.../uart/include/transport/uart/ble_hci_uart.h | 19 +
net/nimble/transport/uart/pkg.yml | 34 +
net/nimble/transport/uart/src/ble_hci_uart.c | 743 ++++++
sys/config/src/config_nmgr.c | 18 +-
sys/fcb/src/fcb.c | 6 +-
sys/fcb/src/fcb_rotate.c | 10 +-
sys/log/include/log/log.h | 8 +
sys/log/src/log.c | 5 +
sys/log/src/log_fcb.c | 6 +-
sys/log/src/log_nmgr.c | 8 -
sys/mn_socket/include/mn_socket/mn_socket.h | 146 ++
sys/mn_socket/include/mn_socket/mn_socket_ops.h | 82 +
sys/mn_socket/pkg.yml | 31 +
sys/mn_socket/src/mn_socket.c | 123 +
sys/mn_socket/src/mn_socket_aconv.c | 57 +
sys/mn_socket/src/test/mn_sock_test.c | 82 +
292 files changed, 28344 insertions(+), 12349 deletions(-)
----------------------------------------------------------------------