summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihoon Jung <jh8801.jung@samsung.com>2015-06-15 11:48:37 +0900
committerJihoon Jung <jh8801.jung@samsung.com>2015-06-15 11:49:17 +0900
commit5424732c9da8846406c8cf31c53b521a9b94313b (patch)
treea25a5565191dc0e4ae0487b14b2b48a82017b492
parent0ec3896024a52deff1dc0318b4ab09b0d12fbbdf (diff)
downloadsmartcard-plugin-nfc-tizen_3.0.m1_mobile_release.tar.gz
smartcard-plugin-nfc-tizen_3.0.m1_mobile_release.tar.bz2
smartcard-plugin-nfc-tizen_3.0.m1_mobile_release.zip
Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com> Change-Id: I601d71f0c604a100bdb52e36c5caddf41cc1bd49
-rw-r--r--NFCTerminal.cpp20
-rw-r--r--include/NFCTerminal.h1
2 files changed, 11 insertions, 10 deletions
diff --git a/NFCTerminal.cpp b/NFCTerminal.cpp
index 9fa9110..263b97e 100644
--- a/NFCTerminal.cpp
+++ b/NFCTerminal.cpp
@@ -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
diff --git a/include/NFCTerminal.h b/include/NFCTerminal.h
index d61b5e6..7362258 100644
--- a/include/NFCTerminal.h
+++ b/include/NFCTerminal.h
@@ -20,6 +20,7 @@
/* Tizen library header */
#include "nfc.h"
+#include "nfc_internal.h"
/* local header */
#include "Terminal.h"