Remove kernel code inclusion

Change-Id: Ie40a1602db525c0d2c91561a587addcf01c019fc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3be0269..b70c08b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,13 +17,16 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/ ${KERNEL_INCLUDE})
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align")
 
+ADD_DEFINITIONS("-D__EXPORTED_HEADERS__")
 ADD_DEFINITIONS("-DFEATURE_DLOG_DEBUG")
 ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"MFLD-BLACKBAY\"")
 
+MESSAGE("kernel include path:"${KERNEL_INCLUDE})
+
 MESSAGE(${CMAKE_C_FLAGS})
 MESSAGE(${CMAKE_EXE_LINKER_FLAGS})
 

diff --git a/packaging/tel-plugin-imc-pr3.spec b/packaging/tel-plugin-imc-pr3.spec
index 6021605..1ea6f9e 100644 (file)
--- a/packaging/tel-plugin-imc-pr3.spec
+++ b/packaging/tel-plugin-imc-pr3.spec
@@ -9,6 +9,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires:  audience-bin-mfld-blackbay
 BuildRequires:  cmake
+BuildRequires:  kernel-mfld-blackbay-devel
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(tcore)
@@ -19,10 +20,11 @@ BuildRequires:  pkgconfig(alsa)
 Medfield Blackbay plateform telephony plugin
 
 %prep
+%define kernel_src $(rpm -ql kernel-mfld-blackbay-devel | grep gsmmux.h | sed "s/\\/linux\\/gsmmux.h//")
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DKERNEL_MUX=1
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DKERNEL_MUX=1 -DKERNEL_INCLUDE=%{kernel_src}
 make %{?jobs:-j%jobs}
 
 %post

diff --git a/src/desc_imc_kernel_mux_pr3.c b/src/desc_imc_kernel_mux_pr3.c
index ab7aa6a..12161a9 100644 (file)
--- a/src/desc_imc_kernel_mux_pr3.c
+++ b/src/desc_imc_kernel_mux_pr3.c
@@ -28,6 +28,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <linux/if_ether.h>
+#include <linux/gsmmux.h>
 #include <fcntl.h>
 
 #include <glib.h>
@@ -73,36 +74,6 @@ struct custom_data {
        gboolean rawip_enabled;
 };
 
-struct gsm_config {
-       unsigned int adaption;
-       unsigned int encapsulation;
-       unsigned int initiator;
-       unsigned int t1;
-       unsigned int t2;
-       unsigned int t3;
-       unsigned int n2;
-       unsigned int mru;
-       unsigned int mtu;
-       unsigned int k;
-       unsigned int i;
-       unsigned int clocal;
-       unsigned int unused[7]; /* Padding for expansion without breaking stuff */
-};
-
-#define GSMIOC_GETCONF         _IOR('G', 0, struct gsm_config)
-#define GSMIOC_SETCONF         _IOW('G', 1, struct gsm_config)
-
-struct gsm_netconfig {
-       unsigned int adaption;          /* Adaption to use in network mode */
-       unsigned short protocol;        /* Protocol to use - only ETH_P_IP supported */
-       unsigned short unused2;
-       char if_name[IFNAMSIZ];         /* interface name format string */
-       __u8 unused[28];                /* For future use */
-};
-
-#define GSMIOC_ENABLE_NET      _IOW('G', 2, struct gsm_netconfig)
-#define GSMIOC_DISABLE_NET     _IO('G', 3)
-
 /* Virtual ttys for the mux */
 static const char *dlc_nodes[NUM_DLC] = { "/dev/gsmtty1", "/dev/gsmtty2",
                                        "/dev/gsmtty3", "/dev/gsmtty4",