X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/31abe49fd323411b391dd10335eb4c60cfcecb06..8d960002c8713dfbaed0f0dd52fe7d7cb2dd77b1:/armsrc/lfsampling.c diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index 6314ac74..7af065ea 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -12,8 +12,8 @@ #include "string.h" #include "lfsampling.h" - -sample_config config = { 1, 8, 1, 88, 0 } ; +#include "cipherutils.h" +sample_config config = { 1, 8, 1, 95, 0 } ; void printConfig() { @@ -55,20 +55,20 @@ sample_config* getSamplingConfig() { return &config; } - +/* typedef struct { uint8_t * buffer; uint32_t numbits; uint32_t position; } BitstreamOut; - +*/ /** * @brief Pushes bit onto the stream * @param stream * @param bit */ -void pushBit( BitstreamOut* stream, uint8_t bit) +/*void pushBit( BitstreamOut* stream, uint8_t bit) { int bytepos = stream->position >> 3; // divide by 8 int bitpos = stream->position & 7; @@ -76,7 +76,7 @@ void pushBit( BitstreamOut* stream, uint8_t bit) stream->position++; stream->numbits++; } - +*/ /** * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream * if not already loaded, sets divisor and starts up the antenna. @@ -124,8 +124,9 @@ 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) { //. - uint8_t *dest = (uint8_t *)BigBuf; - int bufsize = BIGBUF_SIZE; + uint8_t *dest = BigBuf_get_addr(); + int bufsize = BigBuf_max_traceLen(); + memset(dest, 0, bufsize); if(bits_per_sample < 1) bits_per_sample = 1;