From bc6c4adcac319ce22508b4e7f5ea272162ea4b2e Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Wed, 16 Dec 2009 13:46:49 +0200
Subject: [PATCH] gisi: pass object handle to g_isi_verify() callback

This will be needed for GPDS.
---
 drivers/isimodem/call-barring.c         | 3 ++-
 drivers/isimodem/call-forwarding.c      | 3 ++-
 drivers/isimodem/call-settings.c        | 3 ++-
 drivers/isimodem/devinfo.c              | 3 ++-
 drivers/isimodem/network-registration.c | 3 ++-
 drivers/isimodem/phonebook.c            | 3 ++-
 drivers/isimodem/voicecall.c            | 5 +++--
 gisi/client.h                           | 3 ++-
 gisi/verify.c                           | 2 +-
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index 62c3cc3..ab38fc2 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -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;
 
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index dd80491..480dd1f 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -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;
 
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index d3b615a..fa3791c 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -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;
 
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index 5f8d85e..481c520 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -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;
 
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index a977775..e05f30e 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -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;
 
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index c24320a..f0e6309 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -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;
 
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 26d4346..5078449 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -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) {
diff --git a/gisi/client.h b/gisi/client.h
index d0c0c4b..683d284 100644
--- a/gisi/client.h
+++ b/gisi/client.h
@@ -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,
diff --git a/gisi/verify.c b/gisi/verify.c
index c40ea77..7958a33 100644
--- a/gisi/verify.c
+++ b/gisi/verify.c
@@ -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;
 }
-- 
2.7.4