You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2022/03/08 15:37:38 UTC
[mynewt-nimble] branch master updated (426c71b -> a9e4b68)
This is an automated email from the ASF dual-hosted git repository.
janc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from 426c71b nimble/ll: Fix checking AUX_CONNECT_RSP
new 6d59b9c pkg.yml: make non-executable
new e2b73b4 includes: remove duplicate includes (remove 2nd)
new fae820b controller: include own header
new 9e63f52 ble_hw: remove legacy functions (only present here)
new 5edbd1d drivers: include your own header
new a9e4b68 host: include own header(s)
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/btshell/src/main.c | 1 -
apps/central/pkg.yml | 0
apps/central/src/main.c | 1 -
apps/peripheral/pkg.yml | 0
apps/scanner/src/main.c | 1 -
babblesim/core/src/cmsis.c | 4 ----
nimble/controller/include/controller/ble_hw.h | 6 ------
nimble/controller/include/controller/ble_phy.h | 3 ---
nimble/controller/src/ble_ll_conn.c | 1 +
nimble/controller/src/ble_ll_rfmgmt.c | 1 -
nimble/controller/src/ble_ll_trace.c | 1 +
nimble/drivers/dialog_cmac/src/ble_hw.c | 1 -
nimble/drivers/dialog_cmac/src/ble_phy.c | 1 -
nimble/drivers/nrf5340/src/ble_phy_trace.c | 1 +
nimble/host/include/host/ble_hs_stop.h | 2 +-
nimble/host/mesh/src/pb_adv.c | 1 -
nimble/host/mesh/src/pb_gatt.c | 1 -
nimble/host/src/ble_att.c | 1 +
nimble/host/src/ble_att_cmd.c | 1 -
nimble/host/src/ble_att_svr.c | 1 +
nimble/host/src/ble_gap.c | 2 ++
nimble/host/src/ble_gattc.c | 1 +
nimble/host/src/ble_gatts.c | 1 +
nimble/host/src/ble_gatts_lcl.c | 1 +
nimble/host/src/ble_hs.c | 1 +
nimble/host/src/ble_hs_log.c | 1 +
nimble/host/src/ble_hs_mbuf.c | 1 +
nimble/host/src/ble_hs_priv.h | 1 -
nimble/host/src/ble_hs_stop.c | 3 ++-
nimble/host/src/ble_ibeacon.c | 1 +
nimble/host/src/ble_l2cap.c | 1 +
nimble/host/src/ble_uuid.c | 1 -
32 files changed, 18 insertions(+), 26 deletions(-)
mode change 100755 => 100644 apps/central/pkg.yml
mode change 100755 => 100644 apps/peripheral/pkg.yml
[mynewt-nimble] 01/06: pkg.yml: make non-executable
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 6d59b9c1cf315162a5aff131e346f1221379a738
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 10:06:19 2022 +0100
pkg.yml: make non-executable
---
apps/central/pkg.yml | 0
apps/peripheral/pkg.yml | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/apps/central/pkg.yml b/apps/central/pkg.yml
old mode 100755
new mode 100644
diff --git a/apps/peripheral/pkg.yml b/apps/peripheral/pkg.yml
old mode 100755
new mode 100644
[mynewt-nimble] 03/06: controller: include own header
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit fae820b5fc0f2522ba04ffc124c551961834ed56
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 10:29:27 2022 +0100
controller: include own header
---
nimble/controller/src/ble_ll_conn.c | 1 +
nimble/controller/src/ble_ll_trace.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index c2739f1..f3d903d 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -27,6 +27,7 @@
#include "nimble/hci_common.h"
#include "nimble/ble_hci_trans.h"
#include "controller/ble_ll.h"
+#include "controller/ble_ll_conn.h"
#include "controller/ble_ll_hci.h"
#include "controller/ble_ll_scan.h"
#include "controller/ble_ll_whitelist.h"
diff --git a/nimble/controller/src/ble_ll_trace.c b/nimble/controller/src/ble_ll_trace.c
index 330b3d4..625d73d 100644
--- a/nimble/controller/src/ble_ll_trace.c
+++ b/nimble/controller/src/ble_ll_trace.c
@@ -20,6 +20,7 @@
#include <stdint.h>
#include "syscfg/syscfg.h"
#include "os/os_trace_api.h"
+#include "controller/ble_ll_trace.h"
#if MYNEWT_VAL(BLE_LL_SYSVIEW)
[mynewt-nimble] 02/06: includes: remove duplicate includes (remove 2nd)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit e2b73b4f327b66a3c4acb52cbbb60e27a4a35194
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 10:13:45 2022 +0100
includes: remove duplicate includes (remove 2nd)
---
apps/btshell/src/main.c | 1 -
apps/central/src/main.c | 1 -
apps/scanner/src/main.c | 1 -
babblesim/core/src/cmsis.c | 4 ----
nimble/controller/src/ble_ll_rfmgmt.c | 1 -
nimble/drivers/dialog_cmac/src/ble_hw.c | 1 -
nimble/drivers/dialog_cmac/src/ble_phy.c | 1 -
nimble/host/mesh/src/pb_adv.c | 1 -
nimble/host/mesh/src/pb_gatt.c | 1 -
nimble/host/src/ble_att_cmd.c | 1 -
nimble/host/src/ble_hs_priv.h | 1 -
nimble/host/src/ble_uuid.c | 1 -
12 files changed, 15 deletions(-)
diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c
index f4f864e..7741050 100644
--- a/apps/btshell/src/main.c
+++ b/apps/btshell/src/main.c
@@ -25,7 +25,6 @@
#include "bsp/bsp.h"
#include "log/log.h"
#include "stats/stats.h"
-#include "bsp/bsp.h"
#include "hal/hal_gpio.h"
#include "console/console.h"
#include "btshell.h"
diff --git a/apps/central/src/main.c b/apps/central/src/main.c
index b237035..c088b94 100755
--- a/apps/central/src/main.c
+++ b/apps/central/src/main.c
@@ -22,7 +22,6 @@
#include "console/console.h"
#include "host/ble_hs.h"
#include "host/util/util.h"
-#include "console/console.h"
#include "log/log.h"
static uint8_t g_own_addr_type;
diff --git a/apps/scanner/src/main.c b/apps/scanner/src/main.c
index d21bba4..5158d0d 100644
--- a/apps/scanner/src/main.c
+++ b/apps/scanner/src/main.c
@@ -22,7 +22,6 @@
#include "console/console.h"
#include "host/ble_hs.h"
#include "host/util/util.h"
-#include "console/console.h"
#include "log/log.h"
/* scan_event() calls scan(), so forward declaration is required */
diff --git a/babblesim/core/src/cmsis.c b/babblesim/core/src/cmsis.c
index 622676c..9beb329 100644
--- a/babblesim/core/src/cmsis.c
+++ b/babblesim/core/src/cmsis.c
@@ -14,12 +14,8 @@
#include "cmsis.h"
#include "os/sim.h"
-#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include "irq_sources.h"
-#include <nrfx.h>
-#include "cmsis.h"
extern void (* systemVectors[256])(void);
diff --git a/nimble/controller/src/ble_ll_rfmgmt.c b/nimble/controller/src/ble_ll_rfmgmt.c
index f73f6b3..1877b61 100644
--- a/nimble/controller/src/ble_ll_rfmgmt.c
+++ b/nimble/controller/src/ble_ll_rfmgmt.c
@@ -20,7 +20,6 @@
#include <stdint.h>
#include <stddef.h>
#include <assert.h>
-#include <stddef.h>
#include "syscfg/syscfg.h"
#include "controller/ble_phy.h"
#include "controller/ble_ll.h"
diff --git a/nimble/drivers/dialog_cmac/src/ble_hw.c b/nimble/drivers/dialog_cmac/src/ble_hw.c
index 763de8d..a2724b6 100644
--- a/nimble/drivers/dialog_cmac/src/ble_hw.c
+++ b/nimble/drivers/dialog_cmac/src/ble_hw.c
@@ -24,7 +24,6 @@
#include "controller/ble_hw.h"
#include "CMAC.h"
#include "cmac_driver/cmac_shared.h"
-#include "mcu/mcu.h"
#include "tinycrypt/aes.h"
static struct tc_aes_key_sched_struct g_ctx;
diff --git a/nimble/drivers/dialog_cmac/src/ble_phy.c b/nimble/drivers/dialog_cmac/src/ble_phy.c
index 9c9d878..1e6a3c9 100644
--- a/nimble/drivers/dialog_cmac/src/ble_phy.c
+++ b/nimble/drivers/dialog_cmac/src/ble_phy.c
@@ -24,7 +24,6 @@
#include <assert.h>
#include <stdint.h>
-#include <assert.h>
#include "nimble/ble.h"
#include "mcu/mcu.h"
#include "mcu/cmac_timer.h"
diff --git a/nimble/host/mesh/src/pb_adv.c b/nimble/host/mesh/src/pb_adv.c
index 1fa2c35..35a02b0 100644
--- a/nimble/host/mesh/src/pb_adv.c
+++ b/nimble/host/mesh/src/pb_adv.c
@@ -20,7 +20,6 @@
#include "adv.h"
#include "crypto.h"
#include "beacon.h"
-#include "prov.h"
#include "mesh/glue.h"
#define GPCF(gpc) (gpc & 0x03)
diff --git a/nimble/host/mesh/src/pb_gatt.c b/nimble/host/mesh/src/pb_gatt.c
index 9a0d709..865356e 100644
--- a/nimble/host/mesh/src/pb_gatt.c
+++ b/nimble/host/mesh/src/pb_gatt.c
@@ -14,7 +14,6 @@
#include "net.h"
#include "proxy.h"
#include "adv.h"
-#include "prov.h"
#include "syscfg/syscfg.h"
#include "pb_gatt_srv.h"
diff --git a/nimble/host/src/ble_att_cmd.c b/nimble/host/src/ble_att_cmd.c
index e719235..6669392 100644
--- a/nimble/host/src/ble_att_cmd.c
+++ b/nimble/host/src/ble_att_cmd.c
@@ -24,7 +24,6 @@
#include "ble_hs_priv.h"
#include "host/ble_att.h"
#include "host/ble_uuid.h"
-#include "ble_hs_priv.h"
#if NIMBLE_BLE_CONNECT
void *
diff --git a/nimble/host/src/ble_hs_priv.h b/nimble/host/src/ble_hs_priv.h
index 538d07a..a57ec3c 100644
--- a/nimble/host/src/ble_hs_priv.h
+++ b/nimble/host/src/ble_hs_priv.h
@@ -29,7 +29,6 @@
#include "ble_hs_hci_priv.h"
#include "ble_hs_atomic_priv.h"
#include "ble_hs_conn_priv.h"
-#include "ble_hs_atomic_priv.h"
#include "ble_hs_mbuf_priv.h"
#include "ble_hs_startup_priv.h"
#include "ble_l2cap_priv.h"
diff --git a/nimble/host/src/ble_uuid.c b/nimble/host/src/ble_uuid.c
index 16352cf..acf016a 100644
--- a/nimble/host/src/ble_uuid.c
+++ b/nimble/host/src/ble_uuid.c
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <stdio.h>
#include "os/os_mbuf.h"
#include "nimble/ble.h"
#include "ble_hs_priv.h"
[mynewt-nimble] 05/06: drivers: include your own header
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 5edbd1dba3865b0fc5def0d147765ed38ac615da
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 10:45:03 2022 +0100
drivers: include your own header
---
nimble/drivers/nrf5340/src/ble_phy_trace.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/nimble/drivers/nrf5340/src/ble_phy_trace.c b/nimble/drivers/nrf5340/src/ble_phy_trace.c
index 6967c3f..dad7867 100644
--- a/nimble/drivers/nrf5340/src/ble_phy_trace.c
+++ b/nimble/drivers/nrf5340/src/ble_phy_trace.c
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <syscfg/syscfg.h>
#include <os/os_trace_api.h>
+#include "controller/ble_phy_trace.h"
#if MYNEWT_VAL(BLE_PHY_SYSVIEW)
[mynewt-nimble] 06/06: host: include own header(s)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit a9e4b68d45a22f729f4a911e83d7ee5336ff78d8
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 11:13:54 2022 +0100
host: include own header(s)
---
nimble/host/include/host/ble_hs_stop.h | 2 +-
nimble/host/src/ble_att.c | 1 +
nimble/host/src/ble_att_svr.c | 1 +
nimble/host/src/ble_gap.c | 2 ++
nimble/host/src/ble_gattc.c | 1 +
nimble/host/src/ble_gatts.c | 1 +
nimble/host/src/ble_gatts_lcl.c | 1 +
nimble/host/src/ble_hs.c | 1 +
nimble/host/src/ble_hs_log.c | 1 +
nimble/host/src/ble_hs_mbuf.c | 1 +
nimble/host/src/ble_hs_stop.c | 3 ++-
nimble/host/src/ble_ibeacon.c | 1 +
nimble/host/src/ble_l2cap.c | 1 +
13 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/nimble/host/include/host/ble_hs_stop.h b/nimble/host/include/host/ble_hs_stop.h
index d16c9c2..e4feb62 100644
--- a/nimble/host/include/host/ble_hs_stop.h
+++ b/nimble/host/include/host/ble_hs_stop.h
@@ -64,7 +64,7 @@ struct ble_hs_stop_listener {
* BLE_HS_EALREADY: Host already stopped; the
* provided callback does *not* get called.
*/
-int ble_hs_stop(struct ble_hs_stop_listener *listener,
+int ble_hs_stop(struct ble_hs_stop_listener *listener,
ble_hs_stop_fn *fn, void *arg);
#endif
diff --git a/nimble/host/src/ble_att.c b/nimble/host/src/ble_att.c
index 8aab7f9..5f119ac 100644
--- a/nimble/host/src/ble_att.c
+++ b/nimble/host/src/ble_att.c
@@ -20,6 +20,7 @@
#include <stddef.h>
#include <errno.h>
#include "ble_hs_priv.h"
+#include "host/ble_att.h"
#if NIMBLE_BLE_CONNECT
static uint16_t ble_att_preferred_mtu_val;
diff --git a/nimble/host/src/ble_att_svr.c b/nimble/host/src/ble_att_svr.c
index 468768a..73e258d 100644
--- a/nimble/host/src/ble_att_svr.c
+++ b/nimble/host/src/ble_att_svr.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include "os/os.h"
+#include "host/ble_att.h"
#include "nimble/ble.h"
#include "host/ble_uuid.h"
#include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 3d8f303..621a88a 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -21,9 +21,11 @@
#include <string.h>
#include <errno.h>
#include "nimble/nimble_opt.h"
+#include "host/ble_gap.h"
#include "host/ble_hs_adv.h"
#include "host/ble_hs_hci.h"
#include "ble_hs_priv.h"
+#include "ble_gap_priv.h"
#if MYNEWT
#include "bsp/bsp.h"
diff --git a/nimble/host/src/ble_gattc.c b/nimble/host/src/ble_gattc.c
index b43a0af..b0535fb 100644
--- a/nimble/host/src/ble_gattc.c
+++ b/nimble/host/src/ble_gattc.c
@@ -56,6 +56,7 @@
#include <string.h>
#include "os/os_mempool.h"
#include "nimble/ble.h"
+#include "host/ble_gatt.h"
#include "host/ble_uuid.h"
#include "host/ble_gap.h"
#include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gatts.c b/nimble/host/src/ble_gatts.c
index 83402e7..93809ca 100644
--- a/nimble/host/src/ble_gatts.c
+++ b/nimble/host/src/ble_gatts.c
@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include "nimble/ble.h"
+#include "host/ble_gatt.h"
#include "host/ble_uuid.h"
#include "host/ble_store.h"
#include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gatts_lcl.c b/nimble/host/src/ble_gatts_lcl.c
index 938d736..f824e90 100644
--- a/nimble/host/src/ble_gatts_lcl.c
+++ b/nimble/host/src/ble_gatts_lcl.c
@@ -19,6 +19,7 @@
#include <stddef.h>
#include <string.h>
+#include "host/ble_gatt.h"
#include "host/ble_uuid.h"
#include "console/console.h"
#include "nimble/ble.h"
diff --git a/nimble/host/src/ble_hs.c b/nimble/host/src/ble_hs.c
index 9f39c8e..5e5c644 100644
--- a/nimble/host/src/ble_hs.c
+++ b/nimble/host/src/ble_hs.c
@@ -24,6 +24,7 @@
#include "syscfg/syscfg.h"
#include "stats/stats.h"
#include "nimble/ble_hci_trans.h"
+#include "host/ble_hs.h"
#include "ble_hs_priv.h"
#include "ble_monitor_priv.h"
#include "nimble/nimble_npl.h"
diff --git a/nimble/host/src/ble_hs_log.c b/nimble/host/src/ble_hs_log.c
index 7ec6946..0670dca 100644
--- a/nimble/host/src/ble_hs_log.c
+++ b/nimble/host/src/ble_hs_log.c
@@ -19,6 +19,7 @@
#include "os/os.h"
#include "host/ble_hs.h"
+#include "host/ble_hs_log.h"
struct log ble_hs_log;
diff --git a/nimble/host/src/ble_hs_mbuf.c b/nimble/host/src/ble_hs_mbuf.c
index 6e920f9..f4d6a79 100644
--- a/nimble/host/src/ble_hs_mbuf.c
+++ b/nimble/host/src/ble_hs_mbuf.c
@@ -18,6 +18,7 @@
*/
#include "host/ble_hs.h"
+#include "host/ble_hs_mbuf.h"
#include "ble_hs_priv.h"
/**
diff --git a/nimble/host/src/ble_hs_stop.c b/nimble/host/src/ble_hs_stop.c
index b90d3ec..e48fff3 100644
--- a/nimble/host/src/ble_hs_stop.c
+++ b/nimble/host/src/ble_hs_stop.c
@@ -21,6 +21,7 @@
#include "sysinit/sysinit.h"
#include "syscfg/syscfg.h"
#include "ble_hs_priv.h"
+#include "host/ble_hs_stop.h"
#include "nimble/nimble_npl.h"
#ifndef MYNEWT
#include "nimble/nimble_port.h"
@@ -217,7 +218,7 @@ ble_hs_stop_begin(struct ble_hs_stop_listener *listener,
}
int
-ble_hs_stop(struct ble_hs_stop_listener *listener,
+ble_hs_stop(struct ble_hs_stop_listener *listener,
ble_hs_stop_fn *fn, void *arg)
{
int rc;
diff --git a/nimble/host/src/ble_ibeacon.c b/nimble/host/src/ble_ibeacon.c
index 0c6ef99..bbd353c 100644
--- a/nimble/host/src/ble_ibeacon.c
+++ b/nimble/host/src/ble_ibeacon.c
@@ -19,6 +19,7 @@
#include <string.h>
#include "host/ble_hs_adv.h"
+#include "host/ble_ibeacon.h"
#include "ble_hs_priv.h"
#define BLE_IBEACON_MFG_DATA_SIZE 25
diff --git a/nimble/host/src/ble_l2cap.c b/nimble/host/src/ble_l2cap.c
index bfbdadf..fb1a617 100644
--- a/nimble/host/src/ble_l2cap.c
+++ b/nimble/host/src/ble_l2cap.c
@@ -21,6 +21,7 @@
#include <errno.h>
#include "syscfg/syscfg.h"
#include "os/os.h"
+#include "host/ble_l2cap.h"
#include "nimble/ble.h"
#include "nimble/hci_common.h"
#include "ble_hs_priv.h"
[mynewt-nimble] 04/06: ble_hw: remove legacy functions (only present here)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 9e63f5258b4b30d900d628d2f118bfa8bc5c80cb
Author: Bas van den Berg <b....@gmail.com>
AuthorDate: Tue Mar 8 10:35:38 2022 +0100
ble_hw: remove legacy functions (only present here)
---
nimble/controller/include/controller/ble_hw.h | 6 ------
nimble/controller/include/controller/ble_phy.h | 3 ---
2 files changed, 9 deletions(-)
diff --git a/nimble/controller/include/controller/ble_hw.h b/nimble/controller/include/controller/ble_hw.h
index cf29307..394c3a1 100644
--- a/nimble/controller/include/controller/ble_hw.h
+++ b/nimble/controller/include/controller/ble_hw.h
@@ -94,12 +94,6 @@ void ble_hw_resolv_list_rmv(int index);
/* Returns the size of the whitelist in HW */
uint8_t ble_hw_resolv_list_size(void);
-/* Enable the resolving list */
-void ble_hw_resolv_list_enable(void);
-
-/* Disables resolving list devices */
-void ble_hw_resolv_list_disable(void);
-
/* Returns index of resolved address; -1 if not resolved */
int ble_hw_resolv_list_match(void);
diff --git a/nimble/controller/include/controller/ble_phy.h b/nimble/controller/include/controller/ble_phy.h
index 3d32bd6..44e8809 100644
--- a/nimble/controller/include/controller/ble_phy.h
+++ b/nimble/controller/include/controller/ble_phy.h
@@ -83,9 +83,6 @@ typedef void (*ble_phy_tx_end_func)(void *arg);
/* Initialize the PHY */
int ble_phy_init(void);
-/* Reset the PHY */
-int ble_phy_reset(void);
-
/* Set the PHY channel */
int ble_phy_setchan(uint8_t chan, uint32_t access_addr, uint32_t crcinit);