modem: linux: rename and update includes

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

2 files changed, 29 insertions, 28 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 cee1f30..44b6c6e 100644
--- a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h
+++ b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_kernel_linux.h
@@ -20,20 +20,20 @@
 #ifndef __XMM626_KERNEL_LINUX_H__
 #define __XMM626_KERNEL_LINUX_H__
 
-#define XMM626_SEC_MODEM_BOOT0_DEVICE           "/dev/xmm6262_boot0"
-#define XMM626_SEC_MODEM_BOOT1_DEVICE           "/dev/umts_boot1"
-#define XMM626_SEC_MODEM_IPC0_DEVICE            "/dev/umts_ipc"
-#define XMM626_SEC_MODEM_RFS0_DEVICE            "/dev/umts_rfs"
-#define XMM626_SEC_MODEM_LINK_PM_DEVICE         "/dev/link_pm"
-#define XMM626_SEC_MODEM_EHCI_POWER_SYSFS       "/sys/devices/platform/soc/12580000.ehci/ehci_power"
+#define XMM626_KERNEL_LINUX_BOOT0_DEVICE           "/dev/xmm6262_boot0"
+#define XMM626_KERNEL_LINUX_BOOT1_DEVICE           "/dev/umts_boot1"
+#define XMM626_KERNEL_LINUX_IPC0_DEVICE            "/dev/umts_ipc"
+#define XMM626_KERNEL_LINUX_RFS0_DEVICE            "/dev/umts_rfs"
+#define XMM626_KERNEL_LINUX_LINK_PM_DEVICE         "/dev/link_pm"
+#define XMM626_KERNEL_LINUX_EHCI_POWER_SYSFS       "/sys/devices/platform/soc/12580000.ehci/ehci_power"
 #define XMM626_SEC_HOSTWAKE_PATH                "/sys/devices/platform/xmm6262/hostwake"
 #define XMM626_SEC_LINK_ACTIVE_PATH		"/sys/devices/platform/xmm6262/link_active"
-#define XMM626_SEC_MODEM_POWER_PATH 		"/sys/devices/platform/xmm6262/modem_power"
-#define XMM626_SEC_MODEM_PDA_ACTIVE_SYSFS	"/sys/devices/platform/xmm6262/pda_active"
-#define XMM626_SEC_MODEM_SLAVEWAKE_SYSFS	"/sys/devices/platform/xmm6262/slavewake"
-//#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_KERNEL_LINUX_POWER_PATH 		"/sys/devices/platform/xmm6262/modem_power"
+#define XMM626_KERNEL_LINUX_PDA_ACTIVE_SYSFS	"/sys/devices/platform/xmm6262/pda_active"
+#define XMM626_KERNEL_LINUX_SLAVEWAKE_SYSFS	"/sys/devices/platform/xmm6262/slavewake"
+//#define XMM626_KERNEL_LINUX_OHCI_POWER_SYSFS       "/sys/devices/platform/s5p-ohci/ohci_power"
+#define XMM626_KERNEL_LINUX_GPRS_IFACE_PREFIX      "rmnet"
+#define XMM626_KERNEL_LINUX_GPRS_IFACE_COUNT                       3
 
 
 #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 4c764ae..dba0c7c 100644
--- a/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c
+++ b/samsung-ipc/modems/xmm626/kernel/linux/xmm626_sec_modem.c
@@ -37,12 +37,13 @@
 
 #include "xmm626.h"
 #include "xmm626_sec_modem.h"
+#include "xmm626_kernel_linux.h"
 
 int xmm626_sec_modem_power(__attribute__((unused)) int device_fd, int power)
 {
     int rc;
 
-    rc = sysfs_value_write(XMM626_SEC_MODEM_POWER_PATH, !!power);
+    rc = sysfs_value_write(XMM626_KERNEL_LINUX_POWER_PATH, !!power);
     if (rc < 0)
         return -99;
 
@@ -56,7 +57,7 @@ int xmm626_sec_modem_boot_power(int device_fd, int power)
     if (device_fd < 0)
         return -1;
 
-    rc = sysfs_value_write(XMM626_SEC_MODEM_POWER_PATH, !!power);
+    rc = sysfs_value_write(XMM626_KERNEL_LINUX_POWER_PATH, !!power);
     if (rc < 0)
         return -1;
 
@@ -88,29 +89,29 @@ int xmm626_sec_modem_hci_power(int power)
     int ehci_rc, ohci_rc = -1;
 
     
-    /*ohci_rc = sysfs_value_write(XMM626_SEC_MODEM_OHCI_POWER_SYSFS, !!power);
+    /*ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_OHCI_POWER_SYSFS, !!power);
     if (ohci_rc >= 0)
         usleep(50000);
 */
 
     if (!!power) {
-	ohci_rc = sysfs_value_write(XMM626_SEC_MODEM_PDA_ACTIVE_SYSFS, 1);
+	ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_PDA_ACTIVE_SYSFS, 1);
 	if (sysfs_value_read(XMM626_SEC_HOSTWAKE_PATH)) {
-		ohci_rc |= sysfs_value_write(XMM626_SEC_MODEM_SLAVEWAKE_SYSFS, 0);
+		ohci_rc |= sysfs_value_write(XMM626_KERNEL_LINUX_SLAVEWAKE_SYSFS, 0);
 		usleep(10000);
-		ohci_rc |= sysfs_value_write(XMM626_SEC_MODEM_SLAVEWAKE_SYSFS, 1);
+		ohci_rc |= sysfs_value_write(XMM626_KERNEL_LINUX_SLAVEWAKE_SYSFS, 1);
 	}
-	ehci_rc = sysfs_value_write(XMM626_SEC_MODEM_EHCI_POWER_SYSFS, !!power);
+	ehci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_EHCI_POWER_SYSFS, !!power);
 	if (ehci_rc >= 0)
 		usleep(50000);
 
 	ohci_rc |= sysfs_value_write(XMM626_SEC_LINK_ACTIVE_PATH, 1);
     } else {
-	    ehci_rc = sysfs_value_write(XMM626_SEC_MODEM_EHCI_POWER_SYSFS, !!power);
+	    ehci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_EHCI_POWER_SYSFS, !!power);
 	if (ehci_rc >= 0)
 		usleep(50000);
 
-	//ohci_rc = sysfs_value_write(XMM626_SEC_MODEM_PDA_ACTIVE_SYSFS, 0);
+	//ohci_rc = sysfs_value_write(XMM626_KERNEL_LINUX_PDA_ACTIVE_SYSFS, 0);
 	ohci_rc = sysfs_value_write(XMM626_SEC_LINK_ACTIVE_PATH, 0);
     }
 
@@ -427,21 +428,21 @@ int xmm626_sec_modem_open(int type)
 	    switch (type) {
 		case IPC_CLIENT_TYPE_FMT:
 		    err = 0;
-		    fd = open(XMM626_SEC_MODEM_IPC0_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
+		    fd = open(XMM626_KERNEL_LINUX_IPC0_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
 		    if (fd < 0) {
 		      err = errno;
 		      printf("%s: open(%s, O_RDWR | O_NOCTTY | O_NONBLOCK) => %d errno: %d\n",
-				      __FUNCTION__, XMM626_SEC_MODEM_IPC0_DEVICE, fd, err);
+				      __FUNCTION__, XMM626_KERNEL_LINUX_IPC0_DEVICE, fd, err);
 		    }
 
 		    break;
 		case IPC_CLIENT_TYPE_RFS:
 		    err = 0;
-		    fd = open(XMM626_SEC_MODEM_RFS0_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
+		    fd = open(XMM626_KERNEL_LINUX_RFS0_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
 		    if (fd < 0) {
 			    err  = errno;
 		            printf("%s: open(%s, O_RDWR | O_NOCTTY | O_NONBLOCK) => %d errno: %d\n", 
-					    __FUNCTION__, XMM626_SEC_MODEM_RFS0_DEVICE, fd, err);
+					    __FUNCTION__, XMM626_KERNEL_LINUX_RFS0_DEVICE, fd, err);
 		    }
 		    break;
 		default:
@@ -544,10 +545,10 @@ char *xmm626_sec_modem_gprs_get_iface(unsigned int cid)
 {
     char *iface = NULL;
 
-    if (cid > XMM626_SEC_MODEM_GPRS_IFACE_COUNT)
+    if (cid > XMM626_KERNEL_LINUX_GPRS_IFACE_COUNT)
         return NULL;
 
-    asprintf(&iface, "%s%d", XMM626_SEC_MODEM_GPRS_IFACE_PREFIX, cid - 1);
+    asprintf(&iface, "%s%d", XMM626_KERNEL_LINUX_GPRS_IFACE_PREFIX, cid - 1);
 
     return iface;
 }
@@ -557,7 +558,7 @@ int xmm626_sec_modem_gprs_get_capabilities(struct ipc_client_gprs_capabilities *
     if (capabilities == NULL)
         return -1;
 
-    capabilities->cid_count = XMM626_SEC_MODEM_GPRS_IFACE_COUNT;
+    capabilities->cid_count = XMM626_KERNEL_LINUX_GPRS_IFACE_COUNT;
 
     return 0;
 }