From 1f0ef063743025f5e01c641e7367634c5c11f88b Mon Sep 17 00:00:00 2001 From: pwpiwi Date: Fri, 20 Dec 2019 08:22:23 +0100 Subject: [PATCH] iso15693: decode WRITE_MULTI_BLOCK in 'hf list 15' --- armsrc/iso15693.c | 4 ++-- client/cmdhflist.c | 1 + common/protocols.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c index c7b70807..351b0184 100644 --- a/armsrc/iso15693.c +++ b/armsrc/iso15693.c @@ -1611,8 +1611,8 @@ void ReaderIso15693(uint32_t parameter) { TagUID[3] = answer[5]; TagUID[4] = answer[6]; TagUID[5] = answer[7]; - TagUID[6] = answer[8]; - TagUID[7] = answer[9]; // IC Manufacturer code always E0 + TagUID[6] = answer[8]; // IC Manufacturer code + TagUID[7] = answer[9]; // always E0 } Dbprintf("%d octets read from IDENTIFY request:", answerLen); diff --git a/client/cmdhflist.c b/client/cmdhflist.c index 61f2fa66..c7e3dab8 100644 --- a/client/cmdhflist.c +++ b/client/cmdhflist.c @@ -254,6 +254,7 @@ void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) { case ISO15693_WRITEBLOCK :snprintf(exp, size, "WRITEBLOCK");return; case ISO15693_LOCKBLOCK :snprintf(exp, size, "LOCKBLOCK");return; case ISO15693_READ_MULTI_BLOCK :snprintf(exp, size, "READ_MULTI_BLOCK");return; + case ISO15693_WRITE_MULTI_BLOCK :snprintf(exp, size, "WRITE_MULTI_BLOCK");return; case ISO15693_SELECT :snprintf(exp, size, "SELECT");return; case ISO15693_RESET_TO_READY :snprintf(exp, size, "RESET_TO_READY");return; case ISO15693_WRITE_AFI :snprintf(exp, size, "WRITE_AFI");return; diff --git a/common/protocols.h b/common/protocols.h index 6c46a192..37a88449 100644 --- a/common/protocols.h +++ b/common/protocols.h @@ -187,7 +187,7 @@ NXP/Philips CUSTOM COMMANDS #define ISO15693_WRITEBLOCK 0x21 #define ISO15693_LOCKBLOCK 0x22 #define ISO15693_READ_MULTI_BLOCK 0x23 -#define ISO15693_WRITE_MULTI_BLOCK 0x23 +#define ISO15693_WRITE_MULTI_BLOCK 0x24 #define ISO15693_SELECT 0x25 #define ISO15693_RESET_TO_READY 0x26 #define ISO15693_WRITE_AFI 0x27