diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 4 | ||||
-rw-r--r-- | apps/misc.c | 4 | ||||
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 4 | ||||
-rw-r--r-- | apps/plugins/iriver_flash.c | 2 | ||||
-rw-r--r-- | apps/plugins/settings_dumper.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/version.h | 26 |
10 files changed, 11 insertions, 39 deletions
diff --git a/apps/main.c b/apps/main.c index e4b9286b4e..e8043a79d4 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -120,8 +120,6 @@ | |||
120 | 120 | ||
121 | /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ | 121 | /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ |
122 | 122 | ||
123 | const char appsversion[]=APPSVERSION; | ||
124 | |||
125 | static void init(void); | 123 | static void init(void); |
126 | 124 | ||
127 | #ifdef HAVE_SDL | 125 | #ifdef HAVE_SDL |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 59a72e1ad7..76ceaa483e 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -172,7 +172,7 @@ static const char* info_getname(int selected_item, void *data, | |||
172 | { | 172 | { |
173 | case INFO_VERSION: | 173 | case INFO_VERSION: |
174 | snprintf(buffer, buffer_len, "%s: %s", | 174 | snprintf(buffer, buffer_len, "%s: %s", |
175 | str(LANG_VERSION), appsversion); | 175 | str(LANG_VERSION), rbversion); |
176 | break; | 176 | break; |
177 | 177 | ||
178 | case INFO_BUFFER: /* buffer */ | 178 | case INFO_BUFFER: /* buffer */ |
@@ -259,7 +259,7 @@ static int info_speak_item(int selected_item, void * data) | |||
259 | { | 259 | { |
260 | case INFO_VERSION: /* version */ | 260 | case INFO_VERSION: /* version */ |
261 | talk_id(LANG_VERSION, false); | 261 | talk_id(LANG_VERSION, false); |
262 | talk_spell(appsversion, true); | 262 | talk_spell(rbversion, true); |
263 | break; | 263 | break; |
264 | 264 | ||
265 | case INFO_BUFFER: /* buffer */ | 265 | case INFO_BUFFER: /* buffer */ |
diff --git a/apps/misc.c b/apps/misc.c index 95c0dd6e34..747abe076b 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -621,7 +621,7 @@ int show_logo( void ) | |||
621 | char version[32]; | 621 | char version[32]; |
622 | int font_h, font_w; | 622 | int font_h, font_w; |
623 | 623 | ||
624 | snprintf(version, sizeof(version), "Ver. %s", appsversion); | 624 | snprintf(version, sizeof(version), "Ver. %s", rbversion); |
625 | 625 | ||
626 | lcd_clear_display(); | 626 | lcd_clear_display(); |
627 | #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) | 627 | #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) |
@@ -646,7 +646,7 @@ int show_logo( void ) | |||
646 | lcd_clear_display(); | 646 | lcd_clear_display(); |
647 | lcd_double_height(true); | 647 | lcd_double_height(true); |
648 | lcd_puts(0, 0, rockbox); | 648 | lcd_puts(0, 0, rockbox); |
649 | lcd_puts_scroll(0, 1, appsversion); | 649 | lcd_puts_scroll(0, 1, rbversion); |
650 | #endif | 650 | #endif |
651 | lcd_update(); | 651 | lcd_update(); |
652 | 652 | ||
diff --git a/apps/plugin.c b/apps/plugin.c index 83f27ea249..d626ef6488 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -718,7 +718,7 @@ static const struct plugin_api rockbox_api = { | |||
718 | semaphore_release, | 718 | semaphore_release, |
719 | #endif | 719 | #endif |
720 | 720 | ||
721 | appsversion, | 721 | rbversion, |
722 | /* new stuff at the end, sort into place next time | 722 | /* new stuff at the end, sort into place next time |
723 | the API gets incompatible */ | 723 | the API gets incompatible */ |
724 | }; | 724 | }; |
diff --git a/apps/plugin.h b/apps/plugin.h index 7e198c97bd..a6b864ba44 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -885,7 +885,7 @@ int (*round_value_to_list32)(unsigned long value, | |||
885 | void (*semaphore_release)(struct semaphore *s); | 885 | void (*semaphore_release)(struct semaphore *s); |
886 | #endif | 886 | #endif |
887 | 887 | ||
888 | const char *appsversion; | 888 | const char *rbversion; |
889 | /* new stuff at the end, sort into place next time | 889 | /* new stuff at the end, sort into place next time |
890 | the API gets incompatible */ | 890 | the API gets incompatible */ |
891 | }; | 891 | }; |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 165ce54634..945abe924d 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -546,7 +546,7 @@ int main(void) | |||
546 | "will continue.\n\n",BATTERY_LOG); | 546 | "will continue.\n\n",BATTERY_LOG); |
547 | rb->fdprintf(fd, | 547 | rb->fdprintf(fd, |
548 | "Battery bench run for %s version %s\n\n" | 548 | "Battery bench run for %s version %s\n\n" |
549 | ,MODEL_NAME,rb->appsversion); | 549 | ,MODEL_NAME,rb->rbversion); |
550 | 550 | ||
551 | rb->fdprintf(fd, | 551 | rb->fdprintf(fd, |
552 | "Battery type: %d mAh Buffer Entries: %d\n" | 552 | "Battery type: %d mAh Buffer Entries: %d\n" |
@@ -578,7 +578,7 @@ int main(void) | |||
578 | rb->fdprintf(fd, "\n--File already present. Resuming Benchmark--\n"); | 578 | rb->fdprintf(fd, "\n--File already present. Resuming Benchmark--\n"); |
579 | rb->fdprintf(fd, | 579 | rb->fdprintf(fd, |
580 | "Battery bench run for %s version %s\n\n" | 580 | "Battery bench run for %s version %s\n\n" |
581 | ,MODEL_NAME,rb->appsversion); | 581 | ,MODEL_NAME,rb->rbversion); |
582 | rb->close(fd); | 582 | rb->close(fd); |
583 | } | 583 | } |
584 | 584 | ||
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index 3f5490e754..24542a9398 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c | |||
@@ -411,7 +411,7 @@ int flash_rockbox(const char *filename, int section) | |||
411 | rb->memset(&hdr, 0, sizeof(struct flash_header)); | 411 | rb->memset(&hdr, 0, sizeof(struct flash_header)); |
412 | hdr.magic = FLASH_MAGIC; | 412 | hdr.magic = FLASH_MAGIC; |
413 | hdr.length = len; | 413 | hdr.length = len; |
414 | // rb->strncpy(hdr.version, APPSVERSION, sizeof(hdr.version)-1); | 414 | // rb->strncpy(hdr.version, rb->rbversion , sizeof(hdr.version)-1); |
415 | p16 = (uint16_t *)&hdr; | 415 | p16 = (uint16_t *)&hdr; |
416 | 416 | ||
417 | rb->snprintf(buf, sizeof(buf), "Programming..."); | 417 | rb->snprintf(buf, sizeof(buf), "Programming..."); |
diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c index ea69353e17..93c4f67657 100644 --- a/apps/plugins/settings_dumper.c +++ b/apps/plugins/settings_dumper.c | |||
@@ -129,7 +129,7 @@ enum plugin_status plugin_start( | |||
129 | return PLUGIN_ERROR; | 129 | return PLUGIN_ERROR; |
130 | list = rb->get_settings_list(&setting_count); | 130 | list = rb->get_settings_list(&setting_count); |
131 | rb->fdprintf(fd, "# .cfg file created by rockbox %s - " | 131 | rb->fdprintf(fd, "# .cfg file created by rockbox %s - " |
132 | "http://www.rockbox.org\r\n\r\n", rb->appsversion); | 132 | "http://www.rockbox.org\r\n\r\n", rb->rbversion); |
133 | 133 | ||
134 | rb->fdprintf(fd, "# -- Sound settings -- #\r\n"); | 134 | rb->fdprintf(fd, "# -- Sound settings -- #\r\n"); |
135 | for(i=0;i<setting_count;i++) | 135 | for(i=0;i<setting_count;i++) |
diff --git a/apps/settings.c b/apps/settings.c index 6349372326..25593e55ac 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -536,7 +536,7 @@ static bool settings_write_config(const char* filename, int options) | |||
536 | if (fd < 0) | 536 | if (fd < 0) |
537 | return false; | 537 | return false; |
538 | fdprintf(fd, "# .cfg file created by rockbox %s - " | 538 | fdprintf(fd, "# .cfg file created by rockbox %s - " |
539 | "http://www.rockbox.org\r\n\r\n", appsversion); | 539 | "http://www.rockbox.org\r\n\r\n", rbversion); |
540 | for(i=0; i<nb_settings; i++) | 540 | for(i=0; i<nb_settings; i++) |
541 | { | 541 | { |
542 | if (settings[i].cfg_name == NULL) | 542 | if (settings[i].cfg_name == NULL) |
diff --git a/apps/version.h b/apps/version.h deleted file mode 100644 index 73828ddfc5..0000000000 --- a/apps/version.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Björn Stenberg | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #ifndef _VERSION_H_ | ||
22 | #define _VERSION_H_ | ||
23 | |||
24 | extern const char appsversion[]; | ||
25 | |||
26 | #endif | ||