isigen: enabled multiple PDP contexts

isigen: enabled multiple PDP contexts

[Mika Liljeberg]

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

Hi,

Here's the patch to enable multiple PDP contexts in isigen.
Turns out that probing the context count is not feasible,
so we just default to four.

   MikaL

[PATCH 1/1] isigen: create four gprs contexts

 plugins/isigen.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

[PATCH 1/1] isigen: create four gprs contexts

[Mika Liljeberg]

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

---
 plugins/isigen.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/isigen.c b/plugins/isigen.c
index 838d060..3ea7110 100644
--- a/plugins/isigen.c
+++ b/plugins/isigen.c
@@ -58,6 +58,8 @@
 #include "drivers/isimodem/mtc.h"
 #include "drivers/isimodem/debug.h"
 
+#define ISI_DEFAULT_PDPS 4	/* Number of supported PDP contexts */
+
 struct isi_data {
 	struct ofono_modem *modem;
 	char const *ifname;
@@ -407,6 +409,7 @@ static void isigen_post_online(struct ofono_modem *modem)
 	struct isi_data *isi = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
+	int i;
 
 	DBG("(%p) with %s", modem, isi->ifname);
 
@@ -420,13 +423,19 @@ static void isigen_post_online(struct ofono_modem *modem)
 	ofono_call_barring_create(isi->modem, 0, "isimodem", isi->idx);
 	ofono_call_meter_create(isi->modem, 0, "isimodem", isi->idx);
 	ofono_radio_settings_create(isi->modem, 0, "isimodem", isi->idx);
-	gprs = ofono_gprs_create(isi->modem, 0, "isimodem", isi->idx);
-	gc = ofono_gprs_context_create(isi->modem, 0, "isimodem", isi->idx);
 
-	if (gprs && gc)
+	gprs = ofono_gprs_create(isi->modem, 0, "isimodem", isi->idx);
+	if (!gprs)
+		return;
+	for (i = 0; i < ISI_DEFAULT_PDPS; i++) {
+		gc = ofono_gprs_context_create(isi->modem, 0,
+						"isimodem", isi->idx);
+		if (!gc) {
+			DBG("Failed to add context %d", i);
+			break;
+		}
 		ofono_gprs_add_context(gprs, gc);
-	else
-		DBG("Failed to add context");
+	}
 }
 
 static int isigen_enable(struct ofono_modem *modem)
-- 
1.7.0.4

Re: isigen: enabled multiple PDP contexts

[Marcel Holtmann]

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

Hi Mika,

> Here's the patch to enable multiple PDP contexts in isigen.
> Turns out that probing the context count is not feasible,
> so we just default to four.

you might wanna ask your modem firmware guys to add something like this.
For me it would sounds like a good idea to know how many active GPRS
contexts that specific modem supports.

Regards

Marcel

RE: isigen: enabled multiple PDP contexts

[Mika.Liljeberg]

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

Hi Marcel,

> you might wanna ask your modem firmware guys to add something 
> like this.
> For me it would sounds like a good idea to know how many active GPRS
> contexts that specific modem supports.

You wouldn't suggest that if you knew the process involved. ;) Anyway, the change would not help existing hardware.

	MikaL

Re: [PATCH 1/1] isigen: create four gprs contexts

[Denis Kenzior]

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

Hi Mika,

On 11/11/2010 04:00 AM, Mika Liljeberg wrote:
> ---
>  plugins/isigen.c |   19 ++++++++++++++-----
>  1 files changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/plugins/isigen.c b/plugins/isigen.c
> index 838d060..3ea7110 100644
> --- a/plugins/isigen.c
> +++ b/plugins/isigen.c
> @@ -58,6 +58,8 @@
>  #include "drivers/isimodem/mtc.h"
>  #include "drivers/isimodem/debug.h"
>  
> +#define ISI_DEFAULT_PDPS 4	/* Number of supported PDP contexts */
> +
>  struct isi_data {
>  	struct ofono_modem *modem;
>  	char const *ifname;
> @@ -407,6 +409,7 @@ static void isigen_post_online(struct ofono_modem *modem)
>  	struct isi_data *isi = ofono_modem_get_data(modem);
>  	struct ofono_gprs *gprs;
>  	struct ofono_gprs_context *gc;
> +	int i;
>  
>  	DBG("(%p) with %s", modem, isi->ifname);
>  
> @@ -420,13 +423,19 @@ static void isigen_post_online(struct ofono_modem *modem)
>  	ofono_call_barring_create(isi->modem, 0, "isimodem", isi->idx);
>  	ofono_call_meter_create(isi->modem, 0, "isimodem", isi->idx);
>  	ofono_radio_settings_create(isi->modem, 0, "isimodem", isi->idx);
> -	gprs = ofono_gprs_create(isi->modem, 0, "isimodem", isi->idx);
> -	gc = ofono_gprs_context_create(isi->modem, 0, "isimodem", isi->idx);
>  
> -	if (gprs && gc)
> +	gprs = ofono_gprs_create(isi->modem, 0, "isimodem", isi->idx);
> +	if (!gprs)
> +		return;

Tiny nitpick, but please follow the coding style.  Specifically item M1.

> +	for (i = 0; i < ISI_DEFAULT_PDPS; i++) {
> +		gc = ofono_gprs_context_create(isi->modem, 0,
> +						"isimodem", isi->idx);
> +		if (!gc) {
> +			DBG("Failed to add context %d", i);
> +			break;
> +		}

And again, item M1 here

>  		ofono_gprs_add_context(gprs, gc);
> -	else
> -		DBG("Failed to add context");
> +	}
>  }
>  
>  static int isigen_enable(struct ofono_modem *modem)

Regards,
-Denis

RE: [PATCH 1/1] isigen: create four gprs contexts

[Mika.Liljeberg]

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


> Tiny nitpick, but please follow the coding style.  
> Specifically item M1.

Hookay. I wish I had a script that picked these things up... *wink*

;-)

	MikaL

[PATCH 1/1] isigen: create four gprs contexts

[Mika Liljeberg]

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

---
 plugins/isigen.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/isigen.c b/plugins/isigen.c
index 838d060..fad4e20 100644
--- a/plugins/isigen.c
+++ b/plugins/isigen.c
@@ -58,6 +58,8 @@
 #include "drivers/isimodem/mtc.h"
 #include "drivers/isimodem/debug.h"
 
+#define ISI_DEFAULT_PDPS 4	/* Number of supported PDP contexts */
+
 struct isi_data {
 	struct ofono_modem *modem;
 	char const *ifname;
@@ -407,6 +409,7 @@ static void isigen_post_online(struct ofono_modem *modem)
 	struct isi_data *isi = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
+	int i;
 
 	DBG("(%p) with %s", modem, isi->ifname);
 
@@ -420,13 +423,21 @@ static void isigen_post_online(struct ofono_modem *modem)
 	ofono_call_barring_create(isi->modem, 0, "isimodem", isi->idx);
 	ofono_call_meter_create(isi->modem, 0, "isimodem", isi->idx);
 	ofono_radio_settings_create(isi->modem, 0, "isimodem", isi->idx);
+
 	gprs = ofono_gprs_create(isi->modem, 0, "isimodem", isi->idx);
-	gc = ofono_gprs_context_create(isi->modem, 0, "isimodem", isi->idx);
+	if (!gprs)
+		return;
+
+	for (i = 0; i < ISI_DEFAULT_PDPS; i++) {
+		gc = ofono_gprs_context_create(isi->modem, 0,
+						"isimodem", isi->idx);
+		if (!gc) {
+			DBG("Failed to add context %d", i);
+			break;
+		}
 
-	if (gprs && gc)
 		ofono_gprs_add_context(gprs, gc);
-	else
-		DBG("Failed to add context");
+	}
 }
 
 static int isigen_enable(struct ofono_modem *modem)
-- 
1.7.0.4

Re: [PATCH 1/1] isigen: create four gprs contexts

[Denis Kenzior]

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

Hi Mika,

On 11/11/2010 09:50 AM, Mika Liljeberg wrote:
> ---
>  plugins/isigen.c |   19 +++++++++++++++----
>  1 files changed, 15 insertions(+), 4 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis