RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-28 16:02:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: syntax suger..

Browse source
This commit is contained in:
iceman1001 2016-04-10 12:58:04 +02:00
parent 2abdfa491c
commit 1b4a446aba
1 changed files with 19 additions and 28 deletions

45
armsrc/iso15693.c
View file

@ -223,7 +223,7 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait) static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
{ {
int c; int c;
volatile uint32_t r;
// FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); // FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
if(*wait < 10) { *wait = 10; } if(*wait < 10) { *wait = 10; }
@ -231,10 +231,10 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
// for(c = 0; c < *wait;) { // for(c = 0; c < *wait;) {
// if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { // if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
// AT91C_BASE_SSC->SSC_THR = 0x00; // For exact timing! // AT91C_BASE_SSC->SSC_THR = 0x00; // For exact timing!
// c++; // ++c;
// } // }
// if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { // if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
// volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR; // r = AT91C_BASE_SSC->SSC_RHR;
// (void)r; // (void)r;
// } // }
// WDT_HIT(); // WDT_HIT();
@ -244,13 +244,10 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
for(;;) { for(;;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
AT91C_BASE_SSC->SSC_THR = cmd[c]; AT91C_BASE_SSC->SSC_THR = cmd[c];
c++; if( ++c >= len) break;
if(c >= len) {
break;
}
} }
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR; r = AT91C_BASE_SSC->SSC_RHR;
(void)r; (void)r;
} }
WDT_HIT(); WDT_HIT();
@ -264,19 +261,17 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait) static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
{ {
int c = 0; int c = 0;
volatile uint32_t r;
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K);
if(*wait < 10) { *wait = 10; } if(*wait < 10) { *wait = 10; }
for(;;) { for(;;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
AT91C_BASE_SSC->SSC_THR = cmd[c]; AT91C_BASE_SSC->SSC_THR = cmd[c];
c++; if( ++c >= len) break;
if(c >= len) {
break;
}
} }
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR; r = AT91C_BASE_SSC->SSC_RHR;
(void)r; (void)r;
} }
WDT_HIT(); WDT_HIT();
@ -569,13 +564,14 @@ static void BuildIdentifyRequest(void);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void AcquireRawAdcSamplesIso15693(void) void AcquireRawAdcSamplesIso15693(void)
{ {
uint8_t *dest = BigBuf_get_addr(); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
int c = 0; int c = 0;
int getNext = 0; int getNext = 0;
int8_t prev = 0; int8_t prev = 0;
volatile uint32_t r;
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); uint8_t *dest = BigBuf_get_addr();
BuildIdentifyRequest(); BuildIdentifyRequest();
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@ -592,13 +588,10 @@ void AcquireRawAdcSamplesIso15693(void)
for(;;) { for(;;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
AT91C_BASE_SSC->SSC_THR = ToSend[c]; AT91C_BASE_SSC->SSC_THR = ToSend[c];
c++; if( ++c == ToSendMax+3) break;
if(c == ToSendMax+3) {
break;
}
} }
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR; r = AT91C_BASE_SSC->SSC_RHR;
(void)r; (void)r;
} }
WDT_HIT(); WDT_HIT();
@ -609,9 +602,9 @@ void AcquireRawAdcSamplesIso15693(void)
c = 0; c = 0;
getNext = FALSE; getNext = FALSE;
for(;;) { for(;;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))
AT91C_BASE_SSC->SSC_THR = 0x43; AT91C_BASE_SSC->SSC_THR = 0x43;
}
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
int8_t b; int8_t b;
b = (int8_t)AT91C_BASE_SSC->SSC_RHR; b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
@ -621,13 +614,11 @@ void AcquireRawAdcSamplesIso15693(void)
// every other is Q. We just want power, so abs(I) + abs(Q) is // every other is Q. We just want power, so abs(I) + abs(Q) is
// close to what we want. // close to what we want.
if(getNext) { if(getNext) {
int8_t r = ABS(b) + ABS(prev);
dest[c++] = (uint8_t)r; dest[c++] = (uint8_t)(ABS(b) + ABS(prev));
if(c >= 2000) break;
if(c >= 2000) {
break;
}
} else { } else {
prev = b; prev = b;
} }