From: adam@algroup.co.uk <adam@algroup.co.uk@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Sun, 28 Jun 2009 22:13:04 +0000 (+0000)
Subject: enable flashing from linux
X-Git-Tag: v1.0.0~600
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0673512814df7d58c90f7928cffbf505c8316cb7?hp=bb06be43b711b601e6e479317532c3c783dd0c34

enable flashing from linux
---

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index af822c32..655f194c 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -24,6 +24,7 @@ typedef struct {
 #define CMD_SETUP_WRITE								0x0001
 #define CMD_FINISH_WRITE							0x0003
 #define CMD_HARDWARE_RESET							0x0004
+#define CMD_START_FLASH								0x0005
 #define CMD_ACK										0x00ff
 
 // For general mucking around
diff --git a/linux/Makefile b/linux/Makefile
index ef764db4..36c31cbe 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -13,7 +13,7 @@ else
 QTGUI = guidummy.o
 endif
 
-all: proxmark3 snooper cli
+all: proxmark3 snooper cli flasher
 
 proxmark3: LDFLAGS+=$(QTLDFLAGS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
@@ -22,10 +22,12 @@ snooper: snooper.o gui.o command.o usb.o guidummy.o
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 
+flasher: flasher.o usb.o
+
 proxguiqt.moc.cpp: proxguiqt.h
 	$(MOC) -o$@ $^
 
 clean:
-	rm -f cli proxmark3 snooper *.o *.moc.cpp
+	rm -f cli flasher proxmark3 snooper *.o *.moc.cpp
 
 .PHONY: all clean
diff --git a/linux/flasher.c b/linux/flasher.c
index 05f31249..7cc8966f 100644
--- a/linux/flasher.c
+++ b/linux/flasher.c
@@ -149,6 +149,7 @@ int main(int argc, char **argv) {
 	sleep(1);
 
 	fprintf(stderr,"Waiting for Proxmark to reappear on USB...\n");
+	fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
 	while(!(devh=OpenProxmark(0))) { sleep(1); }
 	fprintf(stderr,"Found...\n");