git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/appmain.c b/armsrc/appmain.c

index eded359e0da364906aef836339d13ee34c9d6152..e292483b80b5a6634151a11ad5243bf0ff77cf49 100644 (file)

--- a/armsrc/appmain.c

+++ b/armsrc/appmain.c

@@ -10,20 +10,18 @@

// executes.

//-----------------------------------------------------------------------------

+#include <stdarg.h>

+

#include "usb_cdc.h"

#include "cmd.h"

-

#include "proxmark3.h"

#include "apps.h"

#include "util.h"

#include "printf.h"

#include "string.h"

-

-#include <stdarg.h>

-

#include "legicrf.h"

-#include <hitag2.h>

-#include <hitagS.h>

+#include "hitag2.h"

+#include "hitagS.h"

#include "lfsampling.h"

#include "BigBuf.h"

#include "mifareutil.h"

@@ -37,8 +35,6 @@

#include "iso14443a.h"

#endif

-#define abs(x) ( ((x)<0) ? -(x) : (x) )

-

//=============================================================================

// A buffer where we can queue things up to be sent through the FPGA, for

// any purpose (fake tag, as reader, whatever). We go MSB first, since that

@@ -454,7 +450,7 @@ void StandAloneMode14a()

SpinDelay(300);

}

- if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid))

+ if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0, true))

continue;

else

{

@@ -867,7 +863,7 @@ void ListenReaderField(int limit)

if (limit != HF_ONLY) {

if(mode == 1) {

- if (abs(lf_av - lf_baseline) > REPORT_CHANGE)

+ if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)

LED_D_ON();

else

LED_D_OFF();

@@ -875,7 +871,7 @@ void ListenReaderField(int limit)

lf_av_new = AvgAdc(ADC_CHAN_LF);

// see if there's a significant change

- if(abs(lf_av - lf_av_new) > REPORT_CHANGE) {

+ if(ABS(lf_av - lf_av_new) > REPORT_CHANGE) {

Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);

lf_av = lf_av_new;

if (lf_av > lf_max)

@@ -885,7 +881,7 @@ void ListenReaderField(int limit)

if (limit != LF_ONLY) {

if (mode == 1){

- if (abs(hf_av - hf_baseline) > REPORT_CHANGE)

+ if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)

LED_B_ON();

else

LED_B_OFF();

@@ -893,7 +889,7 @@ void ListenReaderField(int limit)

hf_av_new = AvgAdc(ADC_CHAN_HF);

// see if there's a significant change

- if(abs(hf_av - hf_av_new) > REPORT_CHANGE) {

+ if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {

Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);

hf_av = hf_av_new;

if (hf_av > hf_max)

@@ -942,7 +938,7 @@ void UsbPacketReceived(uint8_t *packet, int len)

setSamplingConfig((sample_config *) c->d.asBytes);

break;

case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:

- cmd_send(CMD_ACK,SampleLF(c->arg[0]),0,0,0,0);

+ cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0);

break;

case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:

ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);

@@ -1019,10 +1015,10 @@ void UsbPacketReceived(uint8_t *packet, int len)

WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);

break;

case CMD_EM4X_READ_WORD:

- EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);

+ EM4xReadWord(c->arg[0], c->arg[1],c->arg[2]);

break;

case CMD_EM4X_WRITE_WORD:

- EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);

+ EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);

break;

case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation

CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);

@@ -1030,6 +1026,9 @@ void UsbPacketReceived(uint8_t *packet, int len)

case CMD_VIKING_CLONE_TAG:

CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);

break;

+ case CMD_COTAG:

+ Cotag(c->arg[0]);

+ break;

#endif

#ifdef WITH_HITAG

@@ -1052,7 +1051,12 @@ void UsbPacketReceived(uint8_t *packet, int len)

ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);

break;

case CMD_WR_HITAG_S://writer for Hitag tags args=data to write,page and key or challenge

- WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);

+ if ((hitag_function)c->arg[0] < 10) {

+ WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);

+ }

+ else if ((hitag_function)c->arg[0] >= 10) {

+ WriterHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes, c->arg[2]);

+ }

break;

#endif

@@ -1164,6 +1168,9 @@ void UsbPacketReceived(uint8_t *packet, int len)

case CMD_MIFAREU_WRITEBL:

MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);

break;

+ case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:

+ MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

+ break;

case CMD_MIFARE_NESTED:

MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

break;

@@ -1192,6 +1199,9 @@ void UsbPacketReceived(uint8_t *packet, int len)

break;

// Work with "magic Chinese" card

+ case CMD_MIFARE_CWIPE:

+ MifareCWipe(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

+ break;

case CMD_MIFARE_CSETBLOCK:

MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

break;

@@ -1287,6 +1297,15 @@ void UsbPacketReceived(uint8_t *packet, int len)

break;

case CMD_DOWNLOADED_SIM_SAMPLES_125K: {

+ // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.

+ // to be able to use this one for uploading data to device

+ // arg1 = 0 upload for LF usage

+ // 1 upload for HF usage

+ if (c->arg[1] == 0)

+ FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

+ else

+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

+

uint8_t *b = BigBuf_get_addr();

memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);

cmd_send(CMD_ACK,0,0,0,0,0);

@@ -1297,7 +1316,7 @@ void UsbPacketReceived(uint8_t *packet, int len)

break;

case CMD_SET_LF_DIVISOR:

- FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

+ FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);

break;