Merge delveop into master Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/063324d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/063324d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/063324d3 Branch: refs/heads/master Commit: 063324d365915cbee9a220d2a4775740ac3b35bb Parents: faa7814 c6f7543 Author: wes3 <w...@micosa.io> Authored: Tue Mar 8 14:15:04 2016 -0800 Committer: wes3 <w...@micosa.io> Committed: Tue Mar 8 14:15:04 2016 -0800 ---------------------------------------------------------------------- LICENSE | 1 + compiler/arm-none-eabi-m0/pkg.yml | 2 +- compiler/arm-none-eabi-m4/pkg.yml | 2 +- compiler/sim/pkg.yml | 7 +- libs/os/include/os/arch/cortex_m0/os/os_arch.h | 2 +- libs/os/include/os/arch/cortex_m4/os/os_arch.h | 2 +- libs/os/include/os/arch/sim/os/os_arch.h | 4 +- libs/os/include/os/os_eventq.h | 1 - libs/os/include/os/os_sched.h | 2 +- libs/os/src/arch/cortex_m0/os_arch_arm.c | 16 +- libs/os/src/arch/cortex_m4/os_arch_arm.c | 16 +- libs/os/src/arch/sim/os_arch_sim.c | 327 +++++++++----------- libs/os/src/arch/sim/os_arch_stack_frame.s | 71 +++++ libs/os/src/os.c | 1 + libs/os/src/os_callout.c | 2 +- libs/os/src/os_eventq.c | 12 +- libs/os/src/os_mutex.c | 4 +- libs/os/src/os_sched.c | 15 +- libs/os/src/os_sem.c | 4 +- libs/os/src/os_time.c | 2 +- libs/util/include/util/util.h | 2 + net/nimble/controller/src/ble_ll_adv.c | 18 +- net/nimble/controller/src/ble_ll_conn.c | 3 + net/nimble/controller/src/ble_ll_scan.c | 17 +- project/bletest/src/main.c | 4 +- 25 files changed, 276 insertions(+), 261 deletions(-) ----------------------------------------------------------------------
