From 8eb58ad08c4cac4d0d572474792b18ed3acd3271 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Fri, 10 Aug 2012 14:56:38 +0200 Subject: Move checking for flashing protocol from main to cold-flash --- src/main2.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/main2.c') diff --git a/src/main2.c b/src/main2.c index b18b1ee..0d11c1b 100644 --- a/src/main2.c +++ b/src/main2.c @@ -719,16 +719,13 @@ int main(int argc, char **argv) { /* cold flash */ if ( dev_cold_flash ) { - if ( usb_dev->flash_device->protocol != FLASH_COLD ) { - usb_close_device(usb_dev); - printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again"); - continue; - } - - cold_flash(usb_dev, image_2nd, image_secondary); + ret = cold_flash(usb_dev, image_2nd, image_secondary); usb_close_device(usb_dev); usb_dev = NULL; + if ( ret != 0 ) + continue; + if ( dev_flash ) { dev_cold_flash = 0; continue; -- cgit v1.2.3