ipc_client_gprs_specs handlers: pass the ipc_client struct

This enables to use logging inside the callbacks.

At this point the ipc_client struct is already available,
so it is safe to do that.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

6 files changed, 25 insertions, 14 deletions

diff --git a/samsung-ipc/devices/aries/aries.c b/samsung-ipc/devices/aries/aries.c
index 694831b..6daa0cc 100644
--- a/samsung-ipc/devices/aries/aries.c
+++ b/samsung-ipc/devices/aries/aries.c
@@ -805,7 +805,8 @@ int aries_gprs_deactivate(__attribute__((unused)) struct ipc_client *client,
     return 0;
 }
 
-char *aries_gprs_get_iface(unsigned int cid)
+char *aries_gprs_get_iface(__attribute__((unused)) struct ipc_client *client,
+                           unsigned int cid)
 {
     char *iface = NULL;
 
@@ -817,7 +818,8 @@ char *aries_gprs_get_iface(unsigned int cid)
     return iface;
 }
 
-int aries_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
+int aries_gprs_get_capabilities(__attribute__((unused)) struct ipc_client *client,
+                                struct ipc_client_gprs_capabilities *capabilities)
 {
     if (capabilities == NULL)
         return -1;
diff --git a/samsung-ipc/devices/crespo/crespo.c b/samsung-ipc/devices/crespo/crespo.c
index 8f89d0b..58f5f51 100644
--- a/samsung-ipc/devices/crespo/crespo.c
+++ b/samsung-ipc/devices/crespo/crespo.c
@@ -545,7 +545,8 @@ int crespo_gprs_deactivate(__attribute__((unused)) struct ipc_client *client,
     return 0;
 }
 
-char *crespo_gprs_get_iface_single(__attribute__((unused)) unsigned int cid)
+char *crespo_gprs_get_iface_single(__attribute__((unused)) struct ipc_client *client,
+                                   __attribute__((unused)) unsigned int cid)
 {
     char *iface = NULL;
 
@@ -554,7 +555,8 @@ char *crespo_gprs_get_iface_single(__attribute__((unused)) unsigned int cid)
     return iface;
 }
 
-int crespo_gprs_get_capabilities_single(struct ipc_client_gprs_capabilities *capabilities)
+int crespo_gprs_get_capabilities_single(__attribute__((unused)) struct ipc_client *client,
+                                        struct ipc_client_gprs_capabilities *capabilities)
 {
     if (capabilities == NULL)
         return -1;
@@ -564,7 +566,8 @@ int crespo_gprs_get_capabilities_single(struct ipc_client_gprs_capabilities *cap
     return 0;
 }
 
-char *crespo_gprs_get_iface(unsigned int cid)
+char *crespo_gprs_get_iface(__attribute__((unused)) struct ipc_client *client,
+                            unsigned int cid)
 {
     char *iface = NULL;
 
@@ -576,7 +579,8 @@ char *crespo_gprs_get_iface(unsigned int cid)
     return iface;
 }
 
-int crespo_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
+int crespo_gprs_get_capabilities(__attribute__((unused)) struct ipc_client *client,
+                                 struct ipc_client_gprs_capabilities *capabilities)
 {
     if (capabilities == NULL)
         return -1;
diff --git a/samsung-ipc/ipc.c b/samsung-ipc/ipc.c
index 74756fc..6f297c4 100644
--- a/samsung-ipc/ipc.c
+++ b/samsung-ipc/ipc.c
@@ -503,7 +503,7 @@ char *ipc_client_gprs_get_iface(struct ipc_client *client, unsigned int cid)
       return NULL;
     }
 
-    return client->gprs_specs->gprs_get_iface(cid);
+    return client->gprs_specs->gprs_get_iface(client, cid);
 }
 
 int ipc_client_gprs_get_capabilities(struct ipc_client *client,
@@ -514,7 +514,7 @@ int ipc_client_gprs_get_capabilities(struct ipc_client *client,
       return -1;
     }
 
-    return client->gprs_specs->gprs_get_capabilities(capabilities);
+    return client->gprs_specs->gprs_get_capabilities(client, capabilities);
 }
 
 char *ipc_client_nv_data_path(struct ipc_client *client)
diff --git a/samsung-ipc/ipc.h b/samsung-ipc/ipc.h
index c238428..7b30092 100644
--- a/samsung-ipc/ipc.h
+++ b/samsung-ipc/ipc.h
@@ -72,8 +72,9 @@ struct ipc_client_handlers {
 };
 
 struct ipc_client_gprs_specs {
-    char *(*gprs_get_iface)(unsigned int cid);
-    int (*gprs_get_capabilities)(struct ipc_client_gprs_capabilities *capabilities);
+    char *(*gprs_get_iface)(struct ipc_client *client, unsigned int cid);
+    int (*gprs_get_capabilities)(struct ipc_client *client,
+                                 struct ipc_client_gprs_capabilities *capabilities);
 };
 
 struct ipc_client_nv_data_specs {
diff --git a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
index 837260d..283aa4b 100644
--- a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
+++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
@@ -559,7 +559,8 @@ int xmm626_kernel_smdk4412_poll(__attribute__((unused)) struct ipc_client *clien
     return rc;
 }
 
-char *xmm626_kernel_smdk4412_gprs_get_iface(unsigned int cid)
+char *xmm626_kernel_smdk4412_gprs_get_iface(__attribute__((unused)) struct ipc_client *client,
+                                            unsigned int cid)
 {
     char *iface = NULL;
 
@@ -571,7 +572,8 @@ char *xmm626_kernel_smdk4412_gprs_get_iface(unsigned int cid)
     return iface;
 }
 
-int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
+int xmm626_kernel_smdk4412_gprs_get_capabilities(__attribute__((unused)) struct ipc_client *client,
+                                                 struct ipc_client_gprs_capabilities *capabilities)
 {
     if (capabilities == NULL)
         return -1;
diff --git a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
index 99b4714..cfbe490 100644
--- a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
+++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
@@ -64,8 +64,10 @@ int xmm626_kernel_smdk4412_write(struct ipc_client *client, int fd,
 int xmm626_kernel_smdk4412_poll(struct ipc_client *client, int fd,
     struct ipc_poll_fds *fds, struct timeval *timeout);
 
-char *xmm626_kernel_smdk4412_gprs_get_iface(unsigned int cid);
-int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities);
+char *xmm626_kernel_smdk4412_gprs_get_iface(struct ipc_client *client,
+                                            unsigned int cid);
+int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client *client,
+                                                 struct ipc_client_gprs_capabilities *capabilities);
 
 #endif