rename SNOOP -> SNIFF

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
 

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
 

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);

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);
 

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();
 }

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

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

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

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);
 }

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.