[Replicant] [libsamsung-ipc][PATCH 1/7] devices: crespo: cosmetic cleanups

Denis 'GNUtoo' Carikli GNUtoo at cyberdimension.org
Thu Feb 6 05:08:15 UTC 2020


- Whitespaces were unified to use 4 spaces as stated by the
  last line that has vim settings.
- The line length was limited to 80 characters with the exception
  of the functions with only one argument where it didn't make
  sense to try to split it as the result would look counter intuitive.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
 samsung-ipc/devices/crespo/crespo.c | 74 ++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/samsung-ipc/devices/crespo/crespo.c b/samsung-ipc/devices/crespo/crespo.c
index 612ce5d..a7e5ef8 100644
--- a/samsung-ipc/devices/crespo/crespo.c
+++ b/samsung-ipc/devices/crespo/crespo.c
@@ -50,7 +50,8 @@ int crespo_boot(struct ipc_client *client)
 
     ipc_client_log(client, "Starting crespo modem boot");
 
-    modem_image_data = file_data_read(client, CRESPO_MODEM_IMAGE_DEVICE, CRESPO_MODEM_IMAGE_SIZE, 0x1000, 0);
+    modem_image_data = file_data_read(client, CRESPO_MODEM_IMAGE_DEVICE,
+                                      CRESPO_MODEM_IMAGE_SIZE, 0x1000, 0);
     if (modem_image_data == NULL) {
         ipc_client_log(client, "Reading modem image data failed");
         goto error;
@@ -93,7 +94,8 @@ int crespo_boot(struct ipc_client *client)
 
     lseek(modem_ctl_fd, 0, SEEK_SET);
 
-    rc = xmm616_firmware_send(client, modem_ctl_fd, NULL, (void *) p, CRESPO_MODEM_IMAGE_SIZE - CRESPO_PSI_SIZE);
+    rc = xmm616_firmware_send(client, modem_ctl_fd, NULL, (void *) p,
+                              CRESPO_MODEM_IMAGE_SIZE - CRESPO_PSI_SIZE);
     if (rc < 0) {
         ipc_client_log(client, "Sending XMM616 firmware failed");
         goto error;
@@ -134,8 +136,9 @@ int crespo_fmt_send(struct ipc_client *client, struct ipc_message *message)
     struct modem_io mio;
     int rc;
 
-    if (client == NULL || client->handlers == NULL || client->handlers->write == NULL || message == NULL)
-        return -1;
+    if (client == NULL || client->handlers == NULL ||
+        client->handlers->write == NULL || message == NULL)
+      return -1;
 
     ipc_fmt_header_setup(&header, message);
 
@@ -145,11 +148,14 @@ int crespo_fmt_send(struct ipc_client *client, struct ipc_message *message)
 
     memcpy(mio.data, &header, sizeof(struct ipc_fmt_header));
     if (message->data != NULL && message->size > 0)
-        memcpy((void *) ((unsigned char *) mio.data + sizeof(struct ipc_fmt_header)), message->data, message->size);
+        memcpy((void *) ((unsigned char *) mio.data +
+                         sizeof(struct ipc_fmt_header)),
+               message->data, message->size);
 
     ipc_client_log_send(client, message, __func__);
 
-    rc = client->handlers->write(client->handlers->transport_data, (void *) &mio, sizeof(struct modem_io));
+    rc = client->handlers->write(client->handlers->transport_data,
+                                 (void *) &mio, sizeof(struct modem_io));
     if (rc < 0) {
         ipc_client_log(client, "Writing FMT data failed");
         goto error;
@@ -174,17 +180,21 @@ int crespo_fmt_recv(struct ipc_client *client, struct ipc_message *message)
     struct modem_io mio;
     int rc;
 
-    if (client == NULL || client->handlers == NULL || client->handlers->read == NULL || message == NULL)
-        return -1;
+    if (client == NULL || client->handlers == NULL ||
+        client->handlers->read == NULL || message == NULL)
+      return -1;
 
     memset(&mio, 0, sizeof(struct modem_io));
     mio.size = CRESPO_BUFFER_LENGTH;
     mio.data = calloc(1, mio.size);
 
-    rc = client->handlers->read(client->handlers->transport_data, &mio, sizeof(struct modem_io) + mio.size);
-    if (rc < 0 || mio.data == NULL || mio.size < sizeof(struct ipc_fmt_header) || mio.size > CRESPO_BUFFER_LENGTH) {
-        ipc_client_log(client, "Reading FMT data failed");
-        goto error;
+    rc = client->handlers->read(client->handlers->transport_data, &mio,
+                                sizeof(struct modem_io) + mio.size);
+    if (rc < 0 || mio.data == NULL ||
+        mio.size < sizeof(struct ipc_fmt_header) ||
+        mio.size > CRESPO_BUFFER_LENGTH) {
+      ipc_client_log(client, "Reading FMT data failed");
+      goto error;
     }
 
     header = (struct ipc_fmt_header *) mio.data;
@@ -195,7 +205,10 @@ int crespo_fmt_recv(struct ipc_client *client, struct ipc_message *message)
         message->size = mio.size - sizeof(struct ipc_fmt_header);
         message->data = calloc(1, message->size);
 
-        memcpy(message->data, (void *) ((unsigned char *) mio.data + sizeof(struct ipc_fmt_header)), message->size);
+        memcpy(message->data,
+               (void *) ((unsigned char *) mio.data +
+                         sizeof(struct ipc_fmt_header)),
+               message->size);
     }
 
     ipc_client_log_recv(client, message, __func__);
@@ -218,8 +231,9 @@ int crespo_rfs_send(struct ipc_client *client, struct ipc_message *message)
     struct modem_io mio;
     int rc;
 
-    if (client == NULL || client->handlers == NULL || client->handlers->write == NULL || message == NULL)
-        return -1;
+    if (client == NULL || client->handlers == NULL ||
+        client->handlers->write == NULL || message == NULL)
+      return -1;
 
     memset(&mio, 0, sizeof(struct modem_io));
     mio.id = message->mseq;
@@ -234,7 +248,8 @@ int crespo_rfs_send(struct ipc_client *client, struct ipc_message *message)
 
     ipc_client_log_send(client, message, __func__);
 
-    rc = client->handlers->write(client->handlers->transport_data, (void *) &mio, sizeof(struct modem_io));
+    rc = client->handlers->write(client->handlers->transport_data,
+                                 (void *) &mio, sizeof(struct modem_io));
     if (rc < 0) {
         ipc_client_log(client, "Writing RFS data failed");
         goto error;
@@ -258,17 +273,20 @@ int crespo_rfs_recv(struct ipc_client *client, struct ipc_message *message)
     struct modem_io mio;
     int rc;
 
-    if (client == NULL || client->handlers == NULL || client->handlers->read == NULL || message == NULL)
-        return -1;
+    if (client == NULL || client->handlers == NULL ||
+        client->handlers->read == NULL || message == NULL)
+      return -1;
 
     memset(&mio, 0, sizeof(struct modem_io));
     mio.size = CRESPO_BUFFER_LENGTH;
     mio.data = calloc(1, mio.size);
 
-    rc = client->handlers->read(client->handlers->transport_data, &mio, sizeof(struct modem_io) + mio.size);
-    if (rc < 0 || mio.data == NULL || mio.size <= 0 || mio.size > CRESPO_BUFFER_LENGTH) {
-        ipc_client_log(client, "Reading RFS data failed");
-        goto error;
+    rc = client->handlers->read(client->handlers->transport_data, &mio,
+                                sizeof(struct modem_io) + mio.size);
+    if (rc < 0 || mio.data == NULL || mio.size <= 0 ||
+        mio.size > CRESPO_BUFFER_LENGTH) {
+      ipc_client_log(client, "Reading RFS data failed");
+      goto error;
     }
 
     memset(message, 0, sizeof(struct ipc_message));
@@ -482,8 +500,8 @@ int crespo_power_off(__attribute__((unused)) void *data)
 }
 
 int crespo_data_create(void **transport_data,
-		       __attribute__((unused)) void **power_data,
-		       __attribute__((unused)) void **gprs_data)
+                       __attribute__((unused)) void **power_data,
+                       __attribute__((unused)) void **gprs_data)
 {
     if (transport_data == NULL)
         return -1;
@@ -494,8 +512,8 @@ int crespo_data_create(void **transport_data,
 }
 
 int crespo_data_destroy(void *transport_data,
-			__attribute__((unused)) void *power_data,
-			__attribute__((unused)) void *gprs_data)
+                        __attribute__((unused)) void *power_data,
+                        __attribute__((unused)) void *gprs_data)
 {
     if (transport_data == NULL)
         return -1;
@@ -506,13 +524,13 @@ int crespo_data_destroy(void *transport_data,
 }
 
 int crespo_gprs_activate(__attribute__((unused)) void *data,
-			 __attribute__((unused)) unsigned int cid)
+                         __attribute__((unused)) unsigned int cid)
 {
     return 0;
 }
 
 int crespo_gprs_deactivate(__attribute__((unused)) void *data,
-			   __attribute__((unused)) unsigned int cid)
+                           __attribute__((unused)) unsigned int cid)
 {
     return 0;
 }
-- 
2.25.0



More information about the Replicant mailing list