The XMM626 is the modem model, and SEC is a reference to Samsung Electronics.
However, in practice the xmm626_sec_modem file and functions are tied to a specific kernel interface which is not upstream. In CyanogenMod, LineageOS and Replicant (up to the 6.0 version), most of the devices supported by libsamsung-ipc use a kernel named android_kernel_samsung_smdk4412, which implements this interface. So it is more clear to use a name that reflects that instead of using the generic xmm626_sec_modem name. Even if SMDK4412 is also a Samsung evaluation board for the Exynos 4412 System on a chip, the kernel name is probably way more known to people working on supporting devices with an XMM626 modem in libsamsung-ipc. Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]> --- Android.mk | 2 +- samsung-ipc/Makefile.am | 4 +- samsung-ipc/devices/galaxys2/galaxys2.c | 64 ++++++++++--------- samsung-ipc/devices/i9300/i9300.c | 54 ++++++++-------- samsung-ipc/devices/maguro/maguro.c | 36 ++++++----- samsung-ipc/devices/n5100/n5100.c | 54 ++++++++-------- samsung-ipc/devices/n7100/n7100.c | 54 ++++++++-------- samsung-ipc/devices/piranha/piranha.c | 32 +++++----- ...6_sec_modem.c => xmm626_kernel_smdk4412.c} | 64 ++++++++++--------- ...6_sec_modem.h => xmm626_kernel_smdk4412.h} | 39 +++++------ 10 files changed, 209 insertions(+), 194 deletions(-) rename samsung-ipc/modems/xmm626/{xmm626_sec_modem.c => xmm626_kernel_smdk4412.c} (83%) rename samsung-ipc/modems/xmm626/{xmm626_sec_modem.h => xmm626_kernel_smdk4412.h} (59%) diff --git a/Android.mk b/Android.mk index 63388f1..391185c 100644 --- a/Android.mk +++ b/Android.mk @@ -55,8 +55,8 @@ libsamsung_ipc_local_src_files := \ samsung-ipc/modems/xmm616/xmm616.c \ samsung-ipc/modems/xmm626/xmm626.c \ samsung-ipc/modems/xmm626/xmm626_hsic.c \ + samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c \ samsung-ipc/modems/xmm626/xmm626_mipi.c \ - samsung-ipc/modems/xmm626/xmm626_sec_modem.c \ samsung-ipc/devices/ipc_devices.c \ samsung-ipc/devices/crespo/crespo.c \ samsung-ipc/devices/aries/aries.c \ diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am index 726c189..1b18760 100644 --- a/samsung-ipc/Makefile.am +++ b/samsung-ipc/Makefile.am @@ -27,10 +27,10 @@ libsamsung_ipc_la_SOURCES = \ modems/xmm626/xmm626.h \ modems/xmm626/xmm626_hsic.c \ modems/xmm626/xmm626_hsic.h \ + modems/xmm626/xmm626_kernel_smdk4412.c \ + modems/xmm626/xmm626_kernel_smdk4412.h \ modems/xmm626/xmm626_mipi.c \ modems/xmm626/xmm626_mipi.h \ - modems/xmm626/xmm626_sec_modem.c \ - modems/xmm626/xmm626_sec_modem.h \ modems/xmm626/xmm626_modem.h \ modems/xmm626/xmm626_modem_link_device_hsic.h \ modems/xmm626/xmm626_modem_prj.h \ diff --git a/samsung-ipc/devices/galaxys2/galaxys2.c b/samsung-ipc/devices/galaxys2/galaxys2.c index 3c46121..a3a1631 100644 --- a/samsung-ipc/devices/galaxys2/galaxys2.c +++ b/samsung-ipc/devices/galaxys2/galaxys2.c @@ -29,7 +29,7 @@ #include "galaxys2.h" #include "xmm626.h" #include "xmm626_hsic.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int galaxys2_boot(struct ipc_client *client) { @@ -75,10 +75,10 @@ int galaxys2_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem link device"); - rc = xmm626_sec_modem_power(client, modem_boot_fd, 0); - rc |= xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(client, 0); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0); + 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"); @@ -86,10 +86,10 @@ int galaxys2_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem off"); - rc = xmm626_sec_modem_power(client, modem_boot_fd, 1); - rc |= xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1); + 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"); @@ -97,7 +97,7 @@ int galaxys2_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem on"); - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -174,37 +174,37 @@ int galaxys2_boot(struct ipc_client *client) usleep(300000); - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(client, 0); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -245,7 +245,7 @@ int galaxys2_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct galaxys2_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -262,7 +262,7 @@ int galaxys2_close(__attribute__((unused)) struct ipc_client *client, transport_data = (struct galaxys2_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -279,7 +279,8 @@ int galaxys2_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct galaxys2_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -295,7 +296,8 @@ int galaxys2_write(__attribute__((unused)) struct ipc_client *client, transport_data = (struct galaxys2_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -311,7 +313,7 @@ int galaxys2_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct galaxys2_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -332,7 +334,7 @@ int galaxys2_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -380,14 +382,14 @@ int galaxys2_data_destroy(void *transport_data, struct ipc_client_ops galaxys2_fmt_ops = { .boot = galaxys2_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops galaxys2_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers galaxys2_handlers = { @@ -408,8 +410,8 @@ struct ipc_client_handlers galaxys2_handlers = { }; struct ipc_client_gprs_specs galaxys2_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 = { diff --git a/samsung-ipc/devices/i9300/i9300.c b/samsung-ipc/devices/i9300/i9300.c index 06633f9..20d8405 100644 --- a/samsung-ipc/devices/i9300/i9300.c +++ b/samsung-ipc/devices/i9300/i9300.c @@ -29,7 +29,7 @@ #include "i9300.h" #include "xmm626.h" #include "xmm626_hsic.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int i9300_boot(struct ipc_client *client) { @@ -75,15 +75,15 @@ int i9300_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem link device"); - rc = xmm626_sec_modem_hci_power(client, 0); + rc = xmm626_kernel_smdk4412_hci_power(client, 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_sec_modem_power(client, modem_boot_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1); + rc |= xmm626_kernel_smdk4412_hci_power(client, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); @@ -91,7 +91,7 @@ int i9300_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem on"); - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -168,37 +168,37 @@ int i9300_boot(struct ipc_client *client) usleep(300000); - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(client, 0); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -239,7 +239,7 @@ int i9300_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct i9300_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -255,7 +255,7 @@ int i9300_close(__attribute__((unused)) struct ipc_client *client, void *data) transport_data = (struct i9300_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -272,7 +272,8 @@ int i9300_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct i9300_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -288,7 +289,8 @@ int i9300_write(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct i9300_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -304,7 +306,7 @@ int i9300_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct i9300_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -325,7 +327,7 @@ int i9300_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -373,14 +375,14 @@ int i9300_data_destroy(void *transport_data, struct ipc_client_ops i9300_fmt_ops = { .boot = i9300_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops i9300_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers i9300_handlers = { @@ -401,8 +403,8 @@ struct ipc_client_handlers i9300_handlers = { }; struct ipc_client_gprs_specs i9300_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 i9300_nv_data_specs = { diff --git a/samsung-ipc/devices/maguro/maguro.c b/samsung-ipc/devices/maguro/maguro.c index bc2b4f6..e8fcb00 100644 --- a/samsung-ipc/devices/maguro/maguro.c +++ b/samsung-ipc/devices/maguro/maguro.c @@ -30,7 +30,7 @@ #include "maguro.h" #include "xmm626.h" #include "xmm626_mipi.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int maguro_boot(struct ipc_client *client) { @@ -69,14 +69,14 @@ int maguro_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem boot device"); - rc = xmm626_sec_modem_power(client, modem_boot_fd, 0); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_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_sec_modem_power(client, modem_boot_fd, 1); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); goto error; @@ -177,14 +177,14 @@ int maguro_boot(struct ipc_client *client) } ipc_client_log(client, "Sent XMM626 MIPI HW reset"); - rc = xmm626_sec_modem_status_online_wait(client, modem_boot_fd); + rc = xmm626_kernel_smdk4412_status_online_wait(client, modem_boot_fd); if (rc < 0) { ipc_client_log(client, "Waiting for online status failed"); goto error; } ipc_client_log(client, "Waited for online status"); - rc = xmm626_sec_modem_boot_power(client, modem_boot_fd, 0); + rc = xmm626_kernel_smdk4412_boot_power(client, modem_boot_fd, 0); if (rc < 0) { ipc_client_log(client, "Turning modem boot off failed"); goto error; @@ -223,7 +223,7 @@ int maguro_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct maguro_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -239,7 +239,7 @@ int maguro_close(__attribute__((unused)) struct ipc_client *client, void *data) transport_data = (struct maguro_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -256,7 +256,8 @@ int maguro_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct maguro_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -272,7 +273,8 @@ int maguro_write(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct maguro_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -288,7 +290,7 @@ int maguro_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct maguro_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -309,7 +311,7 @@ int maguro_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -357,14 +359,14 @@ int maguro_data_destroy(void *transport_data, struct ipc_client_ops maguro_fmt_ops = { .boot = maguro_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops maguro_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers maguro_handlers = { @@ -385,8 +387,8 @@ struct ipc_client_handlers maguro_handlers = { }; struct ipc_client_gprs_specs maguro_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 maguro_nv_data_specs = { diff --git a/samsung-ipc/devices/n5100/n5100.c b/samsung-ipc/devices/n5100/n5100.c index c768750..b477b32 100644 --- a/samsung-ipc/devices/n5100/n5100.c +++ b/samsung-ipc/devices/n5100/n5100.c @@ -30,7 +30,7 @@ #include "n5100.h" #include "xmm626.h" #include "xmm626_hsic.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int n5100_boot(struct ipc_client *client) { @@ -76,15 +76,15 @@ int n5100_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem link device"); - rc = xmm626_sec_modem_hci_power(client, 0); + rc = xmm626_kernel_smdk4412_hci_power(client, 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_sec_modem_power(client, modem_boot_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1); + rc |= xmm626_kernel_smdk4412_hci_power(client, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); @@ -92,7 +92,7 @@ int n5100_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem on"); - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -169,37 +169,37 @@ int n5100_boot(struct ipc_client *client) usleep(300000); - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(client, 0); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -240,7 +240,7 @@ int n5100_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n5100_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -256,7 +256,7 @@ int n5100_close(__attribute__((unused)) struct ipc_client *client, void *data) transport_data = (struct n5100_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -273,7 +273,8 @@ int n5100_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n5100_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -289,7 +290,8 @@ int n5100_write(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n5100_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -305,7 +307,7 @@ int n5100_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n5100_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -326,7 +328,7 @@ int n5100_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -374,14 +376,14 @@ int n5100_data_destroy(void *transport_data, struct ipc_client_ops n5100_fmt_ops = { .boot = n5100_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops n5100_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers n5100_handlers = { @@ -402,8 +404,8 @@ struct ipc_client_handlers n5100_handlers = { }; struct ipc_client_gprs_specs n5100_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 n5100_nv_data_specs = { diff --git a/samsung-ipc/devices/n7100/n7100.c b/samsung-ipc/devices/n7100/n7100.c index 5b27585..c9eccd3 100644 --- a/samsung-ipc/devices/n7100/n7100.c +++ b/samsung-ipc/devices/n7100/n7100.c @@ -29,7 +29,7 @@ #include "n7100.h" #include "xmm626.h" #include "xmm626_hsic.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int n7100_boot(struct ipc_client *client) { @@ -75,15 +75,15 @@ int n7100_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem link device"); - rc = xmm626_sec_modem_hci_power(client, 0); + rc = xmm626_kernel_smdk4412_hci_power(client, 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_sec_modem_power(client, modem_boot_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1); + rc |= xmm626_kernel_smdk4412_hci_power(client, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); @@ -91,7 +91,7 @@ int n7100_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem on"); - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -168,37 +168,37 @@ int n7100_boot(struct ipc_client *client) usleep(300000); - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(client, 0); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); + 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_sec_modem_link_control_enable(client, modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(client, 1); - rc |= xmm626_sec_modem_link_control_active(client, modem_link_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; } - rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); + 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; @@ -239,7 +239,7 @@ int n7100_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n7100_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -255,7 +255,7 @@ int n7100_close(__attribute__((unused)) struct ipc_client *client, void *data) transport_data = (struct n7100_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -272,7 +272,8 @@ int n7100_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n7100_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -288,7 +289,8 @@ int n7100_write(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n7100_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -304,7 +306,7 @@ int n7100_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct n7100_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -325,7 +327,7 @@ int n7100_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -373,14 +375,14 @@ int n7100_data_destroy(void *transport_data, struct ipc_client_ops n7100_fmt_ops = { .boot = n7100_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops n7100_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers n7100_handlers = { @@ -401,8 +403,8 @@ struct ipc_client_handlers n7100_handlers = { }; struct ipc_client_gprs_specs n7100_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 n7100_nv_data_specs = { diff --git a/samsung-ipc/devices/piranha/piranha.c b/samsung-ipc/devices/piranha/piranha.c index 9029a5f..6504c58 100644 --- a/samsung-ipc/devices/piranha/piranha.c +++ b/samsung-ipc/devices/piranha/piranha.c @@ -29,7 +29,7 @@ #include "piranha.h" #include "xmm626.h" #include "xmm626_mipi.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" int piranha_boot(struct ipc_client *client) { @@ -67,14 +67,14 @@ int piranha_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem boot device"); - rc = xmm626_sec_modem_power(client, modem_boot_fd, 0); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_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_sec_modem_power(client, modem_boot_fd, 1); + rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); goto error; @@ -188,7 +188,7 @@ int piranha_open(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct piranha_transport_data *) data; - transport_data->fd = xmm626_sec_modem_open(client, type); + transport_data->fd = xmm626_kernel_smdk4412_open(client, type); if (transport_data->fd < 0) return -1; @@ -204,7 +204,7 @@ int piranha_close(__attribute__((unused)) struct ipc_client *client, void *data) transport_data = (struct piranha_transport_data *) data; - xmm626_sec_modem_close(client, transport_data->fd); + xmm626_kernel_smdk4412_close(client, transport_data->fd); transport_data->fd = -1; return 0; @@ -221,7 +221,8 @@ int piranha_read(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct piranha_transport_data *) data; - rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, + length); return rc; } @@ -237,7 +238,8 @@ int piranha_write(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct piranha_transport_data *) data; - rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length); + rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, + length); return rc; } @@ -253,7 +255,7 @@ int piranha_poll(__attribute__((unused)) struct ipc_client *client, void *data, transport_data = (struct piranha_transport_data *) data; - rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout); + rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout); return rc; } @@ -274,7 +276,7 @@ int piranha_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(client, fd, 0); + rc = xmm626_kernel_smdk4412_power(client, fd, 0); close(fd); @@ -322,14 +324,14 @@ int piranha_data_destroy(void *transport_data, struct ipc_client_ops piranha_fmt_ops = { .boot = piranha_boot, - .send = xmm626_sec_modem_fmt_send, - .recv = xmm626_sec_modem_fmt_recv, + .send = xmm626_kernel_smdk4412_fmt_send, + .recv = xmm626_kernel_smdk4412_fmt_recv, }; struct ipc_client_ops piranha_rfs_ops = { .boot = NULL, - .send = xmm626_sec_modem_rfs_send, - .recv = xmm626_sec_modem_rfs_recv, + .send = xmm626_kernel_smdk4412_rfs_send, + .recv = xmm626_kernel_smdk4412_rfs_recv, }; struct ipc_client_handlers piranha_handlers = { @@ -350,8 +352,8 @@ struct ipc_client_handlers piranha_handlers = { }; struct ipc_client_gprs_specs piranha_gprs_specs = { - .gprs_get_iface = xmm626_sec_modem_gprs_get_iface, - .gprs_get_capabilities = xmm626_sec_modem_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 piranha_nv_data_specs = { diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c similarity index 83% rename from samsung-ipc/modems/xmm626/xmm626_sec_modem.c rename to samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c index a186910..9cb77bc 100644 --- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c +++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.c @@ -35,10 +35,10 @@ #include "xmm626_modem_link_device_hsic.h" #include "xmm626.h" -#include "xmm626_sec_modem.h" +#include "xmm626_kernel_smdk4412.h" -int xmm626_sec_modem_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; @@ -52,8 +52,8 @@ int xmm626_sec_modem_power(__attribute__((unused)) struct ipc_client *client, return 0; } -int xmm626_sec_modem_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; @@ -68,8 +68,8 @@ int xmm626_sec_modem_boot_power(__attribute__((unused)) struct ipc_client *clien return 0; } -int xmm626_sec_modem_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; @@ -89,8 +89,8 @@ int xmm626_sec_modem_status_online_wait(__attribute__((unused)) struct ipc_clien return -1; } -int xmm626_sec_modem_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; @@ -108,8 +108,8 @@ int xmm626_sec_modem_hci_power(__attribute__((unused)) struct ipc_client *client return 0; } -int xmm626_sec_modem_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; @@ -123,8 +123,8 @@ int xmm626_sec_modem_link_control_enable(__attribute__((unused)) struct ipc_clie return 0; } -int xmm626_sec_modem_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; @@ -138,8 +138,8 @@ int xmm626_sec_modem_link_control_active(__attribute__((unused)) struct ipc_clie return 0; } -int xmm626_sec_modem_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; @@ -159,8 +159,8 @@ int xmm626_sec_modem_link_connected_wait(__attribute__((unused)) struct ipc_clie return -1; } -int xmm626_sec_modem_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; @@ -180,8 +180,8 @@ int xmm626_sec_modem_link_get_hostwake_wait(__attribute__((unused)) struct ipc_c return -1; } -int xmm626_sec_modem_fmt_send(struct ipc_client *client, - struct ipc_message *message) +int xmm626_kernel_smdk4412_fmt_send(struct ipc_client *client, + struct ipc_message *message) { struct ipc_fmt_header header; void *buffer; @@ -212,7 +212,8 @@ int xmm626_sec_modem_fmt_send(struct ipc_client *client, count = 0; while (count < length) { - rc = client->handlers->write(client, client->handlers->transport_data, p, length - count); + 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; @@ -235,7 +236,7 @@ complete: return rc; } -int xmm626_sec_modem_fmt_recv(struct ipc_client *client, +int xmm626_kernel_smdk4412_fmt_recv(struct ipc_client *client, struct ipc_message *message) { struct ipc_fmt_header *header; @@ -253,7 +254,8 @@ int xmm626_sec_modem_fmt_recv(struct ipc_client *client, length = XMM626_DATA_SIZE; buffer = calloc(1, length); - rc = client->handlers->read(client, client->handlers->transport_data, buffer, 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; @@ -305,7 +307,7 @@ complete: return rc; } -int xmm626_sec_modem_rfs_send(struct ipc_client *client, +int xmm626_kernel_smdk4412_rfs_send(struct ipc_client *client, struct ipc_message *message) { struct ipc_rfs_header header; @@ -361,7 +363,7 @@ complete: return rc; } -int xmm626_sec_modem_rfs_recv(struct ipc_client *client, +int xmm626_kernel_smdk4412_rfs_recv(struct ipc_client *client, struct ipc_message *message) { struct ipc_rfs_header *header; @@ -437,7 +439,7 @@ complete: return rc; } -int xmm626_sec_modem_open(__attribute__((unused)) struct ipc_client *client, +int xmm626_kernel_smdk4412_open(__attribute__((unused)) struct ipc_client *client, int type) { int fd; @@ -458,7 +460,7 @@ int xmm626_sec_modem_open(__attribute__((unused)) struct ipc_client *client, return fd; } -int xmm626_sec_modem_close(__attribute__((unused)) struct ipc_client *client, +int xmm626_kernel_smdk4412_close(__attribute__((unused)) struct ipc_client *client, int fd) { if (fd < 0) @@ -469,7 +471,7 @@ int xmm626_sec_modem_close(__attribute__((unused)) struct ipc_client *client, return 0; } -int xmm626_sec_modem_read(__attribute__((unused)) struct ipc_client *client, +int xmm626_kernel_smdk4412_read(__attribute__((unused)) struct ipc_client *client, int fd, void *buffer, size_t length) { int status; @@ -487,7 +489,7 @@ int xmm626_sec_modem_read(__attribute__((unused)) struct ipc_client *client, return rc; } -int xmm626_sec_modem_write(__attribute__((unused)) struct ipc_client *client, +int xmm626_kernel_smdk4412_write(__attribute__((unused)) struct ipc_client *client, int fd, const void *buffer, size_t length) { int status; @@ -505,7 +507,7 @@ int xmm626_sec_modem_write(__attribute__((unused)) struct ipc_client *client, return rc; } -int xmm626_sec_modem_poll(__attribute__((unused)) struct ipc_client *client, +int xmm626_kernel_smdk4412_poll(__attribute__((unused)) struct ipc_client *client, int fd, struct ipc_poll_fds *fds, struct timeval *timeout) { @@ -559,7 +561,7 @@ int xmm626_sec_modem_poll(__attribute__((unused)) struct ipc_client *client, return rc; } -char *xmm626_sec_modem_gprs_get_iface(unsigned int cid) +char *xmm626_kernel_smdk4412_gprs_get_iface(unsigned int cid) { char *iface = NULL; @@ -571,7 +573,7 @@ char *xmm626_sec_modem_gprs_get_iface(unsigned int cid) return iface; } -int xmm626_sec_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities) +int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities) { if (capabilities == NULL) return -1; diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h similarity index 59% rename from samsung-ipc/modems/xmm626/xmm626_sec_modem.h rename to samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h index 1eb6a3d..97f52c0 100644 --- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h +++ b/samsung-ipc/modems/xmm626/xmm626_kernel_smdk4412.h @@ -31,41 +31,42 @@ #define XMM626_SEC_MODEM_GPRS_IFACE_PREFIX "rmnet" #define XMM626_SEC_MODEM_GPRS_IFACE_COUNT 3 -int xmm626_sec_modem_power(struct ipc_client *client, int device_fd, int power); -int xmm626_sec_modem_boot_power(struct ipc_client *client, int device_fd, +int xmm626_kernel_smdk4412_power(struct ipc_client *client, int device_fd, int power); -int xmm626_sec_modem_status_online_wait(struct ipc_client *client, +int xmm626_kernel_smdk4412_boot_power(struct ipc_client *client, int device_fd, + int power); +int xmm626_kernel_smdk4412_status_online_wait(struct ipc_client *client, int device_fd); -int xmm626_sec_modem_hci_power(struct ipc_client *client, int power); -int xmm626_sec_modem_link_control_enable(struct ipc_client *client, +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 xmm626_sec_modem_link_control_active(struct ipc_client *client, +int xmm626_kernel_smdk4412_link_control_active(struct ipc_client *client, int device_fd, int active); -int xmm626_sec_modem_link_connected_wait(struct ipc_client *client, +int xmm626_kernel_smdk4412_link_connected_wait(struct ipc_client *client, int device_fd); -int xmm626_sec_modem_link_get_hostwake_wait(struct ipc_client *client, +int xmm626_kernel_smdk4412_link_get_hostwake_wait(struct ipc_client *client, int device_fd); -int xmm626_sec_modem_fmt_send(struct ipc_client *client, +int xmm626_kernel_smdk4412_fmt_send(struct ipc_client *client, struct ipc_message *message); -int xmm626_sec_modem_fmt_recv(struct ipc_client *client, +int xmm626_kernel_smdk4412_fmt_recv(struct ipc_client *client, struct ipc_message *message); -int xmm626_sec_modem_rfs_send(struct ipc_client *client, +int xmm626_kernel_smdk4412_rfs_send(struct ipc_client *client, struct ipc_message *message); -int xmm626_sec_modem_rfs_recv(struct ipc_client *client, +int xmm626_kernel_smdk4412_rfs_recv(struct ipc_client *client, struct ipc_message *message); -int xmm626_sec_modem_open(struct ipc_client *client, int type); -int xmm626_sec_modem_close(struct ipc_client *client, int fd); -int xmm626_sec_modem_read(struct ipc_client *client, int fd, void *buffer, +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); -int xmm626_sec_modem_write(struct ipc_client *client, int fd, +int xmm626_kernel_smdk4412_write(struct ipc_client *client, int fd, const void *buffer, size_t length); -int xmm626_sec_modem_poll(struct ipc_client *client, int fd, +int xmm626_kernel_smdk4412_poll(struct ipc_client *client, int fd, struct ipc_poll_fds *fds, struct timeval *timeout); -char *xmm626_sec_modem_gprs_get_iface(unsigned int cid); -int xmm626_sec_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities); +char *xmm626_kernel_smdk4412_gprs_get_iface(unsigned int cid); +int xmm626_kernel_smdk4412_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities); #endif -- 2.25.1 _______________________________________________ Replicant mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/replicant
