diff --git a/armsrc/Makefile b/armsrc/Makefile index 382407e1d..7db669cb8 100644 --- a/armsrc/Makefile +++ b/armsrc/Makefile @@ -38,7 +38,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \ -DWITH_ISO14443a \ -DWITH_ICLASS \ -DWITH_FELICA \ - -DWITH_HFSNOOP \ + -DWITH_HFSNIFF \ -DWITH_LF_SAMYRUN \ -fno-strict-aliasing -ffunction-sections -fdata-sections diff --git a/armsrc/appmain.c b/armsrc/appmain.c index dbe20b2b7..ba2aa75e3 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -650,8 +650,8 @@ void UsbPacketReceived(uint8_t *packet, int len) { case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); break; - case CMD_LF_SNOOP_RAW_ADC_SAMPLES: { - uint32_t bits = SnoopLF(); + case CMD_LF_SNIFF_RAW_ADC_SAMPLES: { + uint32_t bits = SniffLF(); cmd_send(CMD_ACK, bits, 0, 0, 0, 0); break; } @@ -765,8 +765,8 @@ void UsbPacketReceived(uint8_t *packet, int len) { #endif #ifdef WITH_HITAG - case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type - SnoopHitag(c->arg[0]); + case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type + SniffHitag(c->arg[0]); break; case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes); @@ -843,7 +843,7 @@ void UsbPacketReceived(uint8_t *packet, int len) { case CMD_READ_SRI_TAG: ReadSTMemoryIso14443b(c->arg[0]); break; - case CMD_SNOOP_ISO_14443B: + case CMD_SNIFF_ISO_14443B: SniffIso14443b(); break; case CMD_SIMULATE_TAG_ISO_14443B: @@ -862,7 +862,7 @@ void UsbPacketReceived(uint8_t *packet, int len) { case CMD_FELICA_LITE_SIM: felica_sim_lite(c->arg[0]); break; - case CMD_FELICA_SNOOP: + case CMD_FELICA_SNIFF: felica_sniff(c->arg[0], c->arg[1]); break; case CMD_FELICA_LITE_DUMP: @@ -871,7 +871,7 @@ void UsbPacketReceived(uint8_t *packet, int len) { #endif #ifdef WITH_ISO14443a - case CMD_SNOOP_ISO_14443a: + case CMD_SNIFF_ISO_14443a: SniffIso14443a(c->arg[0]); break; case CMD_READER_ISO_14443a: @@ -1003,7 +1003,7 @@ void UsbPacketReceived(uint8_t *packet, int len) { #ifdef WITH_ICLASS // Makes use of ISO14443a FPGA Firmware - case CMD_SNOOP_ICLASS: + case CMD_SNIFF_ICLASS: SniffIClass(); break; case CMD_SIMULATE_TAG_ICLASS: @@ -1043,9 +1043,9 @@ void UsbPacketReceived(uint8_t *packet, int len) { break; #endif -#ifdef WITH_HFSNOOP +#ifdef WITH_HFSNIFF case CMD_HF_SNIFFER: - HfSnoop(c->arg[0], c->arg[1]); + HfSniff(c->arg[0], c->arg[1]); break; #endif diff --git a/armsrc/apps.h b/armsrc/apps.h index 36c865900..ebc9d302c 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -223,7 +223,7 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data); void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType); // hitag2.h -void SnoopHitag(uint32_t type); +void SniffHitag(uint32_t type); void SimulateHitagTag(bool tag_mem_supplied, byte_t *data); void ReaderHitag(hitag_function htf, hitag_data *htd); void WriterHitag(hitag_function htf, hitag_data *htd, int page); @@ -239,7 +239,7 @@ uint8_t cmd_receive(UsbCommand *cmd); uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len); // util.h -void HfSnoop(int, int); +void HfSniff(int, int); //felica.c extern void felica_sendraw(UsbCommand *c); diff --git a/armsrc/felica.c b/armsrc/felica.c index 3aa3c282d..190960bd4 100644 --- a/armsrc/felica.c +++ b/armsrc/felica.c @@ -544,7 +544,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) { int remFrames = (samplesToSkip) ? samplesToSkip : 0; - Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip); + Dbprintf("Sniff FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip); iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD); diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c index 4ec60d175..11ceff3d9 100644 --- a/armsrc/hfsnoop.c +++ b/armsrc/hfsnoop.c @@ -4,9 +4,9 @@ #include "util.h" #include "usb_cdc.h" // for usb_poll_validate_length -static void RAMFUNC optimizedSnoop(void); +static void RAMFUNC optimizedSniff(void); -static void RAMFUNC optimizedSnoop(void) { +static void RAMFUNC optimizedSniff(void) { int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory uint16_t *dest = (uint16_t *)BigBuf_get_addr(); @@ -23,7 +23,7 @@ static void RAMFUNC optimizedSnoop(void) { set_tracelen(BigBuf_max_traceLen()); } -void HfSnoop(int samplesToSkip, int triggersToSkip) { +void HfSniff(int samplesToSkip, int triggersToSkip) { BigBuf_free(); BigBuf_Clear(); @@ -66,14 +66,14 @@ void HfSnoop(int samplesToSkip, int triggersToSkip) { if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) waitcount--; } - optimizedSnoop(); + optimizedSniff(); Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r); } //Resetting Frame mode (First set in fpgaloader.c) AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); - DbpString("HF Snoop end"); + DbpString("HF Sniffing end"); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LED_D_OFF(); } diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c index c872c1261..7ed6c88ca 100644 --- a/armsrc/hitag2.c +++ b/armsrc/hitag2.c @@ -10,7 +10,7 @@ // Hitag2 complete rewrite of the code // - Fixed modulation/encoding issues // - Rewrote code for transponder emulation -// - Added snooping of transponder communication +// - Added sniffing of transponder communication // - Added reader functionality // // (c) 2012 Roel Verdult @@ -801,7 +801,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t return true; } -void SnoopHitag(uint32_t type) { +void SniffHitag(uint32_t type) { int frame_count; int response; int overflow; @@ -829,7 +829,7 @@ void SnoopHitag(uint32_t type) { auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH); memset(auth_table, 0x00, AUTH_TABLE_LENGTH); - DbpString("Starting Hitag2 snoop"); + DbpString("Starting Hitag2 sniff"); LED_D_ON(); // Set up eavesdropping mode, frequency divisor which will drive the FPGA diff --git a/armsrc/iclass.c b/armsrc/iclass.c index e14a3c145..1326306b1 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -18,7 +18,7 @@ // // FIX: // ==== -// We still have sometimes a demodulation error when snooping iClass communication. +// We still have sometimes a demodulation error when sniffing iClass communication. // The resulting trace of a read-block-03 command may look something like this: // // + 22279: : 0c 03 e8 01 diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c index 57433c682..9586ee0ab 100644 --- a/armsrc/iso14443b.c +++ b/armsrc/iso14443b.c @@ -1413,7 +1413,7 @@ static void iso1444b_setup_sniff(void) { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); BigBuf_free(); BigBuf_Clear_ext(false); - clear_trace();//setup snoop + clear_trace(); set_tracing(true); // Initialize Demod and Uart structs diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index faf77229c..7018fbae2 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -29,7 +29,7 @@ void printConfig() { /** * Called from the USB-handler to set the sampling configuration - * The sampling config is used for std reading and snooping. + * The sampling config is used for std reading and sniffing. * * Other functions may read samples and ignore the sampling config, * such as functions to read the UID from a prox tag or similar. @@ -253,10 +253,10 @@ uint32_t SampleLF(bool printCfg, int sample_size) { return ReadLF(true, printCfg, sample_size); } /** -* Initializes the FPGA for snoop-mode (field off), and acquires the samples. +* Initializes the FPGA for sniffer-mode (field off), and acquires the samples. * @return number of bits sampled **/ -uint32_t SnoopLF() { +uint32_t SniffLF() { BigBuf_Clear_ext(false); return ReadLF(false, true, 0); } diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h index 94c370ed9..8556cd327 100644 --- a/armsrc/lfsampling.h +++ b/armsrc/lfsampling.h @@ -30,10 +30,10 @@ void doT55x7Acquisition(size_t sample_size); uint32_t SampleLF(bool silent, int sample_size); /** -* Initializes the FPGA for snoop-mode (field off), and acquires the samples. +* Initializes the FPGA for sniff-mode (field off), and acquires the samples. * @return number of bits sampled **/ -uint32_t SnoopLF(); +uint32_t SniffLF(); // adds sample size to default options uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after); @@ -67,7 +67,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field); /** * Called from the USB-handler to set the sampling configuration - * The sampling config is used for std reading and snooping. + * The sampling config is used for std reading and sniffing. * * Other functions may read samples and ignore the sampling config, * such as functions to read the UID from a prox tag or similar. diff --git a/client/cli.c b/client/cli.c index 19e472586..270689732 100644 --- a/client/cli.c +++ b/client/cli.c @@ -21,7 +21,7 @@ int main(int argc, char **argv) { if (argc != 3 && argc != 4) { printf("\n\tusage: cli [logfile (default cli.log)]\n"); printf("\n"); - printf("\texample: cli hi14asnoop hi14alist h14a.log\n"); + printf("\texample: cli hf 14a sniff hf 14a list h14a.log\n"); printf("\n"); return -1; } diff --git a/client/cmdhf.c b/client/cmdhf.c index 63bfd6d0f..8368160f8 100644 --- a/client/cmdhf.c +++ b/client/cmdhf.c @@ -21,7 +21,7 @@ int usage_hf_search() { return 0; } int usage_hf_sniff() { - PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data"); + PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data"); PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device, and " _YELLOW_("'data plot'")" to look at it"); PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n"); PrintAndLogEx(NORMAL, "Usage: hf sniff "); diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 6d4b39e4e..6dd7149f2 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -803,7 +803,7 @@ int CmdHF14ASniff(const char *Cmd) { if (ctmp == 'c') param |= 0x01; if (ctmp == 'r') param |= 0x02; } - UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}}; + UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}}; clearCommandBuffer(); SendCommand(&c); return 0; diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 564b18012..39b6c4937 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -145,7 +145,7 @@ int CmdHF14BSniff(const char *Cmd) { char cmdp = tolower(param_getchar(Cmd, 0)); if (cmdp == 'h') return usage_hf_14b_sniff(); - UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}}; + UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}}; clearCommandBuffer(); SendCommand(&c); return 0; diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c index e06f133e3..33d506a58 100644 --- a/client/cmdhffelica.c +++ b/client/cmdhffelica.c @@ -218,7 +218,7 @@ int CmdHFFelicaSniff(const char *Cmd) { //Validations if (errors || cmdp == 0) return usage_hf_felica_sniff(); - UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}}; + UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}}; clearCommandBuffer(); SendCommand(&c); return 0; diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c index b71f2fd03..5f77e7c85 100644 --- a/client/cmdhficlass.c +++ b/client/cmdhficlass.c @@ -279,7 +279,7 @@ int CmdHFiClassList(const char *Cmd) { int CmdHFiClassSniff(const char *Cmd) { char cmdp = tolower(param_getchar(Cmd, 0)); if (cmdp == 'h') return usage_hf_iclass_sniff(); - UsbCommand c = {CMD_SNOOP_ICLASS}; + UsbCommand c = {CMD_SNIFF_ICLASS}; SendCommand(&c); return 0; } diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index e3b8cb957..6ece17850 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -3506,7 +3506,7 @@ static command_t CommandTable[] = { {"nack", CmdHf14AMfNack, 0, "Test for Mifare NACK bug"}, {"chk", CmdHF14AMfChk, 0, "Check keys"}, {"fchk", CmdHF14AMfChk_fast, 0, "Check keys fast, targets all keys on card"}, - {"decrypt", CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"}, + {"decrypt", CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"}, {"-----------", CmdHelp, 1, ""}, {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"}, {"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"}, diff --git a/client/cmdlf.c b/client/cmdlf.c index b6202ed73..1b9387848 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -70,8 +70,8 @@ int usage_lf_config(void) { PrintAndLogEx(NORMAL, " a resolution of 4 bits per sample."); PrintAndLogEx(NORMAL, " lf read"); PrintAndLogEx(NORMAL, " Performs a read (active field)"); - PrintAndLogEx(NORMAL, " lf snoop"); - PrintAndLogEx(NORMAL, " Performs a snoop (no active field)"); + PrintAndLogEx(NORMAL, " lf sniff"); + PrintAndLogEx(NORMAL, " Performs a sniff (no active field)"); return 0; } int usage_lf_simfsk(void) { @@ -389,7 +389,7 @@ int CmdLFSniff(const char *Cmd) { uint8_t cmdp = tolower(param_getchar(Cmd, 0)); if (cmdp == 'h') return usage_lf_sniff(); - UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}}; + UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}}; clearCommandBuffer(); SendCommand(&c); WaitForResponse(CMD_ACK, NULL); @@ -896,12 +896,15 @@ int CmdLFfind(const char *Cmd) { } if (EM4x50Read("", false)) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;} + + if (CmdHIDDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;} if (CmdAWIDDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;} + if (CmdParadoxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;} + if (CmdEM410xDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;} if (CmdFdxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;} if (CmdGuardDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; } - if (CmdHIDDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;} - if (CmdPSKIdteck("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;} + if (CmdIdteckDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;} if (CmdIndalaDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!"); goto out;} if (CmdIOProxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;} if (CmdJablotronDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;} @@ -910,7 +913,7 @@ int CmdLFfind(const char *Cmd) { if (CmdNoralsyDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;} if (CmdKeriDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;} if (CmdPacDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;} - if (CmdParadoxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;} + if (CmdPrescoDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;} if (CmdPyramidDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;} if (CmdSecurakeyDemod("")) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;} diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c index 9ffdfa6cb..53d4d5036 100644 --- a/client/cmdlfhitag.c +++ b/client/cmdlfhitag.c @@ -174,7 +174,7 @@ int CmdLFHitagList(const char *Cmd) { } int CmdLFHitagSniff(const char *Cmd) { - UsbCommand c = {CMD_SNOOP_HITAG}; + UsbCommand c = {CMD_SNIFF_HITAG}; clearCommandBuffer(); SendCommand(&c); return 0; diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h index 5e562c10b..ac563bd26 100644 --- a/client/hid-flasher/usb_cmd.h +++ b/client/hid-flasher/usb_cmd.h @@ -96,7 +96,7 @@ typedef struct { #define CMD_IO_DEMOD_FSK 0x021A #define CMD_IO_CLONE_TAG 0x021B #define CMD_EM410X_DEMOD 0x021c -// Sampling configuration for LF reader/snooper +// Sampling configuration for LF reader/sniffer #define CMD_SET_LF_SAMPLING_CONFIG 0x021d #define CMD_FSK_SIM_TAG 0x021E #define CMD_ASK_SIM_TAG 0x021F @@ -119,10 +119,10 @@ typedef struct { #define CMD_ISO_15693_COMMAND 0x0313 #define CMD_ISO_15693_COMMAND_DONE 0x0314 #define CMD_ISO_15693_FIND_AFI 0x0315 -#define CMD_LF_SNOOP_RAW_ADC_SAMPLES 0x0317 +#define CMD_LF_SNIFF_RAW_ADC_SAMPLES 0x0317 // For Hitag2 transponders -#define CMD_SNOOP_HITAG 0x0370 +#define CMD_SNIFF_HITAG 0x0370 #define CMD_SIMULATE_HITAG 0x0371 #define CMD_READER_HITAG 0x0372 @@ -135,8 +135,8 @@ typedef struct { #define CMD_ANTIFUZZ_ISO_14443a 0x0380 #define CMD_SIMULATE_TAG_ISO_14443B 0x0381 -#define CMD_SNOOP_ISO_14443B 0x0382 -#define CMD_SNOOP_ISO_14443a 0x0383 +#define CMD_SNIFF_ISO_14443B 0x0382 +#define CMD_SNIFF_ISO_14443a 0x0383 #define CMD_SIMULATE_TAG_ISO_14443a 0x0384 #define CMD_READER_ISO_14443a 0x0385 @@ -151,7 +151,7 @@ typedef struct { #define CMD_LEGIC_ESET 0x03BD #define CMD_LEGIC_EGET 0x03BE -#define CMD_SNOOP_ICLASS 0x0392 +#define CMD_SNIFF_ICLASS 0x0392 #define CMD_SIMULATE_TAG_ICLASS 0x0393 #define CMD_READER_ICLASS 0x0394 #define CMD_READER_ICLASS_REPLAY 0x0395 diff --git a/include/usb_cmd.h b/include/usb_cmd.h index 94ae66eaa..a15229969 100644 --- a/include/usb_cmd.h +++ b/include/usb_cmd.h @@ -129,7 +129,7 @@ typedef struct { #define CMD_IO_DEMOD_FSK 0x021A #define CMD_IO_CLONE_TAG 0x021B #define CMD_EM410X_DEMOD 0x021c -// Sampling configuration for LF reader/snooper +// Sampling configuration for LF reader/sniffer #define CMD_SET_LF_SAMPLING_CONFIG 0x021d #define CMD_FSK_SIM_TAG 0x021E #define CMD_ASK_SIM_TAG 0x021F @@ -154,10 +154,10 @@ typedef struct { #define CMD_ISO_15693_COMMAND 0x0313 #define CMD_ISO_15693_COMMAND_DONE 0x0314 #define CMD_ISO_15693_FIND_AFI 0x0315 -#define CMD_LF_SNOOP_RAW_ADC_SAMPLES 0x0317 +#define CMD_LF_SNIFF_RAW_ADC_SAMPLES 0x0317 // For Hitag2 transponders -#define CMD_SNOOP_HITAG 0x0370 +#define CMD_SNIFF_HITAG 0x0370 #define CMD_SIMULATE_HITAG 0x0371 #define CMD_READER_HITAG 0x0372 @@ -170,9 +170,9 @@ typedef struct { #define CMD_ANTIFUZZ_ISO_14443a 0x0380 #define CMD_SIMULATE_TAG_ISO_14443B 0x0381 -#define CMD_SNOOP_ISO_14443B 0x0382 +#define CMD_SNIFF_ISO_14443B 0x0382 -#define CMD_SNOOP_ISO_14443a 0x0383 +#define CMD_SNIFF_ISO_14443a 0x0383 #define CMD_SIMULATE_TAG_ISO_14443a 0x0384 #define CMD_READER_ISO_14443a 0x0385 @@ -192,7 +192,7 @@ typedef struct { #define CMD_ICLASS_READCHECK 0x038F #define CMD_ICLASS_CLONE 0x0390 #define CMD_ICLASS_DUMP 0x0391 -#define CMD_SNOOP_ICLASS 0x0392 +#define CMD_SNIFF_ICLASS 0x0392 #define CMD_SIMULATE_TAG_ICLASS 0x0393 #define CMD_READER_ICLASS 0x0394 #define CMD_READER_ICLASS_REPLAY 0x0395 @@ -204,7 +204,7 @@ typedef struct { // For ISO1092 / FeliCa #define CMD_FELICA_SIMULATE_TAG 0x03A0 -#define CMD_FELICA_SNOOP 0x03A1 +#define CMD_FELICA_SNIFF 0x03A1 #define CMD_FELICA_COMMAND 0x03A2 //temp #define CMD_FELICA_LITE_DUMP 0x03AA