diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-28 21:46:45 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-28 21:46:45 +0000 |
commit | ab9fd1840b8025336081bd72fb9dbaea7b9909dd (patch) | |
tree | 4c410bffcf1a9de2ce55a59bef45e3ecfa183a62 /apps/plugins/rockbox_flash.c | |
parent | 8418a2c94a97da1d6f42f21dc348aadd1e177d77 (diff) | |
download | rockbox-ab9fd1840b8025336081bd72fb9dbaea7b9909dd.tar.gz rockbox-ab9fd1840b8025336081bd72fb9dbaea7b9909dd.zip |
plugins: use lcd_putsf/lcd_putsxyf
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27926 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockbox_flash.c')
-rw-r--r-- | apps/plugins/rockbox_flash.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 9da3f63c8b..09ee96997c 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -559,7 +559,6 @@ static void DoUserDialog(char* filename) | |||
559 | { | 559 | { |
560 | tImageHeader ImageHeader; | 560 | tImageHeader ImageHeader; |
561 | tFlashInfo FlashInfo; | 561 | tFlashInfo FlashInfo; |
562 | static char buf[MAX_PATH]; | ||
563 | int button; | 562 | int button; |
564 | int rc; /* generic return code */ | 563 | int rc; /* generic return code */ |
565 | UINT32 space, aligned_size, true_size; | 564 | UINT32 space, aligned_size, true_size; |
@@ -612,8 +611,7 @@ static void DoUserDialog(char* filename) | |||
612 | bl_version = BootloaderVersion(); | 611 | bl_version = BootloaderVersion(); |
613 | if (bl_version < LATEST_BOOTLOADER_VERSION) | 612 | if (bl_version < LATEST_BOOTLOADER_VERSION) |
614 | { | 613 | { |
615 | rb->snprintf(buf, sizeof(buf), "Bootloader V%d", bl_version); | 614 | rb->lcd_putsf(0, 0, "Bootloader V%d", bl_version); |
616 | rb->lcd_puts(0, 0, buf); | ||
617 | rb->lcd_puts(0, 1, "Hint: You're not "); | 615 | rb->lcd_puts(0, 1, "Hint: You're not "); |
618 | rb->lcd_puts(0, 2, "using the latest "); | 616 | rb->lcd_puts(0, 2, "using the latest "); |
619 | rb->lcd_puts(0, 3, "bootloader. "); | 617 | rb->lcd_puts(0, 3, "bootloader. "); |
@@ -722,10 +720,9 @@ static void DoUserDialog(char* filename) | |||
722 | if (rc) | 720 | if (rc) |
723 | { /* errors */ | 721 | { /* errors */ |
724 | rb->lcd_clear_display(); | 722 | rb->lcd_clear_display(); |
725 | rb->snprintf(buf, sizeof(buf), "%d errors", rc); | ||
726 | rb->lcd_puts(0, 0, "Error:"); | 723 | rb->lcd_puts(0, 0, "Error:"); |
727 | rb->lcd_puts(0, 1, "Programming fail!"); | 724 | rb->lcd_puts(0, 1, "Programming fail!"); |
728 | rb->lcd_puts(0, 2, buf); | 725 | rb->lcd_putsf(0, 2, "%d errors", rc); |
729 | rb->lcd_update(); | 726 | rb->lcd_update(); |
730 | button = WaitForButton(); | 727 | button = WaitForButton(); |
731 | } | 728 | } |
@@ -743,10 +740,9 @@ static void DoUserDialog(char* filename) | |||
743 | } | 740 | } |
744 | else | 741 | else |
745 | { | 742 | { |
746 | rb->snprintf(buf, sizeof(buf), "%d errors", rc); | ||
747 | rb->lcd_puts(0, 0, "Error:"); | 743 | rb->lcd_puts(0, 0, "Error:"); |
748 | rb->lcd_puts(0, 1, "Verify fail!"); | 744 | rb->lcd_puts(0, 1, "Verify fail!"); |
749 | rb->lcd_puts(0, 2, buf); | 745 | rb->lcd_putsf(0, 2, "%d errors", rc); |
750 | rb->lcd_puts(0, 3, "Use safe image"); | 746 | rb->lcd_puts(0, 3, "Use safe image"); |
751 | rb->lcd_puts(0, 4, "if booting hangs:"); | 747 | rb->lcd_puts(0, 4, "if booting hangs:"); |
752 | rb->lcd_puts(0, 5, "F1 during power-on"); | 748 | rb->lcd_puts(0, 5, "F1 during power-on"); |