diff options
Diffstat (limited to 'bootloader/main.c')
-rw-r--r-- | bootloader/main.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/bootloader/main.c b/bootloader/main.c index 1b6ccc7aeb..a9411a766d 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -56,11 +56,6 @@ | |||
56 | static bool recovery_mode = false; | 56 | static bool recovery_mode = false; |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | int usb_screen(void) | ||
60 | { | ||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | char version[] = APPSVERSION; | 59 | char version[] = APPSVERSION; |
65 | 60 | ||
66 | /* Reset the cookie for the crt0 crash check */ | 61 | /* Reset the cookie for the crt0 crash check */ |
@@ -434,9 +429,7 @@ void main(void) | |||
434 | hold_status = true; | 429 | hold_status = true; |
435 | } | 430 | } |
436 | 431 | ||
437 | /* Power on the hard drive early, to speed up the loading. | 432 | /* Power on the hard drive early, to speed up the loading. */ |
438 | Some H300 don't like this, so we only do it for the H100 */ | ||
439 | #ifndef IRIVER_H300_SERIES | ||
440 | if (!hold_status | 433 | if (!hold_status |
441 | # ifdef HAVE_EEPROM_SETTINGS | 434 | # ifdef HAVE_EEPROM_SETTINGS |
442 | && !recovery_mode | 435 | && !recovery_mode |
@@ -450,7 +443,6 @@ void main(void) | |||
450 | if (!hold_status && !usb_detect() && !recovery_mode) | 443 | if (!hold_status && !usb_detect() && !recovery_mode) |
451 | try_flashboot(); | 444 | try_flashboot(); |
452 | # endif | 445 | # endif |
453 | #endif | ||
454 | 446 | ||
455 | backlight_init(); | 447 | backlight_init(); |
456 | #ifdef HAVE_UDA1380 | 448 | #ifdef HAVE_UDA1380 |
@@ -596,3 +588,22 @@ void main(void) | |||
596 | void screen_dump(void) | 588 | void screen_dump(void) |
597 | { | 589 | { |
598 | } | 590 | } |
591 | |||
592 | int usb_screen(void) | ||
593 | { | ||
594 | return 0; | ||
595 | } | ||
596 | |||
597 | unsigned short *bidi_l2v(const unsigned char *str, int orientation) | ||
598 | { | ||
599 | static unsigned short utf16_buf[SCROLL_LINE_SIZE]; | ||
600 | unsigned short *target; | ||
601 | (void)orientation; | ||
602 | |||
603 | target = utf16_buf; | ||
604 | |||
605 | while (*str) | ||
606 | str = utf8decode(str, target++); | ||
607 | *target = 0; | ||
608 | return utf16_buf; | ||
609 | } | ||