Skip to contentSkip to conversation

bluetooth: add CMER and BRSF support in HFP AG

PATCH In review Frédéric Danis 2 participants 6 messages Feb 23, 2011 – Feb 24, 2011

lore
Share & tools
lore

Frédéric Danis

author
#0 lore raw

cover bluetooth: add CMER and BRSF support in HFP AG

Add CMER and simple BRSF support for HFP AG allowing to setup Service Level Connection

Frédéric Danis (2):
emulator: add CMER support
emulator: add BRSF support

 src/emulator.c |  150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 148 insertions(+), 2 deletions(-)
author
#1 lore raw

PATCH 1/2 emulator: add CMER support

---
 src/emulator.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 105 insertions(+), 2 deletions(-)
src/emulator.c +105 -2
index f0ca8c8..ca36c0e 100644
@@ -43,6 +43,8 @@ struct ofono_emulator {
 	GAtServer *server;
 	GAtPPP *ppp;
 	guint source;
+	int events_mode;
+	gboolean events_ind;
 	GSList *indicators;
 };
 

@@ -251,6 +253,103 @@ fail:
 	}
 }
 
+static void cmer_cb(GAtServer *server, GAtServerRequestType type,
+			GAtResult *result, gpointer user_data)
+{
+	struct ofono_emulator *em = user_data;
+	char buf[32];
+
+	switch (type) {
+	case G_AT_SERVER_REQUEST_TYPE_QUERY:
+		sprintf(buf, "+CMER: %d,0,0,%d,0", em->events_mode,
+						em->events_ind);
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
+		sprintf(buf, "+CMER: (0,3),(0),(0),(0,1),(0)");
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SET:
+	{
+		GAtResultIter iter;
+		int mode;
+		int ind = em->events_ind;
+		int val;
+
+		g_at_result_iter_init(&iter, result);
+		g_at_result_iter_next(&iter, "");
+
+		/* mode */
+		if (g_at_result_iter_next_number(&iter, &mode) == FALSE)
+			goto fail;
+
+		if ((mode != 0) && (mode != 3))
+			goto fail;
+
+		/* keyp */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if (val != 0)
+			goto fail;
+
+		/* disp */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if (val != 0)
+			goto fail;
+
+		/* ind */
+		if (g_at_result_iter_next_number(&iter, &ind) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if ((ind != 0) && (ind != 1))
+			goto fail;
+
+		/* bfr */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if (val != 0)
+			goto fail;
+
+		/* check that bfr is last parameter */
+		if (g_at_result_iter_skip_next(&iter) == TRUE)
+			goto fail;
+
+done:
+		em->events_mode = mode;
+		em->events_ind = ind;
+
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+
+		break;
+	}
+
+	default:
+fail:
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+		break;
+	}
+}
+
 static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
 					int min, int max, int dflt)
 {

@@ -324,6 +423,7 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_BATTERY, 0, 5, 5);
 
 		g_at_server_register(em->server, "+CIND", cind_cb, em, NULL);
+		g_at_server_register(em->server, "+CMER", cmer_cb, em, NULL);
 	}
 
 	__ofono_atom_register(em->atom, emulator_unregister);

@@ -364,6 +464,7 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
 		return NULL;
 
 	em->type = type;
+	em->events_mode = 3;	/* default mode is forwarding events */
 
 	em->atom = __ofono_modem_add_atom_offline(modem, atom_t,
 							emulator_remove, em);

@@ -546,8 +647,10 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
 
 		ind->value = value;
 
-		sprintf(buf, "+CIEV: %d,%d", i, ind->value);
-		g_at_server_send_info(em->server, buf, TRUE);
+		if (em->events_mode == 3 && em->events_ind) {
+			sprintf(buf, "+CIEV: %d,%d", i, ind->value);
+			g_at_server_send_info(em->server, buf, TRUE);
+		}
 
 		return;
 	}
Signature · 1 line
1.7.1
#2 lore raw

Re: [PATCH 1/2] emulator: add CMER support

Hi Frédéric,

Quoted 3 lines · Frédéric Danis
---
 src/emulator.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 105 insertions(+), 2 deletions(-)

I applied this patch, but one comment below:

Quoted 51 lines
src/emulator.c +35 -0
index f0ca8c8..ca36c0e 100644
@@ -43,6 +43,8 @@ struct ofono_emulator {
 	GAtServer *server;
 	GAtPPP *ppp;
 	guint source;
+	int events_mode;
+	gboolean events_ind;
 	GSList *indicators;
 };
 

@@ -251,6 +253,103 @@ fail:
 	}
 }
 
+static void cmer_cb(GAtServer *server, GAtServerRequestType type,
+			GAtResult *result, gpointer user_data)
+{
+	struct ofono_emulator *em = user_data;
+	char buf[32];
+
+	switch (type) {
+	case G_AT_SERVER_REQUEST_TYPE_QUERY:
+		sprintf(buf, "+CMER: %d,0,0,%d,0", em->events_mode,
+						em->events_ind);
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
+		sprintf(buf, "+CMER: (0,3),(0),(0),(0,1),(0)");
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SET:
+	{
+		GAtResultIter iter;
+		int mode;
+		int ind = em->events_ind;
+		int val;
+
+		g_at_result_iter_init(&iter, result);
+		g_at_result_iter_next(&iter, "");
+
+		/* mode */
+		if (g_at_result_iter_next_number(&iter, &mode) == FALSE)
+			goto fail;

src/emulator.c fail: · line 298

Quoted 10 lines
src/emulator.c +10 -0
+
+		if ((mode != 0) && (mode != 3))
+			goto fail;
+
+		/* keyp */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}

From what I understand you're trying to enable something like:

+CMER=3,,1 right?

So this code does accomplish this, but it also allows silliness like this:

+CMER=3,"foobar",,1

You might want to make a special version of next_number that would actually check that either the number is given, or the field is empty.

Quoted 76 lines
src/emulator.c +56 -0
+
+		if (val != 0)
+			goto fail;
+
+		/* disp */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if (val != 0)
+			goto fail;
+
+		/* ind */
+		if (g_at_result_iter_next_number(&iter, &ind) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if ((ind != 0) && (ind != 1))
+			goto fail;
+
+		/* bfr */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
+
+		if (val != 0)
+			goto fail;
+
+		/* check that bfr is last parameter */
+		if (g_at_result_iter_skip_next(&iter) == TRUE)
+			goto fail;
+
+done:
+		em->events_mode = mode;
+		em->events_ind = ind;
+
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+
+		break;
+	}
+
+	default:
+fail:
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+		break;
+	}
+}
+
 static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
 					int min, int max, int dflt)
 {

@@ -324,6 +423,7 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_BATTERY, 0, 5, 5);
 
 		g_at_server_register(em->server, "+CIND", cind_cb, em, NULL);
+		g_at_server_register(em->server, "+CMER", cmer_cb, em, NULL);
 	}
 
 	__ofono_atom_register(em->atom, emulator_unregister);

@@ -364,6 +464,7 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
 		return NULL;
 
 	em->type = type;
+	em->events_mode = 3;	/* default mode is forwarding events */
 
 	em->atom = __ofono_modem_add_atom_offline(modem, atom_t,
 							emulator_remove, em);

@@ -546,8 +647,10 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
 
 		ind->value = value;

src/emulator.c void ofono_emulator_set_indicator(struct ofono_emulator *em, · line 656

Quoted 10 lines
src/emulator.c +4 -2
 
-		sprintf(buf, "+CIEV: %d,%d", i, ind->value);
-		g_at_server_send_info(em->server, buf, TRUE);
+		if (em->events_mode == 3 && em->events_ind) {
+			sprintf(buf, "+CIEV: %d,%d", i, ind->value);
+			g_at_server_send_info(em->server, buf, TRUE);
+		}
 
 		return;
 	}

Regards,
-Denis

author
#3 lore raw

Re: [PATCH 1/2] emulator: add CMER support

Hi Denis

Quoted 73 lines · Denis Kenzior

Hi Frédéric,

Quoted 3 lines · Frédéric Danis
---
  src/emulator.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 files changed, 105 insertions(+), 2 deletions(-)

I applied this patch, but one comment below:

Quoted 62 lines
src/emulator.c +45 -0
index f0ca8c8..ca36c0e 100644
@@ -43,6 +43,8 @@ struct ofono_emulator {
  	GAtServer *server;
  	GAtPPP *ppp;
  	guint source;
+	int events_mode;
+	gboolean events_ind;
  	GSList *indicators;
  };
 

@@ -251,6 +253,103 @@ fail:
  	}
  }
 
+static void cmer_cb(GAtServer *server, GAtServerRequestType type,
+			GAtResult *result, gpointer user_data)
+{
+	struct ofono_emulator *em = user_data;
+	char buf[32];
+
+	switch (type) {
+	case G_AT_SERVER_REQUEST_TYPE_QUERY:
+		sprintf(buf, "+CMER: %d,0,0,%d,0", em->events_mode,
+						em->events_ind);
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
+		sprintf(buf, "+CMER: (0,3),(0),(0),(0,1),(0)");
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	case G_AT_SERVER_REQUEST_TYPE_SET:
+	{
+		GAtResultIter iter;
+		int mode;
+		int ind = em->events_ind;
+		int val;
+
+		g_at_result_iter_init(&iter, result);
+		g_at_result_iter_next(&iter, "");
+
+		/* mode */
+		if (g_at_result_iter_next_number(&iter,&mode) == FALSE)
+			goto fail;
+
+		if ((mode != 0)&&  (mode != 3))
+			goto fail;
+
+		/* keyp */
+		if (g_at_result_iter_next_number(&iter,&val) == FALSE) {
+			if (g_at_result_iter_skip_next(&iter) == FALSE)
+				goto done;
+			goto fail;
+		}
Quoted 1 line

From what I understand you're trying to enable something like:

Quoted 9 lines

+CMER=3,,1 right?

So this code does accomplish this, but it also allows silliness like this:

+CMER=3,"foobar",,1

You might want to make a special version of next_number that would actually check that either the number is given, or the field is empty.

The current version check that the parameter is a number or the end (skip_next returns false) :
AT+CMER=3,0,0,1,0 or AT+CMER=3,0 are supported.

Currently void parameter are not supported (AT+CMER=3,,,1).

I will send a patch to support number or void parameter.

Regards

Fred

Signature · 2 lines
Frederic Danis                            Open Source Technology Centre
frederic.danis(a)intel.com                              Intel Corporation
author
#4 lore raw

PATCH 2/2 emulator: add BRSF support

In reply to Frédéric Danis
---
 src/emulator.c |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)
src/emulator.c +44 -1
index ca36c0e..f024468 100644
@@ -43,6 +43,9 @@ struct ofono_emulator {
 	GAtServer *server;
 	GAtPPP *ppp;
 	guint source;
+	gboolean slc;
+	int l_features;
+	int r_features;
 	int events_mode;
 	gboolean events_ind;
 	GSList *indicators;

@@ -174,6 +177,39 @@ error:
        g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
 }
 
+static void brsf_cb(GAtServer *server, GAtServerRequestType type,
+			GAtResult *result, gpointer user_data)
+{
+	struct ofono_emulator *em = user_data;
+	GAtResultIter iter;
+	int val;
+	char buf[16];
+
+	switch (type) {
+	case G_AT_SERVER_REQUEST_TYPE_SET:
+		g_at_result_iter_init(&iter, result);
+		g_at_result_iter_next(&iter, "");
+
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE)
+			goto fail;
+
+		if ((val < 0) && (val > 127))
+			goto fail;
+
+		em->r_features = val;
+
+		sprintf(buf, "+BRSF: %d", em->l_features);
+		g_at_server_send_info(em->server, buf, TRUE);
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+		break;
+
+	default:
+fail:
+		g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+		break;
+	}
+}
+
 static void cind_cb(GAtServer *server, GAtServerRequestType type,
 			GAtResult *result, gpointer user_data)
 {

@@ -340,6 +376,7 @@ done:
 
 		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
 
+		em->slc = TRUE;
 		break;
 	}
 

@@ -422,6 +459,7 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_ROAMING, 0, 1, 0);
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_BATTERY, 0, 5, 5);
 
+		g_at_server_register(em->server, "+BRSF", brsf_cb, em, NULL);
 		g_at_server_register(em->server, "+CIND", cind_cb, em, NULL);
 		g_at_server_register(em->server, "+CMER", cmer_cb, em, NULL);
 	}

@@ -464,6 +502,8 @@ 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->events_mode = 3;	/* default mode is forwarding events */
 
 	em->atom = __ofono_modem_add_atom_offline(modem, atom_t,

@@ -545,6 +585,9 @@ static void handler_proxy(GAtServer *server, GAtServerRequestType type,
 	struct handler *h = userdata;
 	struct ofono_emulator_request req;
 
+	if ((h->em->type == OFONO_EMULATOR_TYPE_HFP) && !h->em->slc)
+		g_at_server_send_final(h->em->server, G_AT_SERVER_RESULT_ERROR);
+
 	switch (type) {
 	case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY:
 		req.type = OFONO_EMULATOR_REQUEST_TYPE_COMMAND_ONLY;

@@ -647,7 +690,7 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
 
 		ind->value = value;
 
-		if (em->events_mode == 3 && em->events_ind) {
+		if (em->events_mode == 3 && em->events_ind && em->slc) {
 			sprintf(buf, "+CIEV: %d,%d", i, ind->value);
 			g_at_server_send_info(em->server, buf, TRUE);
 		}
Signature · 1 line
1.7.1
#5 lore raw

Re: [PATCH 2/2] emulator: add BRSF support

Hi Frédéric,

Quoted 4 lines · Frédéric Danis
---
 src/emulator.c |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)

Patch has been applied, thanks.

Regards,
-Denis