mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-02-23 18:27:28 -08:00
fix compile issue with gcc 9.1.0 (issue #868)
This commit is contained in:
parent
d8ecc98a8e
commit
70dbfc3fc7
@ -998,7 +998,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
|
||||
switch(c->cmd) {
|
||||
#ifdef WITH_LF
|
||||
case CMD_SET_LF_SAMPLING_CONFIG:
|
||||
setSamplingConfig((sample_config *) c->d.asBytes);
|
||||
setSamplingConfig(c->d.asBytes);
|
||||
break;
|
||||
case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
|
||||
cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0);
|
||||
|
@ -39,17 +39,17 @@ void printConfig()
|
||||
* @brief setSamplingConfig
|
||||
* @param sc
|
||||
*/
|
||||
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->samples_to_skip != -1) config.samples_to_skip = sc->samples_to_skip;
|
||||
void setSamplingConfig(uint8_t *config_data) {
|
||||
sample_config *sc = (sample_config *)config_data;
|
||||
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->samples_to_skip != -1) config.samples_to_skip = sc->samples_to_skip;
|
||||
|
||||
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;
|
||||
|
||||
printConfig();
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
#ifndef LFSAMPLING_H
|
||||
#define LFSAMPLING_H
|
||||
#ifndef LFSAMPLING_H__
|
||||
#define LFSAMPLING_H__
|
||||
|
||||
/**
|
||||
* acquisition of Cotag LF signal. Similar to other LF, since the Cotag has such long datarate RF/384
|
||||
@ -45,7 +45,7 @@ uint32_t DoAcquisition_config(bool silent, int sample_size);
|
||||
* Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
|
||||
* if not already loaded, sets divisor and starts up the antenna.
|
||||
* @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
|
||||
* 0 or 95 ==> 125 KHz
|
||||
* 0 or 95 ==> 125 KHz
|
||||
*
|
||||
**/
|
||||
void LFSetupFPGAForADC(int divisor, bool lf_field);
|
||||
@ -61,9 +61,9 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
|
||||
* @brief setSamplingConfig
|
||||
* @param sc
|
||||
*/
|
||||
void setSamplingConfig(sample_config *sc);
|
||||
void setSamplingConfig(uint8_t *config_data);
|
||||
|
||||
sample_config * getSamplingConfig();
|
||||
sample_config *getSamplingConfig();
|
||||
|
||||
void printConfig();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user