Modify the codes for 64bit build

Change-Id: Iebc1e2a938360bcbe7a75c4d513c4af3fb61677d
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index 2efe627..a93f390 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -2960,7 +2960,11 @@ int _bt_service_remove_alarm(alarm_id_t alarm_id)
 
 gint compare_alarm(gconstpointer list_data, gconstpointer data)
 {
+#ifdef ARCH64
+       alarm_id_t alarm_id = (alarm_id_t)(uintptr_t)data;
+#else
        alarm_id_t alarm_id = (alarm_id_t)data;
+#endif
        bt_service_alarm_t *p_data = (bt_service_alarm_t *)list_data;
 
        if (p_data->alarm_id == alarm_id)
@@ -2979,7 +2983,11 @@ static void alarm_data_free(void *data)
 static gboolean _bt_adapter_request_delayed_cb(gpointer user_data)
 {
        int result;
+#ifdef ARCH64
+       int function = (int)(uintptr_t)user_data;
+#else
        int function = (int)user_data;
+#endif
 
        switch (function) {
        case BT_ENABLE_ADAPTER:
@@ -3034,7 +3042,11 @@ int _bt_adapter_request_delayed(int function)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       g_idle_add((GSourceFunc)_bt_adapter_request_delayed_cb, (void*)function);
+#ifdef ARCH64
+       g_idle_add((GSourceFunc)_bt_adapter_request_delayed_cb, (void *)(uintptr_t)function);
+#else
+       g_idle_add((GSourceFunc)_bt_adapter_request_delayed_cb, (void *)function);
+#endif
 
        return BLUETOOTH_ERROR_NONE;
 }

diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c
index 26120bc..a69b949 100644 (file)
--- a/bt-service/bt-service-device.c
+++ b/bt-service/bt-service-device.c
@@ -318,7 +318,7 @@ static void __bt_get_uuids(GVariant *value, bt_remote_dev_info_t *info)
        ret_if(info == NULL);
 
        info->uuid_count = g_variant_get_size(value);
-       info->uuids = g_variant_dup_strv(value, &info->uuid_count);
+       info->uuids = g_variant_dup_strv(value, (gsize *)&info->uuid_count);
 }
 
 bt_remote_dev_info_t *_bt_get_remote_device_info(char *address)

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index 2cbc95d..e84e7c4 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -4,7 +4,7 @@
 
 Name:       bluetooth-frwk
 Summary:    Bluetooth framework for BlueZ and Obexd. This package is Bluetooth framework based on BlueZ and Obexd stack.
-Version:    0.2.154
+Version:    0.2.155
 Release:    1
 Group:      Network & Connectivity/Bluetooth
 License:    Apache-2.0
@@ -158,6 +158,13 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_RADIO"
 export FFLAGS="$FFLAGS -DTIZEN_FEATURE_RADIO"
 %endif
 
+%ifarch aarch64
+echo arch64
+export CFLAGS+=" -DARCH64"
+export CXXFLAGS+=" -DARCH64"
+export FFLAGS+=" -DARCH64"
+%endif
+
 cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_LIB_DIR=%{_libdir} \
 -DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP \
@@ -284,5 +291,5 @@ sed -i 's/%TZ_SYS_DEFAULT_USER/app/' %{buildroot}%{_datadir}/dbus-1/system-servi
 %manifest %{name}.manifest
 %defattr(-, root, root)
 %{_bindir}/bluetooth-frwk-test
-%{_bindir}/bluetooth-gatt-test
-%{_bindir}/bluetooth-advertising-test
+#%{_bindir}/bluetooth-gatt-test
+#%{_bindir}/bluetooth-advertising-test

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bd40794..b1b2e87 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,5 +34,5 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS}
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-ADD_SUBDIRECTORY(gatt-test)
-ADD_SUBDIRECTORY(le-adv)
+#ADD_SUBDIRECTORY(gatt-test)
+#ADD_SUBDIRECTORY(le-adv)

diff --git a/test/bluetooth-frwk-test.c b/test/bluetooth-frwk-test.c
index efbfb61..eb58d5a 100644 (file)
--- a/test/bluetooth-frwk-test.c
+++ b/test/bluetooth-frwk-test.c
@@ -26,6 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <pthread.h>
 #include <dbus/dbus.h>
+#include <stdint.h>
 
 #include "bluetooth-api.h"
 #include "bluetooth-hid-api.h"
@@ -274,7 +275,14 @@ int test_input_callback(void *data)
        int ret = 0;
        int test_id;
 
+#ifdef ARCH64
+       test_id = find_tc_number((uintptr_t)data);
+#else
        test_id = find_tc_number((int)data);
+#endif
+       if (test_id == -1)
+               return 0;
+
        TC_PRT("TC : %s[%d]", tc_table[test_id].tc_name, tc_table[test_id].tc_code);
 
        switch (tc_table[test_id].tc_code) {
@@ -1749,9 +1757,13 @@ void bt_event_callback(int event, bluetooth_event_param_t* param, void *user_dat
 
 static gboolean key_event_cb(GIOChannel * chan, GIOCondition cond , gpointer data)
 {
-       char buf[10] = {0};
+       char buf[49] = {0};
 
+#ifdef ARCH64
+       unsigned long len = 0;
+#else
        unsigned int len = 0;
+#endif
        int test_id;
        memset(buf, 0, sizeof(buf));
 
@@ -1766,8 +1778,11 @@ static gboolean key_event_cb(GIOChannel * chan, GIOCondition cond , gpointer dat
 
        test_id = atoi(buf);
 
-       if (test_id)
-               g_idle_add(test_input_callback, (void*)test_id);
+#ifdef ARCH64
+       g_idle_add(test_input_callback, (void *)(uintptr_t)test_id);
+#else
+       g_idle_add(test_input_callback, (void *)test_id);
+#endif
 
        return TRUE;
 }