github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-06 21:21:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compile issue with gcc 9.1.0 (issue #868)

Browse source
This commit is contained in:
pwpiwi 2019-09-21 13:56:01 +01:00 • committed by GitHub
parent d8ecc98a8e
commit 70dbfc3fc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/appmain.c
View file

@ -998,7 +998,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
switch(c->cmd) { switch(c->cmd) {
#ifdef WITH_LF #ifdef WITH_LF
case CMD_SET_LF_SAMPLING_CONFIG: case CMD_SET_LF_SAMPLING_CONFIG:
setSamplingConfig((sample_config *) c->d.asBytes); setSamplingConfig(c->d.asBytes);
break; break;
case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0); cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0);

18
armsrc/lfsampling.c
View file

@ -39,17 +39,17 @@ void printConfig()
* @brief setSamplingConfig * @brief setSamplingConfig
* @param sc * @param sc
*/ */
void setSamplingConfig(sample_config *sc) void setSamplingConfig(uint8_t *config_data) {
{ sample_config *sc = (sample_config *)config_data;
if(sc->divisor != 0) config.divisor = sc->divisor; if (sc->divisor != 0) config.divisor = sc->divisor;
if(sc->bits_per_sample!= 0) config.bits_per_sample= sc->bits_per_sample; if (sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
if(sc->decimation!= 0) config.decimation= sc->decimation; if (sc->decimation != 0) config.decimation = sc->decimation;
if(sc->trigger_threshold != -1) config.trigger_threshold= sc->trigger_threshold; 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; if (sc->samples_to_skip != -1) config.samples_to_skip = sc->samples_to_skip;
config.averaging= sc->averaging; config.averaging= sc->averaging;
if(config.bits_per_sample > 8) config.bits_per_sample = 8; if (config.bits_per_sample > 8) config.bits_per_sample = 8;
if(config.decimation < 1) config.decimation = 1; if (config.decimation < 1) config.decimation = 1;
printConfig(); printConfig();
} }

8
armsrc/lfsampling.h
View file

@ -1,5 +1,5 @@
#ifndef LFSAMPLING_H #ifndef LFSAMPLING_H__
#define LFSAMPLING_H #define LFSAMPLING_H__
/** /**
* acquisition of Cotag LF signal. Similar to other LF, since the Cotag has such long datarate RF/384 * acquisition of Cotag LF signal. Similar to other LF, since the Cotag has such long datarate RF/384
@ -61,9 +61,9 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
* @brief setSamplingConfig * @brief setSamplingConfig
* @param sc * @param sc
*/ */
void setSamplingConfig(sample_config *sc); void setSamplingConfig(uint8_t *config_data);
sample_config * getSamplingConfig(); sample_config *getSamplingConfig();
void printConfig(); void printConfig();