This contains no functional changes.
Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]>
---
.../modems/xmm626/xmm626_kernel_smdk4412.c | 868 +++++++++---------
.../modems/xmm626/xmm626_kernel_smdk4412.h | 61 +-
2 files changed, 476 insertions(+), 453 deletions(-)
diff --git a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
index 283aa4b..7d3c841 100644
--- a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
+++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c
@@ -37,550 +37,570 @@
#include "xmm626.h"
#include "xmm626_kernel_smdk4412.h"
-int xmm626_kernel_smdk4412_power(__attribute__((unused)) struct ipc_client
*client,
- int device_fd, int power)
+int xmm626_kernel_smdk4412_power(
+ __attribute__((unused)) struct ipc_client *client, int device_fd,
+ int power)
{
- int rc;
+ int rc;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- rc = ioctl(device_fd, power ? IOCTL_MODEM_ON : IOCTL_MODEM_OFF, 0);
- if (rc < 0)
- return -1;
+ rc = ioctl(device_fd, power ? IOCTL_MODEM_ON : IOCTL_MODEM_OFF, 0);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_boot_power(__attribute__((unused)) struct
ipc_client *client,
- int device_fd, int power)
+int xmm626_kernel_smdk4412_boot_power(
+ __attribute__((unused)) struct ipc_client *client, int device_fd,
+ int power)
{
- int rc;
+ int rc;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- rc = ioctl(device_fd, power ? IOCTL_MODEM_BOOT_ON : IOCTL_MODEM_BOOT_OFF,
- 0);
- if (rc < 0)
- return -1;
+ rc = ioctl(device_fd, power ?
+ IOCTL_MODEM_BOOT_ON : IOCTL_MODEM_BOOT_OFF,
+ 0);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_status_online_wait(__attribute__((unused)) struct
ipc_client *client,
- int device_fd)
+int xmm626_kernel_smdk4412_status_online_wait(
+ __attribute__((unused)) struct ipc_client *client, int device_fd)
{
- int status;
- int i;
+ int status;
+ int i;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- i = 0;
- for (i = 0; i < 100; i++) {
- status = ioctl(device_fd, IOCTL_MODEM_STATUS, 0);
- if (status == STATE_ONLINE)
- return 0;
+ i = 0;
+ for (i = 0; i < 100; i++) {
+ status = ioctl(device_fd, IOCTL_MODEM_STATUS, 0);
+ if (status == STATE_ONLINE)
+ return 0;
- usleep(50000);
- }
+ usleep(50000);
+ }
- return -1;
+ return -1;
}
-int xmm626_kernel_smdk4412_hci_power(__attribute__((unused)) struct ipc_client
*client,
- int power)
+int xmm626_kernel_smdk4412_hci_power(
+ __attribute__((unused)) struct ipc_client *client, int power)
{
- int ehci_rc, ohci_rc;
+ int ehci_rc, ohci_rc;
- ehci_rc = sysfs_value_write(XMM626_SEC_MODEM_EHCI_POWER_SYSFS, !!power);
- if (ehci_rc >= 0)
- usleep(50000);
+ ehci_rc = sysfs_value_write(XMM626_SEC_MODEM_EHCI_POWER_SYSFS, !!power);
+ if (ehci_rc >= 0)
+ usleep(50000);
- ohci_rc = sysfs_value_write(XMM626_SEC_MODEM_OHCI_POWER_SYSFS, !!power);
- if (ohci_rc >= 0)
- usleep(50000);
+ ohci_rc = sysfs_value_write(XMM626_SEC_MODEM_OHCI_POWER_SYSFS, !!power);
+ if (ohci_rc >= 0)
+ usleep(50000);
- if (ehci_rc < 0 && ohci_rc < 0)
- return -1;
+ if (ehci_rc < 0 && ohci_rc < 0)
+ return -1;
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_link_control_enable(__attribute__((unused)) struct
ipc_client *client,
- int device_fd, int enable)
+int xmm626_kernel_smdk4412_link_control_enable(
+ __attribute__((unused)) struct ipc_client *client,
+ int device_fd, int enable)
{
- int rc;
+ int rc;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- rc = ioctl(device_fd, IOCTL_LINK_CONTROL_ENABLE, &enable);
- if (rc < 0)
- return -1;
+ rc = ioctl(device_fd, IOCTL_LINK_CONTROL_ENABLE, &enable);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_link_control_active(__attribute__((unused)) struct
ipc_client *client,
- int device_fd, int active)
+int xmm626_kernel_smdk4412_link_control_active(
+ __attribute__((unused)) struct ipc_client *client, int device_fd,
+ int active)
{
- int rc;
+ int rc;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- rc = ioctl(device_fd, IOCTL_LINK_CONTROL_ACTIVE, &active);
- if (rc < 0)
- return -1;
+ rc = ioctl(device_fd, IOCTL_LINK_CONTROL_ACTIVE, &active);
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_link_connected_wait(__attribute__((unused)) struct
ipc_client *client,
- int device_fd)
+int xmm626_kernel_smdk4412_link_connected_wait(
+ __attribute__((unused)) struct ipc_client *client, int device_fd)
{
- int status;
- int i;
+ int status;
+ int i;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- i = 0;
- for (i = 0; i < 100; i++) {
- status = ioctl(device_fd, IOCTL_LINK_CONNECTED, 0);
- if (status)
- return 0;
+ i = 0;
+ for (i = 0; i < 100; i++) {
+ status = ioctl(device_fd, IOCTL_LINK_CONNECTED, 0);
+ if (status)
+ return 0;
- usleep(50000);
- }
+ usleep(50000);
+ }
- return -1;
+ return -1;
}
-int xmm626_kernel_smdk4412_link_get_hostwake_wait(__attribute__((unused))
struct ipc_client *client,
- int device_fd)
+int xmm626_kernel_smdk4412_link_get_hostwake_wait(
+ __attribute__((unused)) struct ipc_client *client, int device_fd)
{
- int status;
- int i;
+ int status;
+ int i;
- if (device_fd < 0)
- return -1;
+ if (device_fd < 0)
+ return -1;
- i = 0;
- for (i = 0; i < 10; i++) {
- status = ioctl(device_fd, IOCTL_LINK_GET_HOSTWAKE, 0);
- if (status)
- return 0;
+ i = 0;
+ for (i = 0; i < 10; i++) {
+ status = ioctl(device_fd, IOCTL_LINK_GET_HOSTWAKE, 0);
+ if (status)
+ return 0;
- usleep(50000);
- }
+ usleep(50000);
+ }
- return -1;
+ return -1;
}
int xmm626_kernel_smdk4412_fmt_send(struct ipc_client *client,
- struct ipc_message *message)
+ struct ipc_message *message)
{
- struct ipc_fmt_header header;
- void *buffer;
- size_t length;
- size_t count;
- unsigned char *p;
- int rc;
-
- if (client == NULL || client->handlers == NULL ||
- client->handlers->write == NULL || message == NULL) {
- return -1;
- }
-
- ipc_fmt_header_setup(&header, message);
-
- length = header.length;
- buffer = calloc(1, length);
-
- memcpy(buffer, &header, sizeof(struct ipc_fmt_header));
- if (message->data != NULL && message->size > 0)
- memcpy((void *) ((unsigned char *) buffer +
- sizeof(struct ipc_fmt_header)),
- message->data, message->size);
-
- ipc_client_log_send(client, message, __func__);
-
- p = (unsigned char *) buffer;
-
- count = 0;
- while (count < length) {
- rc = client->handlers->write(client, client->handlers->transport_data,
p, length - count);
- if (rc <= 0) {
- ipc_client_log(client, "Writing FMT data failed");
- goto error;
- }
-
- count += rc;
- p += rc;
- }
-
- rc = 0;
- goto complete;
+ struct ipc_fmt_header header;
+ void *buffer;
+ size_t length;
+ size_t count;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || client->handlers == NULL ||
+ client->handlers->write == NULL || message == NULL) {
+ return -1;
+ }
+
+ ipc_fmt_header_setup(&header, message);
+
+ length = header.length;
+ buffer = calloc(1, length);
+
+ memcpy(buffer, &header, sizeof(struct ipc_fmt_header));
+ if (message->data != NULL && message->size > 0) {
+ memcpy((void *) ((unsigned char *) buffer +
+ sizeof(struct ipc_fmt_header)),
+ message->data, message->size);
+ }
+
+ ipc_client_log_send(client, message, __func__);
+
+ p = (unsigned char *) buffer;
+
+ count = 0;
+ while (count < length) {
+ rc = client->handlers->write(client,
+ client->handlers->transport_data,
+ p, length - count);
+ if (rc <= 0) {
+ ipc_client_log(client, "Writing FMT data failed");
+ goto error;
+ }
+
+ count += rc;
+ p += rc;
+ }
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (buffer != NULL)
- free(buffer);
+ if (buffer != NULL)
+ free(buffer);
- return rc;
+ return rc;
}
int xmm626_kernel_smdk4412_fmt_recv(struct ipc_client *client,
- struct ipc_message *message)
+ struct ipc_message *message)
{
- struct ipc_fmt_header *header;
- void *buffer = NULL;
- size_t length;
- size_t count;
- unsigned char *p;
- int rc;
-
- if (client == NULL || client->handlers == NULL ||
- client->handlers->read == NULL || message == NULL) {
- return -1;
- }
-
- length = XMM626_DATA_SIZE;
- buffer = calloc(1, length);
-
- rc = client->handlers->read(client, client->handlers->transport_data,
buffer, length);
- if (rc < (int) sizeof(struct ipc_fmt_header)) {
- ipc_client_log(client, "Reading FMT header failed");
- goto error;
- }
-
- header = (struct ipc_fmt_header *) buffer;
-
- ipc_fmt_message_setup(header, message);
-
- if (header->length > sizeof(struct ipc_fmt_header)) {
- message->size = header->length - sizeof(struct ipc_fmt_header);
- message->data = calloc(1, message->size);
-
- p = (unsigned char *) message->data;
-
- count = rc - sizeof(struct ipc_fmt_header);
- if (count > 0) {
- memcpy(p, (void *) ((unsigned char *) buffer +
- sizeof(struct ipc_fmt_header)), count);
- p += count;
- }
-
- while (count < message->size) {
- rc = client->handlers->read(client,
- client->handlers->transport_data, p,
- message->size - count);
- if (rc <= 0) {
- ipc_client_log(client, "Reading FMT data failed");
- goto error;
- }
-
- count += rc;
- p += rc;
- }
- }
-
- ipc_client_log_recv(client, message, __func__);
-
- rc = 0;
- goto complete;
+ struct ipc_fmt_header *header;
+ void *buffer = NULL;
+ size_t length;
+ size_t count;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || client->handlers == NULL ||
+ client->handlers->read == NULL || message == NULL) {
+ return -1;
+ }
+
+ length = XMM626_DATA_SIZE;
+ buffer = calloc(1, length);
+
+ rc = client->handlers->read(client, client->handlers->transport_data,
+ buffer, length);
+ if (rc < (int) sizeof(struct ipc_fmt_header)) {
+ ipc_client_log(client, "Reading FMT header failed");
+ goto error;
+ }
+
+ header = (struct ipc_fmt_header *) buffer;
+
+ ipc_fmt_message_setup(header, message);
+
+ if (header->length > sizeof(struct ipc_fmt_header)) {
+ message->size = header->length - sizeof(struct ipc_fmt_header);
+ message->data = calloc(1, message->size);
+
+ p = (unsigned char *) message->data;
+
+ count = rc - sizeof(struct ipc_fmt_header);
+ if (count > 0) {
+ memcpy(p,
+ (void *) ((unsigned char *) buffer +
+ sizeof(struct ipc_fmt_header)),
+ count);
+ p += count;
+ }
+
+ while (count < message->size) {
+ rc = client->handlers->read(
+ client, client->handlers->transport_data, p,
+ message->size - count);
+ if (rc <= 0) {
+ ipc_client_log(client,
+ "Reading FMT data failed");
+ goto error;
+ }
+
+ count += rc;
+ p += rc;
+ }
+ }
+
+ ipc_client_log_recv(client, message, __func__);
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (buffer != NULL)
- free(buffer);
+ if (buffer != NULL)
+ free(buffer);
- return rc;
+ return rc;
}
int xmm626_kernel_smdk4412_rfs_send(struct ipc_client *client,
- struct ipc_message *message)
+ struct ipc_message *message)
{
- struct ipc_rfs_header header;
- void *buffer;
- size_t length;
- size_t count;
- unsigned char *p;
- int rc;
-
- if (client == NULL || client->handlers == NULL ||
- client->handlers->write == NULL || message == NULL) {
- return -1;
- }
-
- ipc_rfs_header_setup(&header, message);
-
- length = header.length;
- buffer = calloc(1, length);
-
- memcpy(buffer, &header, sizeof(struct ipc_rfs_header));
- if (message->data != NULL && message->size > 0)
- memcpy((void *) ((unsigned char *) buffer +
- sizeof(struct ipc_rfs_header)),
- message->data, message->size);
-
- ipc_client_log_send(client, message, __func__);
-
- p = (unsigned char *) buffer;
-
- count = 0;
- while (count < length) {
- rc = client->handlers->write(client, client->handlers->transport_data,
- p, length - count);
- if (rc <= 0) {
- ipc_client_log(client, "Writing RFS data failed");
- goto error;
- }
-
- count += rc;
- p += rc;
- }
-
- rc = 0;
- goto complete;
+ struct ipc_rfs_header header;
+ void *buffer;
+ size_t length;
+ size_t count;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || client->handlers == NULL ||
+ client->handlers->write == NULL || message == NULL) {
+ return -1;
+ }
+
+ ipc_rfs_header_setup(&header, message);
+
+ length = header.length;
+ buffer = calloc(1, length);
+
+ memcpy(buffer, &header, sizeof(struct ipc_rfs_header));
+ if (message->data != NULL && message->size > 0) {
+ memcpy((void *) (
+ (unsigned char *) buffer +
+ sizeof(struct ipc_rfs_header)),
+ message->data,
+ message->size);
+ }
+
+ ipc_client_log_send(client, message, __func__);
+
+ p = (unsigned char *) buffer;
+
+ count = 0;
+ while (count < length) {
+ rc = client->handlers->write(client,
+ client->handlers->transport_data,
+ p, length - count);
+ if (rc <= 0) {
+ ipc_client_log(client, "Writing RFS data failed");
+ goto error;
+ }
+
+ count += rc;
+ p += rc;
+ }
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (buffer != NULL)
- free(buffer);
+ if (buffer != NULL)
+ free(buffer);
- return rc;
+ return rc;
}
int xmm626_kernel_smdk4412_rfs_recv(struct ipc_client *client,
- struct ipc_message *message)
+ struct ipc_message *message)
{
- struct ipc_rfs_header *header;
- void *buffer = NULL;
- size_t length;
- size_t count;
- unsigned char *p;
- int rc;
-
- if (client == NULL || client->handlers == NULL ||
- client->handlers->read == NULL || message == NULL) {
- return -1;
- }
-
- length = XMM626_DATA_SIZE;
- buffer = calloc(1, length);
-
- rc = client->handlers->read(client, client->handlers->transport_data,
- buffer, length);
- if (rc < (int) sizeof(struct ipc_rfs_header)) {
- ipc_client_log(client, "Reading RFS header failed");
- goto error;
- }
-
- header = (struct ipc_rfs_header *) buffer;
- if (header->length > XMM626_DATA_SIZE_LIMIT) {
- ipc_client_log(client, "Invalid RFS header length: %u",
header->length);
- goto error;
- }
-
- ipc_rfs_message_setup(header, message);
-
- if (header->length > sizeof(struct ipc_rfs_header)) {
- message->size = header->length - sizeof(struct ipc_rfs_header);
- message->data = calloc(1, message->size);
-
- p = (unsigned char *) message->data;
-
- count = rc - sizeof(struct ipc_rfs_header);
- if (count > 0) {
- memcpy(p, (void *) ((unsigned char *) buffer +
- sizeof(struct ipc_rfs_header)),
- count);
- p += count;
- }
-
- while (count < message->size) {
- rc = client->handlers->read(client,
- client->handlers->transport_data, p,
- message->size - count);
- if (rc <= 0) {
- ipc_client_log(client, "Reading RFS data failed");
- goto error;
- }
-
- count += rc;
- p += rc;
- }
- }
-
- ipc_client_log_recv(client, message, __func__);
-
- rc = 0;
- goto complete;
+ struct ipc_rfs_header *header;
+ void *buffer = NULL;
+ size_t length;
+ size_t count;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL || client->handlers == NULL ||
+ client->handlers->read == NULL || message == NULL) {
+ return -1;
+ }
+
+ length = XMM626_DATA_SIZE;
+ buffer = calloc(1, length);
+
+ rc = client->handlers->read(client, client->handlers->transport_data,
+ buffer, length);
+ if (rc < (int) sizeof(struct ipc_rfs_header)) {
+ ipc_client_log(client, "Reading RFS header failed");
+ goto error;
+ }
+
+ header = (struct ipc_rfs_header *) buffer;
+ if (header->length > XMM626_DATA_SIZE_LIMIT) {
+ ipc_client_log(client, "Invalid RFS header length: %u",
+ header->length);
+ goto error;
+ }
+
+ ipc_rfs_message_setup(header, message);
+
+ if (header->length > sizeof(struct ipc_rfs_header)) {
+ message->size = header->length - sizeof(struct ipc_rfs_header);
+ message->data = calloc(1, message->size);
+
+ p = (unsigned char *) message->data;
+
+ count = rc - sizeof(struct ipc_rfs_header);
+ if (count > 0) {
+ memcpy(p,
+ (void *) ((unsigned char *) buffer +
+ sizeof(struct ipc_rfs_header)),
+ count);
+ p += count;
+ }
+
+ while (count < message->size) {
+ rc = client->handlers->read(
+ client, client->handlers->transport_data, p,
+ message->size - count);
+ if (rc <= 0) {
+ ipc_client_log(client,
+ "Reading RFS data failed");
+ goto error;
+ }
+
+ count += rc;
+ p += rc;
+ }
+ }
+
+ ipc_client_log_recv(client, message, __func__);
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (buffer != NULL)
- free(buffer);
+ if (buffer != NULL)
+ free(buffer);
- return rc;
+ return rc;
}
-int xmm626_kernel_smdk4412_open(__attribute__((unused)) struct ipc_client
*client,
- int type)
+int xmm626_kernel_smdk4412_open(
+ __attribute__((unused)) struct ipc_client *client, int type)
{
- int fd;
-
- switch (type) {
- case IPC_CLIENT_TYPE_FMT:
- fd = open(XMM626_SEC_MODEM_IPC0_DEVICE,
- O_RDWR | O_NOCTTY | O_NONBLOCK);
- break;
- case IPC_CLIENT_TYPE_RFS:
- fd = open(XMM626_SEC_MODEM_RFS0_DEVICE,
- O_RDWR | O_NOCTTY | O_NONBLOCK);
- break;
- default:
- return -1;
- }
-
- return fd;
+ int fd;
+
+ switch (type) {
+ case IPC_CLIENT_TYPE_FMT:
+ fd = open(XMM626_SEC_MODEM_IPC0_DEVICE,
+ O_RDWR | O_NOCTTY | O_NONBLOCK);
+ break;
+ case IPC_CLIENT_TYPE_RFS:
+ fd = open(XMM626_SEC_MODEM_RFS0_DEVICE,
+ O_RDWR | O_NOCTTY | O_NONBLOCK);
+ break;
+ default:
+ return -1;
+ }
+
+ return fd;
}
-int xmm626_kernel_smdk4412_close(__attribute__((unused)) struct ipc_client
*client,
- int fd)
+int xmm626_kernel_smdk4412_close(
+ __attribute__((unused)) struct ipc_client *client, int fd)
{
- if (fd < 0)
- return -1;
+ if (fd < 0)
+ return -1;
- close(fd);
+ close(fd);
- return 0;
+ return 0;
}
-int xmm626_kernel_smdk4412_read(__attribute__((unused)) struct ipc_client
*client,
- int fd, void *buffer, size_t length)
+int xmm626_kernel_smdk4412_read(
+ __attribute__((unused)) struct ipc_client *client, int fd, void *buffer,
+ size_t length)
{
- int status;
- int rc;
+ int status;
+ int rc;
- if (fd < 0 || buffer == NULL || length <= 0)
- return -1;
+ if (fd < 0 || buffer == NULL || length <= 0)
+ return -1;
- status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
- if (status != STATE_ONLINE && status != STATE_BOOTING)
- return -1;
+ status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
+ if (status != STATE_ONLINE && status != STATE_BOOTING)
+ return -1;
- rc = read(fd, buffer, length);
+ rc = read(fd, buffer, length);
- return rc;
+ return rc;
}
-int xmm626_kernel_smdk4412_write(__attribute__((unused)) struct ipc_client
*client,
- int fd, const void *buffer, size_t length)
+int xmm626_kernel_smdk4412_write(
+ __attribute__((unused)) struct ipc_client *client, int fd,
+ const void *buffer, size_t length)
{
- int status;
- int rc;
+ int status;
+ int rc;
- if (fd < 0 || buffer == NULL || length <= 0)
- return -1;
+ if (fd < 0 || buffer == NULL || length <= 0)
+ return -1;
- status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
- if (status != STATE_ONLINE && status != STATE_BOOTING)
- return -1;
+ status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
+ if (status != STATE_ONLINE && status != STATE_BOOTING)
+ return -1;
- rc = write(fd, buffer, length);
+ rc = write(fd, buffer, length);
- return rc;
+ return rc;
}
-int xmm626_kernel_smdk4412_poll(__attribute__((unused)) struct ipc_client
*client,
- int fd, struct ipc_poll_fds *fds,
- struct timeval *timeout)
+int xmm626_kernel_smdk4412_poll(
+ __attribute__((unused)) struct ipc_client *client,
+ int fd, struct ipc_poll_fds *fds, struct timeval *timeout)
{
- int status;
- fd_set set;
- int fd_max;
- unsigned int i;
- unsigned int count;
- int rc;
-
- if (fd < 0)
- return -1;
-
- FD_ZERO(&set);
- FD_SET(fd, &set);
-
- 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->fds[i] > fd_max)
- fd_max = fds->fds[i];
- }
- }
- }
-
- rc = select(fd_max + 1, &set, NULL, NULL, timeout);
-
- if (FD_ISSET(fd, &set)) {
- status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
- if (status != STATE_ONLINE && status != STATE_BOOTING)
- return -1;
- }
-
- 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--;
- }
- }
-
- fds->count = count;
- }
-
- return rc;
+ int status;
+ fd_set set;
+ int fd_max;
+ unsigned int i;
+ unsigned int count;
+ int rc;
+
+ if (fd < 0)
+ return -1;
+
+ FD_ZERO(&set);
+ FD_SET(fd, &set);
+
+ 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->fds[i] > fd_max)
+ fd_max = fds->fds[i];
+ }
+ }
+ }
+
+ rc = select(fd_max + 1, &set, NULL, NULL, timeout);
+
+ if (FD_ISSET(fd, &set)) {
+ status = ioctl(fd, IOCTL_MODEM_STATUS, 0);
+ if (status != STATE_ONLINE && status != STATE_BOOTING)
+ return -1;
+ }
+
+ 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--;
+ }
+ }
+
+ fds->count = count;
+ }
+
+ return rc;
}
-char *xmm626_kernel_smdk4412_gprs_get_iface(__attribute__((unused)) struct
ipc_client *client,
- unsigned int cid)
+char *xmm626_kernel_smdk4412_gprs_get_iface(
+ __attribute__((unused)) struct ipc_client *client, unsigned int cid)
{
- char *iface = NULL;
+ char *iface = NULL;
- if (cid > XMM626_SEC_MODEM_GPRS_IFACE_COUNT)
- return NULL;
+ if (cid > XMM626_SEC_MODEM_GPRS_IFACE_COUNT)
+ return NULL;
- asprintf(&iface, "%s%d", XMM626_SEC_MODEM_GPRS_IFACE_PREFIX, cid - 1);
+ asprintf(&iface, "%s%d", XMM626_SEC_MODEM_GPRS_IFACE_PREFIX, cid - 1);
- return iface;
+ return iface;
}
-int xmm626_kernel_smdk4412_gprs_get_capabilities(__attribute__((unused))
struct ipc_client *client,
- struct
ipc_client_gprs_capabilities *capabilities)
+int xmm626_kernel_smdk4412_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 = XMM626_SEC_MODEM_GPRS_IFACE_COUNT;
+ capabilities->cid_count = XMM626_SEC_MODEM_GPRS_IFACE_COUNT;
- return 0;
+ return 0;
}
-
-// vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
index cfbe490..cea8d8e 100644
--- a/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
+++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h
@@ -20,55 +20,58 @@
#ifndef __XMM626_SEC_MODEM_H__
#define __XMM626_SEC_MODEM_H__
-#define XMM626_SEC_MODEM_BOOT0_DEVICE "/dev/umts_boot0"
-#define XMM626_SEC_MODEM_BOOT1_DEVICE "/dev/umts_boot1"
-#define XMM626_SEC_MODEM_IPC0_DEVICE "/dev/umts_ipc0"
-#define XMM626_SEC_MODEM_RFS0_DEVICE "/dev/umts_rfs0"
-#define XMM626_SEC_MODEM_LINK_PM_DEVICE "/dev/link_pm"
-#define XMM626_SEC_MODEM_EHCI_POWER_SYSFS
"/sys/devices/platform/s5p-ehci/ehci_power"
-#define XMM626_SEC_MODEM_OHCI_POWER_SYSFS
"/sys/devices/platform/s5p-ohci/ohci_power"
+#define XMM626_SEC_MODEM_BOOT0_DEVICE "/dev/umts_boot0"
+#define XMM626_SEC_MODEM_BOOT1_DEVICE "/dev/umts_boot1"
+#define XMM626_SEC_MODEM_IPC0_DEVICE "/dev/umts_ipc0"
+#define XMM626_SEC_MODEM_RFS0_DEVICE "/dev/umts_rfs0"
+#define XMM626_SEC_MODEM_LINK_PM_DEVICE "/dev/link_pm"
+#define XMM626_SEC_MODEM_EHCI_POWER_SYSFS \
+ "/sys/devices/platform/s5p-ehci/ehci_power"
+#define XMM626_SEC_MODEM_OHCI_POWER_SYSFS \
+ "/sys/devices/platform/s5p-ohci/ohci_power"
-#define XMM626_SEC_MODEM_GPRS_IFACE_PREFIX "rmnet"
-#define XMM626_SEC_MODEM_GPRS_IFACE_COUNT 3
+#define XMM626_SEC_MODEM_GPRS_IFACE_PREFIX "rmnet"
+#define XMM626_SEC_MODEM_GPRS_IFACE_COUNT 3
-int xmm626_kernel_smdk4412_power(struct ipc_client *client, int device_fd, int
power);
+int xmm626_kernel_smdk4412_power(struct ipc_client *client, int device_fd,
+ int power);
int xmm626_kernel_smdk4412_boot_power(struct ipc_client *client, int device_fd,
- int power);
+ int power);
int xmm626_kernel_smdk4412_status_online_wait(struct ipc_client *client,
- int device_fd);
+ int device_fd);
int xmm626_kernel_smdk4412_hci_power(struct ipc_client *client, int power);
int xmm626_kernel_smdk4412_link_control_enable(struct ipc_client *client,
- int device_fd, int enable);
+ int device_fd, int enable);
int xmm626_kernel_smdk4412_link_control_active(struct ipc_client *client,
- int device_fd, int active);
+ int device_fd, int active);
int xmm626_kernel_smdk4412_link_connected_wait(struct ipc_client *client,
- int device_fd);
+ int device_fd);
int xmm626_kernel_smdk4412_link_get_hostwake_wait(struct ipc_client *client,
- int device_fd);
+ int device_fd);
int xmm626_kernel_smdk4412_fmt_send(struct ipc_client *client,
- struct ipc_message *message);
+ struct ipc_message *message);
int xmm626_kernel_smdk4412_fmt_recv(struct ipc_client *client,
- struct ipc_message *message);
+ struct ipc_message *message);
int xmm626_kernel_smdk4412_rfs_send(struct ipc_client *client,
- struct ipc_message *message);
+ struct ipc_message *message);
int xmm626_kernel_smdk4412_rfs_recv(struct ipc_client *client,
- struct ipc_message *message);
+ struct ipc_message *message);
int xmm626_kernel_smdk4412_open(struct ipc_client *client, int type);
int xmm626_kernel_smdk4412_close(struct ipc_client *client, int fd);
int xmm626_kernel_smdk4412_read(struct ipc_client *client, int fd, void
*buffer,
- size_t length);
+ size_t length);
int xmm626_kernel_smdk4412_write(struct ipc_client *client, int fd,
- const void *buffer, size_t length);
+ const void *buffer, size_t length);
int xmm626_kernel_smdk4412_poll(struct ipc_client *client, int fd,
- struct ipc_poll_fds *fds, struct timeval *timeout);
+ struct ipc_poll_fds *fds,
+ struct timeval *timeout);
char *xmm626_kernel_smdk4412_gprs_get_iface(struct ipc_client *client,
- unsigned int cid);
-int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client *client,
- struct
ipc_client_gprs_capabilities *capabilities);
+ unsigned int cid);
+int xmm626_kernel_smdk4412_gprs_get_capabilities(
+ struct ipc_client *client,
+ struct ipc_client_gprs_capabilities *capabilities);
-#endif
-
-// vim:ts=4:sw=4:expandtab
+#endif /* __XMM626_SEC_MODEM_H__ */
--
2.27.0
_______________________________________________
Replicant mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/replicant
