modem: kernel: linux update function names

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

2 files changed, 27 insertions, 19 deletions

diff --git a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h
index 44b6c6e..68caa05 100644
--- a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h
+++ b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h
@@ -35,6 +35,14 @@
 #define XMM626_KERNEL_LINUX_GPRS_IFACE_PREFIX      "rmnet"
 #define XMM626_KERNEL_LINUX_GPRS_IFACE_COUNT                       3
 
+int xmm626_kernel_linux_modem_power(__attribute__((unused)) int device_fd, int power);
+int xmm626_kernel_linux_modem_boot_power(int device_fd, int power);
+int xmm626_kernel_linux_modem_hci_power(int power);
+int xmm626_kernel_linux_modem_link_connected_wait(__attribute__((unused)) int device_fd);
+int xmm626_kernel_linux_modem_open(int type);
+int xmm626_kernel_linux_modem_read(int fd, void *buffer, size_t length);
+int xmm626_kernel_linux_modem_write(int fd, const void *buffer, size_t length);
+int xmm626_kernel_linux_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities);
 
 #endif /* __XMM626_KERNEL_LINUX_H__ */
 
diff --git a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c
index af0a57c..c954600 100644
--- a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c
+++ b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c
@@ -36,10 +36,10 @@
 #include <modem_link_device_hsic.h>
 
 #include <xmm626.h>
-#include <xmm626_sec_modem.h>
+#include <xmm626_kernel_linux_modem.h>
 #include "xmm626_kernel_linux.h"
 
-int xmm626_sec_modem_power(__attribute__((unused)) int device_fd, int power)
+int xmm626_kernel_linux_modem_power(__attribute__((unused)) int device_fd, int power)
 {
     int rc;
 
@@ -50,7 +50,7 @@ int xmm626_sec_modem_power(__attribute__((unused)) int device_fd, int power)
     return 0;
 }
 
-int xmm626_sec_modem_boot_power(int device_fd, int power)
+int xmm626_kernel_linux_modem_boot_power(int device_fd, int power)
 {
     int rc;
 
@@ -64,7 +64,7 @@ int xmm626_sec_modem_boot_power(int device_fd, int power)
     return 0;
 }
 
-int xmm626_sec_modem_hci_power(int power)
+int xmm626_kernel_linux_modem_hci_power(int power)
 {
     int ehci_rc, ohci_rc = -1;
 
@@ -76,7 +76,7 @@ int xmm626_sec_modem_hci_power(int power)
 
     if (!!power) {
 	ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_PDA_ACTIVE_SYSFS, 1);
-	if (sysfs_value_read(XMM626_SEC_HOSTWAKE_PATH)) {
+	if (sysfs_value_read(XMM626_KERNEL_LINUX_HOSTWAKE_PATH)) {
 		ohci_rc |= sysfs_value_write(XMM626_KERNEL_LINUX_SLAVEWAKE_SYSFS, 0);
 		usleep(10000);
 		ohci_rc |= sysfs_value_write(XMM626_KERNEL_LINUX_SLAVEWAKE_SYSFS, 1);
@@ -85,14 +85,14 @@ int xmm626_sec_modem_hci_power(int power)
 	if (ehci_rc >= 0)
 		usleep(50000);
 
-	ohci_rc |= sysfs_value_write(XMM626_SEC_LINK_ACTIVE_PATH, 1);
+	ohci_rc |= sysfs_value_write(XMM626_KERNEL_LINUX_LINK_ACTIVE_PATH, 1);
     } else {
 	    ehci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_EHCI_POWER_SYSFS, !!power);
 	if (ehci_rc >= 0)
 		usleep(50000);
 
 	//ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_PDA_ACTIVE_SYSFS, 0);
-	ohci_rc = sysfs_value_write(XMM626_SEC_LINK_ACTIVE_PATH, 0);
+	ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_LINK_ACTIVE_PATH, 0);
     }
 
 
@@ -105,7 +105,7 @@ int xmm626_sec_modem_hci_power(int power)
     return 0;
 }
 
-int xmm626_sec_modem_link_control_enable(__attribute__((unused)) int device_fd,
+int xmm626_kernel_linux_modem_link_control_enable(__attribute__((unused)) int device_fd,
 					 int enable)
 {
 	if (enable) {
@@ -113,19 +113,19 @@ int xmm626_sec_modem_link_control_enable(__attribute__((unused)) int device_fd,
     return 0;
 }
 
-int xmm626_sec_modem_link_control_active(__attribute__((unused)) int device_fd,
+int xmm626_kernel_linux_modem_link_control_active(__attribute__((unused)) int device_fd,
 					 int active)
 {
     int rc;
 
-    rc = sysfs_value_write(XMM626_SEC_LINK_ACTIVE_PATH, !!active);
+    rc = sysfs_value_write(XMM626_KERNEL_LINUX_LINK_ACTIVE_PATH, !!active);
     if (rc < 0)
         return -1;
 
     return 0;
 }
 
-int xmm626_sec_modem_link_connected_wait(__attribute__((unused)) int device_fd)
+int xmm626_kernel_linux_modem_link_connected_wait(__attribute__((unused)) int device_fd)
 {
     int i;
 
@@ -138,7 +138,7 @@ int xmm626_sec_modem_link_connected_wait(__attribute__((unused)) int device_fd)
     return 0;
 }
 
-int xmm626_sec_modem_link_get_hostwake_wait(
+int xmm626_kernel_linux_modem_link_get_hostwake_wait(
 	__attribute__((unused)) int device_fd)
 {
     int status;
@@ -147,8 +147,8 @@ int xmm626_sec_modem_link_get_hostwake_wait(
     i = 0;
     for (i = 0; i < 10; i++) {
         /* !gpio_get_value (hostwake) */
-//        status = sysfs_value_read(XMM626_SEC_HOSTWAKE_PATH);
-	printf("%s: i=%d read(%s) => status: %d\n", __FUNCTION__, i, XMM626_SEC_HOSTWAKE_PATH, status);
+//        status = sysfs_value_read(XMM626_KERNEL_LINUX_HOSTWAKE_PATH);
+	printf("%s: i=%d read(%s) => status: %d\n", __FUNCTION__, i, XMM626_KERNEL_LINUX_HOSTWAKE_PATH, status);
 //        if (status == 0) /* invert: return true when hostwake is low */
  //           return 0;
 
@@ -158,7 +158,7 @@ int xmm626_sec_modem_link_get_hostwake_wait(
     return 0;
 }
 
-int xmm626_sec_modem_open(int type)
+int xmm626_kernel_linux_modem_open(int type)
 {
     int fd = -2;
     int i = 0;
@@ -198,7 +198,7 @@ int xmm626_sec_modem_open(int type)
     return fd;
 }
 
-int xmm626_sec_modem_read(int fd, void *buffer, size_t length)
+int xmm626_kernel_linux_modem_read(int fd, void *buffer, size_t length)
 {
     int rc;
 
@@ -210,7 +210,7 @@ int xmm626_sec_modem_read(int fd, void *buffer, size_t length)
     return rc;
 }
 
-int xmm626_sec_modem_write(int fd, const void *buffer, size_t length)
+int xmm626_kernel_linux_modem_write(int fd, const void *buffer, size_t length)
 {
     int rc;
 
@@ -222,7 +222,7 @@ int xmm626_sec_modem_write(int fd, const void *buffer, size_t length)
     return rc;
 }
 
-char *xmm626_sec_modem_gprs_get_iface(unsigned int cid)
+char *xmm626_kernel_linux_modem_gprs_get_iface(unsigned int cid)
 {
     char *iface = NULL;
 
@@ -234,7 +234,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_linux_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
 {
     if (capabilities == NULL)
         return -1;