[Replicant] [libsamsung-ipc][PATCH 38/48] devices: galaxys2: switch to Linux code style
Denis 'GNUtoo' Carikli
GNUtoo at cyberdimension.org
Sun Apr 5 18:21:12 UTC 2020
This contains no functional changes.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
samsung-ipc/devices/galaxys2/galaxys2.c | 609 ++++++++++++------------
samsung-ipc/devices/galaxys2/galaxys2.h | 30 +-
2 files changed, 326 insertions(+), 313 deletions(-)
diff --git a/samsung-ipc/devices/galaxys2/galaxys2.c b/samsung-ipc/devices/galaxys2/galaxys2.c
index 4f7783f..95a99bb 100644
--- a/samsung-ipc/devices/galaxys2/galaxys2.c
+++ b/samsung-ipc/devices/galaxys2/galaxys2.c
@@ -33,397 +33,412 @@
int galaxys2_boot(struct ipc_client *client)
{
- void *modem_image_data = NULL;
- int modem_image_fd = -1;
- int modem_boot_fd = -1;
- int modem_link_fd = -1;
- unsigned char *p;
- int rc;
-
- if (client == NULL)
- return -1;
-
- ipc_client_log(client, "Starting galaxys2 modem boot");
-
- modem_image_fd = open(GALAXYS2_MODEM_IMAGE_DEVICE, O_RDONLY);
- if (modem_image_fd < 0) {
- ipc_client_log(client, "Opening modem image device failed");
- goto error;
- }
- ipc_client_log(client, "Opened modem image device");
-
- modem_image_data = mmap(0, GALAXYS2_MODEM_IMAGE_SIZE, PROT_READ,
- MAP_SHARED, modem_image_fd, 0);
- if (modem_image_data == NULL || modem_image_data == (void *) 0xffffffff) {
- ipc_client_log(client, "Mapping modem image data to memory failed");
- goto error;
- }
- ipc_client_log(client, "Mapped modem image data to memory");
-
- modem_boot_fd = open(XMM626_SEC_MODEM_BOOT0_DEVICE,
- O_RDWR | O_NOCTTY | O_NONBLOCK);
- if (modem_boot_fd < 0) {
- ipc_client_log(client, "Opening modem boot device failed");
- goto error;
- }
- ipc_client_log(client, "Opened modem boot device");
-
- modem_link_fd = open(XMM626_SEC_MODEM_LINK_PM_DEVICE, O_RDWR);
- if (modem_link_fd < 0) {
- ipc_client_log(client, "Opening modem link device failed");
- goto error;
- }
- ipc_client_log(client, "Opened modem link device");
-
- rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 0);
- rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
- rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
- rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
-
- if (rc < 0) {
- ipc_client_log(client, "Turning the modem off failed");
- goto error;
- }
- ipc_client_log(client, "Turned the modem off");
-
- rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
- rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
- rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
- rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
-
- if (rc < 0) {
- ipc_client_log(client, "Turning the modem on failed");
- goto error;
- }
- ipc_client_log(client, "Turned the modem on");
-
- rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
- if (rc < 0) {
- ipc_client_log(client, "Waiting for link connected failed");
- goto error;
- }
- ipc_client_log(client, "Waited for link connected");
-
- p = (unsigned char *) modem_image_data + GALAXYS2_PSI_OFFSET;
-
- rc = xmm626_hsic_psi_send(client, modem_boot_fd, (void *) p,
- GALAXYS2_PSI_SIZE);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC PSI failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC PSI");
-
- p = (unsigned char *) modem_image_data + GALAXYS2_EBL_OFFSET;
-
- rc = xmm626_hsic_ebl_send(client, modem_boot_fd, (void *) p,
- GALAXYS2_EBL_SIZE);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC EBL failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC EBL");
-
- rc = xmm626_hsic_port_config_send(client, modem_boot_fd);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC port config failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC port config");
-
- p = (unsigned char *) modem_image_data + GALAXYS2_SEC_START_OFFSET;
-
- rc = xmm626_hsic_sec_start_send(client, modem_boot_fd, (void *) p,
- GALAXYS2_SEC_START_SIZE);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC SEC start failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC SEC start");
-
- p = (unsigned char *) modem_image_data + GALAXYS2_FIRMWARE_OFFSET;
-
- rc = xmm626_hsic_firmware_send(client, modem_boot_fd, (void *) p,
- GALAXYS2_FIRMWARE_SIZE);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC firmware failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC firmware");
-
- rc = xmm626_hsic_nv_data_send(client, modem_boot_fd);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC nv_data failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC nv_data");
-
- rc = xmm626_hsic_sec_end_send(client, modem_boot_fd);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC SEC end failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC SEC end");
-
- rc = xmm626_hsic_hw_reset_send(client, modem_boot_fd);
- if (rc < 0) {
- ipc_client_log(client, "Sending XMM626 HSIC HW reset failed");
- goto error;
- }
- ipc_client_log(client, "Sent XMM626 HSIC HW reset");
-
- usleep(300000);
-
- rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
- if (rc < 0) {
- ipc_client_log(client, "Waiting for host wake failed");
- }
-
- rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
- rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
- rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
-
- if (rc < 0) {
- ipc_client_log(client, "Turning the modem off failed");
- goto error;
- }
-
- rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
- if (rc < 0) {
- ipc_client_log(client, "Waiting for host wake failed");
- goto error;
- }
- ipc_client_log(client, "Waited for host wake");
-
- rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
- rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
- rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
-
- if (rc < 0) {
- ipc_client_log(client, "Turning the modem on failed");
- goto error;
- }
-
- rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
- if (rc < 0) {
- ipc_client_log(client, "Waiting for link connected failed");
- goto error;
- }
- ipc_client_log(client, "Waited for link connected");
-
- usleep(300000);
-
- rc = 0;
- goto complete;
+ void *modem_image_data = NULL;
+ int modem_image_fd = -1;
+ int modem_boot_fd = -1;
+ int modem_link_fd = -1;
+ unsigned char *p;
+ int rc;
+
+ if (client == NULL)
+ return -1;
+
+ ipc_client_log(client, "Starting galaxys2 modem boot");
+
+ modem_image_fd = open(GALAXYS2_MODEM_IMAGE_DEVICE, O_RDONLY);
+ if (modem_image_fd < 0) {
+ ipc_client_log(client, "Opening modem image device failed");
+ goto error;
+ }
+ ipc_client_log(client, "Opened modem image device");
+
+ modem_image_data = mmap(0, GALAXYS2_MODEM_IMAGE_SIZE, PROT_READ,
+ MAP_SHARED, modem_image_fd, 0);
+ if (modem_image_data == NULL ||
+ modem_image_data == (void *) 0xffffffff) {
+ ipc_client_log(client, "Mapping modem image data to memory "
+ "failed");
+ goto error;
+ }
+ ipc_client_log(client, "Mapped modem image data to memory");
+
+ modem_boot_fd = open(XMM626_SEC_MODEM_BOOT0_DEVICE,
+ O_RDWR | O_NOCTTY | O_NONBLOCK);
+ if (modem_boot_fd < 0) {
+ ipc_client_log(client, "Opening modem boot device failed");
+ goto error;
+ }
+ ipc_client_log(client, "Opened modem boot device");
+
+ modem_link_fd = open(XMM626_SEC_MODEM_LINK_PM_DEVICE, O_RDWR);
+ if (modem_link_fd < 0) {
+ ipc_client_log(client, "Opening modem link device failed");
+ goto error;
+ }
+ ipc_client_log(client, "Opened modem link device");
+
+ rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 0);
+ rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd,
+ 0);
+ rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+ rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd,
+ 0);
+
+ if (rc < 0) {
+ ipc_client_log(client, "Turning the modem off failed");
+ goto error;
+ }
+ ipc_client_log(client, "Turned the modem off");
+
+ rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
+ rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd,
+ 1);
+ rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+ rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd,
+ 1);
+
+ if (rc < 0) {
+ ipc_client_log(client, "Turning the modem on failed");
+ goto error;
+ }
+ ipc_client_log(client, "Turned the modem on");
+
+ rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Waiting for link connected failed");
+ goto error;
+ }
+ ipc_client_log(client, "Waited for link connected");
+
+ p = (unsigned char *) modem_image_data + GALAXYS2_PSI_OFFSET;
+
+ rc = xmm626_hsic_psi_send(client, modem_boot_fd, (void *) p,
+ GALAXYS2_PSI_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC PSI failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC PSI");
+
+ p = (unsigned char *) modem_image_data + GALAXYS2_EBL_OFFSET;
+
+ rc = xmm626_hsic_ebl_send(client, modem_boot_fd, (void *) p,
+ GALAXYS2_EBL_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC EBL failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC EBL");
+
+ rc = xmm626_hsic_port_config_send(client, modem_boot_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC port config "
+ "failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC port config");
+
+ p = (unsigned char *) modem_image_data + GALAXYS2_SEC_START_OFFSET;
+
+ rc = xmm626_hsic_sec_start_send(client, modem_boot_fd, (void *) p,
+ GALAXYS2_SEC_START_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC SEC start failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC SEC start");
+
+ p = (unsigned char *) modem_image_data + GALAXYS2_FIRMWARE_OFFSET;
+
+ rc = xmm626_hsic_firmware_send(client, modem_boot_fd, (void *) p,
+ GALAXYS2_FIRMWARE_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC firmware failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC firmware");
+
+ rc = xmm626_hsic_nv_data_send(client, modem_boot_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC nv_data failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC nv_data");
+
+ rc = xmm626_hsic_sec_end_send(client, modem_boot_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC SEC end failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC SEC end");
+
+ rc = xmm626_hsic_hw_reset_send(client, modem_boot_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM626 HSIC HW reset failed");
+ goto error;
+ }
+ ipc_client_log(client, "Sent XMM626 HSIC HW reset");
+
+ usleep(300000);
+
+ rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client,
+ modem_link_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Waiting for host wake failed");
+ }
+
+ rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd,
+ 0);
+ rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+ rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd,
+ 0);
+
+ if (rc < 0) {
+ ipc_client_log(client, "Turning the modem off failed");
+ goto error;
+ }
+
+ rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client,
+ modem_link_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Waiting for host wake failed");
+ goto error;
+ }
+ ipc_client_log(client, "Waited for host wake");
+
+ rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd,
+ 1);
+ rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+ rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd,
+ 1);
+
+ if (rc < 0) {
+ ipc_client_log(client, "Turning the modem on failed");
+ goto error;
+ }
+
+ rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
+ if (rc < 0) {
+ ipc_client_log(client, "Waiting for link connected failed");
+ goto error;
+ }
+ ipc_client_log(client, "Waited for link connected");
+
+ usleep(300000);
+
+ rc = 0;
+ goto complete;
error:
- rc = -1;
+ rc = -1;
complete:
- if (modem_image_data != NULL)
- munmap(modem_image_data, GALAXYS2_MODEM_IMAGE_SIZE);
+ if (modem_image_data != NULL)
+ munmap(modem_image_data, GALAXYS2_MODEM_IMAGE_SIZE);
- if (modem_image_fd >= 0)
- close(modem_image_fd);
+ if (modem_image_fd >= 0)
+ close(modem_image_fd);
- if (modem_boot_fd >= 0)
- close(modem_boot_fd);
+ if (modem_boot_fd >= 0)
+ close(modem_boot_fd);
- if (modem_link_fd >= 0)
- close(modem_link_fd);
+ if (modem_link_fd >= 0)
+ close(modem_link_fd);
- return rc;
+ return rc;
}
int galaxys2_open(__attribute__((unused)) struct ipc_client *client, void *data,
- int type)
+ int type)
{
- struct galaxys2_transport_data *transport_data;
+ struct galaxys2_transport_data *transport_data;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct galaxys2_transport_data *) data;
+ transport_data = (struct galaxys2_transport_data *) data;
- transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
- if (transport_data->fd < 0)
- return -1;
+ transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
+ if (transport_data->fd < 0)
+ return -1;
- return 0;
+ return 0;
}
int galaxys2_close(__attribute__((unused)) struct ipc_client *client,
- void *data)
+ void *data)
{
- struct galaxys2_transport_data *transport_data;
+ struct galaxys2_transport_data *transport_data;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct galaxys2_transport_data *) data;
+ transport_data = (struct galaxys2_transport_data *) data;
- xmm626_kernel_smdk4412_close(client, transport_data->fd);
- transport_data->fd = -1;
+ xmm626_kernel_smdk4412_close(client, transport_data->fd);
+ transport_data->fd = -1;
- return 0;
+ return 0;
}
int galaxys2_read(__attribute__((unused)) struct ipc_client *client, void *data,
- void *buffer, size_t length)
+ void *buffer, size_t length)
{
- struct galaxys2_transport_data *transport_data;
- int rc;
+ struct galaxys2_transport_data *transport_data;
+ int rc;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct galaxys2_transport_data *) data;
+ transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
+ rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer,
+ length);
- return rc;
+ return rc;
}
int galaxys2_write(__attribute__((unused)) struct ipc_client *client,
- void *data, const void *buffer, size_t length)
+ void *data, const void *buffer, size_t length)
{
- struct galaxys2_transport_data *transport_data;
- int rc;
+ struct galaxys2_transport_data *transport_data;
+ int rc;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct galaxys2_transport_data *) data;
+ transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
+ rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer,
+ length);
- return rc;
+ return rc;
}
int galaxys2_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 galaxys2_transport_data *transport_data;
- int rc;
+ struct galaxys2_transport_data *transport_data;
+ int rc;
- if (data == NULL)
- return -1;
+ if (data == NULL)
+ return -1;
- transport_data = (struct galaxys2_transport_data *) data;
+ transport_data = (struct galaxys2_transport_data *) data;
- rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
+ rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds,
+ timeout);
- return rc;
+ return rc;
}
int galaxys2_power_on(__attribute__((unused)) struct ipc_client *client,
- __attribute__((unused)) void *data)
+ __attribute__((unused)) void *data)
{
- return 0;
+ return 0;
}
int galaxys2_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(XMM626_SEC_MODEM_BOOT0_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
- if (fd < 0)
- return -1;
+ fd = open(XMM626_SEC_MODEM_BOOT0_DEVICE, O_RDWR | O_NOCTTY |
+ O_NONBLOCK);
+ if (fd < 0)
+ return -1;
- rc = xmm626_kernel_smdk4412_power(client, fd, 0);
+ rc = xmm626_kernel_smdk4412_power(client, fd, 0);
- close(fd);
+ close(fd);
- if (rc < 0)
- return -1;
+ if (rc < 0)
+ return -1;
- return 0;
+ return 0;
}
int galaxys2_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 galaxys2_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;
}
int galaxys2_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 galaxys2_transport_data));
+ *transport_data = calloc(1, sizeof(struct galaxys2_transport_data));
- return 0;
+ return 0;
}
int galaxys2_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;
}
struct ipc_client_ops galaxys2_fmt_ops = {
- .boot = galaxys2_boot,
- .send = xmm626_kernel_smdk4412_fmt_send,
- .recv = xmm626_kernel_smdk4412_fmt_recv,
+ .boot = galaxys2_boot,
+ .send = xmm626_kernel_smdk4412_fmt_send,
+ .recv = xmm626_kernel_smdk4412_fmt_recv,
};
struct ipc_client_ops galaxys2_rfs_ops = {
- .boot = NULL,
- .send = xmm626_kernel_smdk4412_rfs_send,
- .recv = xmm626_kernel_smdk4412_rfs_recv,
+ .boot = NULL,
+ .send = xmm626_kernel_smdk4412_rfs_send,
+ .recv = xmm626_kernel_smdk4412_rfs_recv,
};
struct ipc_client_handlers galaxys2_handlers = {
- .read = galaxys2_read,
- .write = galaxys2_write,
- .open = galaxys2_open,
- .close = galaxys2_close,
- .poll = galaxys2_poll,
- .transport_data = NULL,
- .power_on = galaxys2_power_on,
- .power_off = galaxys2_power_off,
- .power_data = NULL,
- .gprs_activate = galaxys2_gprs_activate,
- .gprs_deactivate = galaxys2_gprs_deactivate,
- .gprs_data = NULL,
- .data_create = galaxys2_data_create,
- .data_destroy = galaxys2_data_destroy,
+ .read = galaxys2_read,
+ .write = galaxys2_write,
+ .open = galaxys2_open,
+ .close = galaxys2_close,
+ .poll = galaxys2_poll,
+ .transport_data = NULL,
+ .power_on = galaxys2_power_on,
+ .power_off = galaxys2_power_off,
+ .power_data = NULL,
+ .gprs_activate = galaxys2_gprs_activate,
+ .gprs_deactivate = galaxys2_gprs_deactivate,
+ .gprs_data = NULL,
+ .data_create = galaxys2_data_create,
+ .data_destroy = galaxys2_data_destroy,
};
struct ipc_client_gprs_specs galaxys2_gprs_specs = {
- .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
- .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
+ .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+ .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
};
struct ipc_client_nv_data_specs galaxys2_nv_data_specs = {
- .nv_data_path = XMM626_NV_DATA_PATH,
- .nv_data_md5_path = XMM626_NV_DATA_MD5_PATH,
- .nv_data_backup_path = XMM626_NV_DATA_BACKUP_PATH,
- .nv_data_backup_md5_path = XMM626_NV_DATA_BACKUP_MD5_PATH,
- .nv_data_secret = XMM626_NV_DATA_SECRET,
- .nv_data_size = XMM626_NV_DATA_SIZE,
- .nv_data_chunk_size = XMM626_NV_DATA_CHUNK_SIZE,
+ .nv_data_path = XMM626_NV_DATA_PATH,
+ .nv_data_md5_path = XMM626_NV_DATA_MD5_PATH,
+ .nv_data_backup_path = XMM626_NV_DATA_BACKUP_PATH,
+ .nv_data_backup_md5_path = XMM626_NV_DATA_BACKUP_MD5_PATH,
+ .nv_data_secret = XMM626_NV_DATA_SECRET,
+ .nv_data_size = XMM626_NV_DATA_SIZE,
+ .nv_data_chunk_size = XMM626_NV_DATA_CHUNK_SIZE,
};
-
-// vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/devices/galaxys2/galaxys2.h b/samsung-ipc/devices/galaxys2/galaxys2.h
index 5d315c6..c8142ec 100644
--- a/samsung-ipc/devices/galaxys2/galaxys2.h
+++ b/samsung-ipc/devices/galaxys2/galaxys2.h
@@ -20,22 +20,22 @@
#ifndef __GALAXYS2_H__
#define __GALAXYS2_H__
-#define GALAXYS2_MODEM_IMAGE_SIZE 0x1000000
-#define GALAXYS2_PSI_OFFSET 0
-#define GALAXYS2_PSI_SIZE 0xF000
-#define GALAXYS2_EBL_OFFSET 0xF000
-#define GALAXYS2_EBL_SIZE 0x19000
-#define GALAXYS2_SEC_START_OFFSET 0x9FF800
-#define GALAXYS2_SEC_START_SIZE 0x800
-#define GALAXYS2_FIRMWARE_OFFSET 0x28000
-#define GALAXYS2_FIRMWARE_SIZE 0x9D8000
-#define GALAXYS2_NV_DATA_OFFSET 0xA00000
-#define GALAXYS2_NV_DATA_SIZE 0x200000
+#define GALAXYS2_MODEM_IMAGE_SIZE 0x1000000
+#define GALAXYS2_PSI_OFFSET 0
+#define GALAXYS2_PSI_SIZE 0xF000
+#define GALAXYS2_EBL_OFFSET 0xF000
+#define GALAXYS2_EBL_SIZE 0x19000
+#define GALAXYS2_SEC_START_OFFSET 0x9FF800
+#define GALAXYS2_SEC_START_SIZE 0x800
+#define GALAXYS2_FIRMWARE_OFFSET 0x28000
+#define GALAXYS2_FIRMWARE_SIZE 0x9D8000
+#define GALAXYS2_NV_DATA_OFFSET 0xA00000
+#define GALAXYS2_NV_DATA_SIZE 0x200000
-#define GALAXYS2_MODEM_IMAGE_DEVICE "/dev/block/mmcblk0p8"
+#define GALAXYS2_MODEM_IMAGE_DEVICE "/dev/block/mmcblk0p8"
struct galaxys2_transport_data {
- int fd;
+ int fd;
};
extern struct ipc_client_ops galaxys2_fmt_ops;
@@ -44,6 +44,4 @@ extern struct ipc_client_handlers galaxys2_handlers;
extern struct ipc_client_gprs_specs galaxys2_gprs_specs;
extern struct ipc_client_nv_data_specs galaxys2_nv_data_specs;
-#endif
-
-// vim:ts=4:sw=4:expandtab
+#endif /* __GALAXYS2_H__ */
--
2.26.0
More information about the Replicant
mailing list