Return-Path: X-Original-To: apmail-mynewt-commits-archive@minotaur.apache.org Delivered-To: apmail-mynewt-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F23C01863F for ; Wed, 9 Mar 2016 00:56:39 +0000 (UTC) Received: (qmail 98921 invoked by uid 500); 9 Mar 2016 00:56:39 -0000 Delivered-To: apmail-mynewt-commits-archive@mynewt.apache.org Received: (qmail 98890 invoked by uid 500); 9 Mar 2016 00:56:39 -0000 Mailing-List: contact commits-help@mynewt.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mynewt.incubator.apache.org Delivered-To: mailing list commits@mynewt.incubator.apache.org Received: (qmail 98881 invoked by uid 99); 9 Mar 2016 00:56:39 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2016 00:56:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5F158180699 for ; Wed, 9 Mar 2016 00:56:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id qV1Z83to205y for ; Wed, 9 Mar 2016 00:56:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3E2965FAC4 for ; Wed, 9 Mar 2016 00:56:36 +0000 (UTC) Received: (qmail 98771 invoked by uid 99); 9 Mar 2016 00:56:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2016 00:56:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B7A1DFB8A; Wed, 9 Mar 2016 00:56:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ccollins@apache.org To: commits@mynewt.incubator.apache.org Date: Wed, 09 Mar 2016 00:56:36 -0000 Message-Id: <535865703fc245329e6e9d6eb7e7db77@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-mynewt-larva git commit: Merge delveop into master Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva 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/develop Commit: 063324d365915cbee9a220d2a4775740ac3b35bb Parents: faa7814 c6f7543 Author: wes3 Authored: Tue Mar 8 14:15:04 2016 -0800 Committer: wes3 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(-) ----------------------------------------------------------------------