valentineus/0xFFFF
1
Fork 0
Code Releases Activity

nolo: Merge functions nolo_boot and nolo_boot_to_update_mode to nolo_boot_device

Browse Source
This commit is contained in:
Pali Rohár committed 2012-08-11 15:24:02 +02:00
1 parent 8c1cfe3a6e
commit 8a21acc9cc
2 files changed
+18 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/nolo.c
+17 -12
View File
@@ -158,11 +158,25 @@ int nolo_flash_image(struct usb_device_info * dev, struct image * image) {
} }
int nolo_boot(struct usb_device_info * dev, char * cmdline) { int nolo_boot_device(struct usb_device_info * dev, char * cmdline) {
int size = 0; int size = 0;
int mode = NOLO_BOOT_MODE_NORMAL;
if ( cmdline && cmdline[0] ) { if ( cmdline && strncmp(cmdline, "update", strlen("update")) == 0 && cmdline[strlen("update")] <= 32 ) {
mode = NOLO_BOOT_MODE_UPDATE;
cmdline += strlen("update");
if ( *cmdline ) ++cmdline;
while ( *cmdline && *cmdline <= 32 )
++cmdline;
if ( *cmdline ) {
printf("Booting kernel to update mode with cmdline: %s...\n", cmdline);
size = strlen(cmdline);
} else {
printf("Booting kernel to update mode with default cmdline...\n");
cmdline = NULL;
}
} else if ( cmdline && cmdline[0] ) {
printf("Booting kernel with cmdline: '%s'...\n", cmdline); printf("Booting kernel with cmdline: '%s'...\n", cmdline);
size = strlen(cmdline)+1; size = strlen(cmdline)+1;
} else { } else {
@@ -170,22 +184,13 @@ int nolo_boot(struct usb_device_info * dev, char * cmdline) {
cmdline = NULL; cmdline = NULL;
} }
if ( usb_control_msg(dev->udev, NOLO_WRITE, NOLO_BOOT, NOLO_BOOT_MODE_NORMAL, 0, cmdline, size, 2000) < 0 ) if ( usb_control_msg(dev->udev, NOLO_WRITE, NOLO_BOOT, mode, 0, cmdline, size, 2000) < 0 )
ERROR_RETURN("Booting failed", -1); ERROR_RETURN("Booting failed", -1);
return 0; return 0;
} }
int nolo_boot_to_update_mode(struct usb_device_info * dev) {
printf("Booting to update mode...\n");
if ( usb_control_msg(dev->udev, NOLO_WRITE, NOLO_BOOT, NOLO_BOOT_MODE_UPDATE, 0, NULL, 0, 2000) < 0 )
ERROR_RETURN("Booting failed", -1);
return 0;
}
int nolo_reboot_device(struct usb_device_info * dev) { int nolo_reboot_device(struct usb_device_info * dev) {
printf("Rebooting device...\n"); printf("Rebooting device...\n");
src/nolo.h
+1 -2
View File
@@ -29,8 +29,7 @@ enum device nolo_get_device(struct usb_device_info * dev);
int nolo_load_image(struct usb_device_info * dev, struct image * image); int nolo_load_image(struct usb_device_info * dev, struct image * image);
int nolo_flash_image(struct usb_device_info * dev, struct image * image); int nolo_flash_image(struct usb_device_info * dev, struct image * image);
int nolo_boot(struct usb_device_info * dev, char * cmdline); int nolo_boot_device(struct usb_device_info * dev, char * cmdline);
int nolo_boot_to_update_mode(struct usb_device_info * dev);
int nolo_reboot_device(struct usb_device_info * dev); int nolo_reboot_device(struct usb_device_info * dev);
int nolo_get_root_device(struct usb_device_info * dev); int nolo_get_root_device(struct usb_device_info * dev);