[Replicant] [libsamsung-ipc][PATCH 42/53] devices: crespo: switch to Linux code style
Denis 'GNUtoo' Carikli
GNUtoo at cyberdimension.org
Thu Jun 11 10:57:44 UTC 2020
This contains no functional changes.
"unsigned" was changed to "unsigned int" because
checkpatch.pl was printing the following warning:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
According to the C18 standard[1], "unsigned" is the same as
"unsigned int": in the "6.7 Declarations" section we have:
"- unsigned, or unsigned int" [...]
Each of the comma-separated multisets designates the same type [...]
References:
-----------
[1]The standard doesn't seem to be available for free, but the draft
can be downloaded from the following URL:
https://web.archive.org/web/20181230041359if_/http://www.open-std.org/jtc1/sc22/wg14/www/abq/c17_updated_proposed_fdis.pdf
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
samsung-ipc/devices/crespo/crespo.c | 801 +++++++++---------
samsung-ipc/devices/crespo/crespo.h | 28 +-
samsung-ipc/devices/crespo/crespo_modem_ctl.h | 20 +-
3 files changed, 428 insertions(+), 421 deletions(-)
diff --git a/samsung-ipc/devices/crespo/crespo.c b/samsung-ipc/devices/crespo/crespo.c
index 58f5f51..5aec9c4 100644
--- a/samsung-ipc/devices/crespo/crespo.c
+++ b/samsung-ipc/devices/crespo/crespo.c
@@ -38,605 +38,614 @@
int crespo_boot(struct ipc_client *client)
{
- void *modem_image_data = NULL;
- int modem_ctl_fd = -1;
- int serial_fd = -1;
- unsigned char *p;
- int rc;
-
- if (client == NULL)
- return -1;
-
- 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);
- if (modem_image_data == NULL) {
- ipc_client_log(client, "Reading modem image data failed");
- goto error;
- }
- ipc_client_log(client, "Read modem image data");
-
- modem_ctl_fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR | O_NDELAY);
- if (modem_ctl_fd < 0) {
- ipc_client_log(client, "Opening modem ctl failed");
- goto error;
- }
- ipc_client_log(client, "Opened modem ctl");
-
- rc = ioctl(modem_ctl_fd, IOCTL_MODEM_RESET);
- if (rc < 0) {
- ipc_client_log(client, "Resetting modem failed");
- goto error;
- }
- ipc_client_log(client, "Reset modem");
-
- serial_fd = open(CRESPO_MODEM_SERIAL_DEVICE, O_RDWR | O_NDELAY);
- if (serial_fd < 0) {
- ipc_client_log(client, "Opening serial failed");
- goto error;
- }
- ipc_client_log(client, "Opened serial");
-
- usleep(100000);
-
- p = (unsigned char *) modem_image_data;
-
- rc = xmm616_psi_send(client, serial_fd, (void *) p, CRESPO_PSI_SIZE);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM616 PSI failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM616 PSI");
-
- p += CRESPO_PSI_SIZE;
-
- 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);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM616 firmware failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM616 firmware");
-
- lseek(modem_ctl_fd, CRESPO_MODEM_CTL_NV_DATA_OFFSET, SEEK_SET);
-
- rc = xmm616_nv_data_send(client, modem_ctl_fd, NULL);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM616 nv_data failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM616 nv_data");
-
- rc = 0;
- goto complete;
+ void *modem_image_data = NULL;
+ int modem_ctl_fd = -1;
+ int serial_fd = -1;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL)
+ return -1;
+
+ 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);
+ if (modem_image_data == NULL) {
+ ipc_client_log(client, "Reading modem image data failed");
+ goto error;
+ }
+ ipc_client_log(client, "Read modem image data");
+
+ modem_ctl_fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR | O_NDELAY);
+ if (modem_ctl_fd < 0) {
+ ipc_client_log(client, "Opening modem ctl failed");
+ goto error;
+ }
+ ipc_client_log(client, "Opened modem ctl");
+
+ rc = ioctl(modem_ctl_fd, IOCTL_MODEM_RESET);
+ if (rc < 0) {
+ ipc_client_log(client, "Resetting modem failed");
+ goto error;
+ }
+ ipc_client_log(client, "Reset modem");
+
+ serial_fd = open(CRESPO_MODEM_SERIAL_DEVICE, O_RDWR | O_NDELAY);
+ if (serial_fd < 0) {
+ ipc_client_log(client, "Opening serial failed");
+ goto error;
+ }
+ ipc_client_log(client, "Opened serial");
+
+ usleep(100000);
+
+ p = (unsigned char *) modem_image_data;
+
+ rc = xmm616_psi_send(client, serial_fd, (void *) p, CRESPO_PSI_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM616 PSI failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM616 PSI");
+
+ p += CRESPO_PSI_SIZE;
+
+ 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);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM616 firmware failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM616 firmware");
+
+ lseek(modem_ctl_fd, CRESPO_MODEM_CTL_NV_DATA_OFFSET, SEEK_SET);
+
+ rc = xmm616_nv_data_send(client, modem_ctl_fd, NULL);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM616 nv_data failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM616 nv_data");
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (modem_image_data != NULL)
- free(modem_image_data);
+ if (modem_image_data != NULL)
+ free(modem_image_data);
- if (serial_fd >= 0)
- close(serial_fd);
+ if (serial_fd >= 0)
+ close(serial_fd);
- if (modem_ctl_fd >= 0)
- close(modem_ctl_fd);
+ if (modem_ctl_fd >= 0)
+ close(modem_ctl_fd);
- return rc;
+ return rc;
}
int crespo_fmt_send(struct ipc_client *client, struct ipc_message *message)
{
- struct ipc_fmt_header header;
- struct modem_io mio;
- int rc;
+ struct ipc_fmt_header header;
+ 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);
+ ipc_fmt_header_setup(&header, message);
- memset(&mio, 0, sizeof(struct modem_io));
- mio.size = message->size + sizeof(struct ipc_fmt_header);
- mio.data = calloc(1, mio.size);
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = message->size + sizeof(struct ipc_fmt_header);
+ mio.data = calloc(1, mio.size);
- 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(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);
+ }
- ipc_client_log_send(client, message, __func__);
+ ipc_client_log_send(client, message, __func__);
- rc = client->handlers->write(client, client->handlers->transport_data,
- (void *) &mio, sizeof(struct modem_io));
- if (rc < 0) {
- ipc_client_log(client, "Writing FMT data failed");
- goto error;
- }
+ rc = client->handlers->write(client, client->handlers->transport_data,
+ (void *) &mio, sizeof(struct modem_io));
+ if (rc < 0) {
+ ipc_client_log(client, "Writing FMT data failed");
+ goto error;
+ }
- rc = 0;
- goto complete;
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (mio.data != NULL)
- free(mio.data);
+ if (mio.data != NULL)
+ free(mio.data);
- return rc;
+ return rc;
}
int crespo_fmt_recv(struct ipc_client *client, struct ipc_message *message)
{
- struct ipc_fmt_header *header;
- struct modem_io mio;
- int rc;
+ struct ipc_fmt_header *header;
+ 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);
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = CRESPO_BUFFER_LENGTH;
+ mio.data = calloc(1, mio.size);
- rc = client->handlers->read(client, 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, 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;
+ header = (struct ipc_fmt_header *) mio.data;
- ipc_fmt_message_setup(header, message);
+ ipc_fmt_message_setup(header, message);
- if (mio.size > sizeof(struct ipc_fmt_header)) {
- message->size = mio.size - sizeof(struct ipc_fmt_header);
- message->data = calloc(1, message->size);
+ if (mio.size > sizeof(struct ipc_fmt_header)) {
+ 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__);
+ ipc_client_log_recv(client, message, __func__);
- rc = 0;
- goto complete;
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (mio.data != NULL)
- free(mio.data);
+ if (mio.data != NULL)
+ free(mio.data);
- return rc;
+ return rc;
}
int crespo_rfs_send(struct ipc_client *client, struct ipc_message *message)
{
- struct modem_io mio;
- int rc;
+ 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;
- mio.cmd = IPC_INDEX(message->command);
- mio.size = message->size;
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.id = message->mseq;
+ mio.cmd = IPC_INDEX(message->command);
+ mio.size = message->size;
- if (message->data != NULL && message->size > 0) {
- mio.data = calloc(1, mio.size);
+ if (message->data != NULL && message->size > 0) {
+ mio.data = calloc(1, mio.size);
- memcpy(mio.data, message->data, message->size);
- }
+ memcpy(mio.data, message->data, message->size);
+ }
- ipc_client_log_send(client, message, __func__);
+ ipc_client_log_send(client, message, __func__);
- rc = client->handlers->write(client, client->handlers->transport_data,
- (void *) &mio, sizeof(struct modem_io));
- if (rc < 0) {
- ipc_client_log(client, "Writing RFS data failed");
- goto error;
- }
+ rc = client->handlers->write(client, client->handlers->transport_data,
+ (void *) &mio, sizeof(struct modem_io));
+ if (rc < 0) {
+ ipc_client_log(client, "Writing RFS data failed");
+ goto error;
+ }
- rc = 0;
- goto complete;
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (mio.data != NULL)
- free(mio.data);
+ if (mio.data != NULL)
+ free(mio.data);
- return rc;
+ return rc;
}
int crespo_rfs_recv(struct ipc_client *client, struct ipc_message *message)
{
- struct modem_io mio;
- int rc;
+ 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);
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = CRESPO_BUFFER_LENGTH;
+ mio.data = calloc(1, mio.size);
- rc = client->handlers->read(client, 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, 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));
- message->aseq = mio.id;
- message->command = IPC_COMMAND(IPC_GROUP_RFS, mio.cmd);
+ memset(message, 0, sizeof(struct ipc_message));
+ message->aseq = mio.id;
+ message->command = IPC_COMMAND(IPC_GROUP_RFS, mio.cmd);
- if (mio.size > 0) {
- message->size = mio.size;
- message->data = calloc(1, message->size);
+ if (mio.size > 0) {
+ message->size = mio.size;
+ message->data = calloc(1, message->size);
- memcpy(message->data, mio.data, message->size);
- }
+ memcpy(message->data, mio.data, message->size);
+ }
- ipc_client_log_recv(client, message, __func__);
+ ipc_client_log_recv(client, message, __func__);
- rc = 0;
- goto complete;
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (mio.data != NULL)
- free(mio.data);
+ if (mio.data != NULL)
+ free(mio.data);
- return rc;
+ return rc;
}
int crespo_open(__attribute__((unused)) struct ipc_client *client,
- void *data, int type)
+ void *data, int type)
{
- struct crespo_transport_data *transport_data;
- int fd;
+ struct crespo_transport_data *transport_data;
+ int fd;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct crespo_transport_data *) data;
+ transport_data = (struct crespo_transport_data *) data;
- switch (type) {
- case IPC_CLIENT_TYPE_FMT:
- fd = open(CRESPO_MODEM_FMT_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
- break;
- case IPC_CLIENT_TYPE_RFS:
- fd = open(CRESPO_MODEM_RFS_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
- break;
- default:
- return -1;
- }
+ switch (type) {
+ case IPC_CLIENT_TYPE_FMT:
+ fd = open(CRESPO_MODEM_FMT_DEVICE, O_RDWR | O_NOCTTY |
+ O_NONBLOCK);
+ break;
+ case IPC_CLIENT_TYPE_RFS:
+ fd = open(CRESPO_MODEM_RFS_DEVICE, O_RDWR | O_NOCTTY |
+ O_NONBLOCK);
+ break;
+ default:
+ return -1;
+ }
- if (fd < 0)
- return -1;
+ if (fd < 0)
+ return -1;
- transport_data->fd = fd;
+ transport_data->fd = fd;
- return 0;
+ return 0;
}
int crespo_close(__attribute__((unused)) struct ipc_client *client,
- void *data)
+ void *data)
{
- struct crespo_transport_data *transport_data;
- int fd;
+ struct crespo_transport_data *transport_data;
+ int fd;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct crespo_transport_data *) data;
+ transport_data = (struct crespo_transport_data *) data;
- fd = transport_data->fd;
- if (fd < 0)
- return -1;
+ fd = transport_data->fd;
+ if (fd < 0)
+ return -1;
- transport_data->fd = -1;
- close(fd);
+ transport_data->fd = -1;
+ close(fd);
- return 0;
+ return 0;
}
int crespo_read(__attribute__((unused)) struct ipc_client *client,
- void *data, void *buffer, size_t length)
+ void *data, void *buffer, size_t length)
{
- struct crespo_transport_data *transport_data;
- int fd;
- int rc;
+ struct crespo_transport_data *transport_data;
+ int fd;
+ int rc;
- if (data == NULL || buffer == NULL || length == 0)
- return -1;
+ if (data == NULL || buffer == NULL || length == 0)
+ return -1;
- transport_data = (struct crespo_transport_data *) data;
+ transport_data = (struct crespo_transport_data *) data;
- fd = transport_data->fd;
- if (fd < 0)
- return -1;
+ fd = transport_data->fd;
+ if (fd < 0)
+ return -1;
- rc = ioctl(fd, IOCTL_MODEM_RECV, buffer);
- if (rc < 0)
- return -1;
+ rc = ioctl(fd, IOCTL_MODEM_RECV, buffer);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
int crespo_write(__attribute__((unused)) struct ipc_client *client, void *data,
- const void *buffer, size_t length)
+ const void *buffer, size_t length)
{
- struct crespo_transport_data *transport_data;
- int fd;
- int rc;
+ struct crespo_transport_data *transport_data;
+ int fd;
+ int rc;
- if (data == NULL || buffer == NULL || length == 0)
- return -1;
+ if (data == NULL || buffer == NULL || length == 0)
+ return -1;
- transport_data = (struct crespo_transport_data *) data;
+ transport_data = (struct crespo_transport_data *) data;
- fd = transport_data->fd;
- if (fd < 0)
- return -1;
+ fd = transport_data->fd;
+ if (fd < 0)
+ return -1;
- rc = ioctl(fd, IOCTL_MODEM_SEND, buffer);
- if (rc < 0)
- return -1;
+ rc = ioctl(fd, IOCTL_MODEM_SEND, buffer);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
int crespo_poll(__attribute__((unused)) struct ipc_client *client, void *data,
- struct ipc_poll_fds *fds, struct timeval *timeout)
+ struct ipc_poll_fds *fds, struct timeval *timeout)
{
- struct crespo_transport_data *transport_data;
- fd_set set;
- int fd;
- int fd_max;
- unsigned int i;
- unsigned int count;
- int rc;
+ struct crespo_transport_data *transport_data;
+ fd_set set;
+ int fd;
+ int fd_max;
+ unsigned int i;
+ unsigned int count;
+ int rc;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct crespo_transport_data *) data;
+ transport_data = (struct crespo_transport_data *) data;
- fd = transport_data->fd;
- if (fd < 0)
- return -1;
+ fd = transport_data->fd;
+ if (fd < 0)
+ return -1;
- FD_ZERO(&set);
- FD_SET(fd, &set);
+ FD_ZERO(&set);
+ FD_SET(fd, &set);
- fd_max = fd;
+ fd_max = fd;
- if (fds != NULL && fds->fds != NULL && fds->count > 0) {
- for (i = 0; i < fds->count; i++) {
- if (fds->fds[i] >= 0) {
- FD_SET(fds->fds[i], &set);
+ if (fds != NULL && fds->fds != NULL && fds->count > 0) {
+ for (i = 0; i < fds->count; i++) {
+ if (fds->fds[i] >= 0) {
+ FD_SET(fds->fds[i], &set);
- if (fds->fds[i] > fd_max)
- fd_max = fds->fds[i];
- }
- }
- }
+ if (fds->fds[i] > fd_max)
+ fd_max = fds->fds[i];
+ }
+ }
+ }
- rc = select(fd_max + 1, &set, NULL, NULL, timeout);
+ rc = select(fd_max + 1, &set, NULL, NULL, timeout);
- if (fds != NULL && fds->fds != NULL && fds->count > 0) {
- count = fds->count;
+ if (fds != NULL && fds->fds != NULL && fds->count > 0) {
+ count = fds->count;
- for (i = 0; i < fds->count; i++) {
- if (!FD_ISSET(fds->fds[i], &set)) {
- fds->fds[i] = -1;
- count--;
- }
- }
+ for (i = 0; i < fds->count; i++) {
+ if (!FD_ISSET(fds->fds[i], &set)) {
+ fds->fds[i] = -1;
+ count--;
+ }
+ }
- fds->count = count;
- }
+ fds->count = count;
+ }
- return rc;
+ return rc;
}
int crespo_power_on(__attribute__((unused)) struct ipc_client *client,
- __attribute__((unused)) void *data)
+ __attribute__((unused)) void *data)
{
- int fd;
- int rc;
+ int fd;
+ int rc;
- fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR);
- if (fd < 0)
- return -1;
+ fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR);
+ if (fd < 0)
+ return -1;
- rc = ioctl(fd, IOCTL_MODEM_START);
+ rc = ioctl(fd, IOCTL_MODEM_START);
- close(fd);
+ close(fd);
- if (rc < 0)
- return -1;
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
int crespo_power_off(__attribute__((unused)) struct ipc_client *client,
- __attribute__((unused)) void *data)
+ __attribute__((unused)) void *data)
{
- int fd;
- int rc;
+ int fd;
+ int rc;
- fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR);
- if (fd < 0)
- return -1;
+ fd = open(CRESPO_MODEM_CTL_DEVICE, O_RDWR);
+ if (fd < 0)
+ return -1;
- rc = ioctl(fd, IOCTL_MODEM_OFF);
+ rc = ioctl(fd, IOCTL_MODEM_OFF);
- close(fd);
+ close(fd);
- if (rc < 0)
- return -1;
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
int crespo_data_create(__attribute__((unused)) struct ipc_client *client,
- void **transport_data,
- __attribute__((unused)) void **power_data,
- __attribute__((unused)) void **gprs_data)
+ void **transport_data,
+ __attribute__((unused)) void **power_data,
+ __attribute__((unused)) void **gprs_data)
{
- if (transport_data == NULL)
- return -1;
+ if (transport_data == NULL)
+ return -1;
- *transport_data = calloc(1, sizeof(struct crespo_transport_data));
+ *transport_data = calloc(1, sizeof(struct crespo_transport_data));
- return 0;
+ return 0;
}
int crespo_data_destroy(__attribute__((unused)) struct ipc_client *client,
- void *transport_data,
- __attribute__((unused)) void *power_data,
- __attribute__((unused)) void *gprs_data)
+ void *transport_data,
+ __attribute__((unused)) void *power_data,
+ __attribute__((unused)) void *gprs_data)
{
- if (transport_data == NULL)
- return -1;
+ if (transport_data == NULL)
+ return -1;
- free(transport_data);
+ free(transport_data);
- return 0;
+ return 0;
}
int crespo_gprs_activate(__attribute__((unused)) struct ipc_client *client,
- __attribute__((unused)) void *data,
- __attribute__((unused)) unsigned int cid)
+ __attribute__((unused)) void *data,
+ __attribute__((unused)) unsigned int cid)
{
- return 0;
+ return 0;
}
int crespo_gprs_deactivate(__attribute__((unused)) struct ipc_client *client,
- __attribute__((unused)) void *data,
- __attribute__((unused)) unsigned int cid)
+ __attribute__((unused)) void *data,
+ __attribute__((unused)) unsigned int cid)
{
- return 0;
+ return 0;
}
-char *crespo_gprs_get_iface_single(__attribute__((unused)) struct ipc_client *client,
- __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;
+ char *iface = NULL;
- asprintf(&iface, "%s%d", CRESPO_GPRS_IFACE_PREFIX, 0);
+ asprintf(&iface, "%s%d", CRESPO_GPRS_IFACE_PREFIX, 0);
- return iface;
+ return iface;
}
-int crespo_gprs_get_capabilities_single(__attribute__((unused)) struct ipc_client *client,
- 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;
+ if (capabilities == NULL)
+ return -1;
- capabilities->cid_count = 1;
+ capabilities->cid_count = 1;
- return 0;
+ return 0;
}
char *crespo_gprs_get_iface(__attribute__((unused)) struct ipc_client *client,
- unsigned int cid)
+ unsigned int cid)
{
- char *iface = NULL;
+ char *iface = NULL;
- if (cid > CRESPO_GPRS_IFACE_COUNT)
- return NULL;
+ if (cid > CRESPO_GPRS_IFACE_COUNT)
+ return NULL;
- asprintf(&iface, "%s%d", CRESPO_GPRS_IFACE_PREFIX, cid - 1);
+ asprintf(&iface, "%s%d", CRESPO_GPRS_IFACE_PREFIX, cid - 1);
- return iface;
+ return iface;
}
-int crespo_gprs_get_capabilities(__attribute__((unused)) struct ipc_client *client,
- 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;
+ if (capabilities == NULL)
+ return -1;
- capabilities->cid_count = CRESPO_GPRS_IFACE_COUNT;
+ capabilities->cid_count = CRESPO_GPRS_IFACE_COUNT;
- return 0;
+ return 0;
}
struct ipc_client_ops crespo_fmt_ops = {
- .boot = crespo_boot,
- .send = crespo_fmt_send,
- .recv = crespo_fmt_recv,
+ .boot = crespo_boot,
+ .send = crespo_fmt_send,
+ .recv = crespo_fmt_recv,
};
struct ipc_client_ops crespo_rfs_ops = {
- .boot = NULL,
- .send = crespo_rfs_send,
- .recv = crespo_rfs_recv,
+ .boot = NULL,
+ .send = crespo_rfs_send,
+ .recv = crespo_rfs_recv,
};
struct ipc_client_handlers crespo_handlers = {
- .open = crespo_open,
- .close = crespo_close,
- .read = crespo_read,
- .write = crespo_write,
- .poll = crespo_poll,
- .transport_data = NULL,
- .power_on = crespo_power_on,
- .power_off = crespo_power_off,
- .power_data = NULL,
- .gprs_activate = crespo_gprs_activate,
- .gprs_deactivate = crespo_gprs_deactivate,
- .gprs_data = NULL,
- .data_create = crespo_data_create,
- .data_destroy = crespo_data_destroy,
+ .open = crespo_open,
+ .close = crespo_close,
+ .read = crespo_read,
+ .write = crespo_write,
+ .poll = crespo_poll,
+ .transport_data = NULL,
+ .power_on = crespo_power_on,
+ .power_off = crespo_power_off,
+ .power_data = NULL,
+ .gprs_activate = crespo_gprs_activate,
+ .gprs_deactivate = crespo_gprs_deactivate,
+ .gprs_data = NULL,
+ .data_create = crespo_data_create,
+ .data_destroy = crespo_data_destroy,
};
struct ipc_client_gprs_specs crespo_gprs_specs_single = {
- .gprs_get_iface = crespo_gprs_get_iface_single,
- .gprs_get_capabilities = crespo_gprs_get_capabilities_single,
+ .gprs_get_iface = crespo_gprs_get_iface_single,
+ .gprs_get_capabilities = crespo_gprs_get_capabilities_single,
};
struct ipc_client_gprs_specs crespo_gprs_specs = {
- .gprs_get_iface = crespo_gprs_get_iface,
- .gprs_get_capabilities = crespo_gprs_get_capabilities,
+ .gprs_get_iface = crespo_gprs_get_iface,
+ .gprs_get_capabilities = crespo_gprs_get_capabilities,
};
struct ipc_client_nv_data_specs crespo_nv_data_specs = {
- .nv_data_path = XMM616_NV_DATA_PATH,
- .nv_data_md5_path = XMM616_NV_DATA_MD5_PATH,
- .nv_data_backup_path = XMM616_NV_DATA_BACKUP_PATH,
- .nv_data_backup_md5_path = XMM616_NV_DATA_BACKUP_MD5_PATH,
- .nv_data_secret = XMM616_NV_DATA_SECRET,
- .nv_data_size = XMM616_NV_DATA_SIZE,
- .nv_data_chunk_size = XMM616_NV_DATA_CHUNK_SIZE,
+ .nv_data_path = XMM616_NV_DATA_PATH,
+ .nv_data_md5_path = XMM616_NV_DATA_MD5_PATH,
+ .nv_data_backup_path = XMM616_NV_DATA_BACKUP_PATH,
+ .nv_data_backup_md5_path = XMM616_NV_DATA_BACKUP_MD5_PATH,
+ .nv_data_secret = XMM616_NV_DATA_SECRET,
+ .nv_data_size = XMM616_NV_DATA_SIZE,
+ .nv_data_chunk_size = XMM616_NV_DATA_CHUNK_SIZE,
};
-
-// vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/devices/crespo/crespo.h b/samsung-ipc/devices/crespo/crespo.h
index 97dff96..a996198 100644
--- a/samsung-ipc/devices/crespo/crespo.h
+++ b/samsung-ipc/devices/crespo/crespo.h
@@ -20,22 +20,22 @@
#ifndef __CRESPO_H__
#define __CRESPO_H__
-#define CRESPO_MODEM_IMAGE_SIZE 0xD80000
-#define CRESPO_PSI_SIZE 0x5000
-#define CRESPO_MODEM_CTL_NV_DATA_OFFSET 0xD80000
-#define CRESPO_BUFFER_LENGTH 0x50000
+#define CRESPO_MODEM_IMAGE_SIZE 0xD80000
+#define CRESPO_PSI_SIZE 0x5000
+#define CRESPO_MODEM_CTL_NV_DATA_OFFSET 0xD80000
+#define CRESPO_BUFFER_LENGTH 0x50000
-#define CRESPO_MODEM_IMAGE_DEVICE "/dev/mtd/mtd5ro"
-#define CRESPO_MODEM_SERIAL_DEVICE "/dev/s3c2410_serial3"
-#define CRESPO_MODEM_CTL_DEVICE "/dev/modem_ctl"
-#define CRESPO_MODEM_FMT_DEVICE "/dev/modem_fmt"
-#define CRESPO_MODEM_RFS_DEVICE "/dev/modem_rfs"
+#define CRESPO_MODEM_IMAGE_DEVICE "/dev/mtd/mtd5ro"
+#define CRESPO_MODEM_SERIAL_DEVICE "/dev/s3c2410_serial3"
+#define CRESPO_MODEM_CTL_DEVICE "/dev/modem_ctl"
+#define CRESPO_MODEM_FMT_DEVICE "/dev/modem_fmt"
+#define CRESPO_MODEM_RFS_DEVICE "/dev/modem_rfs"
-#define CRESPO_GPRS_IFACE_PREFIX "rmnet"
-#define CRESPO_GPRS_IFACE_COUNT 3
+#define CRESPO_GPRS_IFACE_PREFIX "rmnet"
+#define CRESPO_GPRS_IFACE_COUNT 3
struct crespo_transport_data {
- int fd;
+ int fd;
};
extern struct ipc_client_ops crespo_fmt_ops;
@@ -45,6 +45,4 @@ extern struct ipc_client_gprs_specs crespo_gprs_specs_single;
extern struct ipc_client_gprs_specs crespo_gprs_specs;
extern struct ipc_client_nv_data_specs crespo_nv_data_specs;
-#endif
-
-// vim:ts=4:sw=4:expandtab
+#endif /* __CRESPO_H__ */
diff --git a/samsung-ipc/devices/crespo/crespo_modem_ctl.h b/samsung-ipc/devices/crespo/crespo_modem_ctl.h
index 7c23165..d71b791 100644
--- a/samsung-ipc/devices/crespo/crespo_modem_ctl.h
+++ b/samsung-ipc/devices/crespo/crespo_modem_ctl.h
@@ -16,10 +16,10 @@
#ifndef __MODEM_CONTROL_H__
#define __MODEM_CONTROL_H__
-#define IOCTL_MODEM_RAMDUMP _IO('o', 0x19)
-#define IOCTL_MODEM_RESET _IO('o', 0x20)
-#define IOCTL_MODEM_START _IO('o', 0x21)
-#define IOCTL_MODEM_OFF _IO('o', 0x22)
+#define IOCTL_MODEM_RAMDUMP _IO('o', 0x19)
+#define IOCTL_MODEM_RESET _IO('o', 0x20)
+#define IOCTL_MODEM_START _IO('o', 0x21)
+#define IOCTL_MODEM_OFF _IO('o', 0x22)
#define IOCTL_MODEM_SEND _IO('o', 0x23)
#define IOCTL_MODEM_RECV _IO('o', 0x24)
@@ -34,11 +34,11 @@ struct modem_io {
/* platform data */
struct modemctl_data {
const char *name;
- unsigned gpio_phone_active;
- unsigned gpio_pda_active;
- unsigned gpio_cp_reset;
- unsigned gpio_phone_on;
- bool is_cdma_modem; /* 1:CDMA Modem */
+ unsigned int gpio_phone_active;
+ unsigned int gpio_pda_active;
+ unsigned int gpio_cp_reset;
+ unsigned int gpio_phone_on;
+ bool is_cdma_modem; /* 1:CDMA Modem */
};
-#endif
+#endif /* __MODEM_CONTROL_H__ */
--
2.27.0
More information about the Replicant
mailing list