projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and...
[proxmark3-svn]
/
armsrc
/
lfsampling.c
diff --git
a/armsrc/lfsampling.c
b/armsrc/lfsampling.c
index 339434215512a7e9536dc9d19a371b14857a7dde..3a502eb683318e4ebb36b754191ffc8b7bf710ea 100644
(file)
--- a/
armsrc/lfsampling.c
+++ b/
armsrc/lfsampling.c
@@
-40,11
+40,11
@@
void printConfig()
void setSamplingConfig(sample_config *sc)
{
if(sc->divisor != 0) config.divisor = sc->divisor;
void setSamplingConfig(sample_config *sc)
{
if(sc->divisor != 0) config.divisor = sc->divisor;
- if(sc->bits_per_sample
!= 0) config.bits_per_sample
= sc->bits_per_sample;
- if(sc->decimation
!= 0) config.decimation
= sc->decimation;
- if(sc->trigger_threshold != -1) config.trigger_threshold= sc->trigger_threshold;
+ if(sc->bits_per_sample
!= 0) config.bits_per_sample
= sc->bits_per_sample;
+ if(sc->decimation
!= 0) config.decimation
= sc->decimation;
+ if(sc->trigger_threshold != -1) config.trigger_threshold
= sc->trigger_threshold;
- config.averaging= sc->averaging;
+ config.averaging
= sc->averaging;
if(config.bits_per_sample > 8) config.bits_per_sample = 8;
if(config.decimation < 1) config.decimation = 1;
if(config.bits_per_sample > 8) config.bits_per_sample = 8;
if(config.decimation < 1) config.decimation = 1;
@@
-121,11
+121,11
@@
void LFSetupFPGAForADC(int divisor, bool lf_field)
*/
uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
{
*/
uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
{
- //
.
+ //
bigbuf, to hold the aquired raw data signal
uint8_t *dest = BigBuf_get_addr();
uint8_t *dest = BigBuf_get_addr();
-
in
t bufsize = BigBuf_max_traceLen();
+
uint16_
t bufsize = BigBuf_max_traceLen();
-
memset(dest, 0, bufsiz
e);
+
BigBuf_Clear_ext(fals
e);
if(bits_per_sample < 1) bits_per_sample = 1;
if(bits_per_sample > 8) bits_per_sample = 8;
if(bits_per_sample < 1) bits_per_sample = 1;
if(bits_per_sample > 8) bits_per_sample = 8;
@@
-141,7
+141,7
@@
uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
uint32_t sample_total_numbers =0 ;
uint32_t sample_total_saved =0 ;
uint32_t sample_total_numbers =0 ;
uint32_t sample_total_saved =0 ;
- while(!BUTTON_PRESS()) {
+ while(!BUTTON_PRESS()
&& !usb_poll_validate_length()
) {
WDT_HIT();
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = 0x43;
WDT_HIT();
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = 0x43;
@@
-244,7
+244,6
@@
uint32_t SampleLF(bool printCfg)
* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
* @return number of bits sampled
**/
* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
* @return number of bits sampled
**/
-
uint32_t SnoopLF() {
return ReadLF(false, true);
}
uint32_t SnoopLF() {
return ReadLF(false, true);
}
@@
-253,52
+252,66
@@
uint32_t SnoopLF() {
* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
* the data is collected in BigBuf.
**/
* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
* the data is collected in BigBuf.
**/
-void doT55x7Acquisition(
void)
{
+void doT55x7Acquisition(
size_t sample_size)
{
- #define T55xx_
SAMPLES_SIZE 12000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)
- #define T55xx_READ_
UPPER_THRESHOLD 128+40 // 50
+ #define T55xx_
READ_UPPER_THRESHOLD 128+60 // 60 grph
+ #define T55xx_READ_
LOWER_THRESHOLD 128-60 // -60 grph
#define T55xx_READ_TOL 5
#define T55xx_READ_TOL 5
- //#define T55xx_READ_LOWER_THRESHOLD 128-40 //-50
uint8_t *dest = BigBuf_get_addr();
uint16_t bufsize = BigBuf_max_traceLen();
uint8_t *dest = BigBuf_get_addr();
uint16_t bufsize = BigBuf_max_traceLen();
- if ( bufsize >
T55xx_SAMPLES_SIZE
)
- bufsize =
T55xx_SAMPLES_SIZE
;
+ if ( bufsize >
sample_size
)
+ bufsize =
sample_size
;
- memset(dest, 0, bufsize);
-
uint16_t i = 0;
bool startFound = false;
bool highFound = false;
uint16_t i = 0;
bool startFound = false;
bool highFound = false;
+ bool lowFound = false;
uint8_t curSample = 0;
uint8_t curSample = 0;
- uint8_t firstSample = 0;
- for(;;) {
+ uint8_t lastSample = 0;
+ uint16_t skipCnt = 0;
+ while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
+ WDT_HIT();
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = 0x43;
LED_D_ON();
}
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = 0x43;
LED_D_ON();
}
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
- curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-
- // find first high sample
+ curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+ LED_D_OFF();
+
+ // skip until the first high sample above threshold
if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-
if (curSample > fir
stSample)
-
fir
stSample = curSample;
+
//if (curSample > la
stSample)
+
// la
stSample = curSample;
highFound = true;
} else if (!highFound) {
highFound = true;
} else if (!highFound) {
+ skipCnt++;
continue;
}
continue;
}
+ // skip until the first Low sample below threshold
+ if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) {
+ //if (curSample > lastSample)
+ lastSample = curSample;
+ lowFound = true;
+ } else if (!lowFound) {
+ skipCnt++;
+ continue;
+ }
+
- // skip until samples begin to change
- if (startFound || curSample < firstSample-T55xx_READ_TOL){
- if (!startFound)
- dest[i++] = firstSample;
- startFound = true;
+ // skip until first high samples begin to change
+ if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD+T55xx_READ_TOL){
+ // if just found start - recover last sample
+ if (!startFound) {
+ dest[i++] = lastSample;
+ startFound = true;
+ }
+ // collect samples
dest[i++] = curSample;
dest[i++] = curSample;
- LED_D_OFF();
- if (i >= bufsize) break;
}
}
}
}
}
}
-}
\ No newline at end of file
+}
+
\ No newline at end of file
Impressum
,
Datenschutz
projects / proxmark3-svn / blobdiff