Handful of build fixes and cleanups
Subsystems (4)
v2 cover Handful of build fixes and cleanups
Hello list,
Here are bunch of regression fixes caused by yours truly - mea culpa.
Changes in v2:
- rework first (install-data-hooks) to per-target hooks
- add renamed files to gitignore (rules patch)
- introduced six extra patches
- fix the @@ substitution in the service.in files
- drop erroneous -fPIC
- add org.bluez.obex.service to gitignore
- drop duplicate -I include in obexd
- adds all manpages to gitignore
- moves libbluetooth public header to sub-folder
You can see the original v1 below.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Emil Velikov (10):
build: rework {install-data,uninstall}-hook
build: install obexd (dbus,systemd} services as needed
build: handle relative libexecdir instances
build: drop %.rules make rule
build: simplify coverage handling
build: drop explicit -fPIC from obexd CFLAGS
gitignore: add org.bluez.obex.service
build: obexd: remove duplicate include -I$(builddir)/lib
gitignore: ignore all manual pages
build: move public headers to sub-folder
.gitignore | 26 +++------------
Makefile.am | 53 +++++++++++++------------------
Makefile.mesh | 2 +-
Makefile.obexd | 17 ++++++----
android/a2dp-sink.c | 2 +-
android/a2dp.c | 6 ++--
android/avctp.c | 2 +-
android/avdtp.c | 2 +-
android/avdtptest.c | 6 ++--
android/avrcp-lib.c | 2 +-
android/avrcp.c | 6 ++--
android/bluetooth.c | 8 ++---
android/bluetoothd-snoop.c | 4 +--
android/gatt.c | 4 +--
android/handsfree-client.c | 6 ++--
android/handsfree.c | 6 ++--
android/health.c | 8 ++---
android/hidhost.c | 6 ++--
android/ipc-tester.c | 2 +-
android/main.c | 4 +--
android/map-client.c | 6 ++--
android/pan.c | 8 ++---
android/sco.c | 2 +-
android/socket.c | 6 ++--
android/tester-a2dp.c | 2 +-
android/tester-avrcp.c | 2 +-
android/tester-gatt.c | 2 +-
android/tester-hdp.c | 2 +-
android/tester-hidhost.c | 2 +-
android/tester-main.c | 2 +-
android/tester-pan.c | 2 +-
attrib/att.c | 2 +-
attrib/gatt.c | 4 +--
attrib/gattrib.c | 2 +-
attrib/gatttool.c | 8 ++---
attrib/interactive.c | 4 +--
attrib/utils.c | 8 ++---
btio/btio.c | 8 ++---
client/mgmt.c | 10 +++---
client/player.c | 2 +-
configure.ac | 18 +++++++++++
emulator/amp.c | 4 +--
emulator/b1ee.c | 4 +--
emulator/btdev.c | 4 +--
emulator/bthost.c | 2 +-
emulator/bthost.h | 2 +-
emulator/hciemu.c | 4 +--
emulator/le.c | 4 +--
emulator/serial.c | 4 +--
emulator/server.c | 4 +--
emulator/smp.c | 4 +--
emulator/vhci.c | 4 +--
lib/bluetooth.c | 4 +--
lib/{ => bluetooth}/bluetooth.h | 0
lib/{ => bluetooth}/bnep.h | 0
lib/{ => bluetooth}/cmtp.h | 0
lib/{ => bluetooth}/hci.h | 0
lib/{ => bluetooth}/hci_lib.h | 0
lib/{ => bluetooth}/hidp.h | 0
lib/{ => bluetooth}/l2cap.h | 0
lib/{ => bluetooth}/rfcomm.h | 0
lib/{ => bluetooth}/sco.h | 0
lib/{ => bluetooth}/sdp.h | 0
lib/{ => bluetooth}/sdp_lib.h | 0
lib/hci.c | 6 ++--
lib/sdp.c | 12 +++----
lib/uuid.c | 2 +-
mesh/bluetooth-mesh.service.in | 2 +-
mesh/main.c | 2 +-
mesh/mesh-io-generic.c | 2 +-
mesh/mesh-io-mgmt.c | 4 +--
mesh/mesh-io.c | 2 +-
mesh/mesh-mgmt.c | 2 +-
monitor/a2dp.c | 2 +-
monitor/analyze.c | 2 +-
monitor/att.c | 6 ++--
monitor/avctp.c | 2 +-
monitor/avdtp.c | 2 +-
monitor/bnep.c | 2 +-
monitor/control.c | 4 +--
monitor/hcidump.c | 6 ++--
monitor/intel.c | 4 +--
monitor/l2cap.c | 2 +-
monitor/msft.c | 2 +-
monitor/packet.c | 6 ++--
monitor/rfcomm.c | 2 +-
monitor/sdp.c | 2 +-
obexd/client/bluetooth.c | 8 ++---
obexd/client/map.c | 2 +-
obexd/client/pbap.c | 4 +--
obexd/plugins/bluetooth.c | 2 +-
obexd/plugins/syncevolution.c | 2 +-
obexd/src/obex.service.in | 2 +-
obexd/src/org.bluez.obex.service.in | 2 +-
peripheral/attach.c | 6 ++--
peripheral/gap.c | 2 +-
peripheral/gatt.c | 4 +--
plugins/admin.c | 2 +-
plugins/autopair.c | 4 +--
plugins/hostname.c | 4 +--
plugins/neard.c | 6 ++--
plugins/policy.c | 4 +--
plugins/sixaxis.c | 4 +--
profiles/audio/a2dp.c | 6 ++--
profiles/audio/avctp.c | 6 ++--
profiles/audio/avdtp.c | 6 ++--
profiles/audio/bap.c | 6 ++--
profiles/audio/bass.c | 2 +-
profiles/audio/control.c | 6 ++--
profiles/audio/csip.c | 6 ++--
profiles/audio/mcp.c | 6 ++--
profiles/audio/media.c | 4 +--
profiles/audio/micp.c | 6 ++--
profiles/audio/sink.c | 4 +--
profiles/audio/source.c | 4 +--
profiles/audio/transport.c | 4 +--
profiles/audio/vcp.c | 6 ++--
profiles/battery/bas.c | 4 +--
profiles/battery/battery.c | 6 ++--
profiles/cups/hcrp.c | 8 ++---
profiles/cups/main.c | 6 ++--
profiles/cups/sdp.c | 6 ++--
profiles/cups/spp.c | 8 ++---
profiles/deviceinfo/deviceinfo.c | 4 +--
profiles/deviceinfo/dis.c | 4 +--
profiles/gap/gas.c | 6 ++--
profiles/health/hdp.c | 6 ++--
profiles/health/hdp_manager.c | 4 +--
profiles/health/hdp_util.c | 6 ++--
profiles/health/mcap.c | 2 +-
profiles/input/device.c | 8 ++---
profiles/input/hog-lib.c | 4 +--
profiles/input/hog.c | 4 +--
profiles/input/manager.c | 6 ++--
profiles/input/server.c | 4 +--
profiles/midi/midi.c | 4 +--
profiles/network/bnep.c | 6 ++--
profiles/network/connection.c | 6 ++--
profiles/network/manager.c | 6 ++--
profiles/network/server.c | 8 ++---
profiles/sap/manager.c | 4 +--
profiles/sap/server.c | 4 +--
profiles/scanparam/scan.c | 4 +--
profiles/scanparam/scpp.c | 4 +--
src/adapter.h | 4 +--
src/adv_monitor.c | 2 +-
src/advertising.c | 4 +--
src/agent.c | 4 +--
src/battery.c | 2 +-
src/bluetooth.service.in | 2 +-
src/device.c | 6 ++--
src/eir.c | 6 ++--
src/eir.h | 2 +-
src/gatt-client.c | 4 +--
src/gatt-database.c | 6 ++--
src/log.c | 4 +--
src/main.c | 4 +--
src/oui.c | 2 +-
src/plugin.c | 2 +-
src/profile.c | 6 ++--
src/rfkill.c | 4 +--
src/sdp-client.c | 6 ++--
src/sdp-xml.c | 4 +--
src/sdpd-database.c | 6 ++--
src/sdpd-request.c | 8 ++---
src/sdpd-server.c | 8 ++---
src/sdpd-service.c | 6 ++--
src/service.c | 4 +--
src/settings.c | 2 +-
src/shared/ad.c | 4 +--
src/shared/ad.h | 2 +-
src/shared/att.c | 4 +--
src/shared/bap.c | 2 +-
src/shared/bass.c | 2 +-
src/shared/btp.c | 2 +-
src/shared/ccp.c | 4 +--
src/shared/csip.c | 2 +-
src/shared/gap.c | 2 +-
src/shared/gatt-client.c | 2 +-
src/shared/gatt-db.c | 2 +-
src/shared/gatt-helpers.c | 2 +-
src/shared/gatt-server.c | 2 +-
src/shared/log.c | 4 +--
src/shared/mcp.c | 4 +--
src/shared/mgmt.c | 4 +--
src/shared/micp.c | 2 +-
src/shared/tester.c | 4 +--
src/shared/util.c | 2 +-
src/shared/vcp.c | 2 +-
src/storage.c | 6 ++--
src/uuid-helper.c | 6 ++--
tools/{hid2hci.rules => 97-hid2hci.rules} | 0
tools/advtest.c | 2 +-
tools/amptest.c | 6 ++--
tools/avinfo.c | 8 ++---
tools/avtest.c | 10 +++---
tools/bdaddr.c | 6 ++--
tools/bluetooth-logger.service.in | 2 +-
tools/bluetooth-player.c | 2 +-
tools/bnep-tester.c | 4 +--
tools/bneptest.c | 8 ++---
tools/btattach.c | 6 ++--
tools/btgatt-client.c | 8 ++---
tools/btgatt-server.c | 8 ++---
tools/btiotest.c | 2 +-
tools/btmon-logger.c | 4 +--
tools/btpclient.c | 2 +-
tools/btpclientctl.c | 2 +-
tools/ciptool.c | 14 ++++----
tools/cltest.c | 8 ++---
tools/hciattach.c | 6 ++--
tools/hciattach_ath3k.c | 6 ++--
tools/hciattach_bcm43xx.c | 6 ++--
tools/hciattach_intel.c | 6 ++--
tools/hciattach_qualcomm.c | 6 ++--
tools/hciattach_st.c | 2 +-
tools/hciattach_ti.c | 6 ++--
tools/hciattach_tialt.c | 6 ++--
tools/hciconfig.c | 6 ++--
tools/hcidump.c | 4 +--
tools/hcieventmask.c | 6 ++--
tools/hcisecfilter.c | 6 ++--
tools/hcitool.c | 6 ++--
tools/hwdb.c | 2 +-
tools/ioctl-tester.c | 6 ++--
tools/iso-tester.c | 2 +-
tools/isotest.c | 6 ++--
tools/l2cap-tester.c | 4 +--
tools/l2ping.c | 8 ++---
tools/l2test.c | 8 ++---
tools/mcaptest.c | 8 ++---
tools/mesh-gatt/gatt.c | 2 +-
tools/mesh-tester.c | 8 ++---
tools/mesh/agent.c | 2 +-
tools/meshctl.c | 2 +-
tools/mgmt-tester.c | 8 ++---
tools/oobtest.c | 2 +-
tools/parser/hci.c | 4 +--
tools/parser/l2cap.c | 2 +-
tools/parser/lmp.c | 4 +--
tools/parser/parser.h | 2 +-
tools/rctest.c | 12 +++----
tools/rfcomm-tester.c | 4 +--
tools/rfcomm.c | 8 ++---
tools/sco-tester.c | 4 +--
tools/scotest.c | 4 +--
tools/sdptool.c | 10 +++---
tools/smp-tester.c | 4 +--
tools/test-runner.c | 6 ++--
tools/userchan-tester.c | 4 +--
unit/test-avrcp.c | 2 +-
unit/test-bap.c | 2 +-
unit/test-bass.c | 2 +-
unit/test-eir.c | 6 ++--
unit/test-gatt.c | 2 +-
unit/test-gattrib.c | 2 +-
unit/test-hog.c | 2 +-
unit/test-lib.c | 4 +--
unit/test-mgmt.c | 2 +-
unit/test-micp.c | 2 +-
unit/test-sdp.c | 6 ++--
unit/test-uuid.c | 2 +-
unit/test-vcp.c | 2 +-
263 files changed, 593 insertions(+), 595 deletions(-)---
base-commit: b55d98e5cc97e4ff8c3980b84f46c84f3b1c1ee3
change-id: 20240214-hook-fixup-f26304b71366
Best regards,
Signature · 1 line
Emil Velikov <[email protected]>
PATCH v2 1/10 build: rework {install-data,uninstall}-hook
Currently autoconfigure throws a useful error, about a duplicate install-data-hook.
Address that by making the two target specific and pulling them as dependencies.
We have to create empty ones otherwise dependency tracking and resolution will fail.
--- Makefile.am | 5 ++++- Makefile.obexd | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
Makefile.am +4 -1
@@ -31,7 +31,7 @@ AM_LDFLAGS = $(MISC_LDFLAGS) confdir = $(sysconfdir)/bluetooth statedir = $(localstatedir)/lib/bluetooth -install-data-hook: +bluetoothd-fix-permissions: install -dm555 $(DESTDIR)$(confdir) install -dm700 $(DESTDIR)$(statedir)
@@ -422,6 +422,9 @@ include Makefile.obexd include android/Makefile.am include Makefile.mesh +install-data-hook: bluetoothd-fix-permissions obexd-add-service-symlink +uninstall-hook: obexd-remove-service-symlink + if HID2HCI rulesdir = $(UDEV_DIR)/rules.d
Makefile.obexd +8 -2
@@ -3,11 +3,14 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service -install-data-hook: +obexd-add-service-symlink: $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service -uninstall-hook: +obexd-remove-service-symlink: rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service +else +obexd-add-service-symlink: +obexd-remove-service-symlink: endif dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
@@ -102,6 +105,9 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC +else +obexd-add-service-symlink: +obexd-remove-service-symlink: endif obexd_src_obexd_SHORTNAME = obexd
Signature · 1 line
2.43.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=826966
---Test result---
Test Summary:
CheckPatch PASS 4.37 seconds GitLint PASS 4.58 seconds BuildEll PASS 24.34 seconds BluezMake FAIL 12.09 seconds MakeCheck FAIL 6.42 seconds MakeDistcheck FAIL 34.23 seconds CheckValgrind FAIL 11.26 seconds CheckSmatch FAIL 12.22 seconds bluezmakeextell FAIL 11.08 seconds IncrementalBuild FAIL 2081.36 seconds ScanBuild PASS 999.98 seconds
Details
##############################
Test: BluezMake - FAIL
Desc: Build BlueZ
Output:
In file included from ./src/eir.h:14,
from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
In file included from client/mgmt.c:34:./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:7801: client/mgmt.o] Error 1
make: *** [Makefile:12164: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
In file included from ../../src/eir.h:14,
from ../../src/shared/ad.c:24:
../../lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[2]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4647: all] Error 2
make: *** [Makefile:12085: distcheck] Error 1
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:
In file included from ./src/eir.h:14,
from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12164: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used. src/shared/crypto.c:272:23: warning: Variable length array is used. src/shared/ad.c: note: in included file (through src/eir.h):./lib/bluetooth/sdp.h:22:11: error: unable to open 'bluetooth/bluetooth.h' ./lib/bluetooth/sdp.h:22:11: error: using '/github/workspace/src/src/lib/bluetooth/bluetooth.h' In file included from ./src/eir.h:14,
from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
In file included from ./src/eir.h:14,
from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
22 | #include <bluetooth/bluetooth.h>
| ^~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
error: tools/97-hid2hci.rules: already exists in working directory
hint: Use 'git am --show-current-patch' to see the failed patch
---
Regards,
Linux Bluetooth
PATCH v2 2/10 build: install obexd (dbus,systemd} services as needed
In reply to Emil VelikovCurrently we ship the service files, even when built with --disable-obex.
Move the "if OBEX" guard few lines further up.
--- Makefile.obexd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Makefile.obexd +2 -1
@@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +if OBEX + if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service
@@ -16,7 +18,6 @@ endif dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service -if OBEX obex_plugindir = $(libdir)/obex/plugins
Signature · 1 line
2.43.1
PATCH v2 3/10 build: handle relative libexecdir instances
In reply to Emil VelikovWith earlier commit, we've used exec_dir to reference the path of obexd and bluetoothd within the service files.
At the same time, in my testing I was providing the complete path on the configure command line. As result, things just worked.
In the default case, the variable contains relative references to ${} variables, which as result end up literal in the services. Ultimately the service files were broken.
Document are reuse the existing pattern of manually expanding the variables.
--- Makefile.am | 2 +- configure.ac | 18 ++++++++++++++++++ mesh/bluetooth-mesh.service.in | 2 +- obexd/src/obex.service.in | 2 +- obexd/src/org.bluez.obex.service.in | 2 +- src/bluetooth.service.in | 2 +- tools/bluetooth-logger.service.in | 2 +- 7 files changed, 24 insertions(+), 6 deletions(-)
Makefile.am +1 -1
@@ -16,7 +16,7 @@ CLEANFILES = EXTRA_DIST = -pkglibexecdir = $(libexecdir)/bluetooth +pkglibexecdir = @PKGLIBEXECDIR@ pkglibexec_PROGRAMS =
configure.ac +18 -0
@@ -401,6 +401,24 @@ if (test "${prefix}" = "NONE"); then prefix="${ac_default_prefix}" fi +if (test "${exec_prefix}" = "NONE"); then + # exec_prefix defaults to prefix, although our manual handling of the + # latter (above) confuses autoconf. Manually set the exec_prefix. + exec_prefix="${prefix}" +fi + +# Expand any variables containing relative references like ${prefix} and co. +# +# Otherwise we'll end up with literal references in the final binaries or +# manuals, which is not something we really want. + +if (test "$libexecdir" = '${exec_prefix}/libexec'); then + pkglibexecdir="${exec_prefix}/libexec/bluetooth" +else + pkglibexecdir="${libexecdir}/bluetooth" +fi +AC_SUBST(PKGLIBEXECDIR, "${pkglibexecdir}") + if (test "$localstatedir" = '${prefix}/var'); then storagedir="${prefix}/var/lib/bluetooth" else
mesh/bluetooth-mesh.service.in +1 -1
@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=dbus BusName=org.bluez.mesh -ExecStart=@exec_prefix@/bluetooth/bluetooth-meshd +ExecStart=@PKGLIBEXECDIR@/bluetooth-meshd NotifyAccess=main LimitNPROC=1 ProtectHome=true
obexd/src/obex.service.in +1 -1
@@ -4,7 +4,7 @@ Description=Bluetooth OBEX service [Service] Type=dbus BusName=org.bluez.obex -ExecStart=@exec_prefix@/bluetooth/obexd +ExecStart=@PKGLIBEXECDIR@/obexd [Install] Alias=dbus-org.bluez.obex.service
obexd/src/org.bluez.obex.service.in +1 -1
@@ -1,4 +1,4 @@ [D-BUS Service] Name=org.bluez.obex -Exec=@exec_prefix@/bluetooth/obexd +Exec=@PKGLIBEXECDIR@/obexd SystemdService=dbus-org.bluez.obex.service
src/bluetooth.service.in +1 -1
@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=dbus BusName=org.bluez -ExecStart=@exec_prefix@/bluetooth/bluetoothd +ExecStart=@PKGLIBEXECDIR@/bluetoothd NotifyAccess=main #WatchdogSec=10 #Restart=on-failure
tools/bluetooth-logger.service.in +1 -1
@@ -4,7 +4,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=simple -ExecStart=@exec_prefix@/bluetooth/btmon-logger -p -b /var/log/bluetooth/hci.log +ExecStart=@PKGLIBEXECDIR@/btmon-logger -p -b /var/log/bluetooth/hci.log NotifyAccess=main CapabilityBoundingSet=CAP_NET_RAW LimitNPROC=1
Signature · 1 line
2.43.1
PATCH v2 4/10 build: drop %.rules make rule
In reply to Emil VelikovThere's a single file, so we can drop the makefile rule and rename it accordingly.
---
.gitignore | 2 +-
Makefile.am | 8 +-------
tools/{hid2hci.rules => 97-hid2hci.rules} | 0
3 files changed, 2 insertions(+), 8 deletions(-).gitignore +1 -1
@@ -37,7 +37,7 @@ lib/bluez.pc lib/bluetooth src/builtin.h src/bluetoothd -tools/97-hid2hci.rules +tools/hid2hci.rules profiles/cups/bluetooth profiles/iap/iapd
Makefile.am +1 -7
@@ -429,11 +429,9 @@ if HID2HCI rulesdir = $(UDEV_DIR)/rules.d rules_DATA = tools/97-hid2hci.rules - -CLEANFILES += $(rules_DATA) endif -EXTRA_DIST += tools/hid2hci.rules +EXTRA_DIST += tools/97-hid2hci.rules if TEST testdir = $(pkglibdir)/test
@@ -758,10 +756,6 @@ endif src/builtin.h: src/genbuiltin $(builtin_sources) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ -tools/%.rules: - $(AM_V_at)$(MKDIR_P) tools - $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ - $(lib_libbluetooth_la_OBJECTS): $(local_headers) lib/bluetooth/%.h: lib/%.h
tools/97-hid2hci.rules renamed from tools/hid2hci.rules +0 -0
Signature · 1 line
2.43.1
PATCH v2 5/10 build: simplify coverage handling
In reply to Emil Velikov--- Makefile.am | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
Makefile.am +2 -8
@@ -787,8 +787,8 @@ ell/ell.h: Makefile maintainer-clean-local: -rm -rf ell -if COVERAGE clean-coverage: +if COVERAGE @lcov --directory $(top_builddir) --zerocounters $(RM) -r coverage $(top_builddir)/coverage.info
@@ -797,15 +797,9 @@ coverage: check --output-file $(top_builddir)/coverage.info $(AM_V_at)$(MKDIR_P) coverage @genhtml -o coverage/ $(top_builddir)/coverage.info +endif clean-local: clean-coverage -find $(top_builddir) -name "*.gcno" -delete -find $(top_builddir) -name "*.gcda" -delete $(RM) -r lib/bluetooth - -else -clean-local: - -find $(top_builddir) -name "*.gcno" -delete - -find $(top_builddir) -name "*.gcda" -delete - $(RM) -r lib/bluetooth -endif
Signature · 1 line
2.43.1
PATCH v2 6/10 build: drop explicit -fPIC from obexd CFLAGS
In reply to Emil VelikovThe option is handled by the global --enable-pic. Drop the local explicit argument.
With that we can drop the standalone CFLAGS.
Aside: the -D_FILE_OFFSET_BITS=64 also seems off - we should either be setting it globally or not at all... Something for another rainy day.
--- Makefile.obexd | 2 -- 1 file changed, 2 deletions(-)
Makefile.obexd +0 -2
@@ -104,8 +104,6 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -D_FILE_OFFSET_BITS=64 \ -I$(builddir)/lib -I$(builddir)/obexd/src -obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC - else obexd-add-service-symlink: obexd-remove-service-symlink:
Signature · 1 line
2.43.1
PATCH v2 7/10 gitignore: add org.bluez.obex.service
In reply to Emil Velikov--- .gitignore | 1 + 1 file changed, 1 insertion(+)
.gitignore +1 -0
@@ -168,6 +168,7 @@ mesh/bluetooth-mesh.service obexd/src/builtin.h obexd/src/obexd obexd/src/obex.service +obexd/src/org.bluez.obex.service tools/obex-client-tool tools/obex-server-tool unit/test-gobex
Signature · 1 line
2.43.1
PATCH v2 8/10 build: obexd: remove duplicate include -I$(builddir)/lib
In reply to Emil VelikovThe -I$(builddir)/lib include is already in the AM_CPPFLAGS. Drop the duplicate instance in obexd.
--- Makefile.obexd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile.obexd +1 -1
@@ -102,7 +102,7 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -D_FILE_OFFSET_BITS=64 \ - -I$(builddir)/lib -I$(builddir)/obexd/src + -I$(builddir)/obexd/src else obexd-add-service-symlink:
Signature · 1 line
2.43.1
PATCH v2 9/10 gitignore: ignore all manual pages
In reply to Emil VelikovDrop the few explicit entries and use *.{1,5,8} instead.
--- .gitignore | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
.gitignore +3 -19
@@ -1,3 +1,6 @@ +*.1 +*.5 +*.8 *.o *.a *.lo
@@ -47,36 +50,25 @@ tools/avinfo tools/bccmd tools/hwdb tools/ciptool -tools/ciptool.1 tools/hciattach -tools/hciattach.1 tools/hciconfig -tools/hciconfig.1 tools/hcieventmask tools/hcisecfilter tools/hcitool -tools/hcitool.1 tools/hcidump -tools/hcidump.1 tools/hid2hci -tools/hid2hci.1 tools/rfcomm -tools/rfcomm.1 tools/l2ping -tools/l2ping.1 tools/l2test tools/cltest tools/rctest -tools/rctest.1 tools/scotest tools/amptest tools/oobtest tools/advtest tools/sdptool -tools/sdptool.1 tools/avtest tools/bdaddr -tools/badddr.1 tools/bluemoon tools/seq2bseq tools/hex2hcd
@@ -104,7 +96,6 @@ tools/check-selftest tools/mcaptest tools/bneptest tools/isotest -tools/isotest.1 tools/iso-tester test/sap_client.pyc test/bluezutils.pyc
@@ -134,10 +125,8 @@ tools/bnep-tester tools/userchan-tester tools/ioctl-tester tools/btattach -tools/btattach.1 tools/btconfig tools/btmgmt -tools/btmgmt.1 tools/btsnoop tools/btpclient tools/btpclientctl
@@ -145,22 +134,17 @@ tools/btmon-logger tools/bluetooth-logger.service peripheral/btsensor monitor/btmon -monitor/btmon.1 emulator/btvirt emulator/b1ee emulator/hfp client/bluetoothctl -client/bluetoothctl-mgmt.1 -client/bluetoothctl-monitor.1 tools/meshctl tools/mesh-cfgclient tools/mesh-cfgtest tools/mesh-tester mesh/bluetooth-meshd -mesh/bluetooth-meshd.8 mesh/bluetooth-meshd.rst -src/bluetoothd.8 src/bluetoothd.rst src/bluetooth.service mesh/bluetooth-mesh.service
Signature · 1 line
2.43.1
PATCH v2 10/10 build: move public headers to sub-folder
In reply to Emil VelikovThis allows us to remove the build-time hacks, while also being clearer which headers are local and which are installed.
---
.gitignore | 1 -
Makefile.am | 28 ++++++++++++++--------------
Makefile.mesh | 2 +-
android/a2dp-sink.c | 2 +-
android/a2dp.c | 6 +++---
android/avctp.c | 2 +-
android/avdtp.c | 2 +-
android/avdtptest.c | 6 +++---
android/avrcp-lib.c | 2 +-
android/avrcp.c | 6 +++---
android/bluetooth.c | 8 ++++----
android/bluetoothd-snoop.c | 4 ++--
android/gatt.c | 4 ++--
android/handsfree-client.c | 6 +++---
android/handsfree.c | 6 +++---
android/health.c | 8 ++++----
android/hidhost.c | 6 +++---
android/ipc-tester.c | 2 +-
android/main.c | 4 ++--
android/map-client.c | 6 +++---
android/pan.c | 8 ++++----
android/sco.c | 2 +-
android/socket.c | 6 +++---
android/tester-a2dp.c | 2 +-
android/tester-avrcp.c | 2 +-
android/tester-gatt.c | 2 +-
android/tester-hdp.c | 2 +-
android/tester-hidhost.c | 2 +-
android/tester-main.c | 2 +-
android/tester-pan.c | 2 +-
attrib/att.c | 2 +-
attrib/gatt.c | 4 ++--
attrib/gattrib.c | 2 +-
attrib/gatttool.c | 8 ++++----
attrib/interactive.c | 4 ++--
attrib/utils.c | 8 ++++----
btio/btio.c | 8 ++++----
client/mgmt.c | 10 +++++-----
client/player.c | 2 +-
emulator/amp.c | 4 ++--
emulator/b1ee.c | 4 ++--
emulator/btdev.c | 4 ++--
emulator/bthost.c | 2 +-
emulator/bthost.h | 2 +-
emulator/hciemu.c | 4 ++--
emulator/le.c | 4 ++--
emulator/serial.c | 4 ++--
emulator/server.c | 4 ++--
emulator/smp.c | 4 ++--
emulator/vhci.c | 4 ++--
lib/bluetooth.c | 4 ++--
lib/{ => bluetooth}/bluetooth.h | 0
lib/{ => bluetooth}/bnep.h | 0
lib/{ => bluetooth}/cmtp.h | 0
lib/{ => bluetooth}/hci.h | 0
lib/{ => bluetooth}/hci_lib.h | 0
lib/{ => bluetooth}/hidp.h | 0
lib/{ => bluetooth}/l2cap.h | 0
lib/{ => bluetooth}/rfcomm.h | 0
lib/{ => bluetooth}/sco.h | 0
lib/{ => bluetooth}/sdp.h | 0
lib/{ => bluetooth}/sdp_lib.h | 0
lib/hci.c | 6 +++---
lib/sdp.c | 12 ++++++------
lib/uuid.c | 2 +-
mesh/main.c | 2 +-
mesh/mesh-io-generic.c | 2 +-
mesh/mesh-io-mgmt.c | 4 ++--
mesh/mesh-io.c | 2 +-
mesh/mesh-mgmt.c | 2 +-
monitor/a2dp.c | 2 +-
monitor/analyze.c | 2 +-
monitor/att.c | 6 +++---
monitor/avctp.c | 2 +-
monitor/avdtp.c | 2 +-
monitor/bnep.c | 2 +-
monitor/control.c | 4 ++--
monitor/hcidump.c | 6 +++---
monitor/intel.c | 4 ++--
monitor/l2cap.c | 2 +-
monitor/msft.c | 2 +-
monitor/packet.c | 6 +++---
monitor/rfcomm.c | 2 +-
monitor/sdp.c | 2 +-
obexd/client/bluetooth.c | 8 ++++----
obexd/client/map.c | 2 +-
obexd/client/pbap.c | 4 ++--
obexd/plugins/bluetooth.c | 2 +-
obexd/plugins/syncevolution.c | 2 +-
peripheral/attach.c | 6 +++---
peripheral/gap.c | 2 +-
peripheral/gatt.c | 4 ++--
plugins/admin.c | 2 +-
plugins/autopair.c | 4 ++--
plugins/hostname.c | 4 ++--
plugins/neard.c | 6 +++---
plugins/policy.c | 4 ++--
plugins/sixaxis.c | 4 ++--
profiles/audio/a2dp.c | 6 +++---
profiles/audio/avctp.c | 6 +++---
profiles/audio/avdtp.c | 6 +++---
profiles/audio/bap.c | 6 +++---
profiles/audio/bass.c | 2 +-
profiles/audio/control.c | 6 +++---
profiles/audio/csip.c | 6 +++---
profiles/audio/mcp.c | 6 +++---
profiles/audio/media.c | 4 ++--
profiles/audio/micp.c | 6 +++---
profiles/audio/sink.c | 4 ++--
profiles/audio/source.c | 4 ++--
profiles/audio/transport.c | 4 ++--
profiles/audio/vcp.c | 6 +++---
profiles/battery/bas.c | 4 ++--
profiles/battery/battery.c | 6 +++---
profiles/cups/hcrp.c | 8 ++++----
profiles/cups/main.c | 6 +++---
profiles/cups/sdp.c | 6 +++---
profiles/cups/spp.c | 8 ++++----
profiles/deviceinfo/deviceinfo.c | 4 ++--
profiles/deviceinfo/dis.c | 4 ++--
profiles/gap/gas.c | 6 +++---
profiles/health/hdp.c | 6 +++---
profiles/health/hdp_manager.c | 4 ++--
profiles/health/hdp_util.c | 6 +++---
profiles/health/mcap.c | 2 +-
profiles/input/device.c | 8 ++++----
profiles/input/hog-lib.c | 4 ++--
profiles/input/hog.c | 4 ++--
profiles/input/manager.c | 6 +++---
profiles/input/server.c | 4 ++--
profiles/midi/midi.c | 4 ++--
profiles/network/bnep.c | 6 +++---
profiles/network/connection.c | 6 +++---
profiles/network/manager.c | 6 +++---
profiles/network/server.c | 8 ++++----
profiles/sap/manager.c | 4 ++--
profiles/sap/server.c | 4 ++--
profiles/scanparam/scan.c | 4 ++--
profiles/scanparam/scpp.c | 4 ++--
src/adapter.h | 4 ++--
src/adv_monitor.c | 2 +-
src/advertising.c | 4 ++--
src/agent.c | 4 ++--
src/battery.c | 2 +-
src/device.c | 6 +++---
src/eir.c | 6 +++---
src/eir.h | 2 +-
src/gatt-client.c | 4 ++--
src/gatt-database.c | 6 +++---
src/log.c | 4 ++--
src/main.c | 4 ++--
src/oui.c | 2 +-
src/plugin.c | 2 +-
src/profile.c | 6 +++---
src/rfkill.c | 4 ++--
src/sdp-client.c | 6 +++---
src/sdp-xml.c | 4 ++--
src/sdpd-database.c | 6 +++---
src/sdpd-request.c | 8 ++++----
src/sdpd-server.c | 8 ++++----
src/sdpd-service.c | 6 +++---
src/service.c | 4 ++--
src/settings.c | 2 +-
src/shared/ad.c | 4 ++--
src/shared/ad.h | 2 +-
src/shared/att.c | 4 ++--
src/shared/bap.c | 2 +-
src/shared/bass.c | 2 +-
src/shared/btp.c | 2 +-
src/shared/ccp.c | 4 ++--
src/shared/csip.c | 2 +-
src/shared/gap.c | 2 +-
src/shared/gatt-client.c | 2 +-
src/shared/gatt-db.c | 2 +-
src/shared/gatt-helpers.c | 2 +-
src/shared/gatt-server.c | 2 +-
src/shared/log.c | 4 ++--
src/shared/mcp.c | 4 ++--
src/shared/mgmt.c | 4 ++--
src/shared/micp.c | 2 +-
src/shared/tester.c | 4 ++--
src/shared/util.c | 2 +-
src/shared/vcp.c | 2 +-
src/storage.c | 6 +++---
src/uuid-helper.c | 6 +++---
tools/advtest.c | 2 +-
tools/amptest.c | 6 +++---
tools/avinfo.c | 8 ++++----
tools/avtest.c | 10 +++++-----
tools/bdaddr.c | 6 +++---
tools/bluetooth-player.c | 2 +-
tools/bnep-tester.c | 4 ++--
tools/bneptest.c | 8 ++++----
tools/btattach.c | 6 +++---
tools/btgatt-client.c | 8 ++++----
tools/btgatt-server.c | 8 ++++----
tools/btiotest.c | 2 +-
tools/btmon-logger.c | 4 ++--
tools/btpclient.c | 2 +-
tools/btpclientctl.c | 2 +-
tools/ciptool.c | 14 +++++++-------
tools/cltest.c | 8 ++++----
tools/hciattach.c | 6 +++---
tools/hciattach_ath3k.c | 6 +++---
tools/hciattach_bcm43xx.c | 6 +++---
tools/hciattach_intel.c | 6 +++---
tools/hciattach_qualcomm.c | 6 +++---
tools/hciattach_st.c | 2 +-
tools/hciattach_ti.c | 6 +++---
tools/hciattach_tialt.c | 6 +++---
tools/hciconfig.c | 6 +++---
tools/hcidump.c | 4 ++--
tools/hcieventmask.c | 6 +++---
tools/hcisecfilter.c | 6 +++---
tools/hcitool.c | 6 +++---
tools/hwdb.c | 2 +-
tools/ioctl-tester.c | 6 +++---
tools/iso-tester.c | 2 +-
tools/isotest.c | 6 +++---
tools/l2cap-tester.c | 4 ++--
tools/l2ping.c | 8 ++++----
tools/l2test.c | 8 ++++----
tools/mcaptest.c | 8 ++++----
tools/mesh-gatt/gatt.c | 2 +-
tools/mesh-tester.c | 8 ++++----
tools/mesh/agent.c | 2 +-
tools/meshctl.c | 2 +-
tools/mgmt-tester.c | 8 ++++----
tools/oobtest.c | 2 +-
tools/parser/hci.c | 4 ++--
tools/parser/l2cap.c | 2 +-
tools/parser/lmp.c | 4 ++--
tools/parser/parser.h | 2 +-
tools/rctest.c | 12 ++++++------
tools/rfcomm-tester.c | 4 ++--
tools/rfcomm.c | 8 ++++----
tools/sco-tester.c | 4 ++--
tools/scotest.c | 4 ++--
tools/sdptool.c | 10 +++++-----
tools/smp-tester.c | 4 ++--
tools/test-runner.c | 6 +++---
tools/userchan-tester.c | 4 ++--
unit/test-avrcp.c | 2 +-
unit/test-bap.c | 2 +-
unit/test-bass.c | 2 +-
unit/test-eir.c | 6 +++---
unit/test-gatt.c | 2 +-
unit/test-gattrib.c | 2 +-
unit/test-hog.c | 2 +-
unit/test-lib.c | 4 ++--
unit/test-mgmt.c | 2 +-
unit/test-micp.c | 2 +-
unit/test-sdp.c | 6 +++---
unit/test-uuid.c | 2 +-
unit/test-vcp.c | 2 +-
255 files changed, 546 insertions(+), 547 deletions(-).gitignore +0 -1
@@ -37,7 +37,6 @@ coverage ell lib/bluez.pc -lib/bluetooth src/builtin.h src/bluetoothd tools/hid2hci.rules
Makefile.am +14 -14
@@ -67,16 +67,23 @@ manual_pages = plugin_LTLIBRARIES = lib_sources = lib/bluetooth.c lib/hci.c lib/sdp.c -lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \ - lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \ - lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h +lib_headers = \ + lib/bluetooth/bluetooth.h \ + lib/bluetooth/bnep.h \ + lib/bluetooth/cmtp.h \ + lib/bluetooth/hci.h \ + lib/bluetooth/hci_lib.h \ + lib/bluetooth/hidp.h \ + lib/bluetooth/l2cap.h \ + lib/bluetooth/rfcomm.h \ + lib/bluetooth/sco.h \ + lib/bluetooth/sdp.h \ + lib/bluetooth/sdp_lib.h extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h lib/iso.h extra_sources = lib/uuid.c -local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file))) - -BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h +BUILT_SOURCES = $(ell_built_sources) src/builtin.h if LIBRARY pkginclude_HEADERS += $(lib_headers)
@@ -490,7 +497,7 @@ EXTRA_DIST += doc/btsnoop.txt EXTRA_DIST += tools/magic.btsnoop -AM_CPPFLAGS += $(DBUS_CFLAGS) $(GLIB_CFLAGS) -I$(builddir)/lib +AM_CPPFLAGS += $(DBUS_CFLAGS) $(GLIB_CFLAGS) unit_tests += unit/test-tester
@@ -756,12 +763,6 @@ endif src/builtin.h: src/genbuiltin $(builtin_sources) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ -$(lib_libbluetooth_la_OBJECTS): $(local_headers) - -lib/bluetooth/%.h: lib/%.h - $(AM_V_at)$(MKDIR_P) lib/bluetooth - $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ - ell/shared: Makefile $(AM_V_at)$(MKDIR_P) ell $(AM_V_GEN)for f in $(ell_shared) ; do \
@@ -802,4 +803,3 @@ endif clean-local: clean-coverage -find $(top_builddir) -name "*.gcno" -delete -find $(top_builddir) -name "*.gcda" -delete - $(RM) -r lib/bluetooth
Makefile.mesh +1 -1
@@ -42,7 +42,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \ pkglibexec_PROGRAMS += mesh/bluetooth-meshd mesh/mesh.$(OBJEXT): ell/internal -mesh/main.$(OBJEXT): src/builtin.h lib/bluetooth/bluetooth.h +mesh/main.$(OBJEXT): src/builtin.h mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
android/a2dp-sink.c +1 -1
@@ -15,7 +15,7 @@#include <stdbool.h> #include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/log.h" #include "hal-msg.h" #include "ipc.h"
android/a2dp.c +3 -3
@@ -21,9 +21,9 @@#include <glib.h> #include "btio/btio.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "profiles/audio/a2dp-codecs.h" #include "src/shared/queue.h" #include "src/shared/util.h"
android/avctp.c +1 -1
@@ -30,7 +30,7 @@#include <glib.h> -#include "lib/sdp.h" +#include "lib/bluetooth/sdp.h" #include "src/shared/util.h" #include "src/log.h" #include "avctp.h"
android/avdtp.c +1 -1
@@ -26,7 +26,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/log.h" #include "src/shared/util.h" #include "src/shared/queue.h"
android/avdtptest.c +3 -3
@@ -22,9 +22,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "btio/btio.h" #include "src/shared/util.h"
android/avrcp-lib.c +1 -1
@@ -18,7 +18,7 @@#include <errno.h> #include <string.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "src/log.h"
android/avrcp.c +3 -3
@@ -18,9 +18,9 @@#include <glib.h> #include "btio/btio.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "src/shared/util.h" #include "src/log.h"
android/bluetooth.c +4 -4
@@ -22,8 +22,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/mgmt.h" #include "lib/uuid.h" #include "src/shared/util.h"
@@ -31,8 +31,8 @@#include "src/shared/queue.h" #include "src/shared/ad.h" #include "src/eir.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "src/sdpd.h" #include "src/log.h"
android/bluetoothd-snoop.c +2 -2
@@ -19,8 +19,8 @@#include <sys/capability.h> #endif -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "lib/mgmt.h" #include "src/shared/mainloop.h"
android/gatt.c +2 -2
@@ -21,8 +21,8 @@#include "ipc.h" #include "ipc-common.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "bluetooth.h" #include "gatt.h"
android/handsfree-client.c +3 -3
@@ -18,9 +18,9 @@#include <unistd.h> #include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "src/shared/hfp.h" #include "src/shared/queue.h"
android/handsfree.c +3 -3
@@ -18,9 +18,9 @@#include <unistd.h> #include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "src/uuid-helper.h" #include "src/shared/hfp.h"
android/health.c +4 -4
@@ -21,11 +21,11 @@#include <glib.h> #include "btio/btio.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/l2cap.h" #include "src/log.h" #include "src/shared/util.h" #include "src/shared/queue.h"
android/hidhost.c +3 -3
@@ -22,9 +22,9 @@#include <glib.h> #include "btio/btio.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "src/shared/mgmt.h" #include "src/shared/util.h"
android/ipc-tester.c +1 -1
@@ -25,7 +25,7 @@#include <libgen.h> #include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/tester.h"
android/main.c +2 -2
@@ -31,8 +31,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "src/log.h" #include "src/sdpd.h"
android/map-client.c +3 -3
@@ -17,12 +17,12 @@#include <stdint.h> #include <glib.h> -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "ipc.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "map-client.h" #include "src/log.h" #include "hal-msg.h"
android/pan.c +4 -4
@@ -30,10 +30,10 @@#include <linux/if_bridge.h> #include "btio/btio.h" -#include "lib/bluetooth.h" -#include "lib/bnep.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bnep.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/uuid-helper.h" #include "profiles/network/bnep.h" #include "src/log.h"
android/sco.c +1 -1
@@ -17,7 +17,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "btio/btio.h" #include "src/log.h" #include "src/shared/util.h"
android/socket.c +3 -3
@@ -17,10 +17,10 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "btio/btio.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-client.h" #include "src/sdpd.h" #include "src/log.h"
android/tester-a2dp.c +1 -1
@@ -11,7 +11,7 @@#include "src/shared/util.h" #include "src/shared/tester.h" #include "src/shared/queue.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/utils.h" #include "tester-main.h"
android/tester-avrcp.c +1 -1
@@ -11,7 +11,7 @@#include "src/shared/util.h" #include "src/shared/tester.h" #include "src/shared/queue.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/utils.h" #include "tester-main.h"
android/tester-gatt.c +1 -1
@@ -8,7 +8,7 @@#include <stdbool.h> #include "emulator/bthost.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "src/shared/tester.h" #include "src/shared/queue.h"
android/tester-hdp.c +1 -1
@@ -9,7 +9,7 @@#include <stdbool.h> #include "emulator/bthost.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/utils.h" #include "src/shared/tester.h" #include "src/shared/queue.h"
android/tester-hidhost.c +1 -1
@@ -10,7 +10,7 @@#include "emulator/bthost.h" #include "src/shared/tester.h" #include "src/shared/queue.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/utils.h" #include "tester-main.h"
android/tester-main.c +1 -1
@@ -13,7 +13,7 @@#include <sys/wait.h> #include <sys/signalfd.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/util.h" #include "src/shared/tester.h"
android/tester-pan.c +1 -1
@@ -8,7 +8,7 @@#include <stdbool.h> #include "emulator/bthost.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/utils.h" #include "src/shared/tester.h" #include "src/shared/queue.h"
attrib/att.c +1 -1
@@ -19,7 +19,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
attrib/gatt.c +2 -2
@@ -18,8 +18,8 @@#include <glib.h> -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "src/shared/util.h"
attrib/gattrib.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "btio/btio.h"
attrib/gatttool.c +4 -4
@@ -19,10 +19,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
attrib/interactive.c +2 -2
@@ -26,8 +26,8 @@#include <readline/readline.h> #include <readline/history.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
attrib/utils.c +4 -4
@@ -16,10 +16,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "btio/btio.h"
btio/btio.c +4 -4
@@ -25,10 +25,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/rfcomm.h" -#include "lib/sco.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/rfcomm.h" +#include "lib/bluetooth/sco.h" #include "lib/iso.h" #include "btio.h"
client/mgmt.c +5 -5
@@ -28,11 +28,11 @@#include <wordexp.h> #include <ctype.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "src/uuid-helper.h"
client/player.c +1 -1
@@ -32,7 +32,7 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "profiles/audio/a2dp-codecs.h"
emulator/amp.c +2 -2
@@ -21,8 +21,8 @@#include <sys/socket.h> #include <sys/un.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/mainloop.h"
emulator/b1ee.c +2 -2
@@ -26,8 +26,8 @@#include <netdb.h> #include <arpa/inet.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/mainloop.h"
emulator/btdev.c +2 -2
@@ -25,8 +25,8 @@#include <fcntl.h> #include <unistd.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/timeout.h"
emulator/bthost.c +1 -1
@@ -22,7 +22,7 @@#include <endian.h> #include <stdbool.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "src/shared/tester.h"
emulator/bthost.h +1 -1
@@ -13,7 +13,7 @@#include <stdint.h> #include <sys/uio.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" typedef void (*bthost_send_func ) (const struct iovec *iov,int iovlen,void *user_data);
emulator/hciemu.c +2 -2
@@ -25,8 +25,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "monitor/bt.h" #include "emulator/vhci.h"
emulator/le.c +2 -2
@@ -22,8 +22,8 @@#include <sys/uio.h> #include <time.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/crypto.h"
emulator/serial.c +2 -2
@@ -25,8 +25,8 @@#include <sys/epoll.h> #include <sys/uio.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/mainloop.h" #include "btdev.h"
emulator/server.c +2 -2
@@ -26,8 +26,8 @@#include <netinet/in.h> #include <arpa/inet.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/mainloop.h" #include "btdev.h"
emulator/smp.c +2 -2
@@ -22,8 +22,8 @@#include <stdbool.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/crypto.h"
emulator/vhci.c +2 -2
@@ -24,8 +24,8 @@#include <unistd.h> #include <dirent.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/io.h" #include "monitor/bt.h"
lib/bluetooth.c +2 -2
@@ -23,8 +23,8 @@#include <string.h> #include <sys/socket.h> -#include "bluetooth.h" -#include "hci.h" +#include "bluetooth/bluetooth.h" +#include "bluetooth/hci.h" void baswap (bdaddr_t *dst,const bdaddr_t *src) {
lib/bluetooth/bluetooth.h renamed from lib/bluetooth.h +0 -0
lib/bluetooth/bnep.h renamed from lib/bnep.h +0 -0
lib/bluetooth/cmtp.h renamed from lib/cmtp.h +0 -0
lib/bluetooth/hci.h renamed from lib/hci.h +0 -0
lib/bluetooth/hci_lib.h renamed from lib/hci_lib.h +0 -0
lib/bluetooth/hidp.h renamed from lib/hidp.h +0 -0
lib/bluetooth/l2cap.h renamed from lib/l2cap.h +0 -0
lib/bluetooth/rfcomm.h renamed from lib/rfcomm.h +0 -0
lib/bluetooth/sco.h renamed from lib/sco.h +0 -0
lib/bluetooth/sdp.h renamed from lib/sdp.h +0 -0
lib/bluetooth/sdp_lib.h renamed from lib/sdp_lib.h +0 -0
lib/hci.c +3 -3
@@ -29,9 +29,9 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "bluetooth.h" -#include "hci.h" -#include "hci_lib.h" +#include "bluetooth/bluetooth.h" +#include "bluetooth/hci.h" +#include "bluetooth/hci_lib.h" #ifndef MIN #define MIN (x, y) ((x) < (y) ? (x) : (y))
lib/sdp.c +6 -6
@@ -29,12 +29,12 @@#include <sys/un.h> #include <netinet/in.h> -#include "bluetooth.h" -#include "hci.h" -#include "hci_lib.h" -#include "l2cap.h" -#include "sdp.h" -#include "sdp_lib.h" +#include "bluetooth/bluetooth.h" +#include "bluetooth/hci.h" +#include "bluetooth/hci_lib.h" +#include "bluetooth/l2cap.h" +#include "bluetooth/sdp.h" +#include "bluetooth/sdp_lib.h" #define SDPINF(fmt, arg...) syslog(LOG_INFO, fmt "\n", ## arg) #define SDPERR(fmt, arg...) syslog(LOG_ERR, "%s: " fmt "\n", __func__ , ## arg)
lib/uuid.c +1 -1
@@ -17,7 +17,7 @@#include <stdlib.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "bluetooth/bluetooth.h" #include "uuid.h" static uint128_t bluetooth_base_uuid = {
mesh/main.c +1 -1
@@ -23,7 +23,7 @@#include <sys/stat.h> #include <ell/ell.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "mesh/mesh.h"
mesh/mesh-io-generic.c +1 -1
@@ -20,7 +20,7 @@#include "monitor/bt.h" #include "src/shared/hci.h" #include "src/shared/mgmt.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "mesh/mesh-defs.h"
mesh/mesh-io-mgmt.c +2 -2
@@ -19,8 +19,8 @@#include <ell/ell.h> #include "monitor/bt.h" -#include "lib/bluetooth.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/mgmt.h"
mesh/mesh-io.c +1 -1
@@ -14,7 +14,7 @@#include <ell/ell.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/mgmt.h"
mesh/mesh-mgmt.c +1 -1
@@ -14,7 +14,7 @@#include <ell/ell.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/mgmt.h"
monitor/a2dp.c +1 -1
@@ -18,7 +18,7 @@#include <stdlib.h> #include <string.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "bt.h"
monitor/analyze.c +1 -1
@@ -19,7 +19,7 @@#include <sys/time.h> #include <unistd.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "src/shared/queue.h"
monitor/att.c +3 -3
@@ -27,10 +27,10 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/shared/util.h" #include "src/shared/queue.h"
monitor/avctp.c +1 -1
@@ -20,7 +20,7 @@#include <ctype.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
monitor/avdtp.c +1 -1
@@ -17,7 +17,7 @@#include <stdlib.h> #include <string.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" #include "bt.h"
monitor/bnep.c +1 -1
@@ -20,7 +20,7 @@#include <ctype.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
monitor/control.c +2 -2
@@ -30,8 +30,8 @@#include <fcntl.h> #include <linux/filter.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "lib/mgmt.h" #include "src/shared/util.h"
monitor/hcidump.c +3 -3
@@ -22,9 +22,9 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/shared/mainloop.h"
monitor/intel.c +2 -2
@@ -17,8 +17,8 @@#include <stdio.h> #include <inttypes.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "display.h"
monitor/l2cap.c +1 -1
@@ -19,7 +19,7 @@#include <string.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
monitor/msft.c +1 -1
@@ -30,7 +30,7 @@#include <stdio.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
monitor/packet.c +3 -3
@@ -27,10 +27,10 @@#include <sys/time.h> #include <sys/socket.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/shared/util.h" #include "src/shared/btsnoop.h"
monitor/rfcomm.c +1 -1
@@ -20,7 +20,7 @@#include <ctype.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
monitor/sdp.c +1 -1
@@ -19,7 +19,7 @@#include <string.h> #include <inttypes.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
obexd/client/bluetooth.c +4 -4
@@ -18,10 +18,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/rfcomm.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/rfcomm.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "gdbus/gdbus.h" #include "btio/btio.h"
obexd/client/map.c +1 -1
@@ -21,7 +21,7 @@#include <glib.h> -#include "lib/sdp.h" +#include "lib/bluetooth/sdp.h" #include "gobex/gobex-apparam.h" #include "gdbus/gdbus.h"
obexd/client/pbap.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gobex/gobex-apparam.h" #include "gdbus/gdbus.h"
obexd/plugins/bluetooth.c +1 -1
@@ -22,7 +22,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
obexd/plugins/syncevolution.c +1 -1
@@ -21,7 +21,7 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "gdbus/gdbus.h"
peripheral/attach.c +3 -3
@@ -17,9 +17,9 @@#include <unistd.h> #include <sys/ioctl.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "tools/hciattach.h" #include "peripheral/attach.h"
peripheral/gap.c +1 -1
@@ -15,7 +15,7 @@#include <stdio.h> #include <string.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/util.h" #include "src/shared/mgmt.h"
peripheral/gatt.c +2 -2
@@ -18,8 +18,8 @@#include <string.h> #include <sys/epoll.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" #include "lib/uuid.h" #include "src/shared/mainloop.h" #include "src/shared/util.h"
plugins/admin.c +1 -1
@@ -19,7 +19,7 @@#include <sys/stat.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/adapter.h"
plugins/autopair.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "src/plugin.h" #include "src/adapter.h"
plugins/hostname.c +2 -2
@@ -19,8 +19,8 @@#include <fcntl.h> #include <sys/utsname.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
plugins/neard.c +3 -3
@@ -16,9 +16,9 @@#include <stdlib.h> #include <errno.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
plugins/policy.c +2 -2
@@ -19,8 +19,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "lib/mgmt.h"
plugins/sixaxis.c +2 -2
@@ -26,8 +26,8 @@#include <glib.h> #include <libudev.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/adapter.h"
profiles/audio/a2dp.c +3 -3
@@ -23,9 +23,9 @@#include <dbus/dbus.h> #include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/audio/avctp.c +3 -3
@@ -29,9 +29,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/l2cap.h" #include "lib/uuid.h" #include "btio/btio.h"
profiles/audio/avdtp.c +3 -3
@@ -23,9 +23,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "btio/btio.h"
profiles/audio/bap.c +3 -3
@@ -30,9 +30,9 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "lib/iso.h"
profiles/audio/bass.c +1 -1
@@ -27,7 +27,7 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/dbus-common.h"
profiles/audio/control.c +3 -3
@@ -27,9 +27,9 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/audio/csip.c +3 -3
@@ -27,9 +27,9 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/dbus-common.h"
profiles/audio/mcp.c +3 -3
@@ -27,9 +27,9 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/dbus-common.h"
profiles/audio/media.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "lib/mgmt.h"
profiles/audio/micp.c +3 -3
@@ -27,9 +27,9 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/dbus-common.h"
profiles/audio/sink.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
profiles/audio/source.c +2 -2
@@ -21,8 +21,8 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
profiles/audio/transport.c +2 -2
@@ -19,8 +19,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/audio/vcp.c +3 -3
@@ -27,9 +27,9 @@#include "gdbus/gdbus.h" -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/dbus-common.h"
profiles/battery/bas.c +2 -2
@@ -19,8 +19,8 @@#include "src/log.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
profiles/battery/battery.c +3 -3
@@ -23,9 +23,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
profiles/cups/hcrp.c +4 -4
@@ -20,10 +20,10 @@#include <sys/socket.h> #include <netinet/in.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "cups.h"
profiles/cups/main.c +3 -3
@@ -25,9 +25,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "gdbus/gdbus.h"
profiles/cups/sdp.c +3 -3
@@ -18,9 +18,9 @@#include <signal.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "cups.h"
profiles/cups/spp.c +4 -4
@@ -18,10 +18,10 @@#include <signal.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/rfcomm.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/rfcomm.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "cups.h"
profiles/deviceinfo/deviceinfo.c +2 -2
@@ -17,8 +17,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/plugin.h"
profiles/deviceinfo/dis.c +2 -2
@@ -18,8 +18,8 @@#include "src/log.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
profiles/gap/gas.c +3 -3
@@ -23,9 +23,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
profiles/health/hdp.c +3 -3
@@ -19,9 +19,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
profiles/health/hdp_manager.c +2 -2
@@ -13,8 +13,8 @@#include <stdbool.h> -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "btio/btio.h"
profiles/health/hdp_util.c +3 -3
@@ -17,9 +17,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/health/mcap.c +1 -1
@@ -22,7 +22,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "bluetooth/l2cap.h" #include "btio/btio.h" #include "src/log.h"
profiles/input/device.c +4 -4
@@ -22,10 +22,10 @@#include <sys/ioctl.h> #include <sys/uio.h> -#include "lib/bluetooth.h" -#include "lib/hidp.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hidp.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/input/hog-lib.c +2 -2
@@ -27,8 +27,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
profiles/input/hog.c +2 -2
@@ -24,8 +24,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/log.h"
profiles/input/manager.c +3 -3
@@ -15,9 +15,9 @@#include <errno.h> #include <stdbool.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "src/log.h"
profiles/input/server.c +2 -2
@@ -19,8 +19,8 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/log.h"
profiles/midi/midi.c +2 -2
@@ -15,8 +15,8 @@#include <errno.h> #include <alsa/asoundlib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/plugin.h"
profiles/network/bnep.c +3 -3
@@ -26,9 +26,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/bnep.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/bnep.h" #include "lib/uuid.h" #include "src/log.h"
profiles/network/connection.c +3 -3
@@ -21,9 +21,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/bnep.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bnep.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
profiles/network/manager.c +3 -3
@@ -17,9 +17,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/bnep.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bnep.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/log.h"
profiles/network/server.c +4 -4
@@ -21,10 +21,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/bnep.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bnep.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/sap/manager.c +2 -2
@@ -12,8 +12,8 @@#include <stdbool.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "src/log.h" #include "src/adapter.h"
profiles/sap/server.c +2 -2
@@ -19,8 +19,8 @@#include <errno.h> #include <glib.h> -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
profiles/scanparam/scan.c +2 -2
@@ -16,8 +16,8 @@#include <stdbool.h> #include <errno.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/log.h"
profiles/scanparam/scpp.c +2 -2
@@ -20,8 +20,8 @@#include "src/log.h" -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "src/shared/util.h"
src/adapter.h +2 -2
@@ -13,8 +13,8 @@#include <dbus/dbus.h> #include <glib.h> -#include <lib/bluetooth.h> -#include <lib/sdp.h> +#include <lib/bluetooth/bluetooth.h> +#include <lib/bluetooth/sdp.h> #define ADAPTER_INTERFACE "org.bluez.Adapter1"
src/adv_monitor.c +1 -1
@@ -21,7 +21,7 @@#include <dbus/dbus.h> #include <gdbus/gdbus.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "adapter.h"
src/advertising.c +2 -2
@@ -20,9 +20,9 @@#include <dbus/dbus.h> #include <gdbus/gdbus.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" -#include "lib/sdp.h" +#include "lib/bluetooth/sdp.h" #include "adapter.h" #include "dbus-common.h"
src/agent.c +2 -2
@@ -23,8 +23,8 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h"
src/battery.c +1 -1
@@ -18,7 +18,7 @@#include <glib.h> #include "gdbus/gdbus.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/queue.h" #include "src/shared/util.h" #include "battery.h"
src/device.c +3 -3
@@ -27,9 +27,9 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
src/eir.c +3 -3
@@ -21,9 +21,9 @@#include <stdbool.h> #include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "src/shared/util.h" #include "uuid-helper.h"
src/eir.h +1 -1
@@ -11,7 +11,7 @@#include <glib.h> -#include "lib/sdp.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #define EIR_FLAGS 0x01/* flags */
src/gatt-client.c +2 -2
@@ -21,8 +21,8 @@#include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
src/gatt-database.c +3 -3
@@ -17,9 +17,9 @@#include <errno.h> #include <unistd.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "btio/btio.h" #include "gdbus/gdbus.h"
src/log.c +2 -2
@@ -25,8 +25,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/log.h"
src/main.c +2 -2
@@ -30,8 +30,8 @@#include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "gdbus/gdbus.h" #include "btio/btio.h"
src/oui.c +1 -1
@@ -13,7 +13,7 @@#endif #define _GNU_SOURCE -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "oui.h" #ifdef HAVE_UDEV
src/plugin.c +1 -1
@@ -19,7 +19,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "btio/btio.h" #include "src/plugin.h"
src/profile.c +3 -3
@@ -21,9 +21,9 @@#include <glib.h> #include <dbus/dbus.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "gdbus/gdbus.h"
src/rfkill.c +2 -2
@@ -23,8 +23,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "log.h" #include "adapter.h"
src/sdp-client.c +3 -3
@@ -16,9 +16,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "btio/btio.h" #include "shared/timeout.h"
src/sdp-xml.c +2 -2
@@ -22,8 +22,8 @@#include <glib.h> -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "sdp-xml.h"
src/sdpd-database.c +3 -3
@@ -18,9 +18,9 @@#include <stdlib.h> #include <stdbool.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "sdpd.h" #include "log.h"
src/sdpd-request.c +4 -4
@@ -20,10 +20,10 @@#include <limits.h> #include <stdbool.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/shared/util.h"
src/sdpd-server.c +4 -4
@@ -25,10 +25,10 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "log.h" #include "sdpd.h"
src/sdpd-service.c +3 -3
@@ -23,9 +23,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/shared/util.h" #include "sdpd.h"
src/service.c +2 -2
@@ -23,8 +23,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" #include "log.h" #include "backtrace.h"
src/settings.c +1 -1
@@ -16,7 +16,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "log.h"
src/shared/ad.c +2 -2
@@ -16,8 +16,8 @@#include <ctype.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/ad.h"
src/shared/ad.h +1 -1
@@ -11,7 +11,7 @@#include <inttypes.h> #include <stdbool.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #define BT_AD_MAX_DATA_LEN 31
src/shared/att.c +2 -2
@@ -20,8 +20,8 @@#include "src/shared/queue.h" #include "src/shared/util.h" #include "src/shared/timeout.h" -#include "lib/bluetooth.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" #include "lib/uuid.h" #include "src/shared/att.h" #include "src/shared/crypto.h"
src/shared/bap.c +1 -1
@@ -16,7 +16,7 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/io.h"
src/shared/bass.c +1 -1
@@ -16,7 +16,7 @@#include <errno.h> #include <poll.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "lib/iso.h"
src/shared/btp.c +1 -1
@@ -15,7 +15,7 @@#include <ell/ell.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/btp.h" #define BTP_MTU 512
src/shared/ccp.c +2 -2
@@ -15,9 +15,9 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" -#include "lib/hci.h" +#include "lib/bluetooth/hci.h" #include "src/shared/queue.h" #include "src/shared/util.h"
src/shared/csip.c +1 -1
@@ -17,7 +17,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/queue.h"
src/shared/gap.c +1 -1
@@ -15,7 +15,7 @@#include <stdio.h> #include <stdlib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/util.h"
src/shared/gatt-client.c +1 -1
@@ -13,7 +13,7 @@#endif #include "src/shared/att.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/gatt-helpers.h" #include "src/shared/util.h"
src/shared/gatt-db.c +1 -1
@@ -15,7 +15,7 @@#include <stdbool.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/queue.h"
src/shared/gatt-helpers.c +1 -1
@@ -15,7 +15,7 @@#include "src/shared/queue.h" #include "src/shared/att.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/gatt-helpers.h" #include "src/shared/util.h"
src/shared/gatt-server.c +1 -1
@@ -17,7 +17,7 @@#include <errno.h> #include "src/shared/att.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/queue.h" #include "src/shared/gatt-db.h"
src/shared/log.c +2 -2
@@ -23,8 +23,8 @@#include <signal.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/log.h"
src/shared/mcp.c +2 -2
@@ -15,9 +15,9 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" -#include "lib/hci.h" +#include "lib/bluetooth/hci.h" #include "src/shared/queue.h" #include "src/shared/util.h"
src/shared/mgmt.c +2 -2
@@ -17,9 +17,9 @@#include <string.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" -#include "lib/hci.h" +#include "lib/bluetooth/hci.h" #include "src/shared/io.h" #include "src/shared/queue.h"
src/shared/micp.c +1 -1
@@ -14,7 +14,7 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/queue.h"
src/shared/tester.c +2 -2
@@ -25,8 +25,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h>
src/shared/util.c +1 -1
@@ -29,7 +29,7 @@#include <sys/random.h> #endif -#include <lib/bluetooth.h> +#include <lib/bluetooth/bluetooth.h> /* define MAX_INPUT for musl */ #ifndef MAX_INPUT
src/shared/vcp.c +1 -1
@@ -15,7 +15,7 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/queue.h"
src/storage.c +3 -3
@@ -26,9 +26,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "lib/uuid.h" #include "textfile.h"
src/uuid-helper.c +3 -3
@@ -19,9 +19,9 @@#include <errno.h> #include <arpa/inet.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "uuid-helper.h"
tools/advtest.c +1 -1
@@ -22,7 +22,7 @@#include <getopt.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/amptest.c +3 -3
@@ -23,9 +23,9 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" static int activate_amp_controller (int dev_id) {
tools/avinfo.c +4 -4
@@ -27,10 +27,10 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" #include "profiles/audio/a2dp-codecs.h"
tools/avtest.c +5 -5
@@ -22,11 +22,11 @@#include <sys/socket.h> #include <netinet/in.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" #define AVDTP_PKT_TYPE_SINGLE 0x00#define AVDTP_PKT_TYPE_START 0x01
tools/bdaddr.c +3 -3
@@ -20,9 +20,9 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/oui.h"
tools/bluetooth-player.c +1 -1
@@ -26,7 +26,7 @@#include <glib.h> #include "gdbus/gdbus.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
tools/bnep-tester.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/bnep.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/bnep.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/bneptest.c +4 -4
@@ -28,14 +28,14 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/log.h" #include "src/shared/util.h" #include "btio/btio.h" -#include "lib/bnep.h" +#include "lib/bluetooth/bnep.h" #include "profiles/network/bnep.h" enum {
tools/btattach.c +3 -3
@@ -25,9 +25,9 @@#include <sys/ioctl.h> #include <poll.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h" #include "monitor/bt.h"
tools/btgatt-client.c +4 -4
@@ -21,10 +21,10 @@#include <limits.h> #include <errno.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" #include "lib/uuid.h" #include "src/shared/mainloop.h"
tools/btgatt-server.c +4 -4
@@ -21,10 +21,10 @@#include <unistd.h> #include <errno.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" #include "lib/uuid.h" #include "src/shared/mainloop.h"
tools/btiotest.c +1 -1
@@ -23,7 +23,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "btio/btio.h"
tools/btmon-logger.c +2 -2
@@ -29,8 +29,8 @@#include <linux/capability.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "src/shared/util.h" #include "src/shared/mainloop.h"
tools/btpclient.c +1 -1
@@ -20,7 +20,7 @@#include <ell/ell.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/btp.h" #define AD_PATH "/org/bluez/advertising"
tools/btpclientctl.c +1 -1
@@ -22,7 +22,7 @@#include <fcntl.h> #include <poll.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/ad.h" #include "src/shared/btp.h"
tools/ciptool.c +7 -7
@@ -24,13 +24,13 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" -#include "lib/cmtp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" +#include "lib/bluetooth/cmtp.h" static volatile sig_atomic_t __io_canceled =0 ;
tools/cltest.c +4 -4
@@ -23,10 +23,10 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" #include "src/shared/mainloop.h"
tools/hciattach.c +3 -3
@@ -30,9 +30,9 @@#include <sys/param.h> #include <sys/ioctl.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/shared/tty.h"
tools/hciattach_ath3k.c +3 -3
@@ -22,9 +22,9 @@#include <sys/param.h> #include <sys/ioctl.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciattach_bcm43xx.c +3 -3
@@ -24,9 +24,9 @@#include <time.h> #include <limits.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciattach_intel.c +3 -3
@@ -23,9 +23,9 @@#include <sys/ioctl.h> #include <time.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciattach_qualcomm.c +3 -3
@@ -30,9 +30,9 @@#include <sys/ioctl.h> #include <sys/uio.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciattach_st.c +1 -1
@@ -22,7 +22,7 @@#include <dirent.h> #include <sys/param.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "hciattach.h"
tools/hciattach_ti.c +3 -3
@@ -25,9 +25,9 @@#include <sys/param.h> #include <sys/ioctl.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciattach_tialt.c +3 -3
@@ -29,9 +29,9 @@#include <sys/ioctl.h> #include <sys/uio.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "hciattach.h"
tools/hciconfig.c +3 -3
@@ -27,9 +27,9 @@#include <sys/socket.h> #include <sys/stat.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/textfile.h" #include "src/shared/util.h"
tools/hcidump.c +2 -2
@@ -30,8 +30,8 @@#include "parser/parser.h" #include "parser/sdp.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #define SNAP_LEN HCI_MAX_FRAME_SIZE
tools/hcieventmask.c +3 -3
@@ -18,9 +18,9 @@#include <getopt.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" static struct option main_options[] = { {"device" ,1 ,0 ,'i' },
tools/hcisecfilter.c +3 -3
@@ -16,9 +16,9 @@#include <stdio.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" int main (int argc,char *argv[]) {
tools/hcitool.c +3 -3
@@ -28,9 +28,9 @@#include <sys/socket.h> #include <signal.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "src/oui.h"
tools/hwdb.c +1 -1
@@ -14,7 +14,7 @@#include <stdio.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" static const struct { uint16_t vendor;
tools/ioctl-tester.c +3 -3
@@ -22,10 +22,10 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "monitor/bt.h" #include "emulator/bthost.h"
tools/iso-tester.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/iso.h" #include "lib/mgmt.h"
tools/isotest.c +3 -3
@@ -35,9 +35,9 @@#include <sys/wait.h> #include <poll.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "lib/mgmt.h" #include "lib/iso.h"
tools/l2cap-tester.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/l2cap.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/l2ping.c +4 -4
@@ -26,10 +26,10 @@#include <poll.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" /* Defaults */ static bdaddr_t bdaddr;
tools/l2test.c +4 -4
@@ -30,10 +30,10 @@#include <sys/ioctl.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/l2cap.h" #include "src/shared/util.h" #include "monitor/display.h"
tools/mcaptest.c +4 -4
@@ -20,12 +20,12 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "btio/btio.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/l2cap.h" #include "profiles/health/mcap.h" enum {
tools/mesh-gatt/gatt.c +1 -1
@@ -26,7 +26,7 @@#include "src/shared/shell.h" #include "src/shared/util.h" #include "gdbus/gdbus.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "tools/mesh-gatt/node.h"
tools/mesh-tester.c +4 -4
@@ -23,11 +23,11 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "lib/mgmt.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/l2cap.h" #include "monitor/bt.h" #include "emulator/vhci.h"
tools/mesh/agent.c +1 -1
@@ -17,7 +17,7 @@#include <stdbool.h> #include <inttypes.h> -#include <lib/bluetooth.h> +#include <lib/bluetooth/bluetooth.h> #include "src/shared/shell.h" #include "tools/mesh/agent.h"
tools/meshctl.c +1 -1
@@ -29,7 +29,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/shell.h" #include "src/shared/util.h"
tools/mgmt-tester.c +4 -4
@@ -24,11 +24,11 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "lib/mgmt.h" -#include "lib/l2cap.h" +#include "lib/bluetooth/l2cap.h" #include "monitor/bt.h" #include "emulator/vhci.h"
tools/oobtest.c +1 -1
@@ -15,7 +15,7 @@#include <getopt.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/mainloop.h"
tools/parser/hci.c +2 -2
@@ -22,8 +22,8 @@#include <string.h> #include "parser.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "lib/amp.h" static uint16_t manufacturer =DEFAULT_COMPID ;
tools/parser/l2cap.c +1 -1
@@ -24,7 +24,7 @@#include "parser.h" #include "sdp.h" #include "l2cap.h" -#include "lib/hci.h" +#include "lib/bluetooth/hci.h" #include "lib/a2mp.h" #include "lib/amp.h"
tools/parser/lmp.c +2 -2
@@ -19,8 +19,8 @@#include <sys/socket.h> #include "parser.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #define LMP_U8 (frm) (p_get_u8(frm))#define LMP_U16 (frm) (btohs(htons(p_get_u16(frm))))
tools/parser/parser.h +1 -1
@@ -16,7 +16,7 @@#include <sys/time.h> #include <netinet/in.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "src/shared/util.h" struct frame {
tools/rctest.c +6 -6
@@ -28,12 +28,12 @@#include <sys/socket.h> #include <sys/stat.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/rfcomm.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/rfcomm.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/shared/util.h"
tools/rfcomm-tester.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/rfcomm.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/rfcomm.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/rfcomm.c +4 -4
@@ -28,10 +28,10 @@#include <sys/socket.h> #include <sys/wait.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/rfcomm.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/rfcomm.h" static int rfcomm_raw_tty =0 ;static int auth =0 ;
tools/sco-tester.c +2 -2
@@ -19,8 +19,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sco.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sco.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/scotest.c +2 -2
@@ -25,8 +25,8 @@#include <sys/time.h> #include <sys/socket.h> -#include "lib/bluetooth.h" -#include "lib/sco.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sco.h" #include "src/shared/util.h"
tools/sdptool.c +5 -5
@@ -26,11 +26,11 @@#include <sys/socket.h> #include <netinet/in.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/sdp-xml.h"
tools/smp-tester.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "lib/mgmt.h" #include "monitor/bt.h"
tools/test-runner.c +3 -3
@@ -30,9 +30,9 @@#include <sys/param.h> #include <sys/reboot.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/hci_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/hci_lib.h" #include "tools/hciattach.h" #ifndef WAIT_ANY
tools/userchan-tester.c +2 -2
@@ -20,8 +20,8 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" #include "lib/mgmt.h" #include "monitor/bt.h"
unit/test-avrcp.c +1 -1
@@ -26,7 +26,7 @@#include "src/shared/util.h" #include "src/shared/tester.h" #include "src/log.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "android/avctp.h" #include "android/avrcp-lib.h"
unit/test-bap.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/io.h"
unit/test-bass.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/io.h"
unit/test-eir.c +3 -3
@@ -16,9 +16,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/hci.h" -#include "lib/sdp.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/hci.h" +#include "lib/bluetooth/sdp.h" #include "src/shared/tester.h" #include "src/shared/util.h" #include "src/shared/ad.h"
unit/test-gatt.c +1 -1
@@ -22,7 +22,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/att.h"
unit/test-gattrib.c +1 -1
@@ -23,7 +23,7 @@#include <glib.h> #include "src/shared/util.h" -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "attrib/att.h" #include "attrib/gattrib.h"
unit/test-hog.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h"
unit/test-lib.c +2 -2
@@ -21,8 +21,8 @@#include "src/shared/util.h" #include "src/shared/tester.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" static void test_ntoh64 (const void *data) {
unit/test-mgmt.c +1 -1
@@ -18,7 +18,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/mgmt.h" #include "src/shared/mgmt.h"
unit/test-micp.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/tester.h"
unit/test-sdp.c +3 -3
@@ -20,9 +20,9 @@#include <glib.h> -#include "lib/bluetooth.h" -#include "lib/sdp.h" -#include "lib/sdp_lib.h" +#include "lib/bluetooth/bluetooth.h" +#include "lib/bluetooth/sdp.h" +#include "lib/bluetooth/sdp_lib.h" #include "src/shared/util.h" #include "src/shared/tester.h"
unit/test-uuid.c +1 -1
@@ -14,7 +14,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/tester.h"
unit/test-vcp.c +1 -1
@@ -20,7 +20,7 @@#include <glib.h> -#include "lib/bluetooth.h" +#include "lib/bluetooth/bluetooth.h" #include "lib/uuid.h" #include "src/shared/util.h" #include "src/shared/tester.h"
Signature · 1 line
2.43.1
Hello everyone,
On Fri, 16 Feb 2024 at 23:11, Emil Velikov via B4 Relay <[email protected]> wrote:
[snip]
Quoted 1 line
build: drop %.rules make rule
This patch is flagging a bug in the CI and tripping it over. I'm looking at fixing the CI, but for now please drop this patch.
Quoted 1 line
build: move public headers to sub-folder
This patch is causing failures in CI, which are not reproducible locally. Do ignore this patch as well.
Kindly let me know if I should resend the series with the above two omitted.
Thanks
Emil
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 15 lines · On Fri, 16 Feb 2024 23:11:04 +0000 you wrote:
Hello list,
Here are bunch of regression fixes caused by yours truly - mea culpa.
Changes in v2:
- rework first (install-data-hooks) to per-target hooks
- add renamed files to gitignore (rules patch)
- introduced six extra patches
- fix the @@ substitution in the service.in files
- drop erroneous -fPIC
- add org.bluez.obex.service to gitignore
- drop duplicate -I include in obexd
- adds all manpages to gitignore
- moves libbluetooth public header to sub-folder
Quoted 1 line
[...]
Here is the summary with links:
- [BlueZ,v2,01/10] build: rework {install-data,uninstall}-hook
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=9fe4ccb79ffa - [BlueZ,v2,02/10] build: install obexd (dbus,systemd} services as needed https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=c2b9f357d522 - [BlueZ,v2,03/10] build: handle relative libexecdir instances https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=71d8fda25b21 - [BlueZ,v2,04/10] build: drop %.rules make rule (no matching commit) - [BlueZ,v2,05/10] build: simplify coverage handling https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=344cf10cb60c - [BlueZ,v2,06/10] build: drop explicit -fPIC from obexd CFLAGS https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=bade07f43fed - [BlueZ,v2,07/10] gitignore: add org.bluez.obex.service https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=071ababfe6e3 - [BlueZ,v2,08/10] build: obexd: remove duplicate include -I$(builddir)/lib https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=4d3605e472ed - [BlueZ,v2,09/10] gitignore: ignore all manual pages https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=e6acec4770bb
- [BlueZ,v2,10/10] build: move public headers to sub-folder (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html