github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

armsrc: clarify static vars vs global vars, part 3

Browse source
This commit is contained in:
Philippe Teuwen 2020-05-19 17:43:13 +02:00
commit cb8d589fc4
16 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/Makefile
View file

@ -157,7 +157,7 @@ version.c: default_version.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o
$(info [-] GEN $@) $(info [-] GEN $@)
$(Q)sh ../tools/mkversion.sh > $@ || perl ../tools/mkversion.pl > $@ || $(CP) $^ $@ $(Q)sh ../tools/mkversion.sh > $@ || perl ../tools/mkversion.pl > $@ || $(CP) $^ $@
fpga_version_info.c: $(FPGA_BITSTREAMS) | $(FPGA_COMPRESSOR) fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
$(info [-] GEN $@) $(info [-] GEN $@)
$(Q)$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@ $(Q)$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@

6
armsrc/appmain.c
View file

@ -278,9 +278,9 @@ static void SendVersion(void) {
strncat(VersionString, "\n [ FPGA ]\n ", sizeof(VersionString) - strlen(VersionString) - 1); strncat(VersionString, "\n [ FPGA ]\n ", sizeof(VersionString) - strlen(VersionString) - 1);
for (int i = 0; i < fpga_bitstream_num; i++) { for (int i = 0; i < g_fpga_bitstream_num; i++) {
strncat(VersionString, fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1); strncat(VersionString, g_fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1);
if (i < fpga_bitstream_num - 1) { if (i < g_fpga_bitstream_num - 1) {
strncat(VersionString, "\n ", sizeof(VersionString) - strlen(VersionString) - 1); strncat(VersionString, "\n ", sizeof(VersionString) - strlen(VersionString) - 1);
} }
} }

4
armsrc/flashmem.c
View file

@ -16,8 +16,8 @@
/// Calculates the value of the CSR DLYBCT field given the desired delay (in ns) /// Calculates the value of the CSR DLYBCT field given the desired delay (in ns)
#define SPI_DLYBCT(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 32000) << 24) #define SPI_DLYBCT(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 32000) << 24)
static uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;
uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD; #define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
void FlashmemSetSpiBaudrate(uint32_t baudrate) { void FlashmemSetSpiBaudrate(uint32_t baudrate) {
FLASHMEM_SPIBAUDRATE = baudrate; FLASHMEM_SPIBAUDRATE = baudrate;

2
armsrc/flashmem.h
View file

@ -106,8 +106,6 @@
#define FLASH_FASTBAUD MCK #define FLASH_FASTBAUD MCK
#define FLASH_MINBAUD FLASH_FASTBAUD #define FLASH_MINBAUD FLASH_FASTBAUD
#define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
void FlashmemSetSpiBaudrate(uint32_t baudrate); void FlashmemSetSpiBaudrate(uint32_t baudrate);

4
armsrc/fpgaloader.c
View file

@ -203,7 +203,7 @@ static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8
// 288 bytes from FPGA file 1, followed by 288 bytes from FGPA file 2, etc. // 288 bytes from FPGA file 1, followed by 288 bytes from FGPA file 2, etc.
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) { static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
while ((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) { while ((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % g_fpga_bitstream_num != (bitstream_version - 1)) {
// skip undesired data belonging to other bitstream_versions // skip undesired data belonging to other bitstream_versions
get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer); get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
} }
@ -509,7 +509,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
void Fpga_print_status(void) { void Fpga_print_status(void) {
DbpString(_BLUE_("Currently loaded FPGA image")); DbpString(_BLUE_("Currently loaded FPGA image"));
Dbprintf(" mode....................%s", fpga_version_information[downloaded_bitstream - 1]); Dbprintf(" mode....................%s", g_fpga_version_information[downloaded_bitstream - 1]);
} }
int FpgaGetCurrent(void) { int FpgaGetCurrent(void) {

2
armsrc/i2c.c
View file

@ -32,7 +32,7 @@
#define I2C_ERROR "I2C_WaitAck Error" #define I2C_ERROR "I2C_WaitAck Error"
volatile unsigned long c; static volatile unsigned long c;
// Direct use the loop to delay. 6 instructions loop, Masterclock 48MHz, // Direct use the loop to delay. 6 instructions loop, Masterclock 48MHz,
// delay=1 is about 200kbps // delay=1 is about 200kbps

6
armsrc/iso14443a.c
View file

@ -184,7 +184,7 @@ static tUart14a Uart;
// 0011 - a 2 tick wide pause, or a three tick wide pause shifted left // 0011 - a 2 tick wide pause, or a three tick wide pause shifted left
// 0111 - a 2 tick wide pause shifted left // 0111 - a 2 tick wide pause shifted left
// 1001 - a 2 tick wide pause shifted right // 1001 - a 2 tick wide pause shifted right
const bool Mod_Miller_LUT[] = { static const bool Mod_Miller_LUT[] = {
false, true, false, true, false, false, false, true, false, true, false, true, false, false, false, true,
false, true, false, false, false, false, false, false false, true, false, false, false, false, false, false
}; };
@ -351,11 +351,11 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
// 8 ticks modulated: A collision. Save the collision position and treat as Sequence D // 8 ticks modulated: A collision. Save the collision position and treat as Sequence D
// Note 1: the bitstream may start at any time. We therefore need to sync. // Note 1: the bitstream may start at any time. We therefore need to sync.
// Note 2: parameter offset is used to determine the position of the parity bits (required for the anticollision command only) // Note 2: parameter offset is used to determine the position of the parity bits (required for the anticollision command only)
tDemod14a Demod; static tDemod14a Demod;
// Lookup-Table to decide if 4 raw bits are a modulation. // Lookup-Table to decide if 4 raw bits are a modulation.
// We accept three or four "1" in any position // We accept three or four "1" in any position
const bool Mod_Manchester_LUT[] = { static const bool Mod_Manchester_LUT[] = {
false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, true,
false, false, false, true, false, true, true, true false, false, false, true, false, true, true, true
}; };

4
armsrc/lfsampling.c
View file

@ -100,10 +100,10 @@ static void pushBit(BitstreamOut *stream, uint8_t bit) {
} }
// Holds bit packed struct of samples. // Holds bit packed struct of samples.
BitstreamOut data = {0, 0, 0}; static BitstreamOut data = {0, 0, 0};
// internal struct to keep track of samples gathered // internal struct to keep track of samples gathered
sampling_t samples = {0, 0, 0, 0}; static sampling_t samples = {0, 0, 0, 0};
void initSampleBuffer(uint32_t *sample_size) { void initSampleBuffer(uint32_t *sample_size) {
initSampleBufferEx(sample_size, false); initSampleBufferEx(sample_size, false);

2
armsrc/mifaredesfire.c
View file

@ -33,7 +33,7 @@ static uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4};
/* PCB CID CMD PAYLOAD */ /* PCB CID CMD PAYLOAD */
//static uint8_t __res[MAX_FRAME_SIZE]; //static uint8_t __res[MAX_FRAME_SIZE];
struct desfire_key skey = {0}; static struct desfire_key skey = {0};
static desfirekey_t sessionkey = &skey; static desfirekey_t sessionkey = &skey;
bool InitDesfireCard(void) { bool InitDesfireCard(void) {

2
client/src/cmdflashmem.c
View file

@ -27,8 +27,6 @@
#define FLASH_FASTBAUD MCK #define FLASH_FASTBAUD MCK
#define FLASH_MINBAUD FLASH_FASTBAUD #define FLASH_MINBAUD FLASH_FASTBAUD
#define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int usage_flashmem_spibaud(void) { static int usage_flashmem_spibaud(void) {

2
common/legic_prng.c
View file

@ -12,7 +12,7 @@
// b is 8bit lsfr // b is 8bit lsfr
// c keeps track on which step the prng is. // c keeps track on which step the prng is.
// legic_prng_get_bit() = gets a bit muxed from a and b. // legic_prng_get_bit() = gets a bit muxed from a and b.
struct lfsr { static struct lfsr {
uint8_t a; uint8_t a;
uint8_t b; uint8_t b;
uint32_t c; uint32_t c;

4
common/parity.c
View file

@ -25,7 +25,7 @@ const uint8_t OddByteParity[256] = {
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
}; };
/*
const uint8_t EvenByteParity[256] = { const uint8_t EvenByteParity[256] = {
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
@ -44,4 +44,4 @@ const uint8_t EvenByteParity[256] = {
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
}; };
*/

6
common_arm/usb_cdc.c
View file

@ -130,9 +130,9 @@ AT91SAM7S256 USB Device Port
#define SET_CONTROL_LINE_STATE 0x2221 #define SET_CONTROL_LINE_STATE 0x2221
AT91PS_UDP pUdp = AT91C_BASE_UDP; AT91PS_UDP pUdp = AT91C_BASE_UDP;
uint8_t btConfiguration = 0; static uint8_t btConfiguration = 0;
uint8_t btConnection = 0; static uint8_t btConnection = 0;
uint8_t btReceiveBank = AT91C_UDP_RX_DATA_BK0; static uint8_t btReceiveBank = AT91C_UDP_RX_DATA_BK0;
static const char devDescriptor[] = { static const char devDescriptor[] = {
/* Device descriptor */ /* Device descriptor */

4
common_fpga/fpga.h
View file

@ -17,7 +17,7 @@
#define FPGA_TRACE_SIZE 3072 #define FPGA_TRACE_SIZE 3072
static const uint8_t bitparse_fixed_header[] = {0x00, 0x09, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0x00, 0x01}; static const uint8_t bitparse_fixed_header[] = {0x00, 0x09, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0x00, 0x01};
extern const int fpga_bitstream_num; extern const int g_fpga_bitstream_num;
extern const char *const fpga_version_information[]; extern const char *const g_fpga_version_information[];
#endif #endif

3
include/pmflash.h
View file

@ -14,9 +14,6 @@
#include "common.h" #include "common.h"
// Flashmem spi baudrate
extern uint32_t FLASHMEM_SPIBAUDRATE;
// RDV40 Section // RDV40 Section
// 256kb divided into 4k sectors. // 256kb divided into 4k sectors.
// //

4
tools/fpga_compress/fpga_compress.c
View file

@ -378,8 +378,8 @@ static void print_version_info_preamble(FILE *outfile, int num_infiles) {
fprintf(outfile, "//-----------------------------------------------------------------------------\n"); fprintf(outfile, "//-----------------------------------------------------------------------------\n");
fprintf(outfile, "\n"); fprintf(outfile, "\n");
fprintf(outfile, "\n"); fprintf(outfile, "\n");
fprintf(outfile, "const int fpga_bitstream_num = %d;\n", num_infiles); fprintf(outfile, "const int g_fpga_bitstream_num = %d;\n", num_infiles);
fprintf(outfile, "const char *const fpga_version_information[%d] = {\n", num_infiles); fprintf(outfile, "const char *const g_fpga_version_information[%d] = {\n", num_infiles);
} }
static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) { static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) {