devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed scroll step settings >127 pixels not working (reported on irc). Changed some other LCD driver variables to the natural 'int', cuts down binary size on coldfire a bit. Cleaned up some more settings bits. Bumped config block version, so save your settings to a file before upgrading.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7247 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-07-28 08:36:24 +00:00
parent d074ed66d9
commit 05af28036e
5 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
apps/settings.c
View file

@ -77,7 +77,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
#include "pcm_playback.h" #include "pcm_playback.h"
#endif #endif
#define CONFIG_BLOCK_VERSION 23 #define CONFIG_BLOCK_VERSION 24
#define CONFIG_BLOCK_SIZE 512 #define CONFIG_BLOCK_SIZE 512
#define RTC_BLOCK_SIZE 44 #define RTC_BLOCK_SIZE 44
@ -228,7 +228,7 @@ static const struct bit_entry rtc_bits[] =
{1, S_O(volume_type), 0, "volume display", graphic_numeric }, {1, S_O(volume_type), 0, "volume display", graphic_numeric },
{1, S_O(battery_display), 0, "battery display", graphic_numeric }, {1, S_O(battery_display), 0, "battery display", graphic_numeric },
{1, S_O(timeformat), 0, "time format", "24hour,12hour" }, {1, S_O(timeformat), 0, "time format", "24hour,12hour" },
#endif #endif /* HAVE_LCD_BITMAP */
{1, S_O(show_icons), true, "show icons", off_on }, {1, S_O(show_icons), true, "show icons", off_on },
/* system */ /* system */
{4, S_O(poweroff), 10, {4, S_O(poweroff), 10,
@ -252,9 +252,6 @@ static const struct bit_entry rtc_bits[] =
{8, S_O(last_frequency), 0, NULL, NULL }, /* Default: MIN_FREQ */ {8, S_O(last_frequency), 0, NULL, NULL }, /* Default: MIN_FREQ */
#endif #endif
/* new stuff to be added here */
/* If values are just added to the end, no need to bump the version. */
#if BATTERY_TYPES_COUNT > 1 #if BATTERY_TYPES_COUNT > 1
{1, S_O(battery_type), 0, "battery type", "alkaline,nimh" }, {1, S_O(battery_type), 0, "battery type", "alkaline,nimh" },
#endif #endif
@ -268,7 +265,10 @@ static const struct bit_entry rtc_bits[] =
{1, S_O(remote_flip_display), false, "remote flip display", off_on }, {1, S_O(remote_flip_display), false, "remote flip display", off_on },
#endif #endif
/* Current sum of bits: 259 (worst case) */ /* new stuff to be added here */
/* If values are just added to the end, no need to bump the version. */
/* Current sum of bits: 268 (worst case, but w/o remote lcd) */
/* Sum of all bit sizes must not grow beyond 288! */ /* Sum of all bit sizes must not grow beyond 288! */
}; };
@ -288,7 +288,13 @@ static const struct bit_entry hd_bits[] =
{1, S_O(caption_backlight), false, "caption backlight", off_on }, {1, S_O(caption_backlight), false, "caption backlight", off_on },
#endif #endif
{4, S_O(scroll_speed), 9, "scroll speed", NULL }, /* 0...15 */ {4, S_O(scroll_speed), 9, "scroll speed", NULL }, /* 0...15 */
#ifdef HAVE_LCD_BITMAP
#if LCD_WIDTH > 127
{8, S_O(scroll_step), 6, "scroll step", NULL }, /* 1...160 */
#else
{7, S_O(scroll_step), 6, "scroll step", NULL }, /* 1...112 */ {7, S_O(scroll_step), 6, "scroll step", NULL }, /* 1...112 */
#endif
#endif /* HAVE_LCD_BITMAP */
{8, S_O(scroll_delay), 100, "scroll delay", NULL }, /* 0...250 */ {8, S_O(scroll_delay), 100, "scroll delay", NULL }, /* 0...250 */
{8, S_O(bidir_limit), 50, "bidir limit", NULL }, /* 0...200 */ {8, S_O(bidir_limit), 50, "bidir limit", NULL }, /* 0...200 */
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
@ -313,7 +319,7 @@ static const struct bit_entry hd_bits[] =
{1, S_O(disk_poweroff), false, "disk poweroff", off_on }, {1, S_O(disk_poweroff), false, "disk poweroff", off_on },
#endif #endif
{8, S_O(disk_spindown), 5, "disk spindown", NULL }, {8, S_O(disk_spindown), 5, "disk spindown", NULL },
#endif #endif /* HAVE_MMC */
/* browser */ /* browser */
{3, S_O(dirfilter), SHOW_SUPPORTED, {3, S_O(dirfilter), SHOW_SUPPORTED,
"show files", "all,supported,music,playlists,id3 database" }, "show files", "all,supported,music,playlists,id3 database" },
@ -366,6 +372,13 @@ static const struct bit_entry hd_bits[] =
{1, S_O(rec_directory), 0, /* rec_base_directory */ {1, S_O(rec_directory), 0, /* rec_base_directory */
"rec directory", REC_BASE_DIR ",current" }, "rec directory", REC_BASE_DIR ",current" },
#endif #endif
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
{7, S_O(mdb_strength), 0, "mdb strength", NULL},
{7, S_O(mdb_harmonics), 0, "mdb harmonics", NULL},
{9, S_O(mdb_center), 0, "mdb center", NULL},
{9, S_O(mdb_shape), 0, "mdb shape", NULL},
{1, S_O(mdb_enable), 0, "mdb enable", off_on},
#endif
#if CONFIG_HWCODEC == MAS3507D #if CONFIG_HWCODEC == MAS3507D
{1, S_O(line_in), false, "line in", off_on }, {1, S_O(line_in), false, "line in", off_on },
#endif #endif
@ -374,14 +387,8 @@ static const struct bit_entry hd_bits[] =
{2, S_O(talk_file), 0, "talk file", off_number_spell_hover }, {2, S_O(talk_file), 0, "talk file", off_number_spell_hover },
{1, S_O(talk_menu), true, "talk menu", off_on }, {1, S_O(talk_menu), true, "talk menu", off_on },
/* If values are just added to the end, no need to bump the version. */
{2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" }, {2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" },
{2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" }, {2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" },
{7, S_O(mdb_strength), 0, "mdb strength", NULL},
{7, S_O(mdb_harmonics), 0, "mdb harmonics", NULL},
{9, S_O(mdb_center), 0, "mdb center", NULL},
{9, S_O(mdb_shape), 0, "mdb shape", NULL},
{1, S_O(mdb_enable), 0, "mdb enable", off_on},
{1, S_O(id3_v1_first), 0, "id3 tag priority", "v2-v1,v1-v2"}, {1, S_O(id3_v1_first), 0, "id3 tag priority", "v2-v1,v1-v2"},
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
@ -421,8 +428,9 @@ static const struct bit_entry hd_bits[] =
{1, S_O(replaygain_noclip), false, "replaygain noclip", off_on }, {1, S_O(replaygain_noclip), false, "replaygain noclip", off_on },
#endif #endif
/* If values are just added to the end, no need to bump the version. */
/* new stuff to be added at the end */ /* new stuff to be added at the end */
/* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */
}; };
@ -938,7 +946,7 @@ void settings_load(int which)
} }
if (which & SETTINGS_HD) if (which & SETTINGS_HD)
{ {
load_bit_table(hd_bits, sizeof(hd_bits)/sizeof(hd_bits[0]), load_bit_table(hd_bits, sizeof(hd_bits)/sizeof(hd_bits[0]),
RTC_BLOCK_SIZE*8); RTC_BLOCK_SIZE*8);
} }

4
firmware/drivers/lcd-h100-remote.c
View file

@ -93,9 +93,9 @@ static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrollin
static void scroll_thread(void); static void scroll_thread(void);
static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)]; static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
static const char scroll_name[] = "remote_scroll"; static const char scroll_name[] = "remote_scroll";
static char scroll_ticks = 12; /* # of ticks between updates*/ static int scroll_ticks = 12; /* # of ticks between updates*/
static int scroll_delay = HZ/2; /* ticks delay before start */ static int scroll_delay = HZ/2; /* ticks delay before start */
static char scroll_step = 6; /* pixels per scroll step */ static int scroll_step = 6; /* pixels per scroll step */
static int bidir_limit = 50; /* percent */ static int bidir_limit = 50; /* percent */
static struct scrollinfo scroll[SCROLLABLE_LINES]; static struct scrollinfo scroll[SCROLLABLE_LINES];

4
firmware/drivers/lcd-h100.c
View file

@ -80,9 +80,9 @@ static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrollin
static void scroll_thread(void); static void scroll_thread(void);
static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)]; static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
static const char scroll_name[] = "scroll"; static const char scroll_name[] = "scroll";
static char scroll_ticks = 12; /* # of ticks between updates*/ static int scroll_ticks = 12; /* # of ticks between updates*/
static int scroll_delay = HZ/2; /* ticks delay before start */ static int scroll_delay = HZ/2; /* ticks delay before start */
static char scroll_step = 6; /* pixels per scroll step */ static int scroll_step = 6; /* pixels per scroll step */
static int bidir_limit = 50; /* percent */ static int bidir_limit = 50; /* percent */
static struct scrollinfo scroll[SCROLLABLE_LINES]; static struct scrollinfo scroll[SCROLLABLE_LINES];

4
firmware/drivers/lcd-player.c
View file

@ -78,10 +78,10 @@ struct cursorinfo {
static void scroll_thread(void); static void scroll_thread(void);
static char scroll_stack[DEFAULT_STACK_SIZE]; static char scroll_stack[DEFAULT_STACK_SIZE];
static const char scroll_name[] = "scroll"; static const char scroll_name[] = "scroll";
static char scroll_ticks = 12; /* # of ticks between updates */ static int scroll_ticks = 12; /* # of ticks between updates */
static int scroll_delay = HZ/2; /* delay before starting scroll */ static int scroll_delay = HZ/2; /* delay before starting scroll */
static int jump_scroll_delay = HZ/4; /* delay between jump scroll jumps */ static int jump_scroll_delay = HZ/4; /* delay between jump scroll jumps */
static char scroll_spacing = 3; /* spaces between end and start of text */ static int scroll_spacing = 3; /* spaces between end and start of text */
static int bidir_limit = 50; /* percent */ static int bidir_limit = 50; /* percent */
static int jump_scroll = 0; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ static int jump_scroll = 0; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */

4
firmware/drivers/lcd-recorder.c
View file

@ -90,9 +90,9 @@ static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrollin
static void scroll_thread(void); static void scroll_thread(void);
static char scroll_stack[DEFAULT_STACK_SIZE]; static char scroll_stack[DEFAULT_STACK_SIZE];
static const char scroll_name[] = "scroll"; static const char scroll_name[] = "scroll";
static char scroll_ticks = 12; /* # of ticks between updates*/ static int scroll_ticks = 12; /* # of ticks between updates*/
static int scroll_delay = HZ/2; /* ticks delay before start */ static int scroll_delay = HZ/2; /* ticks delay before start */
static char scroll_step = 6; /* pixels per scroll step */ static int scroll_step = 6; /* pixels per scroll step */
static int bidir_limit = 50; /* percent */ static int bidir_limit = 50; /* percent */
static struct scrollinfo scroll[SCROLLABLE_LINES]; static struct scrollinfo scroll[SCROLLABLE_LINES];