github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-15 01:33:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #131 from holiman/master

Browse source 
Fixes to PR #129
This commit is contained in:
Martin Holst Swende 2015-07-20 23:22:53 +02:00
commit 1adb2023ce
7 changed files with 214 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

1
armsrc/appmain.c
View file

@ -667,6 +667,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
break; break;
case CMD_T55XX_WRITE_BLOCK: case CMD_T55XX_WRITE_BLOCK:
T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]); T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
cmd_send(CMD_ACK,0,0,0,0,0);
break; break;
case CMD_T55XX_READ_TRACE: case CMD_T55XX_READ_TRACE:
T55xxReadTrace(); T55xxReadTrace();

6
armsrc/lfops.c
View file

@ -399,14 +399,10 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
#define OPEN_COIL() HIGH(GPIO_SSC_DOUT) #define OPEN_COIL() HIGH(GPIO_SSC_DOUT)
i = 0; i = 0;
byte_t rx[sizeof(UsbCommand)]; // Storage for usb_read call in loop
for(;;) { for(;;) {
//wait until SSC_CLK goes HIGH //wait until SSC_CLK goes HIGH
while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) { while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
// Craig Young - Adding a usb_read() here to avoid abort on empty UsbCommand if(BUTTON_PRESS() || (usb_poll_validate_length() )) {
// My OS X client does this preventing simulation.
// Performance hit should be non-existent since the read is only performed if usb_poll is true
if(BUTTON_PRESS() || (usb_poll() && usb_read(rx,sizeof(UsbCommand)))) {
DbpString("Stopped"); DbpString("Stopped");
return; return;
} }

16
client/cmdhw.c
View file

@ -406,21 +406,15 @@ int CmdVersion(const char *Cmd)
{ {
UsbCommand c = {CMD_VERSION}; UsbCommand c = {CMD_VERSION};
static UsbCommand resp = {0, {0, 0, 0}}; UsbCommand resp = {0, {0, 0, 0}};
if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available SendCommand(&c);
SendCommand(&c); if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && Cmd != NULL) {
PrintAndLog("Prox/RFID mark3 RFID instrument");
PrintAndLog((char*)resp.d.asBytes);
lookupChipID(resp.arg[0], resp.arg[1]);
}
} else if (Cmd != NULL) {
PrintAndLog("Prox/RFID mark3 RFID instrument"); PrintAndLog("Prox/RFID mark3 RFID instrument");
PrintAndLog((char*)resp.d.asBytes); PrintAndLog((char*)resp.d.asBytes);
lookupChipID(resp.arg[0], resp.arg[1]); lookupChipID(resp.arg[0], resp.arg[1]);
} }
return 0; return 0;
} }

348
client/cmdlfawid.c
View file

@ -16,218 +16,222 @@
#include "cmdparser.h" // CmdsParse, CmdsHelp #include "cmdparser.h" // CmdsParse, CmdsHelp
#include "cmdlfawid.h" // AWID function declarations #include "cmdlfawid.h" // AWID function declarations
#include "lfdemod.h" // parityTest #include "lfdemod.h" // parityTest
#include "cmdmain.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
int usage_lf_awid_fskdemod(void) { int usage_lf_awid_fskdemod(void) {
PrintAndLog("Enables AWID26 compatible reader mode printing details of scanned AWID26 tags."); PrintAndLog("Enables AWID26 compatible reader mode printing details of scanned AWID26 tags.");
PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued."); PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued.");
PrintAndLog("If the ['1'] option is provided, reader mode is exited after reading a single AWID26 card."); PrintAndLog("If the ['1'] option is provided, reader mode is exited after reading a single AWID26 card.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid fskdemod ['1']"); PrintAndLog("Usage: lf awid fskdemod ['1']");
PrintAndLog(" Options : "); PrintAndLog(" Options : ");
PrintAndLog(" 1 : (optional) stop after reading a single card"); PrintAndLog(" 1 : (optional) stop after reading a single card");
PrintAndLog(""); PrintAndLog("");
PrintAndLog(" sample : lf awid fskdemod"); PrintAndLog(" sample : lf awid fskdemod");
PrintAndLog(" : lf awid fskdemod 1"); PrintAndLog(" : lf awid fskdemod 1");
return 0; return 0;
} }
int usage_lf_awid_sim(void) { int usage_lf_awid_sim(void) {
PrintAndLog("Enables simulation of AWID26 card with specified facility-code and card number."); PrintAndLog("Enables simulation of AWID26 card with specified facility-code and card number.");
PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid sim <Facility-Code> <Card-Number>"); PrintAndLog("Usage: lf awid sim <Facility-Code> <Card-Number>");
PrintAndLog(" Options : "); PrintAndLog(" Options : ");
PrintAndLog(" <Facility-Code> : 8-bit value representing the AWID facility code"); PrintAndLog(" <Facility-Code> : 8-bit value representing the AWID facility code");
PrintAndLog(" <Card Number> : 16-bit value representing the AWID card number"); PrintAndLog(" <Card Number> : 16-bit value representing the AWID card number");
PrintAndLog(""); PrintAndLog("");
PrintAndLog(" sample : lf awid sim 224 1337"); PrintAndLog(" sample : lf awid sim 224 1337");
return 0; return 0;
} }
int usage_lf_awid_clone(void) { int usage_lf_awid_clone(void) {
PrintAndLog("Enables cloning of AWID26 card with specified facility-code and card number onto T55x7."); PrintAndLog("Enables cloning of AWID26 card with specified facility-code and card number onto T55x7.");
PrintAndLog("The T55x7 must be on the antenna when issuing this command. T55x7 blocks are calculated and printed in the process."); PrintAndLog("The T55x7 must be on the antenna when issuing this command. T55x7 blocks are calculated and printed in the process.");
PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid clone <Facility-Code> <Card-Number>"); PrintAndLog("Usage: lf awid clone <Facility-Code> <Card-Number>");
PrintAndLog(" Options : "); PrintAndLog(" Options : ");
PrintAndLog(" <Facility-Code> : 8-bit value representing the AWID facility code"); PrintAndLog(" <Facility-Code> : 8-bit value representing the AWID facility code");
PrintAndLog(" <Card Number> : 16-bit value representing the AWID card number"); PrintAndLog(" <Card Number> : 16-bit value representing the AWID card number");
PrintAndLog(""); PrintAndLog("");
PrintAndLog(" sample : lf awid clone 224 1337"); PrintAndLog(" sample : lf awid clone 224 1337");
return 0; return 0;
} }
int CmdAWIDDemodFSK(const char *Cmd) int CmdAWIDDemodFSK(const char *Cmd)
{ {
int findone=0; int findone=0;
if(Cmd[0]=='1') findone=1; if(Cmd[0]=='1') findone=1;
if (Cmd[0]=='h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod(); if (Cmd[0]=='h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod();
UsbCommand c={CMD_AWID_DEMOD_FSK}; UsbCommand c={CMD_AWID_DEMOD_FSK};
c.arg[0]=findone; c.arg[0]=findone;
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
int getAWIDBits(unsigned int fc, unsigned int cn, uint8_t *AWIDBits) int getAWIDBits(unsigned int fc, unsigned int cn, uint8_t *AWIDBits)
{ {
int i; int i;
uint32_t fcode=(fc & 0x000000FF), cnum=(cn & 0x0000FFFF), uBits=0; uint32_t fcode=(fc & 0x000000FF), cnum=(cn & 0x0000FFFF), uBits=0;
if (fcode != fc) if (fcode != fc)
PrintAndLog("NOTE: Facility code truncated for AWID26 format (8-bit facility code)"); PrintAndLog("NOTE: Facility code truncated for AWID26 format (8-bit facility code)");
if (cnum!=cn) if (cnum!=cn)
PrintAndLog("NOTE: Card number was truncated for AWID26 format (16-bit card number)"); PrintAndLog("NOTE: Card number was truncated for AWID26 format (16-bit card number)");
AWIDBits[0] = 0x01; // 6-bit Preamble with 2 parity bits AWIDBits[0] = 0x01; // 6-bit Preamble with 2 parity bits
AWIDBits[1] = 0x1D; // First byte from card format (26-bit) plus parity bits AWIDBits[1] = 0x1D; // First byte from card format (26-bit) plus parity bits
AWIDBits[2] = 0x80; // Set the next two bits as 0b10 to finish card format AWIDBits[2] = 0x80; // Set the next two bits as 0b10 to finish card format
uBits = (fcode<<4) + (cnum>>12); uBits = (fcode<<4) + (cnum>>12);
if (!parityTest(uBits,12,0)) if (!parityTest(uBits,12,0))
AWIDBits[2] |= (1<<5); // If not already even parity, set bit to make even AWIDBits[2] |= (1<<5); // If not already even parity, set bit to make even
uBits = AWIDBits[2]>>5; uBits = AWIDBits[2]>>5;
if (!parityTest(uBits, 3, 1)) if (!parityTest(uBits, 3, 1))
AWIDBits[2] |= (1<<4); AWIDBits[2] |= (1<<4);
uBits = fcode>>5; // first 3 bits of facility-code uBits = fcode>>5; // first 3 bits of facility-code
AWIDBits[2] += (uBits<<1); AWIDBits[2] += (uBits<<1);
if (!parityTest(uBits, 3, 1)) if (!parityTest(uBits, 3, 1))
AWIDBits[2]++; // Set parity bit to make odd parity AWIDBits[2]++; // Set parity bit to make odd parity
uBits = (fcode & 0x1C)>>2; uBits = (fcode & 0x1C)>>2;
AWIDBits[3] = 0; AWIDBits[3] = 0;
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[3] |= (1<<4); AWIDBits[3] |= (1<<4);
AWIDBits[3] += (uBits<<5); AWIDBits[3] += (uBits<<5);
uBits = ((fcode & 0x3)<<1) + ((cnum & 0x8000)>>15); // Grab/shift 2 LSBs from facility code and add shifted MSB from cardnum uBits = ((fcode & 0x3)<<1) + ((cnum & 0x8000)>>15); // Grab/shift 2 LSBs from facility code and add shifted MSB from cardnum
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[3]++; // Set LSB for parity AWIDBits[3]++; // Set LSB for parity
AWIDBits[3]+= (uBits<<1); AWIDBits[3]+= (uBits<<1);
uBits = (cnum & 0x7000)>>12; uBits = (cnum & 0x7000)>>12;
AWIDBits[4] = uBits<<5; AWIDBits[4] = uBits<<5;
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[4] |= (1<<4); AWIDBits[4] |= (1<<4);
uBits = (cnum & 0x0E00)>>9; uBits = (cnum & 0x0E00)>>9;
AWIDBits[4] += (uBits<<1); AWIDBits[4] += (uBits<<1);
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[4]++; // Set LSB for parity AWIDBits[4]++; // Set LSB for parity
uBits = (cnum & 0x1C0)>>6; // Next bits from card number uBits = (cnum & 0x1C0)>>6; // Next bits from card number
AWIDBits[5]=(uBits<<5); AWIDBits[5]=(uBits<<5);
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[5] |= (1<<4); // Set odd parity bit as needed AWIDBits[5] |= (1<<4); // Set odd parity bit as needed
uBits = (cnum & 0x38)>>3; uBits = (cnum & 0x38)>>3;
AWIDBits[5]+= (uBits<<1); AWIDBits[5]+= (uBits<<1);
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[5]++; // Set odd parity bit as needed AWIDBits[5]++; // Set odd parity bit as needed
uBits = (cnum & 0x7); // Last three bits from card number! uBits = (cnum & 0x7); // Last three bits from card number!
AWIDBits[6] = (uBits<<5); AWIDBits[6] = (uBits<<5);
if (!parityTest(uBits,3,1)) if (!parityTest(uBits,3,1))
AWIDBits[6] |= (1<<4); AWIDBits[6] |= (1<<4);
uBits = (cnum & 0x0FFF); uBits = (cnum & 0x0FFF);
if (!parityTest(uBits,12,1)) if (!parityTest(uBits,12,1))
AWIDBits[6] |= (1<<3); AWIDBits[6] |= (1<<3);
else else
AWIDBits[6]++; AWIDBits[6]++;
for (i = 7; i<12; i++) for (i = 7; i<12; i++)
AWIDBits[i]=0x11; AWIDBits[i]=0x11;
return 1; return 1;
} }
int CmdAWIDSim(const char *Cmd) int CmdAWIDSim(const char *Cmd)
{ {
uint32_t fcode = 0, cnum = 0, fc=0, cn=0, i=0; uint32_t fcode = 0, cnum = 0, fc=0, cn=0, i=0;
uint8_t *BS, BitStream[12]; uint8_t *BS, BitStream[12];
uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8 uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8
uint64_t arg2 = 50; // clk RF/50 invert=0 uint64_t arg2 = 50; // clk RF/50 invert=0
BS = BitStream; BS = BitStream;
if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) { if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) {
return usage_lf_awid_sim(); return usage_lf_awid_sim();
} }
fcode=(fc & 0x000000FF); fcode=(fc & 0x000000FF);
cnum=(cn & 0x0000FFFF); cnum=(cn & 0x0000FFFF);
if (fc!=fcode) if (fc!=fcode)
PrintAndLog("Facility-Code (%u) truncated to 8-bits: %u",fc,fcode); PrintAndLog("Facility-Code (%u) truncated to 8-bits: %u",fc,fcode);
if (cn!=cnum) if (cn!=cnum)
PrintAndLog("Card number (%u) truncated to 16-bits: %u",cn,cnum); PrintAndLog("Card number (%u) truncated to 16-bits: %u",cn,cnum);
PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n",fcode,cnum); PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n",fcode,cnum);
PrintAndLog("Press pm3-button to abort simulation or run another command"); PrintAndLog("Press pm3-button to abort simulation or run another command");
// AWID uses: fcHigh: 10, fcLow: 8, clk: 50, invert: 0 // AWID uses: fcHigh: 10, fcLow: 8, clk: 50, invert: 0
if (getAWIDBits(fc, cn, BS)) { if (getAWIDBits(fc, cn, BS)) {
PrintAndLog("Running 'lf simfsk c 50 H 10 L 8 d %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x'", PrintAndLog("Running 'lf simfsk c 50 H 10 L 8 d %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x'",
BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6], BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6],
BS[7],BS[8],BS[9],BS[10],BS[11]); BS[7],BS[8],BS[9],BS[10],BS[11]);
} else } else
PrintAndLog("Error with tag bitstream generation."); PrintAndLog("Error with tag bitstream generation.");
UsbCommand c; UsbCommand c;
c.cmd = CMD_FSK_SIM_TAG; c.cmd = CMD_FSK_SIM_TAG;
c.arg[0] = arg1; // fcHigh<<8 + fcLow c.arg[0] = arg1; // fcHigh<<8 + fcLow
c.arg[1] = arg2; // Inversion and clk setting c.arg[1] = arg2; // Inversion and clk setting
c.arg[2] = 96; // Bitstream length: 96-bits == 12 bytes c.arg[2] = 96; // Bitstream length: 96-bits == 12 bytes
for (i=0; i < 96; i++) for (i=0; i < 96; i++)
c.d.asBytes[i] = (BS[i/8] & (1<<(7-(i%8))))?1:0; c.d.asBytes[i] = (BS[i/8] & (1<<(7-(i%8))))?1:0;
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
int CmdAWIDClone(const char *Cmd) int CmdAWIDClone(const char *Cmd)
{ {
uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0; uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0;
uint8_t BitStream[12]; uint8_t BitStream[12];
uint8_t *BS=BitStream; uint8_t *BS=BitStream;
UsbCommand c; UsbCommand c, resp;
if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) { if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) {
return usage_lf_awid_clone(); return usage_lf_awid_clone();
} }
if ((fc & 0xFF) != fc) { if ((fc & 0xFF) != fc) {
fc &= 0xFF; fc &= 0xFF;
PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc); PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc);
} }
if ((cn & 0xFFFF) != cn) { if ((cn & 0xFFFF) != cn) {
cn &= 0xFFFF; cn &= 0xFFFF;
PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn); PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn);
} }
if (getAWIDBits(fc,cn,BS)) { if (getAWIDBits(fc,cn,BS)) {
PrintAndLog("Preparing to clone AWID26 to T55x7 with FC: %u, CN: %u (Raw: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x)", PrintAndLog("Preparing to clone AWID26 to T55x7 with FC: %u, CN: %u (Raw: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x)",
fc,cn, BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6],BS[7],BS[8],BS[9],BS[10],BS[11]); fc,cn, BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6],BS[7],BS[8],BS[9],BS[10],BS[11]);
blocks[1] = (BS[0]<<24) + (BS[1]<<16) + (BS[2]<<8) + (BS[3]); blocks[1] = (BS[0]<<24) + (BS[1]<<16) + (BS[2]<<8) + (BS[3]);
blocks[2] = (BS[4]<<24) + (BS[5]<<16) + (BS[6]<<8) + (BS[7]); blocks[2] = (BS[4]<<24) + (BS[5]<<16) + (BS[6]<<8) + (BS[7]);
PrintAndLog("Block 0: 0x%08x", blocks[0]); PrintAndLog("Block 0: 0x%08x", blocks[0]);
PrintAndLog("Block 1: 0x%08x", blocks[1]); PrintAndLog("Block 1: 0x%08x", blocks[1]);
PrintAndLog("Block 2: 0x%08x", blocks[2]); PrintAndLog("Block 2: 0x%08x", blocks[2]);
PrintAndLog("Block 3: 0x%08x", blocks[3]); PrintAndLog("Block 3: 0x%08x", blocks[3]);
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
c.cmd = CMD_T55XX_WRITE_BLOCK; c.cmd = CMD_T55XX_WRITE_BLOCK;
c.arg[0] = blocks[i]; c.arg[0] = blocks[i];
c.arg[1] = i; c.arg[1] = i;
c.arg[2] = 0; c.arg[2] = 0;
SendCommand(&c); SendCommand(&c);
} if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
} PrintAndLog("Error occurred, device did not respond during write operation.");
return 0; return -1;
}
}
}
return 0;
} }
static command_t CommandTable[] = static command_t CommandTable[] =
{ {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"}, {"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"},
{"sim", CmdAWIDSim, 0, "<Facility-Code> <Card Number> -- AWID tag simulator"}, {"sim", CmdAWIDSim, 0, "<Facility-Code> <Card Number> -- AWID tag simulator"},
{"clone", CmdAWIDClone, 0, "<Facility-Code> <Card Number> -- Clone AWID to T55x7 (tag must be in range of antenna)"}, {"clone", CmdAWIDClone, 0, "<Facility-Code> <Card Number> -- Clone AWID to T55x7 (tag must be in range of antenna)"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
int CmdLFAWID(const char *Cmd) int CmdLFAWID(const char *Cmd)
{ {
CmdsParse(CommandTable, Cmd); CmdsParse(CommandTable, Cmd);
return 0; return 0;
} }
int CmdHelp(const char *Cmd) int CmdHelp(const char *Cmd)
{ {
CmdsHelp(CommandTable); CmdsHelp(CommandTable);
return 0; return 0;
} }

8
client/cmdlft55xx.c
View file

@ -242,6 +242,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
c.d.asBytes[0] = 0x1; c.d.asBytes[0] = 0x1;
} }
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
PrintAndLog("command execution time out"); PrintAndLog("command execution time out");
@ -670,6 +671,7 @@ int CmdT55xxWriteBlock(const char *Cmd)
} }
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}}; UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
UsbCommand resp;
c.d.asBytes[0] = 0x0; c.d.asBytes[0] = 0x0;
PrintAndLog("Writing to block: %d data : 0x%08X", block, data); PrintAndLog("Writing to block: %d data : 0x%08X", block, data);
@ -680,7 +682,12 @@ int CmdT55xxWriteBlock(const char *Cmd)
c.d.asBytes[0] = 0x1; c.d.asBytes[0] = 0x1;
PrintAndLog("pwd : 0x%08X", password); PrintAndLog("pwd : 0x%08X", password);
} }
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");
return -1;
}
return 0; return 0;
} }
@ -878,6 +885,7 @@ int AquireData( uint8_t block ){
// c.d.asBytes[0] = 0x1; // c.d.asBytes[0] = 0x1;
// } // }
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
PrintAndLog("command execution time out"); PrintAndLog("command execution time out");

28
common/usb_cdc.c
View file

@ -293,31 +293,47 @@ bool usb_poll()
return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank); return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
} }
/**
In github PR #129, some users appears to get a false positive from
usb_poll, which returns true, but the usb_read operation
still returns 0.
This check is basically the same as above, but also checks
that the length available to read is non-zero, thus hopefully fixes the
bug.
**/
bool usb_poll_validate_length()
{
if (!usb_check()) return false;
if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
return (pUdp->UDP_CSR[AT91C_EP_OUT] >> 16) > 0;
}
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
//* \fn usb_read //* \fn usb_read
//* \brief Read available data from Endpoint OUT //* \brief Read available data from Endpoint OUT
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
uint32_t usb_read(byte_t* data, size_t len) { uint32_t usb_read(byte_t* data, size_t len) {
byte_t bank = btReceiveBank; byte_t bank = btReceiveBank;
uint32_t packetSize, nbBytesRcv = 0; uint32_t packetSize, nbBytesRcv = 0;
uint32_t time_out = 0; uint32_t time_out = 0;
while (len) { while (len) {
if (!usb_check()) break; if (!usb_check()) break;
if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) { if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len); packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len);
len -= packetSize; len -= packetSize;
while(packetSize--) while(packetSize--)
data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT]; data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank); pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);
if (bank == AT91C_UDP_RX_DATA_BK0) { if (bank == AT91C_UDP_RX_DATA_BK0) {
bank = AT91C_UDP_RX_DATA_BK1; bank = AT91C_UDP_RX_DATA_BK1;
} else { } else {
bank = AT91C_UDP_RX_DATA_BK0; bank = AT91C_UDP_RX_DATA_BK0;
} }
} }
if (time_out++ == 0x1fff) break; if (time_out++ == 0x1fff) break;
} }
btReceiveBank = bank; btReceiveBank = bank;

1
common/usb_cdc.h
View file

@ -41,6 +41,7 @@ void usb_disable();
void usb_enable(); void usb_enable();
bool usb_check(); bool usb_check();
bool usb_poll(); bool usb_poll();
bool usb_poll_validate_length();
uint32_t usb_read(byte_t* data, size_t len); uint32_t usb_read(byte_t* data, size_t len);
uint32_t usb_write(const byte_t* data, const size_t len); uint32_t usb_write(const byte_t* data, const size_t len);