[PATCH BlueZ v2 2/4] shared: Move AVCTP implementation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>

This moves AVCTP implementation to shared since it does already contain
some unit tests it can be reused by e.g. audio plugin.
---
 Makefile.am                     | 2 +-
 android/Android.mk              | 2 +-
 android/Makefile.am             | 2 +-
 {android => src/shared}/avctp.c | 0
 {android => src/shared}/avctp.h | 0
 src/shared/avrcp.c              | 2 +-
 unit/test-avctp.c               | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename {android => src/shared}/avctp.c (100%)
 rename {android => src/shared}/avctp.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 84dd33b..ba9e5b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -280,7 +280,7 @@ unit_tests += unit/test-avctp
 unit_test_avctp_SOURCES = unit/test-avctp.c \
 				src/shared/util.h src/shared/util.c \
 				src/log.h src/log.c \
-				android/avctp.c android/avctp.h
+				src/shared/avctp.c src/shared/avctp.h
 unit_test_avctp_LDADD = @GLIB_LIBS@
 
 unit_tests += unit/test-gdbus-client
diff --git a/android/Android.mk b/android/Android.mk
index 4f8a17a..763056c 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -38,7 +38,6 @@ LOCAL_SRC_FILES := \
 	bluez/android/audio-ipc.c \
 	bluez/android/avdtp.c \
 	bluez/android/a2dp.c \
-	bluez/android/avctp.c \
 	bluez/android/avrcp.c \
 	bluez/android/pan.c \
 	bluez/android/handsfree.c \
@@ -49,6 +48,7 @@ LOCAL_SRC_FILES := \
 	bluez/src/shared/ringbuf.c \
 	bluez/src/shared/hfp.c \
 	bluez/src/shared/io-glib.c \
+	bluez/src/shared/avctp.c \
 	bluez/src/shared/avrcp.c \
 	bluez/src/sdpd-database.c \
 	bluez/src/sdpd-service.c \
diff --git a/android/Makefile.am b/android/Makefile.am
index 3cc0687..d1b3119 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -29,6 +29,7 @@ android_bluetoothd_SOURCES = android/main.c \
 				src/shared/mgmt.h src/shared/mgmt.c \
 				src/shared/ringbuf.h src/shared/ringbuf.c \
 				src/shared/hfp.h src/shared/hfp.c \
+				src/shared/avctp.h src/shared/avctp.c \
 				src/shared/avrcp.h src/shared/avrcp.c \
 				android/bluetooth.h android/bluetooth.c \
 				android/hidhost.h android/hidhost.c \
@@ -36,7 +37,6 @@ android_bluetoothd_SOURCES = android/main.c \
 				android/audio-ipc.h android/audio-ipc.c \
 				android/avdtp.h android/avdtp.c \
 				android/a2dp.h android/a2dp.c \
-				android/avctp.h android/avctp.c \
 				android/avrcp.h android/avrcp.c \
 				android/socket.h android/socket.c \
 				android/pan.h android/pan.c \
diff --git a/android/avctp.c b/src/shared/avctp.c
similarity index 100%
rename from android/avctp.c
rename to src/shared/avctp.c
diff --git a/android/avctp.h b/src/shared/avctp.h
similarity index 100%
rename from android/avctp.h
rename to src/shared/avctp.h
diff --git a/src/shared/avrcp.c b/src/shared/avrcp.c
index 32bd703..1325284 100644
--- a/src/shared/avrcp.c
+++ b/src/shared/avrcp.c
@@ -32,7 +32,7 @@
 
 #include "src/log.h"
 
-#include "android/avctp.h"
+#include "avctp.h"
 #include "avrcp.h"
 
 struct avrcp {
diff --git a/unit/test-avctp.c b/unit/test-avctp.c
index be1dfd7..83bf2c5 100644
--- a/unit/test-avctp.c
+++ b/unit/test-avctp.c
@@ -38,7 +38,7 @@
 #include "src/shared/util.h"
 #include "src/log.h"
 
-#include "android/avctp.h"
+#include "src/shared/avctp.h"
 
 struct test_pdu {
 	bool valid;
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux