apply new smartcard service(0.1.27) 14/9914/2 accepted/tizen/ivi/genivi accepted/tizen/ivi/stable accepted/tizen_ivi_release tizen_ivi_genivi tizen_ivi_release accepted/tizen/20130913.122520 accepted/tizen/20130913.185642 accepted/tizen/20130913.185808 accepted/tizen/20130913.185819 accepted/tizen/generic/20140312.101453 accepted/tizen/ivi/20140227.222357 accepted/tizen/ivi/genivi/20140213.210718 accepted/tizen/ivi/panda/20140312.111749 accepted/tizen/ivi/release/20140312.112139 accepted/tizen/mobile/20140303.023311 accepted/tizen_ivi_stable/20131119.040334 submit/tizen/20130913.110024 submit/tizen/20140227.200441 submit/tizen/20140312.070656 submit/tizen_ivi_genivi/20140213.210828 submit/tizen_ivi_release/20140312.071132 submit/tizen_ivi_stable/20131119.035351
authorYoungjae Shin <yj99.shin@samsung.com>
Wed, 11 Sep 2013 08:26:22 +0000 (17:26 +0900)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 13 Sep 2013 10:38:49 +0000 (03:38 -0700)
Change-Id: I1cbb606394606ca68da38f8f19a2f73a1975973a

CMakeLists.txt
UICCTerminal.cpp
debian/changelog [deleted file]
debian/compat [deleted file]
debian/control [deleted file]
debian/rules [deleted file]
debian/smartcard-plugin-uicc.dirs [deleted file]
debian/smartcard-plugin-uicc.install [deleted file]
include/UICCTerminal.h
packaging/smartcard-plugin-uicc [deleted file]
packaging/smartcard-plugin-uicc.spec

index 8cb7907..e86e1b3 100644 (file)
@@ -22,7 +22,6 @@ FOREACH(flag ${pkgs_common_CFLAGS})
        SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-#SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -finstrument-functions")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}")
 #SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 #SET(CMAKE_C_FLAGS_RELEASE "-O2")
index 47adb2e..379f829 100644 (file)
  */
 
 /* standard library header */
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
-#include <string.h>
 #include <sys/time.h>
 
 /* SLP library header */
 
 /* local header */
+#include "smartcard-types.h"
 #include "Debug.h"
 #include "TerminalInterface.h"
 #include "UICCTerminal.h"
@@ -51,7 +52,7 @@ void __attribute__ ((destructor)) lib_fini()
 {
 }
 
-/* below trhee functions must be implemented */
+/* below three functions must be implemented */
 extern "C" EXPORT_API const char *get_name()
 {
        return se_name;
@@ -71,87 +72,83 @@ extern "C" EXPORT_API void destroy_instance(void *instance)
        }
        else
        {
-               SCARD_DEBUG_ERR("instance is invalid : getInstance [%p], instance [%p]", UICCTerminal::getInstance(), instance);
+               _ERR("instance is invalid : getInstance [%p], instance [%p]",
+                       UICCTerminal::getInstance(), instance);
        }
 }
 
-static void _uiccTransmitCallback(TapiHandle *handle, int result, void *data, void *user_data)
+static void _uiccTransmitCallback(TapiHandle *handle, int result,
+       void *data, void *user_data)
 {
        TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
        TelSimApduResp_t *apdu = (TelSimApduResp_t *)data;
        callback_param_t *param = (callback_param_t *)user_data;
 
-       SCARD_DEBUG("APDU response");
-
        if (param != NULL)
        {
                if (param->callback != NULL)
                {
-                       terminalTransmitCallback callback = (terminalTransmitCallback)param->callback;
+                       terminalTransmitCallback callback =
+                               (terminalTransmitCallback)param->callback;
 
                        if (apdu != NULL && apdu->apdu_resp_len > 0)
                        {
-                               callback(apdu->apdu_resp, apdu->apdu_resp_len, access_rt, param->param);
+                               callback(apdu->apdu_resp, apdu->apdu_resp_len,
+                                       access_rt, param->param);
                        }
                        else
                        {
                                callback(NULL, 0, access_rt, param->param);
                        }
                }
-               else
-               {
-                       SCARD_DEBUG("there is no callback");
-               }
 
                delete param;
        }
        else
        {
-               SCARD_DEBUG_ERR("invalid param");
+               _ERR("invalid param");
        }
 }
 
-static void _uiccGetATRCallback(TapiHandle *handle, int result, void *data, void *user_data)
+static void _uiccGetATRCallback(TapiHandle *handle, int result,
+       void *data, void *user_data)
 {
        TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
        TelSimAtrResp_t *atr  = (TelSimAtrResp_t *)data;
        callback_param_t *param = (callback_param_t *)user_data;
 
-       SCARD_DEBUG("APDU response");
-
        if (param != NULL)
        {
                if (param->callback != NULL)
                {
-                       terminalGetATRCallback callback = (terminalGetATRCallback)param->callback;
+                       terminalGetATRCallback callback =
+                               (terminalGetATRCallback)param->callback;
 
                        if (atr != NULL && atr->atr_resp_len > 0)
                        {
-                               callback(atr->atr_resp, atr->atr_resp_len, access_rt, param->param);
+                               callback(atr->atr_resp, atr->atr_resp_len,
+                                       access_rt, param->param);
                        }
                        else
                        {
                                callback(NULL, 0, access_rt, param->param);
                        }
                }
-               else
-               {
-                       SCARD_DEBUG("there is no callback");
-               }
 
                delete param;
        }
        else
        {
-               SCARD_DEBUG_ERR("invalid param");
+               _ERR("invalid param");
        }
 }
 
 namespace smartcard_service_api
 {
-       UICCTerminal::UICCTerminal()
+       UICCTerminal::UICCTerminal() : Terminal(), complete(false)
        {
                name = (char *)se_name;
+
                initialize();
        }
 
@@ -169,37 +166,36 @@ namespace smartcard_service_api
 
        bool UICCTerminal::initialize()
        {
-               SCARD_BEGIN();
+               _BEGIN();
 
                if (initialized == false)
                {
-                       char **cpList = NULL;
-
-//                     cpList = tel_get_cp_name_list();
-
                        handle = tel_init(NULL);
                        if (handle != NULL)
                        {
                                int error;
 
-                               error = tel_register_noti_event(handle, TAPI_NOTI_SIM_STATUS, &UICCTerminal::uiccStatusNotiCallback, this);
+                               error = tel_register_noti_event(handle,
+                                       TAPI_NOTI_SIM_STATUS,
+                                       &UICCTerminal::uiccStatusNotiCallback,
+                                       this);
 
                                initialized = true;
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("tel_init failed");
+                               _ERR("tel_init failed");
                        }
                }
 
-               SCARD_END();
+               _END();
 
                return initialized;
        }
 
        void UICCTerminal::finalize()
        {
-               SCARD_BEGIN();
+               _BEGIN();
 
                if (isInitialized())
                {
@@ -210,162 +206,165 @@ namespace smartcard_service_api
                        initialized = false;
                }
 
-               SCARD_END();
+               _END();
        }
 
-       int UICCTerminal::transmitSync(ByteArray command, ByteArray &response)
+       int UICCTerminal::transmitSync(const ByteArray &command,
+               ByteArray &response)
        {
-               int result = -1;
+               int result;
 
-               SCARD_BEGIN();
+               _BEGIN();
 
                SCOPE_LOCK(mutex)
                {
-                       if (command.getLength() > 0)
+                       if (command.size() > 0)
                        {
                                TelSimApdu_t apdu_data = { 0, };
 
-                               apdu_data.apdu = command.getBuffer();
-                               apdu_data.apdu_len = command.getLength();
+                               apdu_data.apdu = (uint8_t *)command.getBuffer();
+                               apdu_data.apdu_len = command.size();
 
-                               syncLock();
+                               complete = false;
+                               error = 0;
+                               this->response.clear();
 
-                               result = tel_req_sim_apdu(handle, &apdu_data, &UICCTerminal::uiccTransmitAPDUCallback, this);
+                               result = tel_req_sim_apdu(handle, &apdu_data,
+                                       &UICCTerminal::uiccTransmitAPDUCallback,
+                                       this);
                                if (result == 0)
                                {
-                                       SCARD_DEBUG("tel_req_sim_apdu request is success");
-
-                                       error = 0;
-                                       this->response.releaseBuffer();
-
-                                       result = waitTimedCondition(3);
+                                       while (complete == false) {
+                                               g_main_context_iteration(NULL,
+                                                       false);
+                                       }
 
+                                       result = error;
 
-                                       if (result == 0 && error == 0)
-                                       {
-                                               if (this->response.getLength() > 0)
+                                       if (error == SCARD_ERROR_OK &&
+                                               this->response.size() > 0)
                                                {
                                                        response = this->response;
-                                               }
-
-                                               SCARD_DEBUG("tel_req_sim_apdu success, length [%d]", response.getLength());
                                        }
                                        else
                                        {
-                                               SCARD_DEBUG_ERR("tel_req_sim_apdu failed, result [%d], cbResult [%d]", result, error);
+                                               _ERR("tel_req_sim_apdu failed, cbResult [%d]", error);
                                        }
                                }
                                else
                                {
-                                       SCARD_DEBUG_ERR("tel_req_sim_apdu failed [%d]", result);
+                                       _ERR("tel_req_sim_apdu failed [%d]", result);
+                                       result = SCARD_ERROR_IO_FAILED;
                                }
-
-                               syncUnlock();
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("apdu is empty");
+                               _ERR("apdu is empty");
+                               result = SCARD_ERROR_ILLEGAL_PARAM;
                        }
                }
 
-               SCARD_END();
+               _END();
 
                return result;
        }
 
        int UICCTerminal::getATRSync(ByteArray &atr)
        {
-               int result = 0;
+               int result;
 
-               SCARD_BEGIN();
+               _BEGIN();
 
                SCOPE_LOCK(mutex)
                {
-                       syncLock();
+                       complete = false;
+                       error = 0;
+                       this->response.clear();
 
-                       result = tel_req_sim_atr(handle, &UICCTerminal::uiccGetAtrCallback, this);
+                       result = tel_req_sim_atr(handle,
+                               &UICCTerminal::uiccGetAtrCallback, this);
                        if (result == 0)
                        {
-                               SCARD_DEBUG("tel_req_sim_atr request is success");
-
-                               error = 0;
-                               this->response.releaseBuffer();
+                               while (complete == false) {
+                                       g_main_context_iteration(NULL,
+                                               false);
+                               }
 
-                               result = waitTimedCondition(3);
+                               result = error;
 
-                               if (result == 0 && error == 0)
-                               {
-                                       if (this->response.getLength() > 0)
+                               if (error == SCARD_ERROR_OK &&
+                                       this->response.size() > 0)
                                        {
                                                atr = this->response;
-                                       }
-
-                                       SCARD_DEBUG("tel_req_sim_atr success, length [%d]", response.getLength());
                                }
                                else
                                {
-                                       SCARD_DEBUG_ERR("tel_req_sim_atr failed, result [%d], cbResult [%d]", result, error);
+                                       _ERR("tel_req_sim_atr failed, cbResult [%d]", error);
                                }
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("tel_req_sim_atr failed [%d]", result);
+                               _ERR("tel_req_sim_atr failed [%d]", result);
+                               result = SCARD_ERROR_IO_FAILED;
                        }
-
-                       syncUnlock();
                }
 
-               SCARD_END();
+               _END();
 
                return result;
        }
 
-       int UICCTerminal::transmit(ByteArray command, terminalTransmitCallback callback, void *userParam)
+       int UICCTerminal::transmit(const ByteArray &command,
+               terminalTransmitCallback callback, void *userParam)
        {
-               int result = -1;
+               int result;
 
-               SCARD_BEGIN();
+               _BEGIN();
 
                SCOPE_LOCK(mutex)
                {
-                       if (command.getLength() > 0)
+                       if (command.size() > 0)
                        {
                                TelSimApdu_t apdu_data = { 0, };
                                callback_param_t *param = NULL;
 
-                               apdu_data.apdu = command.getBuffer();
-                               apdu_data.apdu_len = command.getLength();
+                               apdu_data.apdu = (uint8_t *)command.getBuffer();
+                               apdu_data.apdu_len = command.size();
 
                                param = new callback_param_t();
                                param->callback = (void *)callback;
                                param->param = userParam;
 
-                               result = tel_req_sim_apdu(handle, &apdu_data, _uiccTransmitCallback, param);
+                               result = tel_req_sim_apdu(handle, &apdu_data,
+                                       _uiccTransmitCallback, param);
                                if (result == 0)
                                {
-                                       SCARD_DEBUG("tel_req_sim_apdu request is success");
+                                       _DBG("tel_req_sim_apdu request is success");
                                }
                                else
                                {
-                                       SCARD_DEBUG_ERR("tel_req_sim_apdu failed [%d]", result);
+                                       _ERR("tel_req_sim_apdu failed [%d]", result);
+                                       result = SCARD_ERROR_IO_FAILED;
                                }
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("apdu is empty");
+                               _ERR("apdu is empty");
+                               result = SCARD_ERROR_ILLEGAL_PARAM;
                        }
                }
 
-               SCARD_END();
+               _END();
 
                return result;
        }
 
-       int UICCTerminal::getATR(terminalGetATRCallback callback, void *userParam)
+       int UICCTerminal::getATR(terminalGetATRCallback callback,
+               void *userParam)
        {
-               int result = 0;
+               int result;
 
-               SCARD_BEGIN();
+               _BEGIN();
 
                SCOPE_LOCK(mutex)
                {
@@ -375,147 +374,141 @@ namespace smartcard_service_api
                        param->callback = (void *)callback;
                        param->param = userParam;
 
-                       result = tel_req_sim_atr(handle, _uiccGetATRCallback, param);
+                       result = tel_req_sim_atr(handle,
+                               _uiccGetATRCallback, param);
                        if (result == 0)
                        {
-                               SCARD_DEBUG("tel_req_sim_atr request is success");
+                               _DBG("tel_req_sim_atr request is success");
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("tel_req_sim_atr failed [%d]", result);
+                               _ERR("tel_req_sim_atr failed [%d]", result);
+                               result = SCARD_ERROR_IO_FAILED;
                        }
                }
 
-               SCARD_END();
+               _END();
 
                return result;
        }
 
-       bool UICCTerminal::isSecureElementPresence()
+       bool UICCTerminal::isSecureElementPresence() const
        {
                bool result = false;
                int error = 0;
                TelSimCardStatus_t state = (TelSimCardStatus_t)0;
                int cardChanged = 0;
 
-               SCARD_BEGIN();
+               _BEGIN();
 
                error = tel_get_sim_init_info(handle, &state, &cardChanged);
-
-               SCARD_DEBUG("current sim init state = [%d], error [%d], cardChanged [%d]", state, error, cardChanged);
-
                if (error == 0)
                {
-                       if (state == TAPI_SIM_STATUS_SIM_INIT_COMPLETED || state == TAPI_SIM_STATUS_SIM_INITIALIZING)
+                       if (state == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
                        {
-                               SCARD_DEBUG("sim is initialized");
-
                                result = true;
                        }
                        else
                        {
-                               SCARD_DEBUG_ERR("sim is not initialized");
+                               _ERR("sim is not initialized, state [%d]", state);
                        }
                }
                else
                {
-                       SCARD_DEBUG_ERR("error = [%d]", error);
+                       _ERR("tel_get_sim_init_info failed, [%d]", error);
                }
 
-               SCARD_END();
+               _END();
 
                return result;
        }
 
-       void UICCTerminal::uiccTransmitAPDUCallback(TapiHandle *handle, int result, void *data, void *user_data)
+       void UICCTerminal::uiccTransmitAPDUCallback(TapiHandle *handle,
+               int result, void *data, void *user_data)
        {
                UICCTerminal *instance = (UICCTerminal *)user_data;
                TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
                TelSimApduResp_t *apdu = (TelSimApduResp_t *)data;
 
-               SCARD_DEBUG("APDU response");
-
-               instance->syncLock();
-
                instance->error = access_rt;
 
                if (instance->error == 0)
                {
                        if (apdu != NULL && apdu->apdu_resp_len > 0)
                        {
-                               instance->response.setBuffer(apdu->apdu_resp, apdu->apdu_resp_len);
+                               instance->response.assign(apdu->apdu_resp,
+                                       apdu->apdu_resp_len);
                        }
 
-                       SCARD_DEBUG("response : %s", instance->response.toString());
+                       _DBG("response : %s", instance->response.toString().c_str());
+                       instance->error = SCARD_ERROR_OK;
                }
                else
                {
-                       SCARD_DEBUG_ERR("error : event->Status == [%d]", access_rt);
+                       _ERR("error : event->Status == [%d]", access_rt);
+                       instance->error = SCARD_ERROR_IO_FAILED;
                }
 
-               instance->signalCondition();
-               instance->syncUnlock();
+               instance->complete = true;
        }
 
-       void UICCTerminal::uiccGetAtrCallback(TapiHandle *handle, int result, void *data, void *user_data)
+       void UICCTerminal::uiccGetAtrCallback(TapiHandle *handle, int result,
+               void *data, void *user_data)
        {
                UICCTerminal *instance = (UICCTerminal *)user_data;
                TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
                TelSimAtrResp_t *atr  = (TelSimAtrResp_t *)data;
 
-               SCARD_DEBUG("Get ATR response");
-
-               instance->syncLock();
-
-               instance->error = access_rt;
-
                if (access_rt == 0)
                {
                        if (atr != NULL && atr->atr_resp_len > 0)
                        {
-                               instance->response.setBuffer(atr->atr_resp, atr->atr_resp_len);
+                               instance->response.assign(atr->atr_resp,
+                                       atr->atr_resp_len);
                        }
 
-                       SCARD_DEBUG("response : %s", instance->response.toString());
+                       _DBG("response : %s", instance->response.toString().c_str());
+                       instance->error = SCARD_ERROR_OK;
                }
                else
                {
-                       SCARD_DEBUG_ERR("error : event->Status == [%d]", access_rt);
+                       _ERR("error : event->Status == [%d]", access_rt);
+                       instance->error = SCARD_ERROR_IO_FAILED;
                }
 
-               instance->signalCondition();
-               instance->syncUnlock();
+               instance->complete = true;
        }
 
-       void UICCTerminal::uiccStatusNotiCallback(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+       void UICCTerminal::uiccStatusNotiCallback(TapiHandle *handle,
+               const char *noti_id, void *data, void *user_data)
        {
                UICCTerminal *instance = (UICCTerminal *)user_data;
                TelSimCardStatus_t *status = (TelSimCardStatus_t *)data;
 
-               SCARD_DEBUG("TAPI_NOTI_SIM_STATUS");
-
                switch (*status)
                {
                case TAPI_SIM_STATUS_SIM_INIT_COMPLETED :
-                       SCARD_DEBUG("TAPI_SIM_STATUS_SIM_INIT_COMPLETED");
+                       _DBG("TAPI_SIM_STATUS_SIM_INIT_COMPLETED");
 
                        if (instance->statusCallback != NULL)
                        {
-                               instance->statusCallback((void *)se_name, NOTIFY_SE_AVAILABLE, 0, NULL);
+                               instance->statusCallback((void *)se_name,
+                                       NOTIFY_SE_AVAILABLE, 0, NULL);
                        }
                        break;
 
                case TAPI_SIM_STATUS_CARD_REMOVED :
-                       SCARD_DEBUG("TAPI_SIM_STATUS_CARD_REMOVED");
+                       _DBG("TAPI_SIM_STATUS_CARD_REMOVED");
 
                        if (instance->statusCallback != NULL)
                        {
-                               instance->statusCallback((void *)se_name, NOTIFY_SE_NOT_AVAILABLE, 0, NULL);
+                               instance->statusCallback((void *)se_name,
+                                       NOTIFY_SE_NOT_AVAILABLE, 0, NULL);
                        }
                        break;
 
                default :
-                       SCARD_DEBUG("unknown status [%d]", *status);
+                       /* ignore notification */
                        break;
                }
        }
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 19747a3..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-smartcard-plugin-uicc (0.0.0-3) unstable; urgency=low
-
-  * Upload package
-  * Git: slp/pkgs/s/smartcard-plugin-uicc
-  * Tag: smartcard-plugin-uicc_0.0.0-3
-
- -- Wonkyu Kwon <wonkyu.kwon@samsung.com>  Tue, 13 Mar 2012 13:10:00 +0900
-
-smartcard-plugin-uicc (0.0.0-2) unstable; urgency=low
-
-  * namespace and macro name change
-  * Git: slp/pkgs/s/smartcard-plugin-uicc
-  * Tag: smartcard-plugin-uicc_0.0.0-2
-
- -- Sangsoo Lee <constant.lee@samsung.com>  Wed, 07 Mar 2012 19:37:06 +0900
-
-smartcard-plugin-uicc (0.0.0-1) unstable; urgency=low
-
-  * Initial release
-  * Git: slp/pkgs/s/smartcard-plugin-uicc
-  * Tag: smartcard-plugin-uicc_0.0.0-1
-
- -- Wonkyu Kwon <wonkyu.kwon@samsung.com>  Thu, 31 Jan 2012 00:00:00 +0900
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 45a4fb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index f870d6c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: smartcard-plugin-uicc
-Priority: extra
-Maintainer: Wonkyu Kwon <wonkyu.kwon@samsung.com>, Sangsoo Lee <constant.lee@samsung.com>, Sungjae Lim <sungjae.lim@samsung.com>, Junyong Sim <junyong.sim@samsung.com>, Sechang Sohn <sc.sohn@samsung.com>
-Build-Depends: debhelper (>= 8.0.0), dlog-dev, smartcard-service-common-dev, libslp-tapi-dev
-Standards-Version: 3.9.2
-Section: libs
-Homepage: <insert the upstream URL, if relevant>
-#Vcs-Git: git://git.debian.org/collab-maint/smartcard-plugin-uicc.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/smartcard-plugin-uicc.git;a=summary
-
-Package: smartcard-plugin-uicc
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Smart card service plug-in for UICC
- Smart card service(Open mobile API) plug-in for UICC
-
-Package: smartcard-plugin-uicc-dbg
-Section: debug
-Architecture: any
-Depends: smartcard-plugin-uicc (= ${binary:Version})
-Description: Smart card service plug-in for UICC (debug)
- Smart card service(Open mobile API) plug-in for UICC
-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index b760bee..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-       dh $@ 
diff --git a/debian/smartcard-plugin-uicc.dirs b/debian/smartcard-plugin-uicc.dirs
deleted file mode 100644 (file)
index 34b3bc1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/channels
diff --git a/debian/smartcard-plugin-uicc.install b/debian/smartcard-plugin-uicc.install
deleted file mode 100644 (file)
index 7143a33..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/se/lib*.so
index a7fef1e..b9d2c60 100644 (file)
@@ -42,6 +42,7 @@ namespace smartcard_service_api
                /* temporary data for sync function */
                ByteArray response;
                int error;
+               bool complete;
 
                UICCTerminal();
                ~UICCTerminal();
@@ -56,12 +57,12 @@ namespace smartcard_service_api
                bool initialize();
                void finalize();
 
-               bool isSecureElementPresence();
+               bool isSecureElementPresence() const;
 
-               int transmitSync(ByteArray command, ByteArray &response);
+               int transmitSync(const ByteArray &command, ByteArray &response);
                int getATRSync(ByteArray &atr);
 
-               int transmit(ByteArray command, terminalTransmitCallback callback, void *userParam);
+               int transmit(const ByteArray &command, terminalTransmitCallback callback, void *userParam);
                int getATR(terminalGetATRCallback callback, void *userParam);
 
                friend void uiccTransmitAPDUCallback(TapiHandle *handle, int result, void *data, void *user_data);
diff --git a/packaging/smartcard-plugin-uicc b/packaging/smartcard-plugin-uicc
deleted file mode 100644 (file)
index ec68963..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.\r
-\r
-                                 Apache License\r
-                           Version 2.0, January 2004\r
-                        http://www.apache.org/licenses/\r
-\r
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r
-\r
-   1. Definitions.\r
-\r
-      "License" shall mean the terms and conditions for use, reproduction,\r
-      and distribution as defined by Sections 1 through 9 of this document.\r
-\r
-      "Licensor" shall mean the copyright owner or entity authorized by\r
-      the copyright owner that is granting the License.\r
-\r
-      "Legal Entity" shall mean the union of the acting entity and all\r
-      other entities that control, are controlled by, or are under common\r
-      control with that entity. For the purposes of this definition,\r
-      "control" means (i) the power, direct or indirect, to cause the\r
-      direction or management of such entity, whether by contract or\r
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r
-      outstanding shares, or (iii) beneficial ownership of such entity.\r
-\r
-      "You" (or "Your") shall mean an individual or Legal Entity\r
-      exercising permissions granted by this License.\r
-\r
-      "Source" form shall mean the preferred form for making modifications,\r
-      including but not limited to software source code, documentation\r
-      source, and configuration files.\r
-\r
-      "Object" form shall mean any form resulting from mechanical\r
-      transformation or translation of a Source form, including but\r
-      not limited to compiled object code, generated documentation,\r
-      and conversions to other media types.\r
-\r
-      "Work" shall mean the work of authorship, whether in Source or\r
-      Object form, made available under the License, as indicated by a\r
-      copyright notice that is included in or attached to the work\r
-      (an example is provided in the Appendix below).\r
-\r
-      "Derivative Works" shall mean any work, whether in Source or Object\r
-      form, that is based on (or derived from) the Work and for which the\r
-      editorial revisions, annotations, elaborations, or other modifications\r
-      represent, as a whole, an original work of authorship. For the purposes\r
-      of this License, Derivative Works shall not include works that remain\r
-      separable from, or merely link (or bind by name) to the interfaces of,\r
-      the Work and Derivative Works thereof.\r
-\r
-      "Contribution" shall mean any work of authorship, including\r
-      the original version of the Work and any modifications or additions\r
-      to that Work or Derivative Works thereof, that is intentionally\r
-      submitted to Licensor for inclusion in the Work by the copyright owner\r
-      or by an individual or Legal Entity authorized to submit on behalf of\r
-      the copyright owner. For the purposes of this definition, "submitted"\r
-      means any form of electronic, verbal, or written communication sent\r
-      to the Licensor or its representatives, including but not limited to\r
-      communication on electronic mailing lists, source code control systems,\r
-      and issue tracking systems that are managed by, or on behalf of, the\r
-      Licensor for the purpose of discussing and improving the Work, but\r
-      excluding communication that is conspicuously marked or otherwise\r
-      designated in writing by the copyright owner as "Not a Contribution."\r
-\r
-      "Contributor" shall mean Licensor and any individual or Legal Entity\r
-      on behalf of whom a Contribution has been received by Licensor and\r
-      subsequently incorporated within the Work.\r
-\r
-   2. Grant of Copyright License. Subject to the terms and conditions of\r
-      this License, each Contributor hereby grants to You a perpetual,\r
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
-      copyright license to reproduce, prepare Derivative Works of,\r
-      publicly display, publicly perform, sublicense, and distribute the\r
-      Work and such Derivative Works in Source or Object form.\r
-\r
-   3. Grant of Patent License. Subject to the terms and conditions of\r
-      this License, each Contributor hereby grants to You a perpetual,\r
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
-      (except as stated in this section) patent license to make, have made,\r
-      use, offer to sell, sell, import, and otherwise transfer the Work,\r
-      where such license applies only to those patent claims licensable\r
-      by such Contributor that are necessarily infringed by their\r
-      Contribution(s) alone or by combination of their Contribution(s)\r
-      with the Work to which such Contribution(s) was submitted. If You\r
-      institute patent litigation against any entity (including a\r
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\r
-      or a Contribution incorporated within the Work constitutes direct\r
-      or contributory patent infringement, then any patent licenses\r
-      granted to You under this License for that Work shall terminate\r
-      as of the date such litigation is filed.\r
-\r
-   4. Redistribution. You may reproduce and distribute copies of the\r
-      Work or Derivative Works thereof in any medium, with or without\r
-      modifications, and in Source or Object form, provided that You\r
-      meet the following conditions:\r
-\r
-      (a) You must give any other recipients of the Work or\r
-          Derivative Works a copy of this License; and\r
-\r
-      (b) You must cause any modified files to carry prominent notices\r
-          stating that You changed the files; and\r
-\r
-      (c) You must retain, in the Source form of any Derivative Works\r
-          that You distribute, all copyright, patent, trademark, and\r
-          attribution notices from the Source form of the Work,\r
-          excluding those notices that do not pertain to any part of\r
-          the Derivative Works; and\r
-\r
-      (d) If the Work includes a "NOTICE" text file as part of its\r
-          distribution, then any Derivative Works that You distribute must\r
-          include a readable copy of the attribution notices contained\r
-          within such NOTICE file, excluding those notices that do not\r
-          pertain to any part of the Derivative Works, in at least one\r
-          of the following places: within a NOTICE text file distributed\r
-          as part of the Derivative Works; within the Source form or\r
-          documentation, if provided along with the Derivative Works; or,\r
-          within a display generated by the Derivative Works, if and\r
-          wherever such third-party notices normally appear. The contents\r
-          of the NOTICE file are for informational purposes only and\r
-          do not modify the License. You may add Your own attribution\r
-          notices within Derivative Works that You distribute, alongside\r
-          or as an addendum to the NOTICE text from the Work, provided\r
-          that such additional attribution notices cannot be construed\r
-          as modifying the License.\r
-\r
-      You may add Your own copyright statement to Your modifications and\r
-      may provide additional or different license terms and conditions\r
-      for use, reproduction, or distribution of Your modifications, or\r
-      for any such Derivative Works as a whole, provided Your use,\r
-      reproduction, and distribution of the Work otherwise complies with\r
-      the conditions stated in this License.\r
-\r
-   5. Submission of Contributions. Unless You explicitly state otherwise,\r
-      any Contribution intentionally submitted for inclusion in the Work\r
-      by You to the Licensor shall be under the terms and conditions of\r
-      this License, without any additional terms or conditions.\r
-      Notwithstanding the above, nothing herein shall supersede or modify\r
-      the terms of any separate license agreement you may have executed\r
-      with Licensor regarding such Contributions.\r
-\r
-   6. Trademarks. This License does not grant permission to use the trade\r
-      names, trademarks, service marks, or product names of the Licensor,\r
-      except as required for reasonable and customary use in describing the\r
-      origin of the Work and reproducing the content of the NOTICE file.\r
-\r
-   7. Disclaimer of Warranty. Unless required by applicable law or\r
-      agreed to in writing, Licensor provides the Work (and each\r
-      Contributor provides its Contributions) on an "AS IS" BASIS,\r
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-      implied, including, without limitation, any warranties or conditions\r
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r
-      PARTICULAR PURPOSE. You are solely responsible for determining the\r
-      appropriateness of using or redistributing the Work and assume any\r
-      risks associated with Your exercise of permissions under this License.\r
-\r
-   8. Limitation of Liability. In no event and under no legal theory,\r
-      whether in tort (including negligence), contract, or otherwise,\r
-      unless required by applicable law (such as deliberate and grossly\r
-      negligent acts) or agreed to in writing, shall any Contributor be\r
-      liable to You for damages, including any direct, indirect, special,\r
-      incidental, or consequential damages of any character arising as a\r
-      result of this License or out of the use or inability to use the\r
-      Work (including but not limited to damages for loss of goodwill,\r
-      work stoppage, computer failure or malfunction, or any and all\r
-      other commercial damages or losses), even if such Contributor\r
-      has been advised of the possibility of such damages.\r
-\r
-   9. Accepting Warranty or Additional Liability. While redistributing\r
-      the Work or Derivative Works thereof, You may choose to offer,\r
-      and charge a fee for, acceptance of support, warranty, indemnity,\r
-      or other liability obligations and/or rights consistent with this\r
-      License. However, in accepting such obligations, You may act only\r
-      on Your own behalf and on Your sole responsibility, not on behalf\r
-      of any other Contributor, and only if You agree to indemnify,\r
-      defend, and hold each Contributor harmless for any liability\r
-      incurred by, or claims asserted against, such Contributor by reason\r
-      of your accepting any such warranty or additional liability.\r
-\r
-   END OF TERMS AND CONDITIONS\r
-\r
-   APPENDIX: How to apply the Apache License to your work.\r
-\r
-      To apply the Apache License to your work, attach the following\r
-      boilerplate notice, with the fields enclosed by brackets "[]"\r
-      replaced with your own identifying information. (Don't include\r
-      the brackets!)  The text should be enclosed in the appropriate\r
-      comment syntax for the file format. We also recommend that a\r
-      file or class name and description of purpose be included on the\r
-      same "printed page" as the copyright notice for easier\r
-      identification within third-party archives.\r
-\r
-   Copyright [yyyy] [name of copyright owner]\r
-\r
-   Licensed under the Apache License, Version 2.0 (the "License");\r
-   you may not use this file except in compliance with the License.\r
-   You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-\r
-\r
-\r
index 901d07c..190eb0f 100755 (executable)
@@ -1,20 +1,20 @@
 Name:       smartcard-plugin-uicc
 Summary:    Smartcard plugin uicc
-Version:    0.0.3
+Version:          0.0.7
 Release:    0
-Group:      libs
-License:    Apache License, Version 2.0
+Group:      Telephony/Service
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001:    smartcard-plugin-uicc.manifest
+#ExclusiveArch:    %%arm
+BuildRequires:    cmake
+BuildRequires:    pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(tapi)
-BuildRequires: pkgconfig(smartcard-service)
 BuildRequires: pkgconfig(smartcard-service-common)
-BuildRequires: cmake
-BuildRequires: gettext-tools
 Requires(post):   /sbin/ldconfig
-Requires(post):   /usr/bin/vconftool
-requires(postun): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 
 %description
 Smartcard Service plugin uicc
@@ -23,41 +23,18 @@ Smartcard Service plugin uicc
 %setup -q
 cp %{SOURCE1001} .
 
-%package    devel
-Summary:    smartcard service uicc
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-smartcard service.
-
 %build
-mkdir obj-arm-limux-qnueabi
-cd obj-arm-limux-qnueabi
-cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix}
-#make %{?jobs:-j%jobs}
+%cmake .
 
 %install
-cd obj-arm-limux-qnueabi
 %make_install
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-plugin-uicc %{buildroot}/usr/share/license/
-
-%post
-/sbin/ldconfig
-
-
-%postun
-/sbin/ldconfig
 
-#%post
-# -n nfc-common-lib -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-#%postun
-# -n nfc-common-lib -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/lib/se/lib*.so
-/usr/share/license/smartcard-plugin-uicc
+%{_libdir}/se/lib*.so
+%license LICENSE.APLv2