github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 05:13:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-add piwi's trace memory fixes

Browse source
This commit is contained in:
marshmellow42 2015-06-30 13:00:51 -04:00
commit 5f605b8fc8
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/iso14443b.c
View file

@ -334,6 +334,8 @@ void SimulateIso14443bTag(void)
0x00, 0x21, 0x85, 0x5e, 0xd7 0x00, 0x21, 0x85, 0x5e, 0xd7
}; };
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
clear_trace(); clear_trace();
set_tracing(TRUE); set_tracing(TRUE);
@ -348,8 +350,6 @@ void SimulateIso14443bTag(void)
uint16_t len; uint16_t len;
uint16_t cmdsRecvd = 0; uint16_t cmdsRecvd = 0;
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
// prepare the (only one) tag answer: // prepare the (only one) tag answer:
CodeIso14443bAsTag(response1, sizeof(response1)); CodeIso14443bAsTag(response1, sizeof(response1));
uint8_t *resp1Code = BigBuf_malloc(ToSendMax); uint8_t *resp1Code = BigBuf_malloc(ToSendMax);
@ -908,9 +908,6 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ReadSTMemoryIso14443b(uint32_t dwLast) void ReadSTMemoryIso14443b(uint32_t dwLast)
{ {
clear_trace();
set_tracing(TRUE);
uint8_t i = 0x00; uint8_t i = 0x00;
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@ -929,6 +926,9 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
SpinDelay(200); SpinDelay(200);
clear_trace();
set_tracing(TRUE);
// First command: wake up the tag using the INITIATE command // First command: wake up the tag using the INITIATE command
uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b}; uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b};
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
@ -1199,7 +1199,7 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
FpgaSetupSsc(); FpgaSetupSsc();
if (datalen){ if (datalen){
set_tracing(TRUE); set_tracing(TRUE);