From 6cf7ac77bff93ee00fd180543419d418844db3ec Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Thu, 16 Jan 2020 17:21:12 +0100 Subject: [PATCH] Bluetooth: Always use full path to hci_driver.h The path to include/drivers should not be in the compiler include path list, only include/. In order to make this possible, always explictly refer to hci_driver.h via the drivers/bluetooth/ path and not only bluetooth/. Fixes #21974. Signed-off-by: Carles Cufi --- drivers/bluetooth/hci/h4.c | 2 +- drivers/bluetooth/hci/h5.c | 2 +- drivers/bluetooth/hci/ipm_stm32wb.c | 2 +- drivers/bluetooth/hci/rpmsg.c | 2 +- drivers/bluetooth/hci/spi.c | 2 +- drivers/bluetooth/hci/userchan.c | 2 +- subsys/bluetooth/host/att.c | 2 +- subsys/bluetooth/host/conn.c | 2 +- subsys/bluetooth/host/gatt.c | 2 +- subsys/bluetooth/host/hci_core.c | 2 +- subsys/bluetooth/host/hci_ecc.c | 2 +- subsys/bluetooth/host/hci_raw.c | 2 +- subsys/bluetooth/host/l2cap.c | 2 +- subsys/bluetooth/host/l2cap_br.c | 2 +- subsys/bluetooth/host/rfcomm.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c index ba584e33ea4..fbc3d8af5b7 100644 --- a/drivers/bluetooth/hci/h4.c +++ b/drivers/bluetooth/hci/h4.c @@ -20,7 +20,7 @@ #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_MODULE_NAME bt_driver diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c index 082a00344e4..b6a09e151f7 100644 --- a/drivers/bluetooth/hci/h5.c +++ b/drivers/bluetooth/hci/h5.c @@ -21,7 +21,7 @@ #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_MODULE_NAME bt_driver diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c index 63947ecf85f..0576b32ef00 100644 --- a/drivers/bluetooth/hci/ipm_stm32wb.c +++ b/drivers/bluetooth/hci/ipm_stm32wb.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "bluetooth/addr.h" #include "app_conf.h" diff --git a/drivers/bluetooth/hci/rpmsg.c b/drivers/bluetooth/hci/rpmsg.c index 3c6b83073a8..7158f57e807 100644 --- a/drivers/bluetooth/hci/rpmsg.c +++ b/drivers/bluetooth/hci/rpmsg.c @@ -9,7 +9,7 @@ #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_MODULE_NAME bt_hci_driver diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c index bc00ab445a9..8e99fc9880f 100644 --- a/drivers/bluetooth/hci/spi.c +++ b/drivers/bluetooth/hci/spi.c @@ -13,7 +13,7 @@ #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_MODULE_NAME bt_driver diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c index b6142eea0a7..3b34c2fc54a 100644 --- a/drivers/bluetooth/hci/userchan.c +++ b/drivers/bluetooth/hci/userchan.c @@ -26,7 +26,7 @@ #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_MODULE_NAME bt_driver diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c index 60bcbe778c3..554e1bcb3d7 100644 --- a/subsys/bluetooth/host/att.c +++ b/subsys/bluetooth/host/att.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ATT) #define LOG_MODULE_NAME bt_att diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c index c77b3f667cf..485130d97c3 100644 --- a/subsys/bluetooth/host/conn.c +++ b/subsys/bluetooth/host/conn.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CONN) diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c index c17b02c8b9c..a1917252904 100644 --- a/subsys/bluetooth/host/gatt.c +++ b/subsys/bluetooth/host/gatt.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_GATT) #define LOG_MODULE_NAME bt_gatt diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c index e06179e5c0b..92bc96c45da 100644 --- a/subsys/bluetooth/host/hci_core.c +++ b/subsys/bluetooth/host/hci_core.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #define LOG_MODULE_NAME bt_hci_core diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c index a5a32e460fc..a5c882bc9f0 100644 --- a/subsys/bluetooth/host/hci_ecc.c +++ b/subsys/bluetooth/host/hci_ecc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #define LOG_MODULE_NAME bt_hci_ecc diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c index e1528b3630b..c71b96df745 100644 --- a/subsys/bluetooth/host/hci_raw.c +++ b/subsys/bluetooth/host/hci_raw.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c index 43148b43fca..c59a0b417b9 100644 --- a/subsys/bluetooth/host/l2cap.c +++ b/subsys/bluetooth/host/l2cap.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP) #define LOG_MODULE_NAME bt_l2cap diff --git a/subsys/bluetooth/host/l2cap_br.c b/subsys/bluetooth/host/l2cap_br.c index 8899ad0b6db..455bed37f6c 100644 --- a/subsys/bluetooth/host/l2cap_br.c +++ b/subsys/bluetooth/host/l2cap_br.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP) #define LOG_MODULE_NAME bt_l2cap_br diff --git a/subsys/bluetooth/host/rfcomm.c b/subsys/bluetooth/host/rfcomm.c index 44fe0deb779..7b7ca805e43 100644 --- a/subsys/bluetooth/host/rfcomm.c +++ b/subsys/bluetooth/host/rfcomm.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RFCOMM)