valentineus/0xFFFF
1
Fork 0
Code Releases Activity

mkii: Define MKII_UPDATE_MODE instead hardcoded constant

Browse Source
This commit is contained in:
Pali Rohár committed 2016-03-12 12:01:27 +01:00
1 parent 7b3e9bcf00
commit 54805eb040
3 files changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mkii.c
+2 -2
View File
@@ -164,11 +164,11 @@ int mkii_init(struct usb_device_info * dev) {
if ( ret == 0 ) if ( ret == 0 )
libusb_get_string_descriptor_ascii(dev->udev, desc->iConfiguration, (unsigned char*)buf, sizeof(buf)); libusb_get_string_descriptor_ascii(dev->udev, desc->iConfiguration, (unsigned char*)buf, sizeof(buf));
if ( strncmp(buf, "Firmware Upgrade Configuration", sizeof("Firmware Upgrade Configuration")) == 0 ) if ( strncmp(buf, "Firmware Upgrade Configuration", sizeof("Firmware Upgrade Configuration")) == 0 )
dev->data |= (1UL << 31); dev->data |= MKII_UPDATE_MODE;
if ( ret == 0 ) if ( ret == 0 )
libusb_free_config_descriptor(desc); libusb_free_config_descriptor(desc);
printf("Mode: %s\n", (dev->data & (1UL << 31)) ? "Update" : "PC Suite"); printf("Mode: %s\n", (dev->data & MKII_UPDATE_MODE) ? "Update" : "PC Suite");
return 0; return 0;
src/mkii.h
+2
View File
@@ -24,6 +24,8 @@
#include "device.h" #include "device.h"
#include "usb-device.h" #include "usb-device.h"
#define MKII_UPDATE_MODE (1UL << 31)
int mkii_init(struct usb_device_info * dev); int mkii_init(struct usb_device_info * dev);
enum device mkii_get_device(struct usb_device_info * dev); enum device mkii_get_device(struct usb_device_info * dev);
src/usb-device.c
+2 -2
View File
@@ -377,7 +377,7 @@ void usb_switch_to_update(struct usb_device_info * dev) {
leave_cold_flash(dev); leave_cold_flash(dev);
else if ( dev->flash_device->protocol == FLASH_NOLO ) else if ( dev->flash_device->protocol == FLASH_NOLO )
nolo_boot_device(dev, "update"); nolo_boot_device(dev, "update");
else if ( dev->flash_device->protocol == FLASH_MKII && ! ( dev->data & ( 1UL << 31 ) ) ) else if ( dev->flash_device->protocol == FLASH_MKII && ! ( dev->data & MKII_UPDATE_MODE ) )
mkii_reboot_device(dev); mkii_reboot_device(dev);
else if ( dev->flash_device->protocol == FLASH_DISK ) else if ( dev->flash_device->protocol == FLASH_DISK )
printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again"); printf_and_wait("Unplug USB cable, turn device off, press ENTER and plug USB cable again");
@@ -394,7 +394,7 @@ void usb_switch_to_disk(struct usb_device_info * dev) {
nolo_boot_device(dev, NULL); nolo_boot_device(dev, NULL);
printf_and_wait("Wait until device start, choose USB Mass Storage Mode and press ENTER"); printf_and_wait("Wait until device start, choose USB Mass Storage Mode and press ENTER");
} else if ( dev->flash_device->protocol == FLASH_MKII ) { } else if ( dev->flash_device->protocol == FLASH_MKII ) {
if ( dev->data & ( 1UL << 31 ) ) if ( dev->data & MKII_UPDATE_MODE )
mkii_reboot_device(dev); mkii_reboot_device(dev);
else else
printf_and_wait("Unplug USB cable, plug again, choose USB Mass Storage Mode and press ENTER"); printf_and_wait("Unplug USB cable, plug again, choose USB Mass Storage Mode and press ENTER");