sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

atmodem: Add support for IFX specific phonebook ready notification

This commit is contained in:
Marcel Holtmann 2010-10-21 20:31:25 +02:00
parent 94d67b9c66
commit ae6c0edeae
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/atmodem/phonebook.c
View File

@ -27,6 +27,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <glib.h>
@ -39,6 +40,7 @@
#include "gatresult.h"
#include "atmodem.h"
#include "vendor.h"
#define INDEX_INVALID -1
@ -57,6 +59,8 @@ struct pb_data {
char *old_charset;
int supported;
GAtChat *chat;
unsigned int vendor;
guint ready_id;
};
static void warn_bad()
@ -321,7 +325,7 @@ static void at_list_indices_cb(gboolean ok, GAtResult *result,
if (!g_at_result_iter_open_list(&iter))
goto error;
/* retrieve index_min and index_max from indices
/* Retrieve index_min and index_max from indices
* which seems like "(1-150),32,16"
*/
if (!g_at_result_iter_next_range(&iter, &pbd->index_min,
@ -388,10 +392,29 @@ static void phonebook_not_supported(struct ofono_phonebook *pb)
ofono_phonebook_remove(pb);
}
static void at_list_storages_cb(gboolean ok, GAtResult *result,
gpointer user_data);
static void ifx_pbready_notify(GAtResult *result, gpointer user_data)
{
struct ofono_phonebook *pb = user_data;
struct pb_data *pbd = ofono_phonebook_get_data(pb);
g_at_chat_unregister(pbd->chat, pbd->ready_id);
pbd->ready_id = 0;
if (g_at_chat_send(pbd->chat, "AT+CPBS=?", cpbs_prefix,
at_list_storages_cb, pb, NULL) > 0)
return;
phonebook_not_supported(pb);
}
static void at_list_storages_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct ofono_phonebook *pb = user_data;
struct pb_data *pbd = ofono_phonebook_get_data(pb);
gboolean sm_supported = FALSE;
gboolean me_supported = FALSE;
gboolean in_list = FALSE;
@ -417,14 +440,22 @@ static void at_list_storages_cb(gboolean ok, GAtResult *result,
}
if (in_list && !g_at_result_iter_close_list(&iter))
goto error;
goto vendor;
if (!me_supported && !sm_supported)
goto error;
goto vendor;
ofono_phonebook_register(pb);
return;
vendor:
switch (pbd->vendor) {
case OFONO_VENDOR_IFX:
pbd->ready_id = g_at_chat_register(pbd->chat, "+PBREADY",
ifx_pbready_notify, FALSE, pb, NULL);
return;
}
error:
phonebook_not_supported(pb);
}
@ -504,8 +535,12 @@ static int at_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor,
GAtChat *chat = data;
struct pb_data *pbd;
pbd = g_new0(struct pb_data, 1);
pbd = g_try_new0(struct pb_data, 1);
if (!pbd)
return -ENOMEM;
pbd->chat = g_at_chat_clone(chat);
pbd->vendor = vendor;
ofono_phonebook_set_data(pb, pbd);