Fix 64bit build break

Change-Id: Id51753a91088471905234348c4a142ff591d1413
Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>

diff --git a/client/ClientChannel.cpp b/client/ClientChannel.cpp
index 4102925..c7e9dd4 100644 (file)
--- a/client/ClientChannel.cpp
+++ b/client/ClientChannel.cpp
@@ -537,7 +537,7 @@ EXTERN_API int channel_get_session(channel_h handle, int *session_handle)
        try
        {
                session = channel->getSession();
-               //*session_handle = (int)session;
+               *session_handle = (long)session;
        }
        catch (ExceptionBase &e)
        {

diff --git a/client/Reader.cpp b/client/Reader.cpp
index 2a9cac1..887d896 100644 (file)
--- a/client/Reader.cpp
+++ b/client/Reader.cpp
@@ -296,7 +296,7 @@ EXTERN_API int reader_open_session_sync(reader_h handle, int *session_handle)
        try
        {
                session = (session_h)reader->openSessionSync();
-               //*session_handle = (int)session;
+               *session_handle = (long)session;
        }
        catch (ExceptionBase &e)
        {

diff --git a/client/SEService.cpp b/client/SEService.cpp
index 3ebee77..ef378dd 100644 (file)
--- a/client/SEService.cpp
+++ b/client/SEService.cpp
@@ -613,7 +613,7 @@ EXTERN_API int se_service_get_readers(se_service_h handle, int **readers, int *c
                {
                        if (temp_readers[i]->isSecureElementPresent())
                        {
-                               //(*readers)[i] = (int)temp_readers[i];
+                               (*readers)[i] = (long)temp_readers[i];
                                temp++;
                        }
                }

diff --git a/client/Session.cpp b/client/Session.cpp
index ca5624f..412bc6a 100644 (file)
--- a/client/Session.cpp
+++ b/client/Session.cpp
@@ -622,7 +622,7 @@ EXTERN_API int session_get_reader(session_h handle, int* reader_handle)
        try
        {
                reader = session->getReader();
-               //*reader_handle = (int)reader;
+               *reader_handle = (long)reader;
        }
        catch (ExceptionBase &e)
        {
@@ -777,7 +777,7 @@ EXTERN_API int session_open_basic_channel_sync(session_h handle, unsigned char *
 
        try
        {
-               //*channel_handle = (int)session->openBasicChannelSync(aid, length, P2);
+               *channel_handle = (long)session->openBasicChannelSync(aid, length, P2);
        }
        catch (ExceptionBase &e)
        {
@@ -806,7 +806,7 @@ EXTERN_API  int session_open_logical_channel_sync(session_h handle, unsigned cha
 
        try
        {
-               //*channel_handle = (int)session->openLogicalChannelSync(aid, length, P2);
+               *channel_handle = (long)session->openLogicalChannelSync(aid, length, P2);
        }
        catch (ExceptionBase &e)
        {

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index cf565ce..47c9ab4 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -7,7 +7,7 @@
 ################################################################################
 Name:       smartcard-service
 Summary:    Smartcard Service FW
-Version:    0.1.43
+Version:    0.1.44
 Release:    0
 Group:      libs
 License:    Apache-2.0
@@ -151,7 +151,6 @@ rm -f /usr/bin/smartcard-daemon
 %manifest %{name}-server.manifest
 %defattr(-,root,root,-)
 %{bindir}/bin/smartcard-daemon
-%{_datadir}/packages/%{name}-server.xml
 %if 0%{?test_client:1}
        %{bindir}/bin/smartcard-test-client
 %endif

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 0d1dd81..2e81761 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -72,4 +72,3 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/smartcard-service-server/b
 IF("${USE_AUTOSTART}" STREQUAL "1")
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.SmartcardService.service DESTINATION share/dbus-1/system-services)
 ENDIF()
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/smartcard-service-server.xml DESTINATION share/packages)

diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp
index 55a1118..1eeae03 100644 (file)
--- a/server/ServerGDBus.cpp
+++ b/server/ServerGDBus.cpp
@@ -493,7 +493,7 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceSeService *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               handle = 0;//(guint)params[2];
+               handle = (gulong)params[2];
                user_data = params[3];
 
                __process_shutdown(object, invocation, handle, user_data);
@@ -652,8 +652,8 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceReader *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               reader_id = 0;//(guint)params[3];
+               service_id = (gulong)params[2];
+               reader_id = (gulong)params[3];
                user_data = params[4];
 
                __process_open_session(object, invocation, service_id,
@@ -780,8 +780,8 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceSession *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               session_id = 0;//(guint)params[3];
+               service_id = (gulong)params[2];
+               session_id = (gulong)params[3];
                user_data = params[4];
 
                __process_close_session(object, invocation, service_id,
@@ -892,8 +892,8 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceSession *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               session_id = 0;//(guint)params[3];
+               service_id = (gulong)params[2];
+               session_id = (gulong)params[3];
                user_data = params[4];
 
                __process_get_atr(object, invocation, service_id,
@@ -1020,11 +1020,11 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceSession *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               session_id = 0;//(guint)params[3];
-               type = 0;//(guint)params[4];
+               service_id = (gulong)params[2];
+               session_id = (gulong)params[3];
+               type = (gulong)params[4];
                aid = (GVariant *)params[5];
-               P2 = 0;//(guint8)((int)params[6]);
+               P2 = (guint8)((gulong)params[6]);
                user_data = params[7];
 
                __process_open_channel(object, invocation, service_id,
@@ -1168,8 +1168,8 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceChannel *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               channel_id = 0;//(guint)params[3];
+               service_id = (gulong)params[2];
+               channel_id = (gulong)params[3];
                user_data = params[4];
 
                __process_close_channel(object, invocation, service_id,
@@ -1277,8 +1277,8 @@ namespace smartcard_service_api
 
                object = (SmartcardServiceChannel *)params[0];
                invocation = (GDBusMethodInvocation *)params[1];
-               service_id = 0;//(guint)params[2];
-               channel_id = 0;//(guint)params[3];
+               service_id = (gulong)params[2];
+               channel_id = (gulong)params[3];
                command = (GVariant *)params[4];
                user_data = params[5];
 

diff --git a/server/private/AccessControl.cpp b/server/private/AccessControl.cpp
index b349818..502ce9d 100644 (file)
--- a/server/private/AccessControl.cpp
+++ b/server/private/AccessControl.cpp
@@ -241,7 +241,7 @@ static void _process_is_authorized_nfc_access(vector<void *> &params)
 
        object = (SmartcardServiceAccessControl *)params[0];
        invocation = (GDBusMethodInvocation *)params[1];
-       se_type = 0;//(guint)params[2];
+       se_type = (gulong)params[2];
        package = (gchar *)params[3];
        aid = (GVariant *)params[4];
        user_data = params[5];
@@ -473,7 +473,7 @@ static void _process_is_authorized_extra_access(vector<void *> &params)
 
        object = (SmartcardServiceAccessControl *)params[0];
        invocation = (GDBusMethodInvocation *)params[1];
-       se_type = 0;//(guint)params[2];
+       se_type = (gulong)params[2];
        package = (gchar *)params[3];
        user_data = params[4];
 

diff --git a/server/smartcard-service-server.xml b/server/smartcard-service-server.xml
deleted file mode 100644 (file)
index fe64adb..0000000
--- a/server/smartcard-service-server.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="smartcard-service-server" version="0.1.20" install-location="internal-only" type="rpm">
-       <label>Smartcard Service Server</label>
-       <author email="constant.lee@samsung.com" href="www.samsung.com">Sangsoo Lee</author>
-       <author email="wonkyu.kwon@samsung.com" href="www.samsung.com">Wonkyu Kwon</author>
-       <description>Smartcard Service Server</description>
-       <ui-application appid="smartcard-service-server"
-               exec="/usr/apps/smartcard-service-server/bin/smartcard-daemon"
-               nodisplay="true"
-               multiple="false"
-               type="capp"
-               taskmanage="false"
-               mainapp="true">
-               <label>Smartcard Service Server</label>
-       </ui-application>
-</manifest>