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

FIX: 'hf snoop' - forcing function to clean up AT91C_BASE_SSC->SSC_RFMR into default setup values.

Browse source 
FIX: 'lf ti' - forcing to cleaning up of SSC when finished.
This commit is contained in:
iceman1001 2018-01-27 20:30:50 +01:00
commit 60afef3938
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
armsrc/hfsnoop.c
View file

@ -13,18 +13,13 @@ static void RAMFUNC optimizedSnoop(void)
uint16_t *dest = (uint16_t *)BigBuf_get_addr(); uint16_t *dest = (uint16_t *)BigBuf_get_addr();
uint16_t *destend = dest + n-1; uint16_t *destend = dest + n-1;
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16); // Setting Frame mode, 16 bits per word
// Reading data loop // Reading data loop
while(dest <= destend) while(dest <= destend) {
{ if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)
{
*dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); *dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
dest++; dest++;
} }
} }
//Resetting Frame mode (First set in fpgaloader.c)
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
//setting tracelen - importsnt! it was set by buffer overflow before //setting tracelen - importsnt! it was set by buffer overflow before
set_tracelen( BigBuf_max_traceLen()); set_tracelen( BigBuf_max_traceLen());
} }
@ -50,9 +45,9 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
trigger_cnt = 0; trigger_cnt = 0;
uint16_t r = 0; uint16_t r = 0;
while(!BUTTON_PRESS() && !usb_poll_validate_length() ) { while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
WDT_HIT(); WDT_HIT();
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
r = (uint16_t)AT91C_BASE_SSC->SSC_RHR; r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
r = MAX(r & 0xff, r >> 8); r = MAX(r & 0xff, r >> 8);
if (r >= 180) { if (r >= 180) {
@ -62,7 +57,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
} }
} }
if(!BUTTON_PRESS()) { if (!BUTTON_PRESS()) {
int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0 int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
while(waitcount != 0) { while(waitcount != 0) {
@ -73,6 +68,9 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r); Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
} }
//Resetting Frame mode (First set in fpgaloader.c)
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
DbpString("HF Snoop end"); DbpString("HF Snoop end");
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_D_OFF(); LED_D_OFF();

3
armsrc/lfops.c
View file

@ -319,6 +319,9 @@ void AcquireTiType(void)
} }
} }
} }
// reset SSC
FpgaSetupSsc();
} }
// arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc