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 12:00:23 +00:00
parent 03d185b536
commit 3eba0e9b54
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.6.0, info@libnfc.org) AC_INIT(libnfc, 1.6.0-rc1, info@libnfc.org)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

11
examples/CMakeLists.txt
View file

@ -1,4 +1,13 @@
SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-forum-tag2 nfc-emulate-tag nfc-emulate-uid nfc-poll nfc-relay) SET(EXAMPLES-SOURCES
nfc-anticol
nfc-dep-initiator
nfc-dep-target
nfc-emulate-forum-tag2
nfc-emulate-tag
nfc-emulate-uid
nfc-poll
nfc-relay
)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)

11
utils/CMakeLists.txt
View file

@ -1,4 +1,13 @@
SET(UTILS-SOURCES nfc-emulate-forum-tag4 nfc-list nfc-relay-picc nfc-mfclassic nfc-mfultralight) SET(UTILS-SOURCES
nfc-emulate-forum-tag4
nfc-list
nfc-mfclassic
nfc-mfsetuid
nfc-mfultralight
nfc-probe
nfc-read-forum-tag3
nfc-relay-picc
)
ADD_LIBRARY(nfcutils STATIC ADD_LIBRARY(nfcutils STATIC
nfc-utils.c nfc-utils.c

18
utils/nfc-mfclassic.c
View file

@ -410,24 +410,6 @@ write_card (int write_block_zero)
return true; return true;
} }
static void
mifare_classic_extract_payload (const char *abDump, char *pbPayload)
{
uint8_t uiSectorIndex;
uint8_t uiBlockIndex;
size_t szDumpOffset;
size_t szPayloadIndex = 0;
for (uiSectorIndex = 1; uiSectorIndex < 16; uiSectorIndex++) {
for (uiBlockIndex = 0; uiBlockIndex < 3; uiBlockIndex++) {
szDumpOffset = uiSectorIndex * 16 * 4 + uiBlockIndex * 16;
// for(uint8_t uiByteIndex=0; uiByteIndex<16; uiByteIndex++) printf("%02x ", abDump[szPayloadIndex+uiByteIndex]);
memcpy (pbPayload + szPayloadIndex, abDump + szDumpOffset, 16);
szPayloadIndex += 16;
}
}
}
typedef enum { typedef enum {
ACTION_READ, ACTION_READ,
ACTION_WRITE, ACTION_WRITE,