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

index ea36cdec869ef53d2cd81b8e82365ff9f95d28ea..16c428554a348be12ee5f648afae634243d74144 100644 (file)

--- a/armsrc/lfops.c

+++ b/armsrc/lfops.c

@@ -16,6 +16,7 @@

#include "string.h"

#include "lfdemod.h"

#include "lfsampling.h"

+#include "usb_cdc.h"

/**

@@ -399,14 +400,14 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)

i = 0;

for(;;) {

+ //wait until SSC_CLK goes HIGH

while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {

- if(BUTTON_PRESS()) {

+ if(BUTTON_PRESS() || usb_poll()) {

DbpString("Stopped");

return;

}

WDT_HIT();

}

if (ledcontrol)

LED_D_ON();

@@ -417,17 +418,18 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)

if (ledcontrol)

LED_D_OFF();

- //wait for next sample time

+ //wait until SSC_CLK goes LOW

while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {

if(BUTTON_PRESS()) {

DbpString("Stopped");

return;

}

WDT_HIT();

- }

+ }

i++;

if(i == period) {

i = 0;

if (gap) {

SHORT_COIL();

@@ -460,7 +462,7 @@ static void fc(int c, int *n)

dest[((*n)++)]=0;

}

- // an fc/8 encoded bit is a bit pattern of 11000000 x6 = 48 samples

+ // an fc/8 encoded bit is a bit pattern of 11110000 x6 = 48 samples

if(c==8) {

for (idx=0; idx<6; idx++) {

dest[((*n)++)]=1;

@@ -474,7 +476,7 @@ static void fc(int c, int *n)

}

- // an fc/10 encoded bit is a bit pattern of 1110000000 x5 = 50 samples

+ // an fc/10 encoded bit is a bit pattern of 1111100000 x5 = 50 samples

if(c==10) {

for (idx=0; idx<5; idx++) {

dest[((*n)++)]=1;

@@ -491,35 +493,34 @@ static void fc(int c, int *n)

}

// compose fc/X fc/Y waveform (FSKx)

-static void fcAll(uint8_t c, int *n, uint8_t clock)

+static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)

{

uint8_t *dest = BigBuf_get_addr();

- uint8_t idx;

- uint8_t fcCnt;

- // c = count of field clock for this bit

- int mod = clock % c;

+ uint8_t halfFC = fc/2;

+ uint8_t wavesPerClock = clock/fc;

+ uint8_t mod = clock % fc; //modifier

+ uint8_t modAdj = fc/mod; //how often to apply modifier

+ bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk=TRUE;

// loop through clock - step field clock

- for (idx=0; idx < (uint8_t) clock/c; idx++){

- // loop through field clock length - put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)

- for (fcCnt=0; fcCnt < c; fcCnt++){

- if (fcCnt < c/2){

- dest[((*n)++)]=1;

- } else {

- dest[((*n)++)]=0;

- }

+ for (uint8_t idx=0; idx < wavesPerClock; idx++){

+ // put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)

+ memset(dest+(*n), 0, fc-halfFC); //in case of odd number use extra here

+ memset(dest+(*n)+(fc-halfFC), 1, halfFC);

+ *n += fc;

}

- Dbprintf("mod: %d",mod);

- if (mod>0){ //for FC counts that don't add up to a full clock cycle padd with extra wave

- for (idx=0; idx < mod; idx++){

- if (idx < mod/2) {

- dest[((*n)++)]=1;

- } else {

- dest[((*n)++)]=0;

- }

+ if (mod>0) (*modCnt)++;

+ if ((mod>0) && modAdjOk){ //fsk2

+ if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave

+ memset(dest+(*n), 0, fc-halfFC);

+ memset(dest+(*n)+(fc-halfFC), 1, halfFC);

+ *n += fc;

}

+ if (mod>0 && !modAdjOk){ //fsk1

+ memset(dest+(*n), 0, mod-(mod/2));

+ memset(dest+(*n)+(mod-(mod/2)), 1, mod/2);

+ *n += mod;

+ }

}

// prepare a waveform pattern in the buffer based on the ID given then

@@ -538,7 +539,7 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)

if (hi>0xFFF) {

- DbpString("Tags can only have 44 bits.");

+ DbpString("Tags can only have 44 bits. - USE lf simfsk for larger tags");

return;

}

fc(0,&n);

@@ -587,33 +588,28 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)

int n=0, i=0;

uint8_t fcHigh = arg1 >> 8;

uint8_t fcLow = arg1 & 0xFF;

- //spacer bit

+ uint16_t modCnt = 0;

uint8_t clk = arg2 & 0xFF;

uint8_t invert = (arg2 >> 8) & 1;

- //fcAll(0, &n, clk);

- WDT_HIT();

for (i=0; i<size; i++){

if (BitStream[i] == invert){

- fcAll(fcLow, &n, clk);

+ fcAll(fcLow, &n, clk, &modCnt);

} else {

- fcAll(fcHigh, &n, clk);

+ fcAll(fcHigh, &n, clk, &modCnt);

}

Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, invert: %d, n: %d",fcHigh, fcLow, clk, invert, n);

- //Dbprintf("First 64:");

- //uint8_t *dest = BigBuf_get_addr();

- //i=0;

- //Dbprintf("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", dest[i],dest[i+1],dest[i+2],dest[i+3],dest[i+4],dest[i+5],dest[i+6],dest[i+7],dest[i+8],dest[i+9],dest[i+10],dest[i+11],dest[i+12],dest[i+13],dest[i+14],dest[i+15]);

- //i+=16;

+ /*Dbprintf("DEBUG: First 32:");

+ uint8_t *dest = BigBuf_get_addr();

+ i=0;

+ Dbprintf("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", dest[i],dest[i+1],dest[i+2],dest[i+3],dest[i+4],dest[i+5],dest[i+6],dest[i+7],dest[i+8],dest[i+9],dest[i+10],dest[i+11],dest[i+12],dest[i+13],dest[i+14],dest[i+15]);

+ i+=16;

+ */

if (ledcontrol)

LED_A_ON();

SimulateTagLowFrequency(n, 0, ledcontrol);

if (ledcontrol)

@@ -624,28 +620,15 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)

static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)

{

uint8_t *dest = BigBuf_get_addr();

- uint8_t idx;

+ uint8_t halfClk = clock/2;

// c = current bit 1 or 0

- int i = 0;

- // for when we want a separator

- if (c==2) { //separator

- for (i=0; i<clock/2; i++){

- dest[((*n)++)]=0;

- }

+ if (manchester){

+ memset(dest+(*n), c, halfClk);

+ memset(dest+(*n) + halfClk, c^1, halfClk);

} else {

- if (manchester){

- for (idx=0; idx < (uint8_t) clock/2; idx++){

- dest[((*n)++)]=c;

- }

- for (idx=0; idx < (uint8_t) clock/2; idx++){

- dest[((*n)++)]=c^1;

- }

- } else {

- for (idx=0; idx < (uint8_t) clock; idx++){

- dest[((*n)++)]=c;

- }

+ memset(dest+(*n), c, clock);

}

+ *n += clock;

}

// args clock, ask/man or askraw, invert, transmission separator

@@ -657,28 +640,28 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)

uint8_t manchester = arg1 & 1;

uint8_t separator = arg2 & 1;

uint8_t invert = (arg2 >> 8) & 1;

- WDT_HIT();

for (i=0; i<size; i++){

askSimBit(BitStream[i]^invert, &n, clk, manchester);

}

- if (separator==1) Dbprintf("sorry but separator option not yet available"); //askSimBit(2, &n, clk, manchester);

+ if (manchester==0 && BitStream[0]==BitStream[size-1]){ //run a second set inverted (for biphase phase)

+ for (i=0; i<size; i++){

+ askSimBit(BitStream[i]^invert^1, &n, clk, manchester);

+ }

+ if (separator==1) Dbprintf("sorry but separator option not yet available");

Dbprintf("Simulating with clk: %d, invert: %d, manchester: %d, separator: %d, n: %d",clk, invert, manchester, separator, n);

//DEBUG

- //Dbprintf("First 64:");

+ //Dbprintf("First 32:");

//uint8_t *dest = BigBuf_get_addr();

//i=0;

//Dbprintf("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", dest[i],dest[i+1],dest[i+2],dest[i+3],dest[i+4],dest[i+5],dest[i+6],dest[i+7],dest[i+8],dest[i+9],dest[i+10],dest[i+11],dest[i+12],dest[i+13],dest[i+14],dest[i+15]);

//i+=16;

- //i+=16;

if (ledcontrol)

LED_A_ON();

SimulateTagLowFrequency(n, 0, ledcontrol);

if (ledcontrol)

@@ -689,26 +672,22 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)

static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, bool phaseChg)

{

uint8_t *dest = BigBuf_get_addr();

- uint8_t idx;

+ uint8_t halfWave = waveLen/2;

+ //uint8_t idx;

int i = 0;

if (phaseChg){

// write phase change

- for (i=0; i < waveLen/2; i++){

- dest[((*n)++)] = *curPhase^1;

- }

- for (i=0; i < waveLen/2; i++){

- dest[((*n)++)] = *curPhase;

- }

+ memset(dest+(*n), *curPhase^1, halfWave);

+ memset(dest+(*n) + halfWave, *curPhase, halfWave);

+ *n += waveLen;

*curPhase ^= 1;

+ i += waveLen;

}

//write each normal clock wave for the clock duration

for (; i < clk; i+=waveLen){

- for (idx=0; idx<waveLen/2; idx++){

- dest[((*n)++)] = *curPhase;

- }

- for (idx=0; idx<waveLen/2; idx++){

- dest[((*n)++)] = *curPhase^1;

- }

+ memset(dest+(*n), *curPhase, halfWave);

+ memset(dest+(*n) + halfWave, *curPhase^1, halfWave);

+ *n += waveLen;

}

@@ -720,28 +699,21 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)

uint8_t clk = arg1 >> 8;

uint8_t carrier = arg1 & 0xFF;

uint8_t invert = arg2 & 0xFF;

- uint8_t phase = carrier/2; //extra phase changing bits = 1/2 a carrier wave to change the phase

- //uint8_t invert = (arg2 >> 8) & 1;

uint8_t curPhase = 0;

- WDT_HIT();

for (i=0; i<size; i++){

if (BitStream[i] == curPhase){

pskSimBit(carrier, &n, clk, &curPhase, FALSE);

} else {

- pskSimBit(phase, &n, clk, &curPhase, TRUE);

+ pskSimBit(carrier, &n, clk, &curPhase, TRUE);

}

Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d",carrier, clk, invert, n);

- Dbprintf("First 64:");

- uint8_t *dest = BigBuf_get_addr();

- i=0;

- Dbprintf("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", dest[i],dest[i+1],dest[i+2],dest[i+3],dest[i+4],dest[i+5],dest[i+6],dest[i+7],dest[i+8],dest[i+9],dest[i+10],dest[i+11],dest[i+12],dest[i+13],dest[i+14],dest[i+15]);

- i+=16;

+ //Dbprintf("DEBUG: First 32:");

+ //uint8_t *dest = BigBuf_get_addr();

+ //i=0;

+ //Dbprintf("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", dest[i],dest[i+1],dest[i+2],dest[i+3],dest[i+4],dest[i+5],dest[i+6],dest[i+7],dest[i+8],dest[i+9],dest[i+10],dest[i+11],dest[i+12],dest[i+13],dest[i+14],dest[i+15]);

+ //i+=16;

if (ledcontrol)

LED_A_ON();