[PATCH] isimodem/voicecall: fix hangup_active

[PATCH] isimodem/voicecall: fix hangup_active

[Pekka.Pessi]

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

From: Pekka Pessi <Pekka.Pessi@nokia.com>

---
 drivers/isimodem/voicecall.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 4b720be..ace2346 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -988,11 +988,11 @@ static void isi_answer(struct ofono_voicecall *ovc,
 	isi_call_answer_req(ovc, CALL_ID_ALL, cb, data);
 }
 
-static void isi_hangup(struct ofono_voicecall *ovc,
+static void isi_hangup_active(struct ofono_voicecall *ovc,
 			ofono_voicecall_cb_t cb, void *data)
 {
 	/* AT+CHUP */
-	isi_call_release_req(ovc, CALL_ID_ALL, CALL_CAUSE_TYPE_CLIENT,
+	isi_call_release_req(ovc, CALL_ID_ACTIVE, CALL_CAUSE_TYPE_CLIENT,
 				CALL_CAUSE_RELEASE_BY_USER, cb, data);
 }
 
@@ -1318,7 +1318,7 @@ static struct ofono_voicecall_driver driver = {
 	.remove			= isi_voicecall_remove,
 	.dial			= isi_dial,
 	.answer			= isi_answer,
-	.hangup_active		= isi_hangup,
+	.hangup_active		= isi_hangup_active,
 	.hold_all_active	= isi_hold_all_active,
 	.release_all_held	= isi_release_all_held,
 	.set_udub		= isi_set_udub,
-- 
1.7.0.4

Re: [PATCH] isimodem/voicecall: fix hangup_active

[Marcel Holtmann]

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

Hi Pekka,

> ---
>  drivers/isimodem/voicecall.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> index 4b720be..ace2346 100644
> --- a/drivers/isimodem/voicecall.c
> +++ b/drivers/isimodem/voicecall.c
> @@ -988,11 +988,11 @@ static void isi_answer(struct ofono_voicecall *ovc,
>  	isi_call_answer_req(ovc, CALL_ID_ALL, cb, data);
>  }
>  
> -static void isi_hangup(struct ofono_voicecall *ovc,
> +static void isi_hangup_active(struct ofono_voicecall *ovc,
>  			ofono_voicecall_cb_t cb, void *data)
>  {
>  	/* AT+CHUP */
> -	isi_call_release_req(ovc, CALL_ID_ALL, CALL_CAUSE_TYPE_CLIENT,
> +	isi_call_release_req(ovc, CALL_ID_ACTIVE, CALL_CAUSE_TYPE_CLIENT,
>  				CALL_CAUSE_RELEASE_BY_USER, cb, data);

while at it, you might also wanna remove the reference to an AT command.
Seems like a copy&past leftover from the original atmodem driver.

Regards

Marcel

Re: [PATCH] isimodem/voicecall: fix hangup_active

[Pekka Pessi]

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

Hi Marcel,

2010/10/6 Marcel Holtmann <marcel@holtmann.org>:
>> +static void isi_hangup_active(struct ofono_voicecall *ovc,
>>                       ofono_voicecall_cb_t cb, void *data)
>>  {
>>       /* AT+CHUP */
>> -     isi_call_release_req(ovc, CALL_ID_ALL, CALL_CAUSE_TYPE_CLIENT,
>> +     isi_call_release_req(ovc, CALL_ID_ACTIVE, CALL_CAUSE_TYPE_CLIENT,
>>                               CALL_CAUSE_RELEASE_BY_USER, cb, data);
>
> while at it, you might also wanna remove the reference to an AT command.
> Seems like a copy&past leftover from the original atmodem driver.

Oh yes, the comment is no more correct. I'll do that.

-- 
Pekka.Pessi mail at nokia.com

[PATCH-v2] isimodem/voicecall: fix hangup_active

[Pekka.Pessi]

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

From: Pekka Pessi <Pekka.Pessi@nokia.com>

---
 drivers/isimodem/voicecall.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 4b720be..146390c 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -988,11 +988,10 @@ static void isi_answer(struct ofono_voicecall *ovc,
 	isi_call_answer_req(ovc, CALL_ID_ALL, cb, data);
 }
 
-static void isi_hangup(struct ofono_voicecall *ovc,
+static void isi_hangup_active(struct ofono_voicecall *ovc,
 			ofono_voicecall_cb_t cb, void *data)
 {
-	/* AT+CHUP */
-	isi_call_release_req(ovc, CALL_ID_ALL, CALL_CAUSE_TYPE_CLIENT,
+	isi_call_release_req(ovc, CALL_ID_ACTIVE, CALL_CAUSE_TYPE_CLIENT,
 				CALL_CAUSE_RELEASE_BY_USER, cb, data);
 }
 
@@ -1318,7 +1317,7 @@ static struct ofono_voicecall_driver driver = {
 	.remove			= isi_voicecall_remove,
 	.dial			= isi_dial,
 	.answer			= isi_answer,
-	.hangup_active		= isi_hangup,
+	.hangup_active		= isi_hangup_active,
 	.hold_all_active	= isi_hold_all_active,
 	.release_all_held	= isi_release_all_held,
 	.set_udub		= isi_set_udub,
-- 
1.7.0.4

Re: [PATCH-v2] isimodem/voicecall: fix hangup_active

[Marcel Holtmann]

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

Hi Pekka,

> ---
>  drivers/isimodem/voicecall.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)

patch has been applied. Thanks.

However there are more AT command references in the code that you might
wanna remove and replace with proper ISI specific comments.

Regards

Marcel