github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 22:23:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c

Browse source
This commit is contained in:
iceman1001 2017-08-11 11:40:25 +02:00
commit 6ad546fa13
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/lfops.c
View file

@ -607,7 +607,7 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
// prepare a waveform pattern in the buffer based on the ID given then // prepare a waveform pattern in the buffer based on the ID given then
// simulate a FSK tag until the button is pressed // simulate a FSK tag until the button is pressed
// arg1 contains fcHigh and fcLow, arg2 contains invert and clock // arg1 contains fcHigh and fcLow, arg2 contains invert and clock
void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits)
{ {
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@ -625,7 +625,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
for (i=0; i<size; i++){ for (i=0; i<size; i++){
if (BitStream[i] == invert) if (bits[i] == invert)
fcAll(fcLow, &n, clk, &modCnt); fcAll(fcLow, &n, clk, &modCnt);
else else
fcAll(fcHigh, &n, clk, &modCnt); fcAll(fcHigh, &n, clk, &modCnt);

2
client/Makefile
View file

@ -80,6 +80,7 @@ POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
CORESRCS = uart_posix.c \ CORESRCS = uart_posix.c \
uart_win32.c \ uart_win32.c \
ui.c \
util.c \ util.c \
util_posix.c \ util_posix.c \
scandir.c scandir.c
@ -105,7 +106,6 @@ CMDSRCS = crapto1/crapto1.c \
iso15693tools.c \ iso15693tools.c \
data.c \ data.c \
graph.c \ graph.c \
ui.c \
cmddata.c \ cmddata.c \
lfdemod.c \ lfdemod.c \
cmdanalyse.c \ cmdanalyse.c \

2
client/proxmark3.c
View file

@ -27,7 +27,7 @@
#include "whereami.h" #include "whereami.h"
// a global mutex to prevent interlaced printing from different threads // a global mutex to prevent interlaced printing from different threads
pthread_mutex_t print_lock; extern pthread_mutex_t print_lock;
static serial_port sp; static serial_port sp;
static UsbCommand txcmd; static UsbCommand txcmd;