[PATCH 1/3] emulator: add HFP feature defines

[PATCH 1/3] emulator: add HFP feature defines

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis]

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]

---
 include/emulator.h |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/include/emulator.h b/include/emulator.h
index 5cd894b..452c59c 100644
--- a/include/emulator.h
+++ b/include/emulator.h
@@ -48,6 +48,25 @@ extern "C" {
 #define OFONO_EMULATOR_CALLHELD_MULTIPLE 1
 #define OFONO_EMULATOR_CALLHELD_ON_HOLD 2
 
+/* AG supported features bitmap. Bluetooth HFP 1.5 spec page 77 */
+#define AG_FEATURE_3WAY 0x1
+#define AG_FEATURE_ECNR 0x2
+#define AG_FEATURE_VOICE_RECOG 0x4
+#define AG_FEATURE_IN_BAND_RING_TONE 0x8
+#define AG_FEATURE_ATTACH_VOICE_TAG 0x10
+#define AG_FEATURE_REJECT_CALL 0x20
+#define AG_FEATURE_ENHANCED_CALL_STATUS 0x40
+#define AG_FEATURE_ENHANCED_CALL_CONTROL 0x80
+#define AG_FEATURE_EXTENDED_RES_CODE 0x100
+
+#define HF_FEATURE_ECNR 0x1
+#define HF_FEATURE_3WAY 0x2
+#define HF_FEATURE_CLIP 0x4
+#define HF_FEATURE_VOICE_RECOGNITION 0x8
+#define HF_FEATURE_REMOTE_VOLUME_CONTROL 0x10
+#define HF_FEATURE_ENHANCED_CALL_STATUS 0x20
+#define HF_FEATURE_ENHANCED_CALL_CONTROL 0x40
+
 struct ofono_emulator;
 struct ofono_emulator_request;
 
-- 
1.7.1

Re: [PATCH 1/3] emulator: add HFP feature defines

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

Hi Frédéric,

On 06/20/2011 10:13 AM, Frédéric Danis wrote:
> ---
>  include/emulator.h |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/include/emulator.h b/include/emulator.h
> index 5cd894b..452c59c 100644
> --- a/include/emulator.h
> +++ b/include/emulator.h
> @@ -48,6 +48,25 @@ extern "C" {
>  #define OFONO_EMULATOR_CALLHELD_MULTIPLE 1
>  #define OFONO_EMULATOR_CALLHELD_ON_HOLD 2
>  
> +/* AG supported features bitmap. Bluetooth HFP 1.5 spec page 77 */
> +#define AG_FEATURE_3WAY 0x1
> +#define AG_FEATURE_ECNR 0x2
> +#define AG_FEATURE_VOICE_RECOG 0x4
> +#define AG_FEATURE_IN_BAND_RING_TONE 0x8
> +#define AG_FEATURE_ATTACH_VOICE_TAG 0x10
> +#define AG_FEATURE_REJECT_CALL 0x20
> +#define AG_FEATURE_ENHANCED_CALL_STATUS 0x40
> +#define AG_FEATURE_ENHANCED_CALL_CONTROL 0x80
> +#define AG_FEATURE_EXTENDED_RES_CODE 0x100
> +
> +#define HF_FEATURE_ECNR 0x1
> +#define HF_FEATURE_3WAY 0x2
> +#define HF_FEATURE_CLIP 0x4
> +#define HF_FEATURE_VOICE_RECOGNITION 0x8
> +#define HF_FEATURE_REMOTE_VOLUME_CONTROL 0x10
> +#define HF_FEATURE_ENHANCED_CALL_STATUS 0x20
> +#define HF_FEATURE_ENHANCED_CALL_CONTROL 0x40
> +

Since you're copying them from hfpmodem.h, I suggest making it official
and not duplicate code.  So I would suggest:

- add
	enum hfp_ag_feature {
		HFP_AG_FEATURE_3WAY =	0x1,
		HFP_AG_FEATURE_ECNR =	0x2,
		...
	};

	enum hfp_hf_feature {
		...
	};

to include/types.h, remove them from hfpmodem.h and use the new defines.

>  struct ofono_emulator;
>  struct ofono_emulator_request;
>  

Regards,
-Denis

[PATCH 2/3] hfp_ag: fix SDP record

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

HFP AG supports 3 way calls
---
 plugins/hfp_ag.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/hfp_ag.c b/plugins/hfp_ag.c
index 17751ad..191708b 100644
--- a/plugins/hfp_ag.c
+++ b/plugins/hfp_ag.c
@@ -81,7 +81,7 @@ static const gchar *hfp_ag_record =
 "  </attribute>\n"
 "\n"
 "  <attribute id=\"0x0311\">\n"
-"    <uint16 value=\"0x0000\" />\n"
+"    <uint16 value=\"0x0001\" />\n"
 "  </attribute>\n"
 "</record>\n";
 
-- 
1.7.1

Re: [PATCH 2/3] hfp_ag: fix SDP record

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

Hi Frédéric,

On 06/20/2011 10:13 AM, Frédéric Danis wrote:
> HFP AG supports 3 way calls
> ---
>  plugins/hfp_ag.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

[PATCH 3/3] emulator: fix local HFP AG features

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

---
 src/emulator.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index 1439854..d19706d 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -882,8 +882,10 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
 		return NULL;
 
 	em->type = type;
-	/* TODO: Check real local features */
-	em->l_features = 32;
+	em->l_features = AG_FEATURE_3WAY | AG_FEATURE_REJECT_CALL |
+			AG_FEATURE_ENHANCED_CALL_STATUS |
+			AG_FEATURE_ENHANCED_CALL_CONTROL |
+			AG_FEATURE_EXTENDED_RES_CODE;
 	em->events_mode = 3;	/* default mode is forwarding events */
 	em->cmee_mode = 0;	/* CME ERROR disabled by default */
 
-- 
1.7.1