crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare libnfc 1.6.0-rc1

Browse source
This commit is contained in:
Romuald Conty 2012-03-01 11:37:16 +00:00
parent 9720bc45b4
commit 03d185b536
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,8 +1,8 @@
PROJECT(libnfc C) PROJECT(libnfc C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(VERSION_MAJOR "1") SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "5") SET(VERSION_MINOR "6")
SET(VERSION_PATCH "1") SET(VERSION_PATCH "0")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")

2
configure.ac
View file

@ -1,7 +1,7 @@
# General init # General init
# /!\ Don't forget to update 'CMakeLists.txt' too /!\ # /!\ Don't forget to update 'CMakeLists.txt' too /!\
AC_INIT(libnfc, 1.5.1, info@libnfc.org) AC_INIT(libnfc, 1.6.0, info@libnfc.org)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

2
libnfc/Makefile.am
View file

@ -18,7 +18,7 @@ libnfc_la_SOURCES = \
nfc-emulation.c \ nfc-emulation.c \
nfc-internal.c nfc-internal.c
libnfc_la_LDFLAGS = -no-undefined -version-info 2:0:0 -export-symbols-regex '^nfc_|^iso14443a_|pn53x_transceive|pn53x_SAMConfiguration' libnfc_la_LDFLAGS = -no-undefined -version-info 3:0:0 -export-symbols-regex '^nfc_|^iso14443a_|pn53x_transceive|pn53x_SAMConfiguration'
libnfc_la_CFLAGS = @DRIVERS_CFLAGS@ libnfc_la_CFLAGS = @DRIVERS_CFLAGS@
libnfc_la_LIBADD = \ libnfc_la_LIBADD = \
$(top_builddir)/libnfc/chips/libnfcchips.la \ $(top_builddir)/libnfc/chips/libnfcchips.la \

16
libnfc/buses/uart_win32.c
View file

@ -157,7 +157,7 @@ uart_receive (serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p
if (!SetCommTimeouts (((struct serial_port_windows *) sp)->hPort, &timeouts)) { if (!SetCommTimeouts (((struct serial_port_windows *) sp)->hPort, &timeouts)) {
log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "Unable to apply new timeout settings."); log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "Unable to apply new timeout settings.");
return ECOMIO; return NFC_EIO;
} }
log_put (LOG_CATEGORY, NFC_PRIORITY_TRACE, "Timeouts are set to %u ms", timeout_ms); log_put (LOG_CATEGORY, NFC_PRIORITY_TRACE, "Timeouts are set to %u ms", timeout_ms);
@ -175,9 +175,9 @@ uart_receive (serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p
if (!res) { if (!res) {
DWORD err = GetLastError(); DWORD err = GetLastError();
log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "ReadFile error: %u", err); log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "ReadFile error: %u", err);
return ECOMIO; return NFC_EIO;
} else if (dwBytesReceived == 0) { } else if (dwBytesReceived == 0) {
return ECOMTIMEOUT; return NFC_ETIMEOUT;
} }
if (((DWORD)szRx) > dwTotalBytesReceived) { if (((DWORD)szRx) > dwTotalBytesReceived) {
@ -185,12 +185,12 @@ uart_receive (serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p
} }
if (abort_flag_p != NULL && (*abort_flag_p) && dwTotalBytesReceived == 0) { if (abort_flag_p != NULL && (*abort_flag_p) && dwTotalBytesReceived == 0) {
return EOPABORT; return NFC_EOPABORTED;
} }
} while (((DWORD)szRx) > dwTotalBytesReceived); } while (((DWORD)szRx) > dwTotalBytesReceived);
LOG_HEX ("RX", pbtRx, szRx); LOG_HEX ("RX", pbtRx, szRx);
return (dwTotalBytesReceived == (DWORD) szRx) ? 0 : ECOMIO; return (dwTotalBytesReceived == (DWORD) szRx) ? 0 : NFC_EIO;
} }
int int
@ -207,15 +207,15 @@ uart_send (serial_port sp, const uint8_t * pbtTx, const size_t szTx, int timeout
if (!SetCommTimeouts (((struct serial_port_windows *) sp)->hPort, &timeouts)) { if (!SetCommTimeouts (((struct serial_port_windows *) sp)->hPort, &timeouts)) {
log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "Unable to apply new timeout settings."); log_put (LOG_CATEGORY, NFC_PRIORITY_ERROR, "Unable to apply new timeout settings.");
return ECOMIO; return NFC_EIO;
} }
LOG_HEX ("TX", pbtTx, szTx); LOG_HEX ("TX", pbtTx, szTx);
if (!WriteFile (((struct serial_port_windows *) sp)->hPort, pbtTx, szTx, &dwTxLen, NULL)) { if (!WriteFile (((struct serial_port_windows *) sp)->hPort, pbtTx, szTx, &dwTxLen, NULL)) {
return ECOMIO; return NFC_EIO;
} }
if (!dwTxLen) if (!dwTxLen)
return ECOMIO; return NFC_EIO;
return 0; return 0;
} }