Fix integration issues

Change-Id: I0cae4b97a68b9f8cbcd09de0f16bc5def51418bd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e35ede..fbd0f5d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,11 @@ 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\"")
 

diff --git a/packaging/tel-plugin-mfld-blackbay.spec b/packaging/tel-plugin-mfld-blackbay.spec
index bcfda83..67b2dbb 100644 (file)
--- a/packaging/tel-plugin-mfld-blackbay.spec
+++ b/packaging/tel-plugin-mfld-blackbay.spec
@@ -2,12 +2,13 @@ Name:       tel-plugin-mfld-blackbay
 Summary:    Medfield Blackbay plateform telephony plugin
 Version: 0.0.2
 Release:    1
-Group:      System/Libraries
+Group:      Development/Libraries
 License:    Apache
 Source0:    tel-plugin-mfld-blackbay-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
+BuildRequires:  kernel-mfld-blackbay-devel
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(tcore)
@@ -17,10 +18,11 @@ BuildRequires:  pkgconfig(tcore)
 Medfield Blackbay platform 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}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DKERNEL_INCLUDE=%{kernel_src}
 make %{?jobs:-j%jobs}
 
 %post
@@ -34,5 +36,4 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-#%doc COPYING
 %{_libdir}/telephony/plugins/*

diff --git a/src/desc_mfld_blackbay.c b/src/desc_mfld_blackbay.c
index bae498d..075009f 100644 (file)
--- a/src/desc_mfld_blackbay.c
+++ b/src/desc_mfld_blackbay.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>
@@ -68,35 +69,6 @@ struct custom_data {
        };
 };
 
-#define GSMIOC_GETCONF         _IOR('G', 0, struct gsm_config)
-#define GSMIOC_SETCONF         _IOW('G', 1, struct gsm_config)
-#define GSMIOC_ENABLE_NET      _IOW('G', 2, struct gsm_netconfig)
-#define GSMIOC_DISABLE_NET     _IO('G', 3)
-
-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 */
-};
-
-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 */
-};
-
 /* Virtual ttys for KERNEL mux */
 static const char *dlc_nodes[NUM_DLC] =
                                        { "/dev/gsmtty1", "/dev/gsmtty2",