diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2015-11-11 13:17:33 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2015-11-13 14:00:29 +0200 |
| commit | d0a77e68d7c87f5f43f8dbb52490bc0482da4ee1 (patch) | |
| tree | 855a22cc8d3b7a91c06030d60787b499615c74eb | |
| parent | b6cb2d3ec320bdfdf1cdcdf750e767d214170efd (diff) | |
| download | bluez-d0a77e68d7c87f5f43f8dbb52490bc0482da4ee1.tar.gz | |
scpp: 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 | 3 | ||||
| -rw-r--r-- | android/hog.c | 2 | ||||
| -rw-r--r-- | profiles/scanparam/scpp.c (renamed from android/scpp.c) | 2 | ||||
| -rw-r--r-- | profiles/scanparam/scpp.h (renamed from android/scpp.h) | 0 |
6 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 1027613ce..34fb27f10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -401,7 +401,7 @@ unit_tests += unit/test-hog unit_test_hog_SOURCES = unit/test-hog.c \ $(btio_sources) \ android/hog.h android/hog.c \ - android/scpp.h android/scpp.c \ + profiles/scanparam/scpp.h profiles/scanparam/scpp.c \ profiles/battery/bas.h profiles/battery/bas.c \ android/dis.h android/dis.c \ src/log.h src/log.c \ diff --git a/android/Android.mk b/android/Android.mk index 2f1f6bbdc..03afacdd5 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -39,7 +39,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ bluez/android/main.c \ bluez/android/bluetooth.c \ - bluez/android/scpp.c \ + bluez/profiles/scanparam/scpp.c \ bluez/android/dis.c \ bluez/profiles/battery/bas.c \ bluez/android/hog.c \ diff --git a/android/Makefile.am b/android/Makefile.am index 63bcb63ee..128e9ddce 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -28,7 +28,8 @@ android_bluetoothd_SOURCES = android/main.c \ src/eir.h src/eir.c \ android/bluetooth.h android/bluetooth.c \ android/hidhost.h android/hidhost.c \ - android/scpp.h android/scpp.c \ + profiles/scanparam/scpp.h \ + profiles/scanparam/scpp.c \ android/dis.h android/dis.c \ profiles/battery/bas.h profiles/battery/bas.c \ android/hog.h android/hog.c \ diff --git a/android/hog.c b/android/hog.c index 93e0655c0..e0decac0c 100644 --- a/android/hog.c +++ b/android/hog.c @@ -53,7 +53,7 @@ #include "btio/btio.h" -#include "android/scpp.h" +#include "profiles/scanparam/scpp.h" #include "android/dis.h" #include "profiles/battery/bas.h" #include "android/hog.h" diff --git a/android/scpp.c b/profiles/scanparam/scpp.c index a432733df..df65d2c1e 100644 --- a/android/scpp.c +++ b/profiles/scanparam/scpp.c @@ -44,7 +44,7 @@ #include "attrib/gattrib.h" #include "attrib/gatt.h" -#include "android/scpp.h" +#include "profiles/scanparam/scpp.h" #define SCAN_INTERVAL_WIN_UUID 0x2A4F #define SCAN_REFRESH_UUID 0x2A31 diff --git a/android/scpp.h b/profiles/scanparam/scpp.h index 048fb9f23..048fb9f23 100644 --- a/android/scpp.h +++ b/profiles/scanparam/scpp.h |