summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2014-11-18 23:26:50 +0100
committerPali Rohár <pali.rohar@gmail.com>2014-11-18 23:26:50 +0100
commitfeb2d3ac6a35070c760374fcc569a7736cf71076 (patch)
treee876bd548008a29ac99edc8d5c708ac20d2acf0b
parent78fc280577e15e8d40745caf0d5bfc8f30c505e8 (diff)
download0xFFFF-feb2d3ac6a35070c760374fcc569a7736cf71076.tar.bz2
usb-device: Rename usb_switch_to_mkii to usb_switch_to_update
-rw-r--r--src/usb-device.c4
-rw-r--r--src/usb-device.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/usb-device.c b/src/usb-device.c
index a391c02..536f986 100644
--- a/src/usb-device.c
+++ b/src/usb-device.c
@@ -369,7 +369,7 @@ void usb_switch_to_cold(struct usb_device_info * dev) {
}
-void usb_switch_to_mkii(struct usb_device_info * dev) {
+void usb_switch_to_update(struct usb_device_info * dev) {
printf("\nSwitching to Update mode...\n");
@@ -377,6 +377,8 @@ void usb_switch_to_mkii(struct usb_device_info * dev) {
leave_cold_flash(dev);
else if ( dev->flash_device->protocol == FLASH_NOLO )
nolo_boot_device(dev, "update");
+ else if ( dev->flash_device->protocol == FLASH_MKII )
+ mkii_reboot_device(dev);
else if ( dev->flash_device->protocol == FLASH_DISK )
printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again");
diff --git a/src/usb-device.h b/src/usb-device.h
index 20a073c..983af51 100644
--- a/src/usb-device.h
+++ b/src/usb-device.h
@@ -56,7 +56,7 @@ void usb_close_device(struct usb_device_info * dev);
void usb_switch_to_nolo(struct usb_device_info * dev);
void usb_switch_to_cold(struct usb_device_info * dev);
-void usb_switch_to_mkii(struct usb_device_info * dev);
+void usb_switch_to_update(struct usb_device_info * dev);
void usb_switch_to_disk(struct usb_device_info * dev);
#endif