From: Martin Holst Swende <martin@swende.se>
Date: Sat, 28 Jun 2014 10:47:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into iclass-fixes
X-Git-Tag: v1.1.0~1^2^2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/refs/pull/17/head?hp=-c

Merge remote-tracking branch 'origin/master' into iclass-fixes
---

6db28145eacac986d481ceadf7ee9fc1061555fd
diff --combined armsrc/apps.h
index aaa7d56f,364efe4b..1ef0e472
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@@ -81,6 -81,7 +81,7 @@@ void SetAdcMuxFor(uint32_t whichGpio)
  // Definitions for the FPGA commands.
  #define FPGA_CMD_SET_CONFREG					(1<<12)
  #define FPGA_CMD_SET_DIVISOR					(2<<12)
+ #define FPGA_CMD_SET_USER_BYTE1					(3<<12)
  // Definitions for the FPGA configuration word.
  // LF
  #define FPGA_MAJOR_MODE_LF_ADC					(0<<5)
@@@ -96,7 -97,9 +97,9 @@@
  // Options for LF_ADC
  #define FPGA_LF_ADC_READER_FIELD				(1<<0)
  // Options for LF_EDGE_DETECT
+ #define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD			FPGA_CMD_SET_USER_BYTE1
  #define FPGA_LF_EDGE_DETECT_READER_FIELD 			(1<<0)
+ #define FPGA_LF_EDGE_DETECT_TOGGLE_MODE				(1<<1)
  // Options for the HF reader, tx to tag
  #define FPGA_HF_READER_TX_SHALLOW_MOD				(1<<0)
  // Options for the HF reader, correlating against rx from tag
@@@ -154,7 -157,7 +157,7 @@@ void RAMFUNC SnoopIso14443a(uint8_t par
  void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);
  void ReaderIso14443a(UsbCommand * c);
  // Also used in iclass.c
 -bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t iSamples, uint32_t dwParity, bool bReader);
 +bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t iSamples, uint32_t dwParity, bool readerToTag);
  uint32_t GetParity(const uint8_t * pbtCmd, int iLen);
  void iso14a_set_trigger(bool enable);
  void iso14a_clear_trace();
@@@ -196,9 -199,9 +199,9 @@@ void SetDebugIso15693(uint32_t flag)
  
  /// iclass.h
  void RAMFUNC SnoopIClass(void);
 -void SimulateIClass(uint8_t arg0, uint8_t *datain);
 +void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
  void ReaderIClass(uint8_t arg0);
 -
 +//int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived);
  // hitag2.h
  void SnoopHitag(uint32_t type);
  void SimulateHitagTag(bool tag_mem_supplied, byte_t* data);