From ee1612870c7c8abca93aa6b5472566feb2967f98 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 30 Oct 2017 12:17:32 +0100 Subject: [PATCH] CHG: 'info' unified helptext. ADD: 'hf 14a info' - skeleton function --- client/cmdhf14a.c | 16 +++++++++++----- client/cmdhf14a.h | 1 + client/cmdhf14b.c | 2 +- client/cmdhf15.c | 2 +- client/cmdhfmfdes.c | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index ab7f9517d..337e9698f 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -395,6 +395,11 @@ int CmdHF14AReader(const char *Cmd) { return select_status; } +int CmdHF14AInfo(const char *Cmd) { + + return 0; +} + // Collect ISO14443 Type A UIDs int CmdHF14ACUIDs(const char *Cmd) { // requested number of UIDs @@ -728,11 +733,12 @@ static void waitCmd(uint8_t iSelect) { static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443a history"}, - {"reader", CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"}, - {"cuids", CmdHF14ACUIDs, 0, " Collect n>0 ISO14443 Type A UIDs in one go"}, - {"sim", CmdHF14ASim, 0, " -- Simulate ISO 14443a tag"}, - {"sniff", CmdHF14ASniff, 0, "sniff ISO 14443 Type A traffic"}, + {"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443-a history"}, + {"info", CmdHF14AInfo, 0, "Tag information"}, + {"reader", CmdHF14AReader, 0, "Act like an ISO14443-a reader"}, + {"cuids", CmdHF14ACUIDs, 0, " Collect n>0 ISO14443-a UIDs in one go"}, + {"sim", CmdHF14ASim, 0, " -- Simulate ISO 14443-a tag"}, + {"sniff", CmdHF14ASniff, 0, "sniff ISO 14443-a traffic"}, {"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"}, {NULL, NULL, 0, NULL} }; diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h index 46943f48f..846d51e50 100644 --- a/client/cmdhf14a.h +++ b/client/cmdhf14a.h @@ -34,6 +34,7 @@ extern int CmdHF14A(const char *Cmd); extern int CmdHF14AList(const char *Cmd); extern int CmdHF14AReader(const char *Cmd); +extern int CmdHF14AInfo(const char *Cmd); extern int CmdHF14ASim(const char *Cmd); extern int CmdHF14ASniff(const char *Cmd); extern int CmdHF14ACmdRaw(const char *Cmd); diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 7179385c6..2ec20ec25 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -845,7 +845,7 @@ bool waitCmd14b(bool verbose) { static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"info", CmdHF14Binfo, 0, "Find and print details about a 14443B tag"}, + {"info", CmdHF14Binfo, 0, "Tag information"}, {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"}, {"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"}, {"reader", CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"}, diff --git a/client/cmdhf15.c b/client/cmdhf15.c index ac1e171b3..50735a93c 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -1221,7 +1221,7 @@ static command_t CommandTable15[] = { {"demod", CmdHF15Demod, 1, "Demodulate ISO15693 from tag"}, {"dump", CmdHF15Dump, 0, "Read all memory pages of an ISO15693 tag, save to file"}, {"findafi", CmdHF15Afi, 0, "Brute force AFI of an ISO15693 tag"}, - {"info", CmdHF15Info, 0, "Get Card Information"}, + {"info", CmdHF15Info, 0, "Tag information"}, {"list", CmdHF15List, 0, "[Deprecated] List ISO15693 history"}, {"raw", CmdHF15Raw, 0, "Send raw hex data to tag"}, {"reader", CmdHF15Reader, 0, "Act like an ISO15693 reader"}, diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c index 331c9d2e2..32810e6d7 100644 --- a/client/cmdhfmfdes.c +++ b/client/cmdhfmfdes.c @@ -659,7 +659,7 @@ int CmdHF14ADesAuth(const char *Cmd){ static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"info", CmdHF14ADesInfo, 0, "Get MIFARE DesFire information"}, + {"info", CmdHF14ADesInfo, 0, "Tag information"}, {"enum", CmdHF14ADesEnumApplications,0, "Tries enumerate all applications"}, {"auth", CmdHF14ADesAuth, 0, "Tries a MIFARE DesFire Authentication"}, {"rdbl", CmdHF14ADesRb, 0, "Read MIFARE DesFire block"},