2012-05-18 05:25:10

by Joohi RASTOGI

Subject: [PATCH 1/2] AVRCP: Refactor the code using constants

From: Joohi Rastogi <[email protected]>

---
audio/avrcp.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/audio/avrcp.c b/audio/avrcp.c
index df39d04..a741873 100644
--- a/audio/avrcp.c
+++ b/audio/avrcp.c
@@ -89,6 +89,11 @@
#define CAP_COMPANY_ID 0x02
#define CAP_EVENTS_SUPPORTED 0x03

+#define AVRCP_FEATURE_CATEGORY_1 0x0001
+#define AVRCP_FEATURE_CATEGORY_2 0x0002
+#define AVRCP_FEATURE_CATEGORY_3 0x0004
+#define AVRCP_FEATURE_CATEGORY_4 0x0008
+
enum battery_status {
BATTERY_STATUS_NORMAL = 0,
BATTERY_STATUS_WARNING = 1,
@@ -174,7 +179,11 @@ static sdp_record_t *avrcp_ct_record(void)
sdp_record_t *record;
sdp_data_t *psm, *version, *features;
uint16_t lp = AVCTP_PSM;
- uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103, feat = 0x000f;
+ uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
+ uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
+ AVRCP_FEATURE_CATEGORY_2 |
+ AVRCP_FEATURE_CATEGORY_3 |
+ AVRCP_FEATURE_CATEGORY_4 );

record = sdp_record_alloc();
if (!record)
@@ -238,7 +247,11 @@ static sdp_record_t *avrcp_tg_record(void)
sdp_record_t *record;
sdp_data_t *psm, *version, *features;
uint16_t lp = AVCTP_PSM;
- uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103, feat = 0x000f;
+ uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103;
+ uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
+ AVRCP_FEATURE_CATEGORY_2 |
+ AVRCP_FEATURE_CATEGORY_3 |
+ AVRCP_FEATURE_CATEGORY_4 );

record = sdp_record_alloc();
if (!record)
--
1.7.5.4

2012-05-18 17:52:53

by Johan Hedberg

Subject: Re: [PATCH 1/2] AVRCP: Refactor the code using constants

Hi Joohi,

On Fri, May 18, 2012, [email protected] wrote:
> ---
> audio/avrcp.c | 17 +++++++++++++++--
> 1 files changed, 15 insertions(+), 2 deletions(-)

You'll need to rebase this patch latest git since it doesn't apply
anymore. Additionally there were some issues:

> + uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
> + uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
> + AVRCP_FEATURE_CATEGORY_2 |
> + AVRCP_FEATURE_CATEGORY_3 |
> + AVRCP_FEATURE_CATEGORY_4 );

This doesn't look like it's correctly indented. Split lines should be
indented as much as possible while staying under 80 characters.

> - uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103, feat = 0x000f;
> + uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103;
> + uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
> + AVRCP_FEATURE_CATEGORY_2 |
> + AVRCP_FEATURE_CATEGORY_3 |
> + AVRCP_FEATURE_CATEGORY_4 );

Same here.

Johan

2012-05-10 15:40:28

by Lucas De Marchi

Subject: Re: [PATCH 1/2] AVRCP: Refactor the code using constants

On Thu, May 10, 2012 at 3:26 AM, <[email protected]> wrote:
> From: Joohi Rastogi <[email protected]>
>
> Adds macros for category features
> ---
> ?audio/avrcp.c | ? 13 +++++++++++--
> ?1 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/audio/avrcp.c b/audio/avrcp.c
> index df39d04..1b35c3f 100644
> --- a/audio/avrcp.c
> +++ b/audio/avrcp.c
> @@ -89,6 +89,11 @@
> ?#define CAP_COMPANY_ID ? ? ? ? 0x02
> ?#define CAP_EVENTS_SUPPORTED ? 0x03
>
> +#define AVRCP_FEATURE_CATEGORY_1 ? ? ? 0x0001
> +#define AVRCP_FEATURE_CATEGORY_2 ? ? ? 0x0002
> +#define AVRCP_FEATURE_CATEGORY_3 ? ? ? 0x0004
> +#define AVRCP_FEATURE_CATEGORY_4 ? ? ? 0x0008
> +
> ?enum battery_status {
> ? ? ? ?BATTERY_STATUS_NORMAL = ? ? ? ? 0,
> ? ? ? ?BATTERY_STATUS_WARNING = ? ? ? ?1,
> @@ -174,7 +179,9 @@ static sdp_record_t *avrcp_ct_record(void)
> ? ? ? ?sdp_record_t *record;
> ? ? ? ?sdp_data_t *psm, *version, *features;
> ? ? ? ?uint16_t lp = AVCTP_PSM;
> - ? ? ? uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103, feat = 0x000f;
> + ? ? ? uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
> + ? ? ? uint16_t feat = (AVRCP_FEATURE_CATEGORY_1 | AVRCP_FEATURE_CATEGORY_2
> + ? ? ? ? ? ? ? | AVRCP_FEATURE_CATEGORY_3 | AVRCP_FEATURE_CATEGORY_4);
>
> ? ? ? ?record = sdp_record_alloc();
> ? ? ? ?if (!record)
> @@ -238,7 +245,9 @@ static sdp_record_t *avrcp_tg_record(void)
> ? ? ? ?sdp_record_t *record;
> ? ? ? ?sdp_data_t *psm, *version, *features;
> ? ? ? ?uint16_t lp = AVCTP_PSM;
> - ? ? ? uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103, feat = 0x000f;
> + ? ? ? uint16_t avrcp_ver = 0x0103, avctp_ver = 0x0103;
> + ? ? ? uint16_t feat = (AVRCP_FEATURE_CATEGORY_1 | AVRCP_FEATURE_CATEGORY_2
> + ? ? ? ? ? ? ? | AVRCP_FEATURE_CATEGORY_3 | AVRCP_FEATURE_CATEGORY_4);

Humn... just a matter of taste, I'm ok with it


Ack