From ca855593091fb9cf0a15fe4273a31dbabccc2643 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 1 Jan 2020 20:47:27 +0100 Subject: [PATCH 1/4] some function def (hitag) --- armsrc/lfsampling.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h index b17a871ba..21968cdd2 100644 --- a/armsrc/lfsampling.h +++ b/armsrc/lfsampling.h @@ -52,6 +52,13 @@ uint32_t DoAcquisition_default(int trigger_threshold, bool silent); uint32_t DoAcquisition_config(bool silent, int sample_size); +/** + * Refactoring of lf sampling buffer + */ +void initSamplingBuffer(void); +void logSample(uint8_t sample, uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold); +uint32_t getSampleCounter(); + /** * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream * if not already loaded, sets divisor and starts up the antenna. From 27f7dd6dec8b7fdcbbe7613507f44211c7796900 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 1 Jan 2020 20:47:39 +0100 Subject: [PATCH 2/4] some function def (hitag) --- armsrc/BigBuf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c index a0a25d1fe..765d230a5 100644 --- a/armsrc/BigBuf.c +++ b/armsrc/BigBuf.c @@ -115,9 +115,11 @@ uint16_t BigBuf_max_traceLen(void) { void clear_trace(void) { traceLen = 0; } + void set_tracelen(uint32_t value) { traceLen = value; } + void set_tracing(bool enable) { tracing = enable; } From ffb596373f11fd1a58aded452a26a666c552003d Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 1 Jan 2020 20:48:11 +0100 Subject: [PATCH 3/4] cppcheck --- armsrc/des.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/des.c b/armsrc/des.c index b84bc4c30..ccd32be7d 100644 --- a/armsrc/des.c +++ b/armsrc/des.c @@ -272,7 +272,7 @@ uint8_t substitute(uint8_t a, uint8_t *sbp) { uint32_t des_f(uint32_t r, uint8_t *kr) { uint8_t i; uint32_t t = 0, ret; - uint64_t data; + uint64_t data = 0; uint8_t *sbp; /* sboxpointer */ permute((uint8_t *)e_permtab, (uint8_t *)&r, (uint8_t *)&data); for (i = 0; i < 6; ++i) From 0dc6f38741b6220ce5a119df5548539b8dcdd4ff Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 1 Jan 2020 20:48:21 +0100 Subject: [PATCH 4/4] cppcheck --- armsrc/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/cmd.c b/armsrc/cmd.c index 61ceda2f0..c7f76960b 100644 --- a/armsrc/cmd.c +++ b/armsrc/cmd.c @@ -43,7 +43,7 @@ bool reply_via_fpc = false; bool reply_via_usb = false; int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) { - PacketResponseOLD txcmd = {0}; + PacketResponseOLD txcmd = {CMD_UNKNOWN, {0, 0, 0}, {{0}}}; // for (size_t i = 0; i < sizeof(PacketResponseOLD); i++) // ((uint8_t *)&txcmd)[i] = 0x00;