diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2015-11-11 13:08:52 +0200 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2015-11-13 14:00:28 +0200 |
commit | b6cb2d3ec320bdfdf1cdcdf750e767d214170efd (patch) | |
tree | 57936bcddc508e2dc4b66851a9796cc18a423c63 | |
parent | 368a974e3058eca68d9bffbf767622c80d44ec5d (diff) | |
download | bluez-b6cb2d3ec320bdfdf1cdcdf750e767d214170efd.tar.gz |
bas: Move code from android to profiles
This is a place holder until the code is ported to use shared API so it
can be shared by android and D-Bus daemon.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | android/Android.mk | 2 | ||||
-rw-r--r-- | android/Makefile.am | 2 | ||||
-rw-r--r-- | android/hog.c | 2 | ||||
-rw-r--r-- | profiles/battery/bas.c (renamed from android/bas.c) | 2 | ||||
-rw-r--r-- | profiles/battery/bas.h (renamed from android/bas.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 614922e16..1027613ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -402,7 +402,7 @@ unit_test_hog_SOURCES = unit/test-hog.c \ $(btio_sources) \ android/hog.h android/hog.c \ android/scpp.h android/scpp.c \ - android/bas.h android/bas.c \ + profiles/battery/bas.h profiles/battery/bas.c \ android/dis.h android/dis.c \ src/log.h src/log.c \ attrib/att.h attrib/att.c \ diff --git a/android/Android.mk b/android/Android.mk index 89ca2c268..2f1f6bbdc 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -41,7 +41,7 @@ LOCAL_SRC_FILES := \ bluez/android/bluetooth.c \ bluez/android/scpp.c \ bluez/android/dis.c \ - bluez/android/bas.c \ + bluez/profiles/battery/bas.c \ bluez/android/hog.c \ bluez/android/hidhost.c \ bluez/android/socket.c \ diff --git a/android/Makefile.am b/android/Makefile.am index cb32bc3df..63bcb63ee 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -30,7 +30,7 @@ android_bluetoothd_SOURCES = android/main.c \ android/hidhost.h android/hidhost.c \ android/scpp.h android/scpp.c \ android/dis.h android/dis.c \ - android/bas.h android/bas.c \ + profiles/battery/bas.h profiles/battery/bas.c \ android/hog.h android/hog.c \ android/ipc-common.h \ android/ipc.h android/ipc.c \ diff --git a/android/hog.c b/android/hog.c index 3af932961..93e0655c0 100644 --- a/android/hog.c +++ b/android/hog.c @@ -55,7 +55,7 @@ #include "android/scpp.h" #include "android/dis.h" -#include "android/bas.h" +#include "profiles/battery/bas.h" #include "android/hog.h" #define HOG_UUID "00001812-0000-1000-8000-00805f9b34fb" diff --git a/android/bas.c b/profiles/battery/bas.c index 7a1c4ca56..de369fd3c 100644 --- a/android/bas.c +++ b/profiles/battery/bas.c @@ -43,7 +43,7 @@ #include "attrib/att.h" #include "attrib/gatt.h" -#include "android/bas.h" +#include "profiles/battery/bas.h" #define ATT_NOTIFICATION_HEADER_SIZE 3 #define ATT_READ_RESPONSE_HEADER_SIZE 1 diff --git a/android/bas.h b/profiles/battery/bas.h index 3e175b5b5..3e175b5b5 100644 --- a/android/bas.h +++ b/profiles/battery/bas.h |