Re: [PATCH v2 09/18] isimodem: clip colp clir colr wgmodem2.5

[Aki Niemi]

Hi,

2011/2/23 Andreas Westin :
> From: Jessica Nilsson 
>
> ---
>  drivers/isimodem/call-settings.c |  711 
> +-
>  drivers/isimodem/call.h          |    9 +
>  drivers/isimodem/debug.c         |    4 +
>  drivers/isimodem/ss.h            |   22 ++
>  4 files changed, 728 insertions(+), 18 deletions(-)

I pushed CLIP, COLP and COLR query support based on this patch, plus
refactored the call waiting code some.

The CLIR query and set functionality included was sufficiently
convoluted that I had to leave it out for the time being.

Frankly, I am not sure that even oFono core is working properly here,
if the CLIR status can only be modified locally. That said, my
supplementary-service-foo is admittedly lacking, so if someone can
make sense of CLIR here, I would appreciate comments and/or patches.

Cheers,
Aki
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

[PATCH v2 09/18] isimodem: clip colp clir colr wgmodem2.5

[Andreas Westin]

From: Jessica Nilsson 

---
 drivers/isimodem/call-settings.c |  711 +-
 drivers/isimodem/call.h  |9 +
 drivers/isimodem/debug.c |4 +
 drivers/isimodem/ss.h|   22 ++
 4 files changed, 728 insertions(+), 18 deletions(-)

diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index 89270e9..ed3d11e 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -3,6 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *  Copyright (C) ST-Ericsson SA 2011.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -45,6 +46,7 @@
 
 struct settings_data {
GIsiClient *client;
+   int clir_status;
 };
 
 static void update_status_mask(unsigned int *mask, int bsc)
@@ -88,7 +90,6 @@ static void update_status_mask(unsigned int *mask, int bsc)
break;
}
 }
-
 static gboolean check_response_status(const GIsiMessage *msg, uint8_t msgid)
 {
if (g_isi_msg_error(msg) < 0) {
@@ -104,6 +105,59 @@ static gboolean check_response_status(const GIsiMessage 
*msg, uint8_t msgid)
return TRUE;
 }
 
+static void clip_query_cb(const GIsiMessage *msg, void *data)
+{
+   GIsiSubBlockIter iter;
+   struct isi_cb_data *cbd = data;
+
+   ofono_call_settings_status_cb_t cb = cbd->cb;
+   uint8_t service;
+   guint32 mask = 0;
+
+   if (!check_response_status(msg, SS_SERVICE_COMPLETED_RESP))
+   goto error;
+
+   if (!g_isi_msg_data_get_byte(msg, 0, &service) ||
+   service != SS_INTERROGATION)
+   goto error;
+
+   for (g_isi_sb_iter_init(&iter, msg, 6);
+g_isi_sb_iter_is_valid(&iter);
+g_isi_sb_iter_next(&iter)) {
+   DBG("Sub-block %s",
+   ss_subblock_name(g_isi_sb_iter_get_id(&iter)));
+
+   switch (g_isi_sb_iter_get_id(&iter)) {
+   case SS_STATUS_RESULT: {
+   guint8 ss_status;
+
+   if (!g_isi_sb_iter_get_byte(&iter, &ss_status, 2))
+   goto error;
+
+   DBG("SS_STATUS_RESULT=%d", ss_status);
+
+   if (ss_status & SS_GSM_PROVISIONED)
+   mask = 1;
+   }
+   break;
+   case SS_GSM_ADDITIONAL_INFO:
+   break;
+   default:
+   DBG("Skipping sub-block: %s (%zd bytes)",
+   ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
+   g_isi_sb_iter_get_len(&iter));
+   break;
+   }
+   }
+
+   DBG("status_mask %d\n", mask);
+   CALLBACK_WITH_SUCCESS(cb, mask, cbd->data);
+   return;
+error:
+   CALLBACK_WITH_FAILURE(cb, 0, cbd->data);
+}
+
+
 static gboolean decode_gsm_bsc_info(GIsiSubBlockIter *iter, uint32_t *mask)
 {
uint8_t num;
@@ -136,23 +190,628 @@ static void query_resp_cb(const GIsiMessage *msg, void 
*data)
goto error;
 
for (g_isi_sb_iter_init(&iter, msg, 6);
+g_isi_sb_iter_is_valid(&iter);
+g_isi_sb_iter_next(&iter)) {
+
+   if (g_isi_sb_iter_get_id(&iter) == SS_GSM_BSC_INFO) {
+   if (!decode_gsm_bsc_info(&iter, &mask))
+   goto error;
+
+   CALLBACK_WITH_SUCCESS(cb, mask, cbd->data);
+   return;
+   } else if (g_isi_sb_iter_get_id(&iter) == SS_STATUS_RESULT) {
+   guint8 ss_status;
+
+   if (!g_isi_sb_iter_get_byte(&iter, &ss_status, 2))
+   goto error;
+
+   if (ss_status & SS_GSM_PROVISIONED)
+   mask = 1;
+   CALLBACK_WITH_SUCCESS(cb, mask, cbd->data);
+   return;
+   }
+   }
+
+error:
+   CALLBACK_WITH_FAILURE(cb, 0, cbd->data);
+}
+
+static void isi_clip_query(struct ofono_call_settings *cs,
+   ofono_call_settings_status_cb_t cb, void *data)
+{
+   struct settings_data *sd = ofono_call_settings_get_data(cs);
+   struct isi_cb_data *cbd = isi_cb_data_new(cs, cb, data);
+   unsigned char msg[] = {
+   SS_SERVICE_REQ,
+   SS_INTERROGATION,
+   SS_ALL_TELE_AND_BEARER,
+   SS_GSM_CLIP >> 8,   /* Supplementary services */
+   SS_GSM_CLIP & 0xFF, /* code */
+   SS_SEND_ADDITIONAL_INFO,
+   0   /* Subblock count */
+   };
+   DBG("");
+
+   if (cbd == NULL)
+   goto er