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

Fixed some compile warnings in client, minor tidy up with some dbprintf statements

Browse source
This commit is contained in:
d18c7db 2010-01-04 03:08:45 +00:00
commit 1e1b303093
6 changed files with 12 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/Makefile
View file

@ -10,6 +10,8 @@ WINLIBS = -lgdi32 -lsetupapi
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
ifeq ($(shell echo ""),)
ifeq ($(shell uname),Darwin)
CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
QTLDLIBS = -framework QtGui -framework QtCore
@ -25,7 +27,6 @@ else
QTGUI = guidummy.o
endif
ifeq ($(shell echo ""),)
RM = rm -f
BINS = proxmark3 snooper cli flasher
CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp

4
client/prox.c
View file

@ -225,7 +225,7 @@ void WaitForAck(void) {
}
}
static DWORD ExpectedAddr;
static unsigned int ExpectedAddr;
static BYTE QueuedToSend[256];
static BOOL AllWritten;
#define PHYSICAL_FLASH_START 0x100000
@ -336,7 +336,7 @@ static void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr
char addrStr[9];
memcpy(addrStr, s, 8);
addrStr[8] = '\0';
DWORD addr;
unsigned int addr;
sscanf(addrStr, "%x", &addr);
s += 8;