This contains no functional changes.
Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]>
---
samsung-ipc/modems/xmm616/xmm616.c | 453 +++++++++++++++--------------
samsung-ipc/modems/xmm616/xmm616.h | 35 ++-
2 files changed, 247 insertions(+), 241 deletions(-)
diff --git a/samsung-ipc/modems/xmm616/xmm616.c
b/samsung-ipc/modems/xmm616/xmm616.c
index cf06f5e..e7fc487 100644
--- a/samsung-ipc/modems/xmm616/xmm616.c
+++ b/samsung-ipc/modems/xmm616/xmm616.c
@@ -30,249 +30,256 @@
#include "xmm616.h"
int xmm616_psi_send(struct ipc_client *client, int serial_fd,
- const void *psi_data, unsigned short psi_size)
+ const void *psi_data, unsigned short psi_size)
{
- char at[] = XMM616_AT;
- unsigned char version;
- unsigned char info;
- unsigned char psi_magic;
- unsigned char psi_crc;
- unsigned char psi_ack;
- struct termios termios;
- struct timeval timeout;
- fd_set fds;
- size_t length;
- unsigned char *p;
- int rc;
- int i;
-
- if (client == NULL || serial_fd < 0 || psi_data == NULL || psi_size == 0)
- return -1;
-
- tcgetattr(serial_fd, &termios);
-
- cfmakeraw(&termios);
- cfsetispeed(&termios, B115200);
- cfsetospeed(&termios, B115200);
-
- tcsetattr(serial_fd, TCSANOW, &termios);
-
- length = strlen(at);
- for (i = 0; i < XMM616_AT_COUNT; i++) {
- rc = write(serial_fd, at, length);
- if (rc < (int) length) {
- ipc_client_log(client, "Writing AT in ASCII failed");
- goto error;
- }
-
- usleep(50000);
- }
- ipc_client_log(client, "Wrote AT in ASCII");
-
- usleep(50000);
-
- version = 0;
-
- rc = read(serial_fd, &version, sizeof(version));
- if (rc < (int) sizeof(version)) {
- ipc_client_log(client, "Reading bootcore version failed");
- goto error;
- }
-
- if (version != XMM616_BOOTCORE_VERSION) {
- ipc_client_log(client, "Read wrong bootcore version (0x%x)", version);
- goto error;
- }
-
- ipc_client_log(client, "Read bootcore version (0x%x)", version);
-
- rc = read(serial_fd, &info, sizeof(info));
- if (rc < (int) sizeof(info)) {
- ipc_client_log(client, "Reading info size failed");
- goto error;
- }
- ipc_client_log(client, "Read info size (0x%x)", info);
-
- psi_magic = XMM616_PSI_MAGIC;
-
- rc = write(serial_fd, &psi_magic, sizeof(psi_magic));
- if (rc < (int) sizeof(psi_magic)) {
- ipc_client_log(client, "Writing PSI magic failed");
- goto error;
- }
- ipc_client_log(client, "Wrote PSI magic (0x%x)", psi_magic);
-
- rc = write(serial_fd, &psi_size, sizeof(psi_size));
- if (rc < (int) sizeof(psi_size)) {
- ipc_client_log(client, "Writing PSI size failed");
- goto error;
- }
- ipc_client_log(client, "Wrote PSI size (0x%x)", psi_size);
-
- FD_ZERO(&fds);
- FD_SET(serial_fd, &fds);
-
- timeout.tv_sec = 4;
- timeout.tv_usec = 0;
-
- p = (unsigned char *) psi_data;
- psi_crc = 0;
-
- for (i = 0; i < psi_size; i++) {
- rc = select(serial_fd + 1, NULL, &fds, NULL, &timeout);
- if (rc <= 0) {
- ipc_client_log(client, "Writing PSI failed");
- goto error;
- }
-
- rc = write(serial_fd, p, 1);
- if (rc < 1) {
- ipc_client_log(client, "Writing PSI failed");
- goto error;
- }
-
- psi_crc ^= *p++;
- }
- ipc_client_log(client, "Wrote PSI, CRC is 0x%x", psi_crc);
-
- rc = select(serial_fd + 1, NULL, &fds, NULL, &timeout);
- if (rc <= 0) {
- ipc_client_log(client, "Writing PSI crc failed");
- goto error;
- }
-
- rc = write(serial_fd, &psi_crc, sizeof(psi_crc));
- if (rc < (int) sizeof(psi_crc)) {
- ipc_client_log(client, "Writing PSI crc failed");
- goto error;
- }
- ipc_client_log(client, "Wrote PSI CRC (0x%x)", psi_crc);
-
- timeout.tv_sec = 4;
- timeout.tv_usec = 0;
-
- i = 0;
- do {
- rc = select(serial_fd + 1, &fds, NULL, NULL, &timeout);
- if (rc <= 0) {
- ipc_client_log(client, "Reading PSI ACK failed");
- goto error;
- }
-
- rc = read(serial_fd, &psi_ack, sizeof(psi_ack));
- if (rc < (int) sizeof(psi_ack)) {
- ipc_client_log(client, "Reading PSI ACK failed");
- goto error;
- }
-
- if (i++ > 50) {
- ipc_client_log(client, "Reading PSI ACK failed");
- goto error;
- }
- } while (psi_ack != XMM616_PSI_ACK);
- ipc_client_log(client, "Read PSI ACK (0x%x)", psi_ack);
-
- rc = 0;
- goto complete;
+ char at[] = XMM616_AT;
+ unsigned char version;
+ unsigned char info;
+ unsigned char psi_magic;
+ unsigned char psi_crc;
+ unsigned char psi_ack;
+ struct termios termios;
+ struct timeval timeout;
+ fd_set fds;
+ size_t length;
+ unsigned char *p;
+ int rc;
+ int i;
+
+ if (client == NULL || serial_fd < 0 || psi_data == NULL ||
+ psi_size == 0) {
+ return -1;
+ }
+
+ tcgetattr(serial_fd, &termios);
+
+ cfmakeraw(&termios);
+ cfsetispeed(&termios, B115200);
+ cfsetospeed(&termios, B115200);
+
+ tcsetattr(serial_fd, TCSANOW, &termios);
+
+ length = strlen(at);
+ for (i = 0; i < XMM616_AT_COUNT; i++) {
+ rc = write(serial_fd, at, length);
+ if (rc < (int) length) {
+ ipc_client_log(client, "Writing AT in ASCII failed");
+ goto error;
+ }
+
+ usleep(50000);
+ }
+ ipc_client_log(client, "Wrote AT in ASCII");
+
+ usleep(50000);
+
+ version = 0;
+
+ rc = read(serial_fd, &version, sizeof(version));
+ if (rc < (int) sizeof(version)) {
+ ipc_client_log(client, "Reading bootcore version failed");
+ goto error;
+ }
+
+ if (version != XMM616_BOOTCORE_VERSION) {
+ ipc_client_log(client, "Read wrong bootcore version (0x%x)",
+ version);
+ goto error;
+ }
+
+ ipc_client_log(client, "Read bootcore version (0x%x)", version);
+
+ rc = read(serial_fd, &info, sizeof(info));
+ if (rc < (int) sizeof(info)) {
+ ipc_client_log(client, "Reading info size failed");
+ goto error;
+ }
+ ipc_client_log(client, "Read info size (0x%x)", info);
+
+ psi_magic = XMM616_PSI_MAGIC;
+
+ rc = write(serial_fd, &psi_magic, sizeof(psi_magic));
+ if (rc < (int) sizeof(psi_magic)) {
+ ipc_client_log(client, "Writing PSI magic failed");
+ goto error;
+ }
+ ipc_client_log(client, "Wrote PSI magic (0x%x)", psi_magic);
+
+ rc = write(serial_fd, &psi_size, sizeof(psi_size));
+ if (rc < (int) sizeof(psi_size)) {
+ ipc_client_log(client, "Writing PSI size failed");
+ goto error;
+ }
+ ipc_client_log(client, "Wrote PSI size (0x%x)", psi_size);
+
+ FD_ZERO(&fds);
+ FD_SET(serial_fd, &fds);
+
+ timeout.tv_sec = 4;
+ timeout.tv_usec = 0;
+
+ p = (unsigned char *) psi_data;
+ psi_crc = 0;
+
+ for (i = 0; i < psi_size; i++) {
+ rc = select(serial_fd + 1, NULL, &fds, NULL, &timeout);
+ if (rc <= 0) {
+ ipc_client_log(client, "Writing PSI failed");
+ goto error;
+ }
+
+ rc = write(serial_fd, p, 1);
+ if (rc < 1) {
+ ipc_client_log(client, "Writing PSI failed");
+ goto error;
+ }
+
+ psi_crc ^= *p++;
+ }
+ ipc_client_log(client, "Wrote PSI, CRC is 0x%x", psi_crc);
+
+ rc = select(serial_fd + 1, NULL, &fds, NULL, &timeout);
+ if (rc <= 0) {
+ ipc_client_log(client, "Writing PSI crc failed");
+ goto error;
+ }
+
+ rc = write(serial_fd, &psi_crc, sizeof(psi_crc));
+ if (rc < (int) sizeof(psi_crc)) {
+ ipc_client_log(client, "Writing PSI crc failed");
+ goto error;
+ }
+ ipc_client_log(client, "Wrote PSI CRC (0x%x)", psi_crc);
+
+ timeout.tv_sec = 4;
+ timeout.tv_usec = 0;
+
+ i = 0;
+ do {
+ rc = select(serial_fd + 1, &fds, NULL, NULL, &timeout);
+ if (rc <= 0) {
+ ipc_client_log(client, "Reading PSI ACK failed");
+ goto error;
+ }
+
+ rc = read(serial_fd, &psi_ack, sizeof(psi_ack));
+ if (rc < (int) sizeof(psi_ack)) {
+ ipc_client_log(client, "Reading PSI ACK failed");
+ goto error;
+ }
+
+ if (i++ > 50) {
+ ipc_client_log(client, "Reading PSI ACK failed");
+ goto error;
+ }
+ } while (psi_ack != XMM616_PSI_ACK);
+
+ ipc_client_log(client, "Read PSI ACK (0x%x)", psi_ack);
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- return rc;
+ return rc;
}
int xmm616_firmware_send(struct ipc_client *client, int device_fd,
- void *device_address, const void *firmware_data, size_t firmware_size)
+ void *device_address, const void *firmware_data,
+ size_t firmware_size)
{
- size_t wc;
- unsigned char *p;
- int rc;
-
- if (client == NULL || (device_fd < 0 && device_address == NULL) ||
firmware_data == NULL || firmware_size == 0)
- return -1;
-
- p = (unsigned char *) firmware_data;
-
- if (device_address != NULL) {
- memcpy(device_address, (void *) p, firmware_size);
- } else {
- wc = 0;
- while (wc < firmware_size) {
- rc = write(device_fd, (void *) p, firmware_size - wc);
- if (rc <= 0) {
- ipc_client_log(client, "Writing firmware failed");
- goto error;
- }
-
- p += rc;
- wc += rc;
- }
- }
- ipc_client_log(client, "Wrote firmware");
-
- rc = 0;
- goto complete;
+ size_t wc;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || (device_fd < 0 && device_address == NULL) ||
+ firmware_data == NULL || firmware_size == 0) {
+ return -1;
+ }
+
+ p = (unsigned char *) firmware_data;
+
+ if (device_address != NULL) {
+ memcpy(device_address, (void *) p, firmware_size);
+ } else {
+ wc = 0;
+ while (wc < firmware_size) {
+ rc = write(device_fd, (void *) p, firmware_size - wc);
+ if (rc <= 0) {
+ ipc_client_log(client,
+ "Writing firmware failed");
+ goto error;
+ }
+
+ p += rc;
+ wc += rc;
+ }
+ }
+ ipc_client_log(client, "Wrote firmware");
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- return rc;
+ return rc;
}
int xmm616_nv_data_send(struct ipc_client *client, int device_fd,
- void *device_address)
+ void *device_address)
{
- void *nv_data = NULL;
- size_t nv_size;
- size_t wc;
- unsigned char *p;
- int rc;
-
- if (client == NULL || (device_fd < 0 && device_address == NULL))
- return -1;
-
- nv_size = ipc_client_nv_data_size(client);
- if (nv_size == 0)
- return -1;
-
- nv_data = ipc_nv_data_load(client);
- if (nv_data == NULL) {
- ipc_client_log(client, "Loading nv_data failed");
- goto error;
- }
- ipc_client_log(client, "Loaded nv_data");
-
- p = (unsigned char *) nv_data;
-
- if (device_address != NULL) {
- memcpy(device_address, p, nv_size);
- } else {
- wc = 0;
- while (wc < nv_size) {
- rc = write(device_fd, p, nv_size - wc);
- if (rc <= 0) {
- ipc_client_log(client, "Writing modem image failed");
- goto error;
- }
-
- p += rc;
- wc += rc;
- }
- }
-
- rc = 0;
- goto complete;
+ void *nv_data = NULL;
+ size_t nv_size;
+ size_t wc;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || (device_fd < 0 && device_address == NULL))
+ return -1;
+
+ nv_size = ipc_client_nv_data_size(client);
+ if (nv_size == 0)
+ return -1;
+
+ nv_data = ipc_nv_data_load(client);
+ if (nv_data == NULL) {
+ ipc_client_log(client, "Loading nv_data failed");
+ goto error;
+ }
+ ipc_client_log(client, "Loaded nv_data");
+
+ p = (unsigned char *) nv_data;
+
+ if (device_address != NULL) {
+ memcpy(device_address, p, nv_size);
+ } else {
+ wc = 0;
+ while (wc < nv_size) {
+ rc = write(device_fd, p, nv_size - wc);
+ if (rc <= 0) {
+ ipc_client_log(client,
+ "Writing modem image failed");
+ goto error;
+ }
+
+ p += rc;
+ wc += rc;
+ }
+ }
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (nv_data != NULL)
- free(nv_data);
+ if (nv_data != NULL)
+ free(nv_data);
- return rc;
+ return rc;
}
-
-// vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/modems/xmm616/xmm616.h
b/samsung-ipc/modems/xmm616/xmm616.h
index eb3a21b..820bfa9 100644
--- a/samsung-ipc/modems/xmm616/xmm616.h
+++ b/samsung-ipc/modems/xmm616/xmm616.h
@@ -22,27 +22,26 @@
#ifndef __XMM616_H__
#define __XMM616_H__
-#define XMM616_AT "AT"
-#define XMM616_AT_COUNT 20
-#define XMM616_PSI_MAGIC 0x30
-#define XMM616_PSI_ACK 0x01
-#define XMM616_BOOTCORE_VERSION 0xF0
+#define XMM616_AT "AT"
+#define XMM616_AT_COUNT 20
+#define XMM616_PSI_MAGIC 0x30
+#define XMM616_PSI_ACK 0x01
+#define XMM616_BOOTCORE_VERSION 0xF0
-#define XMM616_NV_DATA_PATH "/efs/nv_data.bin"
-#define XMM616_NV_DATA_MD5_PATH "/efs/nv_data.bin.md5"
-#define XMM616_NV_DATA_BACKUP_PATH "/efs/.nv_data.bak"
-#define XMM616_NV_DATA_BACKUP_MD5_PATH "/efs/.nv_data.bak.md5"
-#define XMM616_NV_DATA_SECRET "Samsung_Android_RIL"
-#define XMM616_NV_DATA_SIZE 0x200000
-#define XMM616_NV_DATA_CHUNK_SIZE 0x1000
+#define XMM616_NV_DATA_PATH "/efs/nv_data.bin"
+#define XMM616_NV_DATA_MD5_PATH "/efs/nv_data.bin.md5"
+#define XMM616_NV_DATA_BACKUP_PATH "/efs/.nv_data.bak"
+#define XMM616_NV_DATA_BACKUP_MD5_PATH "/efs/.nv_data.bak.md5"
+#define XMM616_NV_DATA_SECRET "Samsung_Android_RIL"
+#define XMM616_NV_DATA_SIZE 0x200000
+#define XMM616_NV_DATA_CHUNK_SIZE 0x1000
int xmm616_psi_send(struct ipc_client *client, int serial_fd,
- const void *psi_data, unsigned short psi_size);
+ const void *psi_data, unsigned short psi_size);
int xmm616_firmware_send(struct ipc_client *client, int device_fd,
- void *device_address, const void *firmware_data, size_t firmware_size);
+ void *device_address, const void *firmware_data,
+ size_t firmware_size);
int xmm616_nv_data_send(struct ipc_client *client, int device_fd,
- void *device_address);
+ void *device_address);
-#endif
-
-// vim:ts=4:sw=4:expandtab
+#endif /* __XMM616_H__ */
--
2.27.0
_______________________________________________
Replicant mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/replicant
