From 394133a323e2ba2d3f87f5e5e9d9cbbe60b9546d Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sun, 27 Jul 2014 22:16:36 +0200 Subject: GPRS cid count is unsigned integer Signed-off-by: Paul Kocialkowski --- include/samsung-ipc.h | 12 ++++++------ samsung-ipc/devices/aries/aries.c | 6 +++--- samsung-ipc/devices/crespo/crespo.c | 4 ++-- samsung-ipc/devices/xmm626/xmm626_sec_modem.c | 2 +- samsung-ipc/devices/xmm626/xmm626_sec_modem.h | 2 +- samsung-ipc/ipc.c | 10 +++++----- samsung-ipc/ipc.h | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/samsung-ipc.h b/include/samsung-ipc.h index 91300da..c45bd4b 100644 --- a/include/samsung-ipc.h +++ b/include/samsung-ipc.h @@ -51,7 +51,7 @@ struct ipc_message { }; struct ipc_client_gprs_capabilities { - int cid_count; + unsigned int cid_count; }; /* @@ -74,8 +74,8 @@ int ipc_client_power_handlers_register(struct ipc_client *client, int (*power_on)(void *power_data), int (*power_off)(void *power_data), void *power_data); int ipc_client_gprs_handlers_register(struct ipc_client *client, - int (*gprs_activate)(void *gprs_data, int cid), - int (*gprs_deactivate)(void *gprs_data, int cid), void *gprs_data); + int (*gprs_activate)(void *gprs_data, unsigned int cid), + int (*gprs_deactivate)(void *gprs_data, unsigned int cid), void *gprs_data); void ipc_client_log(struct ipc_client *client, const char *message, ...); int ipc_client_log_callback_register(struct ipc_client *client, @@ -91,12 +91,12 @@ int ipc_client_close(struct ipc_client *client); int ipc_client_poll(struct ipc_client *client, struct timeval *timeout); int ipc_client_power_on(struct ipc_client *client); int ipc_client_power_off(struct ipc_client *client); -int ipc_client_gprs_activate(struct ipc_client *client, int cid); -int ipc_client_gprs_deactivate(struct ipc_client *client, int cid); +int ipc_client_gprs_activate(struct ipc_client *client, unsigned int cid); +int ipc_client_gprs_deactivate(struct ipc_client *client, unsigned int cid); int ipc_client_data_create(struct ipc_client *client); int ipc_client_data_destroy(struct ipc_client *client); -char *ipc_client_gprs_get_iface(struct ipc_client *client, int cid); +char *ipc_client_gprs_get_iface(struct ipc_client *client, unsigned int cid); int ipc_client_gprs_get_capabilities(struct ipc_client *client, struct ipc_client_gprs_capabilities *capabilities); diff --git a/samsung-ipc/devices/aries/aries.c b/samsung-ipc/devices/aries/aries.c index de010c9..99b60c7 100644 --- a/samsung-ipc/devices/aries/aries.c +++ b/samsung-ipc/devices/aries/aries.c @@ -706,7 +706,7 @@ int aries_data_destroy(void *transport_data, void *power_data, void *gprs_data) return 0; } -int aries_gprs_activate(void *data, int cid) +int aries_gprs_activate(void *data, unsigned int cid) { int rc; @@ -717,7 +717,7 @@ int aries_gprs_activate(void *data, int cid) return 0; } -int aries_gprs_deactivate(void *data, int cid) +int aries_gprs_deactivate(void *data, unsigned int cid) { int rc; @@ -728,7 +728,7 @@ int aries_gprs_deactivate(void *data, int cid) return 0; } -char *aries_gprs_get_iface(int cid) +char *aries_gprs_get_iface(unsigned int cid) { char *iface = NULL; struct ifreq ifr; diff --git a/samsung-ipc/devices/crespo/crespo.c b/samsung-ipc/devices/crespo/crespo.c index 7589137..708a1a3 100644 --- a/samsung-ipc/devices/crespo/crespo.c +++ b/samsung-ipc/devices/crespo/crespo.c @@ -470,7 +470,7 @@ int crespo_data_destroy(void *transport_data, void *power_data, void *gprs_data) return 0; } -char *crespo_gprs_get_iface_single(int cid) +char *crespo_gprs_get_iface_single(unsigned int cid) { char *iface = NULL; @@ -489,7 +489,7 @@ int crespo_gprs_get_capabilities_single(struct ipc_client_gprs_capabilities *cap return 0; } -char *crespo_gprs_get_iface(int cid) +char *crespo_gprs_get_iface(unsigned int cid) { char *iface = NULL; diff --git a/samsung-ipc/devices/xmm626/xmm626_sec_modem.c b/samsung-ipc/devices/xmm626/xmm626_sec_modem.c index 5f4d7bf..eedce07 100644 --- a/samsung-ipc/devices/xmm626/xmm626_sec_modem.c +++ b/samsung-ipc/devices/xmm626/xmm626_sec_modem.c @@ -476,7 +476,7 @@ int xmm626_sec_modem_poll(int fd, struct timeval *timeout) return rc; } -char *xmm626_sec_modem_gprs_get_iface(int cid) +char *xmm626_sec_modem_gprs_get_iface(unsigned int cid) { char *iface = NULL; diff --git a/samsung-ipc/devices/xmm626/xmm626_sec_modem.h b/samsung-ipc/devices/xmm626/xmm626_sec_modem.h index 900ddad..6d4ce12 100644 --- a/samsung-ipc/devices/xmm626/xmm626_sec_modem.h +++ b/samsung-ipc/devices/xmm626/xmm626_sec_modem.h @@ -55,7 +55,7 @@ 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 timeval *timeout); -char *xmm626_sec_modem_gprs_get_iface(int cid); +char *xmm626_sec_modem_gprs_get_iface(unsigned int cid); int xmm626_sec_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities); #endif diff --git a/samsung-ipc/ipc.c b/samsung-ipc/ipc.c index f019642..5db8f4d 100644 --- a/samsung-ipc/ipc.c +++ b/samsung-ipc/ipc.c @@ -265,8 +265,8 @@ int ipc_client_power_handlers_register(struct ipc_client *client, } int ipc_client_gprs_handlers_register(struct ipc_client *client, - int (*gprs_activate)(void *gprs_data, int cid), - int (*gprs_deactivate)(void *gprs_data, int cid), void *gprs_data) + int (*gprs_activate)(void *gprs_data, unsigned int cid), + int (*gprs_deactivate)(void *gprs_data, unsigned int cid), void *gprs_data) { if (client == NULL || client->handlers == NULL) return -1; @@ -382,7 +382,7 @@ int ipc_client_power_off(struct ipc_client *client) return client->handlers->power_off(client->handlers->power_data); } -int ipc_client_gprs_activate(struct ipc_client *client, int cid) +int ipc_client_gprs_activate(struct ipc_client *client, unsigned int cid) { if (client == NULL || client->handlers == NULL || client->handlers->gprs_activate == NULL) return -1; @@ -390,7 +390,7 @@ int ipc_client_gprs_activate(struct ipc_client *client, int cid) return client->handlers->gprs_activate(client->handlers->gprs_data, cid); } -int ipc_client_gprs_deactivate(struct ipc_client *client, int cid) +int ipc_client_gprs_deactivate(struct ipc_client *client, unsigned int cid) { if (client == NULL || client->handlers == NULL || client->handlers->gprs_deactivate == NULL) return -1; @@ -414,7 +414,7 @@ int ipc_client_data_destroy(struct ipc_client *client) return client->handlers->data_destroy(client->handlers->transport_data, client->handlers->power_data, client->handlers->power_data); } -char *ipc_client_gprs_get_iface(struct ipc_client *client, int cid) +char *ipc_client_gprs_get_iface(struct ipc_client *client, unsigned int cid) { if (client == NULL || client->gprs_specs == NULL || client->gprs_specs->gprs_get_iface == NULL) return NULL; diff --git a/samsung-ipc/ipc.h b/samsung-ipc/ipc.h index b50303e..5808aa1 100644 --- a/samsung-ipc/ipc.h +++ b/samsung-ipc/ipc.h @@ -54,8 +54,8 @@ struct ipc_client_handlers { void *power_data; /* GPRS handlers */ - int (*gprs_activate)(void *gprs_data, int cid); - int (*gprs_deactivate)(void *gprs_data, int cid); + int (*gprs_activate)(void *gprs_data, unsigned int cid); + int (*gprs_deactivate)(void *gprs_data, unsigned int cid); void *gprs_data; @@ -65,7 +65,7 @@ struct ipc_client_handlers { }; struct ipc_client_gprs_specs { - char *(*gprs_get_iface)(int cid); + char *(*gprs_get_iface)(unsigned int cid); int (*gprs_get_capabilities)(struct ipc_client_gprs_capabilities *capabilities); }; -- cgit v1.1