diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2014-08-28 10:26:45 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2014-08-28 10:44:22 -0400 |
commit | 95a4c3afcd53a1f8b835dec33de51f9c304de4d9 (patch) | |
tree | 951877fd6a5604da066ced93e0e1a16a99181de2 /bootloader | |
parent | 21e2b595c2797c226699cf19a2a2ad4abf22b210 (diff) | |
download | rockbox-95a4c3afcd53a1f8b835dec33de51f9c304de4d9.tar.gz rockbox-95a4c3afcd53a1f8b835dec33de51f9c304de4d9.zip |
Fix up the bootloaders
They can't access the raw RBVERSION define any longer.
Change-Id: I698062b36306399945c01de54cdccaa1a1a8434e
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/creativezvm.c | 2 | ||||
-rw-r--r-- | bootloader/gigabeat-s.c | 2 | ||||
-rw-r--r-- | bootloader/gigabeat.c | 2 | ||||
-rw-r--r-- | bootloader/iaudio_coldfire.c | 2 | ||||
-rw-r--r-- | bootloader/imx233.c | 2 | ||||
-rw-r--r-- | bootloader/ipod.c | 2 | ||||
-rw-r--r-- | bootloader/ipodnano2g.c | 2 | ||||
-rw-r--r-- | bootloader/iriver_h1x0.c | 4 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 2 | ||||
-rw-r--r-- | bootloader/main-e200r-installer.c | 2 | ||||
-rw-r--r-- | bootloader/main-pp.c | 2 | ||||
-rw-r--r-- | bootloader/mini2440.c | 2 | ||||
-rw-r--r-- | bootloader/mpio_hd200_hd300.c | 4 | ||||
-rw-r--r-- | bootloader/mrobe500.c | 2 | ||||
-rw-r--r-- | bootloader/ondavx747.c | 2 | ||||
-rw-r--r-- | bootloader/rk27xx.c | 2 | ||||
-rw-r--r-- | bootloader/sansaconnect.c | 2 | ||||
-rw-r--r-- | bootloader/show_logo.c | 17 | ||||
-rw-r--r-- | bootloader/telechips.c | 2 |
19 files changed, 31 insertions, 26 deletions
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c index f3a3960552..f31f6490a4 100644 --- a/bootloader/creativezvm.c +++ b/bootloader/creativezvm.c | |||
@@ -68,7 +68,7 @@ void main(void) | |||
68 | lcd_setfont(FONT_SYSFIXED); | 68 | lcd_setfont(FONT_SYSFIXED); |
69 | reset_screen(); | 69 | reset_screen(); |
70 | printf("Rockbox boot loader"); | 70 | printf("Rockbox boot loader"); |
71 | printf("Version " RBVERSION); | 71 | printf("Version %s", rbversion); |
72 | 72 | ||
73 | ret = storage_init(); | 73 | ret = storage_init(); |
74 | if(ret) | 74 | if(ret) |
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 50ff12da72..3b852dbaa8 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c | |||
@@ -354,7 +354,7 @@ void main(void) | |||
354 | verbose = true; | 354 | verbose = true; |
355 | 355 | ||
356 | printf("Gigabeat S Rockbox Bootloader"); | 356 | printf("Gigabeat S Rockbox Bootloader"); |
357 | printf("Version " RBVERSION); | 357 | printf("Version %s", rbversion); |
358 | 358 | ||
359 | adc_init(); | 359 | adc_init(); |
360 | batt = _battery_voltage(); | 360 | batt = _battery_voltage(); |
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index f995be078c..52f55a5cdd 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c | |||
@@ -174,7 +174,7 @@ void main(void) | |||
174 | verbose = true; | 174 | verbose = true; |
175 | 175 | ||
176 | printf("Rockbox boot loader"); | 176 | printf("Rockbox boot loader"); |
177 | printf("Version " RBVERSION); | 177 | printf("Version %s", rbversion); |
178 | 178 | ||
179 | sleep(50); /* ATA seems to error without this pause */ | 179 | sleep(50); /* ATA seems to error without this pause */ |
180 | 180 | ||
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c index da7a7af208..013e8859e8 100644 --- a/bootloader/iaudio_coldfire.c +++ b/bootloader/iaudio_coldfire.c | |||
@@ -188,7 +188,7 @@ void main(void) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | printf("Rockbox boot loader"); | 190 | printf("Rockbox boot loader"); |
191 | printf("Version " RBVERSION); | 191 | printf("Version %s", rbversion); |
192 | 192 | ||
193 | check_battery(); | 193 | check_battery(); |
194 | 194 | ||
diff --git a/bootloader/imx233.c b/bootloader/imx233.c index f0d6aa0fe1..d2562d0676 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c | |||
@@ -154,7 +154,7 @@ void main(uint32_t arg, uint32_t addr) | |||
154 | 154 | ||
155 | button_init(); | 155 | button_init(); |
156 | 156 | ||
157 | printf("%s: %s", MSG(240, "Ver", "Boot version"), RBVERSION); | 157 | printf("%s: %s", MSG(240, "Ver", "Boot version"), rbversion); |
158 | printf("%s: %x ", MSG(240, "Arg", "Boot arg"), arg); | 158 | printf("%s: %x ", MSG(240, "Arg", "Boot arg"), arg); |
159 | printf("%s: %x", MSG(240, "Addr", "Boot addr"), addr); | 159 | printf("%s: %x", MSG(240, "Addr", "Boot addr"), addr); |
160 | #if IMX233_SUBTARGET >= 3780 | 160 | #if IMX233_SUBTARGET >= 3780 |
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index cae2501485..b2d4532168 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -334,7 +334,7 @@ void* main(void) | |||
334 | lcd_setfont(FONT_SYSFIXED); | 334 | lcd_setfont(FONT_SYSFIXED); |
335 | 335 | ||
336 | printf("Rockbox boot loader"); | 336 | printf("Rockbox boot loader"); |
337 | printf("Version: " RBVERSION); | 337 | printf("Version: %s", rbversion); |
338 | printf("IPOD version: 0x%08x", IPOD_HW_REVISION); | 338 | printf("IPOD version: 0x%08x", IPOD_HW_REVISION); |
339 | 339 | ||
340 | i=ata_init(); | 340 | i=ata_init(); |
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c index f3be7aed01..cdd866f71e 100644 --- a/bootloader/ipodnano2g.c +++ b/bootloader/ipodnano2g.c | |||
@@ -204,7 +204,7 @@ void main(void) | |||
204 | lcd_setfont(FONT_SYSFIXED); | 204 | lcd_setfont(FONT_SYSFIXED); |
205 | 205 | ||
206 | printf("Rockbox boot loader"); | 206 | printf("Rockbox boot loader"); |
207 | printf("Version: " RBVERSION); | 207 | printf("Version: %s", rbversion); |
208 | 208 | ||
209 | i = storage_init(); | 209 | i = storage_init(); |
210 | 210 | ||
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 61077f3842..7f236d4510 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -254,7 +254,7 @@ void failsafe_menu(void) | |||
254 | extern int line; | 254 | extern int line; |
255 | 255 | ||
256 | reset_screen(); | 256 | reset_screen(); |
257 | printf("Bootloader " RBVERSION); | 257 | printf("Bootloader %s", rbversion); |
258 | check_battery(); | 258 | check_battery(); |
259 | printf("========================="); | 259 | printf("========================="); |
260 | line += FAILSAFE_OPTIONS; | 260 | line += FAILSAFE_OPTIONS; |
@@ -502,7 +502,7 @@ void main(void) | |||
502 | lcd_setfont(FONT_SYSFIXED); | 502 | lcd_setfont(FONT_SYSFIXED); |
503 | 503 | ||
504 | printf("Rockbox boot loader"); | 504 | printf("Rockbox boot loader"); |
505 | printf("Version " RBVERSION); | 505 | printf("Version %s", rbversion); |
506 | 506 | ||
507 | /* No need to wait here more because lcd_init and others already do that. */ | 507 | /* No need to wait here more because lcd_init and others already do that. */ |
508 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ | 508 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ |
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index 2f53d03e2f..362eb947c8 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -210,7 +210,7 @@ void main(void) | |||
210 | lcd_setfont(FONT_SYSFIXED); | 210 | lcd_setfont(FONT_SYSFIXED); |
211 | 211 | ||
212 | printf("Rockbox boot loader"); | 212 | printf("Rockbox boot loader"); |
213 | printf("Version " RBVERSION); | 213 | printf("Version %s", rbversion); |
214 | 214 | ||
215 | sleep(HZ/50); /* Allow the button driver to check the buttons */ | 215 | sleep(HZ/50); /* Allow the button driver to check the buttons */ |
216 | rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC) | 216 | rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC) |
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c index c24f5c068c..490f1f04dd 100644 --- a/bootloader/main-e200r-installer.c +++ b/bootloader/main-e200r-installer.c | |||
@@ -112,7 +112,7 @@ void* main(void) | |||
112 | lcd_setfont(FONT_SYSFIXED); | 112 | lcd_setfont(FONT_SYSFIXED); |
113 | 113 | ||
114 | printf("Rockbox e200R installer"); | 114 | printf("Rockbox e200R installer"); |
115 | printf("Version: " RBVERSION); | 115 | printf("Version: %s", rbversion); |
116 | printf(MODEL_NAME); | 116 | printf(MODEL_NAME); |
117 | printf(""); | 117 | printf(""); |
118 | 118 | ||
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index 9f7b88cdc8..38760a0e58 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -349,7 +349,7 @@ void* main(void) | |||
349 | lcd_setfont(FONT_SYSFIXED); | 349 | lcd_setfont(FONT_SYSFIXED); |
350 | 350 | ||
351 | printf("Rockbox boot loader"); | 351 | printf("Rockbox boot loader"); |
352 | printf("Version: " RBVERSION); | 352 | printf("Version: %s", rbversion); |
353 | printf(MODEL_NAME); | 353 | printf(MODEL_NAME); |
354 | 354 | ||
355 | i=storage_init(); | 355 | i=storage_init(); |
diff --git a/bootloader/mini2440.c b/bootloader/mini2440.c index 4976318e9a..b3d73d1270 100644 --- a/bootloader/mini2440.c +++ b/bootloader/mini2440.c | |||
@@ -79,7 +79,7 @@ int main(void) | |||
79 | verbose = true; | 79 | verbose = true; |
80 | 80 | ||
81 | printf("Rockbox boot loader"); | 81 | printf("Rockbox boot loader"); |
82 | printf("Version " RBVERSION); | 82 | printf("Version %s", rbversion); |
83 | 83 | ||
84 | rc = storage_init(); | 84 | rc = storage_init(); |
85 | if(rc) | 85 | if(rc) |
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c index 963e65f22b..a4e13e1f88 100644 --- a/bootloader/mpio_hd200_hd300.c +++ b/bootloader/mpio_hd200_hd300.c | |||
@@ -196,7 +196,7 @@ static void rb_boot(void) | |||
196 | 196 | ||
197 | reset_screen(); | 197 | reset_screen(); |
198 | printf("Rockbox boot loader"); | 198 | printf("Rockbox boot loader"); |
199 | printf("Version " RBVERSION); | 199 | printf("Version %s", rbversion); |
200 | 200 | ||
201 | rc = storage_init(); | 201 | rc = storage_init(); |
202 | if(rc) | 202 | if(rc) |
@@ -234,7 +234,7 @@ static void bootmenu(void) | |||
234 | /* backbone of menu */ | 234 | /* backbone of menu */ |
235 | /* run the loader */ | 235 | /* run the loader */ |
236 | printf("Rockbox boot loader"); | 236 | printf("Rockbox boot loader"); |
237 | printf("Ver: " RBVERSION); | 237 | printf("Ver: %s", rbversion); |
238 | 238 | ||
239 | check_battery(); | 239 | check_battery(); |
240 | 240 | ||
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index 1b00e12b92..0b9ffb6281 100644 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c | |||
@@ -85,7 +85,7 @@ void main(void) | |||
85 | verbose = true; | 85 | verbose = true; |
86 | 86 | ||
87 | printf("Rockbox boot loader"); | 87 | printf("Rockbox boot loader"); |
88 | printf("Version " RBVERSION); | 88 | printf("Version %s", rbversion); |
89 | 89 | ||
90 | /* Enter USB mode without USB thread */ | 90 | /* Enter USB mode without USB thread */ |
91 | if(usb_detect() == USB_INSERTED) | 91 | if(usb_detect() == USB_INSERTED) |
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c index 0c189eaca1..3d03c36eae 100644 --- a/bootloader/ondavx747.c +++ b/bootloader/ondavx747.c | |||
@@ -297,7 +297,7 @@ int main(void) | |||
297 | if(verbose) | 297 | if(verbose) |
298 | reset_screen(); | 298 | reset_screen(); |
299 | printf(MODEL_NAME" Rockbox Bootloader"); | 299 | printf(MODEL_NAME" Rockbox Bootloader"); |
300 | printf("Version " RBVERSION); | 300 | printf("Version %s", rbversion); |
301 | 301 | ||
302 | #ifdef HAS_BUTTON_HOLD | 302 | #ifdef HAS_BUTTON_HOLD |
303 | if(button_hold()) | 303 | if(button_hold()) |
diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c index dae738ec08..d190ea5a5a 100644 --- a/bootloader/rk27xx.c +++ b/bootloader/rk27xx.c | |||
@@ -159,7 +159,7 @@ void main(void) | |||
159 | else if (boot == of) | 159 | else if (boot == of) |
160 | snprintf(filename,sizeof(filename), BOOTDIR "/%s", "BASE.RKW"); | 160 | snprintf(filename,sizeof(filename), BOOTDIR "/%s", "BASE.RKW"); |
161 | 161 | ||
162 | printf("Bootloader version: %s", RBVERSION); | 162 | printf("Bootloader version: %s", rbversion); |
163 | printf("Loading: %s", filename); | 163 | printf("Loading: %s", filename); |
164 | 164 | ||
165 | ret = load_rkw(loadbuffer, filename, LOAD_SIZE); | 165 | ret = load_rkw(loadbuffer, filename, LOAD_SIZE); |
diff --git a/bootloader/sansaconnect.c b/bootloader/sansaconnect.c index 280c386968..48617ec337 100644 --- a/bootloader/sansaconnect.c +++ b/bootloader/sansaconnect.c | |||
@@ -66,7 +66,7 @@ void main(void) | |||
66 | btn = button_read_device(); | 66 | btn = button_read_device(); |
67 | 67 | ||
68 | printf("Rockbox boot loader"); | 68 | printf("Rockbox boot loader"); |
69 | printf("Version " RBVERSION); | 69 | printf("Version %s", rbversion); |
70 | 70 | ||
71 | ret = storage_init(); | 71 | ret = storage_init(); |
72 | if(ret) | 72 | if(ret) |
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c index 538e90299a..6584e3f24d 100644 --- a/bootloader/show_logo.c +++ b/bootloader/show_logo.c | |||
@@ -28,14 +28,14 @@ | |||
28 | #include "bitmaps/rockboxlogo.h" | 28 | #include "bitmaps/rockboxlogo.h" |
29 | 29 | ||
30 | #if LCD_WIDTH <= 128 | 30 | #if LCD_WIDTH <= 128 |
31 | #define BOOT_VERSION ("Boot " RBVERSION) | 31 | #define BOOT_VERFMT "Boot %s" |
32 | #else | 32 | #else |
33 | #define BOOT_VERSION ("Boot Ver. " RBVERSION) | 33 | #define BOOT_VERFMT "Boot Ver. %s" |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | /* Ensure TEXT_XPOS is >= 0 */ | 36 | /* Ensure TEXT_XPOS is >= 0 */ |
37 | #define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH) | 37 | #define TEXT_WIDTH(l) ((l)*SYSFONT_WIDTH) |
38 | #define TEXT_XPOS ((TEXT_WIDTH > LCD_WIDTH) ? 0 : ((LCD_WIDTH - TEXT_WIDTH) / 2)) | 38 | #define TEXT_XPOS(w) (((w) > LCD_WIDTH) ? 0 : ((LCD_WIDTH - (w)) / 2)) |
39 | #define LOGO_XPOS ((LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2) | 39 | #define LOGO_XPOS ((LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2) |
40 | 40 | ||
41 | void show_logo( void ) | 41 | void show_logo( void ) |
@@ -43,14 +43,19 @@ void show_logo( void ) | |||
43 | lcd_clear_display(); | 43 | lcd_clear_display(); |
44 | lcd_setfont(FONT_SYSFIXED); | 44 | lcd_setfont(FONT_SYSFIXED); |
45 | 45 | ||
46 | char verstr[strlen(rbversion) + sizeof (BOOT_VERFMT)]; | ||
47 | int len = snprintf(verstr, sizeof(verstr), BOOT_VERFMT, rbversion); | ||
48 | int text_width = TEXT_WIDTH(len); | ||
49 | int text_xpos = TEXT_XPOS(text_width); | ||
50 | |||
46 | #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) | 51 | #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) |
47 | /* The top 16 lines of the Sansa Clip screen are yellow, and the bottom 48 | 52 | /* The top 16 lines of the Sansa Clip screen are yellow, and the bottom 48 |
48 | are blue, so we reverse the usual positioning */ | 53 | are blue, so we reverse the usual positioning */ |
49 | lcd_putsxy(TEXT_XPOS, 0, BOOT_VERSION); | 54 | lcd_putsxy(text_xpos, 0, verstr); |
50 | lcd_bmp(&bm_rockboxlogo, LOGO_XPOS, 16); | 55 | lcd_bmp(&bm_rockboxlogo, LOGO_XPOS, 16); |
51 | #else | 56 | #else |
52 | lcd_bmp(&bm_rockboxlogo, LOGO_XPOS, 10); | 57 | lcd_bmp(&bm_rockboxlogo, LOGO_XPOS, 10); |
53 | lcd_putsxy(TEXT_XPOS, LCD_HEIGHT-SYSFONT_HEIGHT, BOOT_VERSION); | 58 | lcd_putsxy(text_xpos, LCD_HEIGHT-SYSFONT_HEIGHT, verstr); |
54 | #endif | 59 | #endif |
55 | 60 | ||
56 | lcd_update(); | 61 | lcd_update(); |
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index 77aa398487..17ba509a6c 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -152,7 +152,7 @@ void* main(void) | |||
152 | available for loading the firmware. Otherwise display the debug screen. */ | 152 | available for loading the firmware. Otherwise display the debug screen. */ |
153 | #ifdef TCCBOOT | 153 | #ifdef TCCBOOT |
154 | printf("Rockbox boot loader"); | 154 | printf("Rockbox boot loader"); |
155 | printf("Version " RBVERSION); | 155 | printf("Version %s", rbversion); |
156 | 156 | ||
157 | printf("ATA"); | 157 | printf("ATA"); |
158 | rc = storage_init(); | 158 | rc = storage_init(); |