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

gisi: pass object handle to g_isi_verify() callback 

This will be needed for GPDS.
This commit is contained in:
Rémi Denis-Courmont 2009-12-16 13:46:49 +02:00 committed by Aki Niemi
parent 0081548fcf
commit bc6c4adcac
9 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/isimodem/call-barring.c
View File

@ -410,7 +410,8 @@ static gboolean isi_call_barring_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_call_barring *barr = opaque;

3
drivers/isimodem/call-forwarding.c
View File

@ -505,7 +505,8 @@ static gboolean isi_call_forwarding_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_call_forwarding *cf = opaque;

3
drivers/isimodem/call-settings.c
View File

@ -287,7 +287,8 @@ static gboolean isi_call_settings_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_call_settings *cs = opaque;

3
drivers/isimodem/devinfo.c
View File

@ -273,7 +273,8 @@ static gboolean isi_devinfo_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_devinfo *info = opaque;

3
drivers/isimodem/network-registration.c
View File

@ -978,7 +978,8 @@ static gboolean isi_netreg_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_netreg *netreg = opaque;

3
drivers/isimodem/phonebook.c
View File

@ -313,7 +313,8 @@ static gboolean isi_phonebook_register(gpointer user)
return FALSE;
}
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_phonebook *pb = opaque;

5
drivers/isimodem/voicecall.c
View File

@ -74,7 +74,8 @@ typedef void GIsiIndication (GIsiClient *client,
const void *restrict data, size_t len,
uint16_t object, void *opaque);
typedef void GIsiVerify (GIsiClient *client, bool alive, void *opaque);
typedef void GIsiVerify (GIsiClient *client, bool alive, uint16_t object,
void *opaque);
typedef bool GIsiResponse(GIsiClient *client,
void const * restrict data, size_t len,
@ -1300,7 +1301,7 @@ static int isi_voicecall_probe(struct ofono_voicecall *ovc,
}
static void isi_call_verify_cb(GIsiClient *client,
bool alive,
bool alive, uint16_t object,
void *ovc)
{
if (alive) {

3
gisi/client.h
View File

@ -38,7 +38,8 @@ typedef struct _GIsiClient GIsiClient;
struct _GIsiRequest;
typedef struct _GIsiRequest GIsiRequest;
typedef void (*GIsiVerifyFunc)(GIsiClient *client, bool alive, void *opaque);
typedef void (*GIsiVerifyFunc)(GIsiClient *client, bool alive,
uint16_t object, void *opaque);
typedef bool (*GIsiResponseFunc)(GIsiClient *client,
const void *restrict data, size_t len,

2
gisi/verify.c
View File

@ -71,7 +71,7 @@ static bool verify_cb(GIsiClient *client, const void *restrict data,
out:
if (func)
func(client, alive, vd->data);
func(client, alive, object, vd->data);
g_free(vd);
return true;
}