Skip to content

Commit 5113c14

Browse files
gmarullcarlescufi
gmarull
authored and
carlescufi
committed
subsystems: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all subsystems code to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent 3702f72 commit 5113c14

File tree

726 files changed

+2969
-2969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

726 files changed

+2969
-2969
lines changed

‎subsys/bluetooth/audio/aics.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <zephyr.h>
9-
#include <sys/byteorder.h>
10-
#include <sys/check.h>
8+
#include <zephyr/zephyr.h>
9+
#include <zephyr/sys/byteorder.h>
10+
#include <zephyr/sys/check.h>
1111

12-
#include <device.h>
13-
#include <init.h>
12+
#include <zephyr/device.h>
13+
#include <zephyr/init.h>
1414

15-
#include <bluetooth/bluetooth.h>
16-
#include <bluetooth/conn.h>
17-
#include <bluetooth/gatt.h>
18-
#include <bluetooth/audio/aics.h>
15+
#include <zephyr/bluetooth/bluetooth.h>
16+
#include <zephyr/bluetooth/conn.h>
17+
#include <zephyr/bluetooth/gatt.h>
18+
#include <zephyr/bluetooth/audio/aics.h>
1919

2020
#include "aics_internal.h"
2121

‎subsys/bluetooth/audio/aics_client.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
* SPDX-License-Identifier: Apache-2.0
88
*/
99

10-
#include <zephyr.h>
10+
#include <zephyr/zephyr.h>
1111
#include <zephyr/types.h>
1212

13-
#include <sys/check.h>
13+
#include <zephyr/sys/check.h>
1414

15-
#include <device.h>
16-
#include <init.h>
15+
#include <zephyr/device.h>
16+
#include <zephyr/init.h>
1717

18-
#include <bluetooth/bluetooth.h>
19-
#include <bluetooth/l2cap.h>
20-
#include <bluetooth/conn.h>
21-
#include <bluetooth/gatt.h>
22-
#include <bluetooth/audio/aics.h>
18+
#include <zephyr/bluetooth/bluetooth.h>
19+
#include <zephyr/bluetooth/l2cap.h>
20+
#include <zephyr/bluetooth/conn.h>
21+
#include <zephyr/bluetooth/gatt.h>
22+
#include <zephyr/bluetooth/audio/aics.h>
2323

2424
#include "aics_internal.h"
2525

‎subsys/bluetooth/audio/aics_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AICS_INTERNAL_
1313
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AICS_INTERNAL_
1414
#include <zephyr/types.h>
15-
#include <bluetooth/gatt.h>
15+
#include <zephyr/bluetooth/gatt.h>
1616

1717
#if defined(CONFIG_BT_AICS)
1818
#define BT_AICS_MAX_DESC_SIZE CONFIG_BT_AICS_MAX_INPUT_DESCRIPTION_SIZE

‎subsys/bluetooth/audio/ascs.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
* SPDX-License-Identifier: Apache-2.0
99
*/
1010

11-
#include <zephyr.h>
12-
#include <sys/byteorder.h>
13-
#include <sys/check.h>
11+
#include <zephyr/zephyr.h>
12+
#include <zephyr/sys/byteorder.h>
13+
#include <zephyr/sys/check.h>
1414

15-
#include <device.h>
16-
#include <init.h>
15+
#include <zephyr/device.h>
16+
#include <zephyr/init.h>
1717

18-
#include <bluetooth/bluetooth.h>
19-
#include <bluetooth/conn.h>
20-
#include <bluetooth/gatt.h>
21-
#include <bluetooth/audio/audio.h>
18+
#include <zephyr/bluetooth/bluetooth.h>
19+
#include <zephyr/bluetooth/conn.h>
20+
#include <zephyr/bluetooth/gatt.h>
21+
#include <zephyr/bluetooth/audio/audio.h>
2222

2323
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ASCS)
2424
#define LOG_MODULE_NAME bt_ascs

‎subsys/bluetooth/audio/bass.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
* SPDX-License-Identifier: Apache-2.0
88
*/
99

10-
#include <zephyr.h>
11-
#include <sys/byteorder.h>
10+
#include <zephyr/zephyr.h>
11+
#include <zephyr/sys/byteorder.h>
1212

13-
#include <device.h>
14-
#include <init.h>
13+
#include <zephyr/device.h>
14+
#include <zephyr/init.h>
1515

16-
#include <bluetooth/bluetooth.h>
17-
#include <bluetooth/conn.h>
18-
#include <bluetooth/iso.h>
19-
#include <bluetooth/gatt.h>
20-
#include <bluetooth/buf.h>
16+
#include <zephyr/bluetooth/bluetooth.h>
17+
#include <zephyr/bluetooth/conn.h>
18+
#include <zephyr/bluetooth/iso.h>
19+
#include <zephyr/bluetooth/gatt.h>
20+
#include <zephyr/bluetooth/buf.h>
2121

2222
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_BASS)
2323
#define LOG_MODULE_NAME bt_bass

‎subsys/bluetooth/audio/bass_client.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
* SPDX-License-Identifier: Apache-2.0
77
*/
88

9-
#include <zephyr.h>
9+
#include <zephyr/zephyr.h>
1010
#include <zephyr/types.h>
1111

12-
#include <device.h>
13-
#include <init.h>
12+
#include <zephyr/device.h>
13+
#include <zephyr/init.h>
1414

15-
#include <bluetooth/bluetooth.h>
16-
#include <bluetooth/conn.h>
17-
#include <bluetooth/gatt.h>
18-
#include <bluetooth/buf.h>
19-
#include <sys/byteorder.h>
20-
#include <sys/check.h>
15+
#include <zephyr/bluetooth/bluetooth.h>
16+
#include <zephyr/bluetooth/conn.h>
17+
#include <zephyr/bluetooth/gatt.h>
18+
#include <zephyr/bluetooth/buf.h>
19+
#include <zephyr/sys/byteorder.h>
20+
#include <zephyr/sys/check.h>
2121

2222
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_BASS_CLIENT)
2323
#define LOG_MODULE_NAME bt_bass_client

‎subsys/bluetooth/audio/bass_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111

1212
#include <zephyr/types.h>
13-
#include <bluetooth/conn.h>
14-
#include <bluetooth/audio/bass.h>
13+
#include <zephyr/bluetooth/conn.h>
14+
#include <zephyr/bluetooth/audio/bass.h>
1515

1616
#define BT_BASS_SCAN_STATE_NOT_SCANNING 0x00
1717
#define BT_BASS_SCAN_STATE_SCANNING 0x01

‎subsys/bluetooth/audio/broadcast_sink.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* SPDX-License-Identifier: Apache-2.0
77
*/
88

9-
#include <zephyr.h>
10-
#include <sys/byteorder.h>
11-
#include <sys/check.h>
12-
13-
#include <bluetooth/bluetooth.h>
14-
#include <bluetooth/conn.h>
15-
#include <bluetooth/gatt.h>
16-
#include <bluetooth/audio/audio.h>
9+
#include <zephyr/zephyr.h>
10+
#include <zephyr/sys/byteorder.h>
11+
#include <zephyr/sys/check.h>
12+
13+
#include <zephyr/bluetooth/bluetooth.h>
14+
#include <zephyr/bluetooth/conn.h>
15+
#include <zephyr/bluetooth/gatt.h>
16+
#include <zephyr/bluetooth/audio/audio.h>
1717

1818
#include "../host/conn_internal.h"
1919
#include "../host/iso_internal.h"

‎subsys/bluetooth/audio/broadcast_source.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* SPDX-License-Identifier: Apache-2.0
77
*/
88

9-
#include <zephyr.h>
10-
#include <sys/byteorder.h>
11-
#include <sys/check.h>
12-
13-
#include <bluetooth/bluetooth.h>
14-
#include <bluetooth/conn.h>
15-
#include <bluetooth/gatt.h>
16-
#include <bluetooth/audio/audio.h>
9+
#include <zephyr/zephyr.h>
10+
#include <zephyr/sys/byteorder.h>
11+
#include <zephyr/sys/check.h>
12+
13+
#include <zephyr/bluetooth/bluetooth.h>
14+
#include <zephyr/bluetooth/conn.h>
15+
#include <zephyr/bluetooth/gatt.h>
16+
#include <zephyr/bluetooth/audio/audio.h>
1717

1818
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_AUDIO_DEBUG_BROADCAST_SOURCE)
1919
#define LOG_MODULE_NAME bt_audio_broadcast_source

‎subsys/bluetooth/audio/capabilities.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
* SPDX-License-Identifier: Apache-2.0
88
*/
99

10-
#include <zephyr.h>
11-
#include <sys/byteorder.h>
10+
#include <zephyr/zephyr.h>
11+
#include <zephyr/sys/byteorder.h>
1212

13-
#include <device.h>
14-
#include <init.h>
13+
#include <zephyr/device.h>
14+
#include <zephyr/init.h>
1515

16-
#include <bluetooth/bluetooth.h>
17-
#include <bluetooth/conn.h>
18-
#include <bluetooth/gatt.h>
19-
#include <bluetooth/audio/audio.h>
20-
#include <bluetooth/audio/capabilities.h>
16+
#include <zephyr/bluetooth/bluetooth.h>
17+
#include <zephyr/bluetooth/conn.h>
18+
#include <zephyr/bluetooth/gatt.h>
19+
#include <zephyr/bluetooth/audio/audio.h>
20+
#include <zephyr/bluetooth/audio/capabilities.h>
2121

2222
#include "pacs_internal.h"
2323

0 commit comments

Comments
 (0)