Skip to contentSkip to conversation

avctp: Move avctp.c|h from profiles/audio to protocol/

PATCH In review Ravi kumar Veeramally 3 participants 4 messages Dec 18, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 avctp: Move avctp.c|h from profiles/audio to protocol/

This is an initial patch for decoupling avctp.c|h from profiles/audio. Goal is to remove external dependency (glib is enough) and reusable to android/* sources.

---
 Makefile.plugins                     | 2 +-
 {profiles/audio => protocol}/avctp.c | 7 +------
 {profiles/audio => protocol}/avctp.h | 0
 3 files changed, 2 insertions(+), 7 deletions(-)
 rename {profiles/audio => protocol}/avctp.c (99%)
 rename {profiles/audio => protocol}/avctp.h (100%)
Makefile.plugins +1 -1
index 6a1ddbf..a64d4f5 100644
@@ -41,7 +41,7 @@ builtin_sources += profiles/audio/source.h profiles/audio/source.c \
 
 builtin_modules += avrcp
 builtin_sources += profiles/audio/control.h profiles/audio/control.c \
-			profiles/audio/avctp.h profiles/audio/avctp.c \
+			protocol/avctp.h protocol/avctp.c \
 			profiles/audio/avrcp.h profiles/audio/avrcp.c \
 			profiles/audio/player.h profiles/audio/player.c
 
protocol/avctp.c renamed from profiles/audio/avctp.c +1 -6
similarity index 99%
rename from profiles/audio/avctp.c
rename to protocol/avctp.c
index 6669ddc..a09cd93 100644
@@ -32,12 +32,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <unistd.h>
-#include <assert.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <netinet/in.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
@@ -54,7 +49,7 @@
 #include "error.h"
 #include "uinput.h"
 #include "avctp.h"
-#include "avrcp.h"
+#include <profiles/audio/avrcp.h>
 
 /* AV/C Panel 1.23, page 76:
  * command with the pressed value is valid for two seconds
protocol/avctp.h renamed from profiles/audio/avctp.h +0 -0
similarity index 100%
rename from profiles/audio/avctp.h
rename to protocol/avctp.h
Signature · 1 line
1.8.3.2
maintainer
#1 lore raw

Hi Ravi,

Quoted 10 lines

This is an initial patch for decoupling avctp.c|h from profiles/audio. Goal is to remove external dependency (glib is enough) and reusable to android/* sources.
---

Makefile.plugins                     | 2 +-
{profiles/audio => protocol}/avctp.c | 7 +------
{profiles/audio => protocol}/avctp.h | 0
3 files changed, 2 insertions(+), 7 deletions(-)

rename {profiles/audio => protocol}/avctp.c (99%) rename {profiles/audio => protocol}/avctp.h (100%)

actually, no.

The breaks my nicely tab-tab-completion handling when going through the source code. Pro{file,tocol} have a way to close prefix.

Regards

Marcel

#2 lore raw

Hi Marcel,

Ok, I just had a chat with Luiz now. Actually task description is outdated. Sorry for inconvenience. Please ignore this patch.

Regards,
Ravi.

Quoted 25 lines · Marcel Holtmann

Hi Ravi,

Quoted 10 lines

This is an initial patch for decoupling avctp.c|h from profiles/audio. Goal is to remove external dependency (glib is enough) and reusable to android/* sources.
---

Makefile.plugins                     | 2 +-
{profiles/audio => protocol}/avctp.c | 7 +------
{profiles/audio => protocol}/avctp.h | 0
3 files changed, 2 insertions(+), 7 deletions(-)

rename {profiles/audio => protocol}/avctp.c (99%) rename {profiles/audio => protocol}/avctp.h (100%)

actually, no.

The breaks my nicely tab-tab-completion handling when going through the source code. Pro{file,tocol} have a way to close prefix.

Regards

Marcel

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

#3 lore raw
In reply to Marcel Holtmann

Hi Marcel, Ravi,

Quoted 13 lines · Marcel Holtmann

Hi Ravi,

Quoted 10 lines

This is an initial patch for decoupling avctp.c|h from profiles/audio. Goal is to remove external dependency (glib is enough) and reusable to android/* sources.
---

Makefile.plugins                     | 2 +-
{profiles/audio => protocol}/avctp.c | 7 +------
{profiles/audio => protocol}/avctp.h | 0
3 files changed, 2 insertions(+), 7 deletions(-)

rename {profiles/audio => protocol}/avctp.c (99%) rename {profiles/audio => protocol}/avctp.h (100%)

Quoted 3 lines

actually, no.

The breaks my nicely tab-tab-completion handling when going through the source code. Pro{file,tocol} have a way to close prefix.

Lets handle these similar to AVDTP by copying it to android, remove dependencies to core the add to android build and create proper unit tests for it, eventually it should replace all the existing implementation of AVCTP but first we need to have the unit tests done. Later we can decide where it should be, perhaps it can even be inside lib/ for example (though internally it might still depend on glib.)

Signature · 1 line
Luiz Augusto von Dentz