From f6d2d508b4fec99e67e63adc33e0441d5d16c05d Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 29 Oct 2017 19:25:34 +0100 Subject: [PATCH] rem: removed old references to google code. --- client/flash.c | 1 + client/flasher.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/flash.c b/client/flash.c index 730a740c2..e5c60def7 100644 --- a/client/flash.c +++ b/client/flash.c @@ -343,6 +343,7 @@ static int enter_bootloader(char *serial_port_name) { static int wait_for_ack(UsbCommand *ack) { ReceiveCommand(ack); + if (ack->cmd != CMD_ACK) { printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n", ack->cmd, (ack->cmd == CMD_NACK) ? "NACK" : ""); return -1; diff --git a/client/flasher.c b/client/flasher.c index c4e02a33a..3f51c03d9 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -89,12 +89,10 @@ static void usage(char *argv0) { fprintf(stdout, "Usage: %s [-b] image.elf [image.elf...]\n\n", argv0); fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n"); fprintf(stdout, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0); - fprintf(stdout, "\nExample (OSX :\n\n\t %s /dev/cu.usbmodem88888888 armsrc/obj/fullimage.elf\n", argv0); - fprintf(stdout, "\nExample (WIN) :\n\n\t %s com3 armsrc/obj/fullimage.elf\n", argv0); + fprintf(stdout, "\nExample (OSX :\n\n\t %s /dev/cu.usbmodem888 armsrc/obj/fullimage.elf\n", argv0); + fprintf(stdout, "\nExample (WIN) :\n\n\t %s com3 armsrc/obj/fullimage.elf\n\n", argv0); fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on ',\n"); - fprintf(stdout, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n"); - fprintf(stdout, " old ref --> http://code.google.com/p/proxmark3/wiki/Linux\n\n"); - fprintf(stdout, " new refs --> "); + fprintf(stdout, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");