valentineus/0xFFFF
1
Fork 0
Code Releases Activity

mkii: Implement rebooting to Update mode

Browse Source
This commit is contained in:
Pali Rohár committed 2016-03-12 12:47:41 +01:00
1 parent 54805eb040
commit d2e7b3d242
4 files changed
+22 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/usb-device.c
+4 -4
View File
@@ -350,7 +350,7 @@ void usb_switch_to_nolo(struct usb_device_info * dev) {
if ( dev->flash_device->protocol == FLASH_COLD )
leave_cold_flash(dev);
else if ( dev->flash_device->protocol == FLASH_MKII )
mkii_reboot_device(dev);
mkii_reboot_device(dev, 0);
else if ( dev->flash_device->protocol == FLASH_DISK )
printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again");
@@ -363,7 +363,7 @@ void usb_switch_to_cold(struct usb_device_info * dev) {
if ( dev->flash_device->protocol == FLASH_NOLO )
nolo_reboot_device(dev);
else if ( dev->flash_device->protocol == FLASH_MKII )
mkii_reboot_device(dev);
mkii_reboot_device(dev, 0);
else if ( dev->flash_device->protocol == FLASH_DISK )
printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again");
@@ -378,7 +378,7 @@ void usb_switch_to_update(struct usb_device_info * dev) {
else if ( dev->flash_device->protocol == FLASH_NOLO )
nolo_boot_device(dev, "update");
else if ( dev->flash_device->protocol == FLASH_MKII && ! ( dev->data & MKII_UPDATE_MODE ) )
mkii_reboot_device(dev);
mkii_reboot_device(dev, 1);
else if ( dev->flash_device->protocol == FLASH_DISK )
printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again");
@@ -395,7 +395,7 @@ void usb_switch_to_disk(struct usb_device_info * dev) {
printf_and_wait("Wait until device start, choose USB Mass Storage Mode and press ENTER");
} else if ( dev->flash_device->protocol == FLASH_MKII ) {
if ( dev->data & MKII_UPDATE_MODE )
mkii_reboot_device(dev);
mkii_reboot_device(dev, 0);
else
printf_and_wait("Unplug USB cable, plug again, choose USB Mass Storage Mode and press ENTER");
}