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:40 UTC
[mynewt-nimble] 02/06: includes: remove duplicate includes (remove 2nd)
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"