[Replicant] [libsamsung-ipc][ 6/6] modem: transport: pass the ipc_client struct
Denis 'GNUtoo' Carikli
GNUtoo at cyberdimension.org
Fri Feb 21 00:12:43 UTC 2020
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 at cyberdimension.org>
---
samsung-ipc/devices/galaxys2/galaxys2.c | 10 +++++-----
samsung-ipc/devices/i9300/i9300.c | 10 +++++-----
samsung-ipc/devices/maguro/maguro.c | 10 +++++-----
samsung-ipc/devices/n5100/n5100.c | 10 +++++-----
samsung-ipc/devices/n7100/n7100.c | 10 +++++-----
samsung-ipc/devices/piranha/piranha.c | 10 +++++-----
samsung-ipc/modems/xmm626/xmm626_sec_modem.c | 17 +++++++++++------
samsung-ipc/modems/xmm626/xmm626_sec_modem.h | 14 ++++++++------
8 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/samsung-ipc/devices/galaxys2/galaxys2.c b/samsung-ipc/devices/galaxys2/galaxys2.c
index fcfaa7d..3c46121 100644
--- a/samsung-ipc/devices/galaxys2/galaxys2.c
+++ b/samsung-ipc/devices/galaxys2/galaxys2.c
@@ -245,7 +245,7 @@ int galaxys2_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct galaxys2_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -262,7 +262,7 @@ int galaxys2_close(__attribute__((unused)) struct ipc_client *client,
transport_data = (struct galaxys2_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -279,7 +279,7 @@ int galaxys2_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -295,7 +295,7 @@ int galaxys2_write(__attribute__((unused)) struct ipc_client *client,
transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -311,7 +311,7 @@ int galaxys2_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/devices/i9300/i9300.c b/samsung-ipc/devices/i9300/i9300.c
index 5728abe..06633f9 100644
--- a/samsung-ipc/devices/i9300/i9300.c
+++ b/samsung-ipc/devices/i9300/i9300.c
@@ -239,7 +239,7 @@ int i9300_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct i9300_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -255,7 +255,7 @@ int i9300_close(__attribute__((unused)) struct ipc_client *client, void *data)
transport_data = (struct i9300_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -272,7 +272,7 @@ int i9300_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct i9300_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -288,7 +288,7 @@ int i9300_write(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct i9300_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -304,7 +304,7 @@ int i9300_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct i9300_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/devices/maguro/maguro.c b/samsung-ipc/devices/maguro/maguro.c
index 3c6f4da..bc2b4f6 100644
--- a/samsung-ipc/devices/maguro/maguro.c
+++ b/samsung-ipc/devices/maguro/maguro.c
@@ -223,7 +223,7 @@ int maguro_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct maguro_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -239,7 +239,7 @@ int maguro_close(__attribute__((unused)) struct ipc_client *client, void *data)
transport_data = (struct maguro_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -256,7 +256,7 @@ int maguro_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct maguro_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -272,7 +272,7 @@ int maguro_write(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct maguro_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -288,7 +288,7 @@ int maguro_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct maguro_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/devices/n5100/n5100.c b/samsung-ipc/devices/n5100/n5100.c
index d50d86f..c768750 100644
--- a/samsung-ipc/devices/n5100/n5100.c
+++ b/samsung-ipc/devices/n5100/n5100.c
@@ -240,7 +240,7 @@ int n5100_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n5100_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -256,7 +256,7 @@ int n5100_close(__attribute__((unused)) struct ipc_client *client, void *data)
transport_data = (struct n5100_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -273,7 +273,7 @@ int n5100_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n5100_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -289,7 +289,7 @@ int n5100_write(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n5100_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -305,7 +305,7 @@ int n5100_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n5100_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/devices/n7100/n7100.c b/samsung-ipc/devices/n7100/n7100.c
index d6aced8..5b27585 100644
--- a/samsung-ipc/devices/n7100/n7100.c
+++ b/samsung-ipc/devices/n7100/n7100.c
@@ -239,7 +239,7 @@ int n7100_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n7100_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -255,7 +255,7 @@ int n7100_close(__attribute__((unused)) struct ipc_client *client, void *data)
transport_data = (struct n7100_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -272,7 +272,7 @@ int n7100_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n7100_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -288,7 +288,7 @@ int n7100_write(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n7100_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -304,7 +304,7 @@ int n7100_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct n7100_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/devices/piranha/piranha.c b/samsung-ipc/devices/piranha/piranha.c
index 5f1b3a0..9029a5f 100644
--- a/samsung-ipc/devices/piranha/piranha.c
+++ b/samsung-ipc/devices/piranha/piranha.c
@@ -188,7 +188,7 @@ int piranha_open(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct piranha_transport_data *) data;
- transport_data->fd = xmm626_sec_modem_open(type);
+ transport_data->fd = xmm626_sec_modem_open(client, type);
if (transport_data->fd < 0)
return -1;
@@ -204,7 +204,7 @@ int piranha_close(__attribute__((unused)) struct ipc_client *client, void *data)
transport_data = (struct piranha_transport_data *) data;
- xmm626_sec_modem_close(transport_data->fd);
+ xmm626_sec_modem_close(client, transport_data->fd);
transport_data->fd = -1;
return 0;
@@ -221,7 +221,7 @@ int piranha_read(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct piranha_transport_data *) data;
- rc = xmm626_sec_modem_read(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
return rc;
}
@@ -237,7 +237,7 @@ int piranha_write(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct piranha_transport_data *) data;
- rc = xmm626_sec_modem_write(transport_data->fd, buffer, length);
+ rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
return rc;
}
@@ -253,7 +253,7 @@ int piranha_poll(__attribute__((unused)) struct ipc_client *client, void *data,
transport_data = (struct piranha_transport_data *) data;
- rc = xmm626_sec_modem_poll(transport_data->fd, fds, timeout);
+ rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
return rc;
}
diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
index e63ad89..a186910 100644
--- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
@@ -437,7 +437,8 @@ complete:
return rc;
}
-int xmm626_sec_modem_open(int type)
+int xmm626_sec_modem_open(__attribute__((unused)) struct ipc_client *client,
+ int type)
{
int fd;
@@ -457,7 +458,8 @@ int xmm626_sec_modem_open(int type)
return fd;
}
-int xmm626_sec_modem_close(int fd)
+int xmm626_sec_modem_close(__attribute__((unused)) struct ipc_client *client,
+ int fd)
{
if (fd < 0)
return -1;
@@ -467,7 +469,8 @@ int xmm626_sec_modem_close(int fd)
return 0;
}
-int xmm626_sec_modem_read(int fd, void *buffer, size_t length)
+int xmm626_sec_modem_read(__attribute__((unused)) struct ipc_client *client,
+ int fd, void *buffer, size_t length)
{
int status;
int rc;
@@ -484,7 +487,8 @@ int xmm626_sec_modem_read(int fd, void *buffer, size_t length)
return rc;
}
-int xmm626_sec_modem_write(int fd, const void *buffer, size_t length)
+int xmm626_sec_modem_write(__attribute__((unused)) struct ipc_client *client,
+ int fd, const void *buffer, size_t length)
{
int status;
int rc;
@@ -501,8 +505,9 @@ int xmm626_sec_modem_write(int fd, const void *buffer, size_t length)
return rc;
}
-int xmm626_sec_modem_poll(int fd, struct ipc_poll_fds *fds,
- struct timeval *timeout)
+int xmm626_sec_modem_poll(__attribute__((unused)) struct ipc_client *client,
+ int fd, struct ipc_poll_fds *fds,
+ struct timeval *timeout)
{
int status;
fd_set set;
diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
index 943c101..1eb6a3d 100644
--- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
@@ -55,12 +55,14 @@ int xmm626_sec_modem_rfs_send(struct ipc_client *client,
int xmm626_sec_modem_rfs_recv(struct ipc_client *client,
struct ipc_message *message);
-int xmm626_sec_modem_open(int type);
-int xmm626_sec_modem_close(int fd);
-int xmm626_sec_modem_read(int fd, void *buffer, size_t length);
-int xmm626_sec_modem_write(int fd, const void *buffer, size_t length);
-int xmm626_sec_modem_poll(int fd, struct ipc_poll_fds *fds,
- struct timeval *timeout);
+int xmm626_sec_modem_open(struct ipc_client *client, int type);
+int xmm626_sec_modem_close(struct ipc_client *client, int fd);
+int xmm626_sec_modem_read(struct ipc_client *client, int fd, void *buffer,
+ size_t length);
+int xmm626_sec_modem_write(struct ipc_client *client, int fd,
+ const void *buffer, size_t length);
+int xmm626_sec_modem_poll(struct ipc_client *client, int fd,
+ struct ipc_poll_fds *fds, struct timeval *timeout);
char *xmm626_sec_modem_gprs_get_iface(unsigned int cid);
int xmm626_sec_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities);
--
2.25.0
More information about the Replicant
mailing list