enable flashing from linux

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index af822c323b7d44007dcad5d5d7eddfea33759157..655f194cd2ae191067bcf699f0dbdc5344972ac0 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -24,6 +24,7 @@ typedef struct {
 #define CMD_SETUP_WRITE                                                                0x0001\r
 #define CMD_FINISH_WRITE                                                       0x0003\r
 #define CMD_HARDWARE_RESET                                                     0x0004\r
 #define CMD_SETUP_WRITE                                                                0x0001\r
 #define CMD_FINISH_WRITE                                                       0x0003\r
 #define CMD_HARDWARE_RESET                                                     0x0004\r

+#define CMD_START_FLASH                                                                0x0005

 #define CMD_ACK                                                                                0x00ff\r
 \r
 // For general mucking around\r
 #define CMD_ACK                                                                                0x00ff\r
 \r
 // For general mucking around\r

diff --git a/linux/Makefile b/linux/Makefile
index ef764db421e62e331e7a4814e9bb5a2c8bd4f7cf..36c31cbe29692adfdbbb8a15d361d01c37fd6b20 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -13,7 +13,7 @@ else
 QTGUI = guidummy.o
 endif
 
 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)
 
 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
 
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 

+flasher: flasher.o usb.o
+

 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
 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
 
 .PHONY: all clean

diff --git a/linux/flasher.c b/linux/flasher.c
index 05f312494364c4996fda43ac103fa5975326f766..7cc8966ff323c5cee97063926a8d6887363cfae5 100644 (file)
--- 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");
        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");
 
        while(!(devh=OpenProxmark(0))) { sleep(1); }
        fprintf(stderr,"Found...\n");