summaryrefslogtreecommitdiff
path: root/bootloader
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-09-08 13:57:13 +0000
committerThomas Martitz <kugel@rockbox.org>2009-09-08 13:57:13 +0000
commite2ccabf89df325ddf0407bfea2fee3c00334264b (patch)
tree2b003f4c00258b95e04ab2a8cf373a60467e7ab7 /bootloader
parentb54b0665167f87850712640d5253e892fe1aa537 (diff)
downloadrockbox-e2ccabf89df325ddf0407bfea2fee3c00334264b.tar.gz
rockbox-e2ccabf89df325ddf0407bfea2fee3c00334264b.zip
Samsung YH925: Reset the LCD orientation to what the OF expects before branching to it in dualbooting
Author: Mark Arigo git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22659 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/main-pp.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index c213a65121..ef0e199e3a 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -47,6 +47,11 @@
47#include "usb.h" 47#include "usb.h"
48#include "usb_drv.h" 48#include "usb_drv.h"
49#endif 49#endif
50#if defined(SAMSUNG_YH925)
51/* this function (in lcd-yh925.c) resets the screen orientation for the OF
52 * for use with dualbooting */
53void lcd_reset(void);
54#endif
50 55
51/* Show the Rockbox logo - in show_logo.c */ 56/* Show the Rockbox logo - in show_logo.c */
52extern int show_logo(void); 57extern int show_logo(void);
@@ -575,7 +580,7 @@ void* main(void)
575 The rest of the loading is done in crt0.S. 580 The rest of the loading is done in crt0.S.
576 1) First try reading from the hidden partition (on Sansa only). 581 1) First try reading from the hidden partition (on Sansa only).
577 2) Next try a decrypted mi4 file in /System/OF.mi4 582 2) Next try a decrypted mi4 file in /System/OF.mi4
578 3) Finally, try a raw firmware binary in /System/OF.mi4. It should be 583 3) Finally, try a raw firmware binary in /System/OF.bin. It should be
579 a mi4 firmware decrypted and header stripped using mi4code. 584 a mi4 firmware decrypted and header stripped using mi4code.
580 */ 585 */
581 printf("Loading original firmware..."); 586 printf("Loading original firmware...");
@@ -615,6 +620,9 @@ void* main(void)
615 printf("Can't load /System/OF.mi4"); 620 printf("Can't load /System/OF.mi4");
616 printf(strerror(rc)); 621 printf(strerror(rc));
617 } else { 622 } else {
623#if defined(SAMSUNG_YH925)
624 lcd_reset();
625#endif
618 return (void*)loadbuffer; 626 return (void*)loadbuffer;
619 } 627 }
620 628
@@ -624,6 +632,9 @@ void* main(void)
624 printf("Can't load /System/OF.bin"); 632 printf("Can't load /System/OF.bin");
625 printf(strerror(rc)); 633 printf(strerror(rc));
626 } else { 634 } else {
635#if defined(SAMSUNG_YH925)
636 lcd_reset();
637#endif
627 return (void*)loadbuffer; 638 return (void*)loadbuffer;
628 } 639 }
629 640