Change for fix build error 89/41389/1 tizen_3.0.m1_mobile tizen_3.0.m1_tv accepted/tizen/ivi/20160218.023235 accepted/tizen/mobile/20150617.082148 accepted/tizen/tv/20150617.082157 accepted/tizen/wearable/20150617.082209 submit/tizen/20150617.022440 submit/tizen/20150617.050123 submit/tizen_common/20151015.190624 submit/tizen_common/20151019.135620 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000002 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorJihoon Jung <jh8801.jung@samsung.com>
Mon, 15 Jun 2015 02:48:37 +0000 (11:48 +0900)
committerJihoon Jung <jh8801.jung@samsung.com>
Mon, 15 Jun 2015 02:49:17 +0000 (11:49 +0900)
Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
Change-Id: I601d71f0c604a100bdb52e36c5caddf41cc1bd49

NFCTerminal.cpp
include/NFCTerminal.h

index 9fa9110..263b97e 100644 (file)
@@ -128,13 +128,13 @@ namespace smartcard_service_api
 
                if (isClosed() == false) {
                        /* close now */
-                       ret = nfc_se_close_secure_element(seHandle);
+                       ret = nfc_se_close_secure_element_internal(seHandle);
                        if (ret == NFC_ERROR_NONE) {
                                seHandle = NULL;
                                closed = true;
                                referred = 0;
                        } else {
-                               _ERR("nfc_se_close_secure_element failed [%d]", ret);
+                               _ERR("nfc_se_close_secure_element_internal failed [%d]", ret);
                        }
                }
 
@@ -154,13 +154,13 @@ namespace smartcard_service_api
 
                if (isInitialized()) {
                        if (referred == 0) {
-                               ret = nfc_se_open_secure_element(NFC_SE_TYPE_ESE,
+                               ret = nfc_se_open_secure_element_internal(NFC_SE_TYPE_ESE,
                                        &seHandle);
                                if (ret == NFC_ERROR_NONE) {
                                        closed = false;
                                        referred++;
                                } else {
-                                       _ERR("nfc_se_open_secure_element failed [%d]", ret);
+                                       _ERR("nfc_se_open_secure_element_internal failed [%d]", ret);
                                }
                        } else {
                                referred++;
@@ -183,13 +183,13 @@ namespace smartcard_service_api
                if (isInitialized())
                {
                        if (referred <= 1) {
-                               ret = nfc_se_close_secure_element(seHandle);
+                               ret = nfc_se_close_secure_element_internal(seHandle);
                                if (ret == NFC_ERROR_NONE) {
                                        seHandle = NULL;
                                        closed = true;
                                        referred = 0;
                                } else {
-                                       _ERR("nfc_se_close_secure_element failed [%d]", ret);
+                                       _ERR("nfc_se_close_secure_element_internal failed [%d]", ret);
                                }
                        } else {
                                referred--;
@@ -214,7 +214,7 @@ namespace smartcard_service_api
                                uint8_t *resp = NULL;
                                uint32_t resp_len;
 
-                               rv = nfc_se_send_apdu(seHandle,
+                               rv = nfc_se_send_apdu_internal(seHandle,
                                        (uint8_t *)command.getBuffer(),
                                        command.size(),
                                        &resp,
@@ -228,7 +228,7 @@ namespace smartcard_service_api
                                }
                                else
                                {
-                                       _ERR("net_nfc_send_apdu_sync failed, [%d]", rv);
+                                       _ERR("nfc_se_send_apdu_internal failed, [%d]", rv);
                                }
                        }
                        else
@@ -257,7 +257,7 @@ namespace smartcard_service_api
                        uint8_t *temp = NULL;
                        uint32_t temp_len;
 
-                       rv = nfc_se_get_atr(seHandle, &temp, &temp_len);
+                       rv = nfc_se_get_atr_internal(seHandle, &temp, &temp_len);
                        if (rv == NFC_ERROR_NONE && temp != NULL)
                        {
                                atr.assign(temp, temp_len);
@@ -265,7 +265,7 @@ namespace smartcard_service_api
                        }
                        else
                        {
-                               _ERR("net_nfc_client_se_get_atr_sync failed");
+                               _ERR("nfc_se_get_atr_internal failed");
                        }
                }
                else
index d61b5e6..7362258 100644 (file)
@@ -20,6 +20,7 @@
 
 /* Tizen library header */
 #include "nfc.h"
+#include "nfc_internal.h"
 
 /* local header */
 #include "Terminal.h"