dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show device name during flashing and change advice on hanging

Browse Source
This commit is contained in:
fnargwibble@gmail.com
2013-10-05 16:44:48 +00:00
parent 0a85b72549
commit e12b82d362
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/flash.c
View File

@@ -306,7 +306,7 @@ static int get_proxmark_state(uint32_t *state)
}
// Enter the bootloader to be able to start flashing
static int enter_bootloader(void)
static int enter_bootloader(char *serial_port_name)
{
uint32_t state;
@@ -340,7 +340,8 @@ static int enter_bootloader(void)
msleep(100);
CloseProxmark();
fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
fprintf(stderr,"Waiting for Proxmark to reappear on ");
fprintf(stderr,serial_port_name);
do {
sleep(1);
fprintf(stderr, ".");
@@ -366,11 +367,11 @@ static int wait_for_ack(void)
}
// Go into flashing mode
int flash_start_flashing(int enable_bl_writes)
int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
{
uint32_t state;
if (enter_bootloader() < 0)
if (enter_bootloader(serial_port_name) < 0)
return -1;
if (get_proxmark_state(&state) < 0)