len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 20:55:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor Clip button changes: UP|REPEAT no longer goes to wps. Volume adjustment activated in list + tree.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19760 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2009-01-13 14:51:44 +00:00
parent 738a5643ad
commit 7bc29086ec
5 changed files with 94 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/keymaps/keymap-clip.c
View file

@ -109,11 +109,17 @@ static const struct button_mapping button_context_list[] = {
{ ACTION_LISTTREE_PGUP, BUTTON_HOME|BUTTON_LEFT, BUTTON_HOME }, { ACTION_LISTTREE_PGUP, BUTTON_HOME|BUTTON_LEFT, BUTTON_HOME },
{ ACTION_LISTTREE_PGDOWN, BUTTON_HOME|BUTTON_RIGHT, BUTTON_HOME }, { ACTION_LISTTREE_PGDOWN, BUTTON_HOME|BUTTON_RIGHT, BUTTON_HOME },
#ifdef HAVE_VOLUME_IN_LIST
{ ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
{ ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
#endif
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_list */ }; /* button_context_list */
static const struct button_mapping button_context_tree[] = { static const struct button_mapping button_context_tree[] = {
{ ACTION_TREE_WPS, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),

1
apps/plugins/SOURCES
View file

@ -151,3 +151,4 @@ superdom.c
#endif /* m:robe 500 */ #endif /* m:robe 500 */
md5sum.c md5sum.c
test_boost.c

3
firmware/export/config-clip.h
View file

@ -75,6 +75,9 @@
#define CONFIG_KEYPAD SANSA_CLIP_PAD #define CONFIG_KEYPAD SANSA_CLIP_PAD
/* define this if the target has volume keys which can be used in the lists */
#define HAVE_VOLUME_IN_LIST
/* Define this if you do software codec */ /* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC #define CONFIG_CODEC SWCODEC
/* There is no hardware tone control */ /* There is no hardware tone control */

156
firmware/target/coldfire/iriver/system-iriver.c
View file

@ -50,22 +50,15 @@
*/ */
#if MEM < 32 #if MEM < 32
#define MAX_REFRESH_TIMER 59 #define MAX_REFRESH_TIMER 54
#define NORMAL_REFRESH_TIMER 21 #define NORMAL_REFRESH_TIMER 10
#define DEFAULT_REFRESH_TIMER 4 #define DEFAULT_REFRESH_TIMER 4
#else #else
#define MAX_REFRESH_TIMER 29 #define MAX_REFRESH_TIMER 26
#define NORMAL_REFRESH_TIMER 10 #define NORMAL_REFRESH_TIMER 4
#define DEFAULT_REFRESH_TIMER 1 #define DEFAULT_REFRESH_TIMER 1
#endif #endif
#ifdef IRIVER_H300_SERIES
#define RECALC_DELAYS(f) \
pcf50606_i2c_recalc_delay(f)
#else
#define RECALC_DELAYS(f)
#endif
#ifdef HAVE_SERIAL #ifdef HAVE_SERIAL
#define BAUD_RATE 57600 #define BAUD_RATE 57600
#define BAUDRATE_DIV_DEFAULT (CPUFREQ_DEFAULT/(BAUD_RATE*32*2)) #define BAUDRATE_DIV_DEFAULT (CPUFREQ_DEFAULT/(BAUD_RATE*32*2))
@ -73,6 +66,21 @@
#define BAUDRATE_DIV_MAX (CPUFREQ_MAX/(BAUD_RATE*32*2)) #define BAUDRATE_DIV_MAX (CPUFREQ_MAX/(BAUD_RATE*32*2))
#endif #endif
static bool pll_initialized = false;
static void init_pll(void)
{
/* Refresh timer for bypass frequency */
PLLCR &= ~1; /* Bypass mode */
PLLCR = 0x0189e025 | (PLLCR & 0x70400000); /* set 112 MHz */
/* Wait until the PLL has locked. This may take up to 10ms! */
while(!(PLLCR & 0x80000000)) {};
pll_initialized = true;
}
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
void set_cpu_frequency (long) __attribute__ ((section (".icode"))); void set_cpu_frequency (long) __attribute__ ((section (".icode")));
void set_cpu_frequency(long frequency) void set_cpu_frequency(long frequency)
@ -81,84 +89,78 @@ void cf_set_cpu_frequency (long) __attribute__ ((section (".icode")));
void cf_set_cpu_frequency(long frequency) void cf_set_cpu_frequency(long frequency)
#endif #endif
{ {
if (!pll_initialized)
init_pll();
switch(frequency) switch(frequency)
{ {
case CPUFREQ_MAX: case CPUFREQ_MAX:
DCR = (0x8200 | DEFAULT_REFRESH_TIMER); CSCR0 = 0x00001180; /* Flash: 4 wait states */
/* Refresh timer for bypass frequency */ CSCR1 = 0x00001580; /* LCD: 5 wait states */
PLLCR &= ~1; /* Bypass mode */
timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
RECALC_DELAYS(CPUFREQ_MAX);
PLLCR = 0x018ae025 | (PLLCR & 0x70400000);
CSCR0 = 0x00001180; /* Flash: 4 wait states */
CSCR1 = 0x00001580; /* LCD: 5 wait states */
#if CONFIG_USBOTG == USBOTG_ISP1362 #if CONFIG_USBOTG == USBOTG_ISP1362
CSCR3 = 0x00002180; /* USBOTG: 8 wait states */ CSCR3 = 0x00002180; /* USBOTG: 8 wait states */
#endif #endif
while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. #if CONFIG_RTC == RTC_PCF50606
This may take up to 10ms! */ pcf50606_i2c_recalc_delay(CPUFREQ_MAX);
timers_adjust_prescale(CPUFREQ_MAX_MULT, true);
DCR = (0x8200 | MAX_REFRESH_TIMER); /* Refresh timer */
cpu_frequency = CPUFREQ_MAX;
IDECONFIG1 = 0x10100000 | (1 << 13) | (3 << 10);
/* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */
IDECONFIG2 = 0x40000 | (1 << 8); /* TA enable + CS2wait */
#ifdef HAVE_SERIAL
UBG10 = BAUDRATE_DIV_MAX >> 8;
UBG20 = BAUDRATE_DIV_MAX & 0xff;
#endif #endif
break; timers_adjust_prescale(CPUFREQ_MAX_MULT, true);
DCR = (0x8200 | MAX_REFRESH_TIMER); /* Refresh timer */
IDECONFIG1 = 0x10100000 | (1 << 13) | (3 << 10);
/* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */
IDECONFIG2 = 0x40000 | (1 << 8); /* TA enable 2 + CS2wait */
case CPUFREQ_NORMAL: PLLCR = (PLLCR & ~0x07000000) | (1 << 24); /* set CPUDIV */
DCR = (DCR & ~0x01ff) | DEFAULT_REFRESH_TIMER; DCR = (0x8200 | MAX_REFRESH_TIMER); /* DRAM refresh timer */
/* Refresh timer for bypass frequency */ cpu_frequency = CPUFREQ_MAX;
PLLCR &= ~1; /* Bypass mode */ break;
timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
RECALC_DELAYS(CPUFREQ_NORMAL); case CPUFREQ_NORMAL:
PLLCR = 0x0589e021 | (PLLCR & 0x70400000); PLLCR = (PLLCR & ~0x07000000) | (5 << 24); /* set CPUDIV */
CSCR0 = 0x00000580; /* Flash: 1 wait state */ DCR = (0x8000 | NORMAL_REFRESH_TIMER); /* DRAM refresh timer */
CSCR1 = 0x00000180; /* LCD: 0 wait states */ cpu_frequency = CPUFREQ_MAX;
CSCR0 = 0x00000580; /* Flash: 1 wait state */
CSCR1 = 0x00000180; /* LCD: 0 wait states */
#if CONFIG_USBOTG == USBOTG_ISP1362 #if CONFIG_USBOTG == USBOTG_ISP1362
CSCR3 = 0x00000580; /* USBOTG: 1 wait state */ CSCR3 = 0x00000580; /* USBOTG: 1 wait state */
#endif #endif
while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. #if CONFIG_RTC == RTC_PCF50606
This may take up to 10ms! */ pcf50606_i2c_recalc_delay(CPUFREQ_NORMAL);
timers_adjust_prescale(CPUFREQ_NORMAL_MULT, true); #endif
DCR = (0x8000 | NORMAL_REFRESH_TIMER); /* Refresh timer */ timers_adjust_prescale(CPUFREQ_NORMAL_MULT, true);
cpu_frequency = CPUFREQ_NORMAL;
IDECONFIG1 = 0x10100000 | (1 << 13) | (1 << 10);
/* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */
IDECONFIG2 = 0x40000 | (0 << 8); /* TA enable + CS2wait */
#ifdef HAVE_SERIAL IDECONFIG1 = 0x10100000 | (1 << 13) | (1 << 10);
UBG10 = BAUDRATE_DIV_NORMAL >> 8; /* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */
UBG20 = BAUDRATE_DIV_NORMAL & 0xff; IDECONFIG2 = 0x40000; /* TA enable 2 */
break;
default:
DCR = (DCR & ~0x01ff) | DEFAULT_REFRESH_TIMER;
/* Refresh timer for bypass frequency */
PLLCR &= ~1; /* Bypass mode */
timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true);
#if CONFIG_RTC == RTC_PCF50606
pcf50606_i2c_recalc_delay(CPUFREQ_DEFAULT_MULT);
#endif #endif
break; /* Power down PLL, but keep CRSEL and CLSEL */
default: PLLCR = 0x00800200 | (PLLCR & 0x70400000);
DCR = (DCR & ~0x01ff) | DEFAULT_REFRESH_TIMER; CSCR0 = 0x00000180; /* Flash: 0 wait states */
/* Refresh timer for bypass frequency */ CSCR1 = 0x00000180; /* LCD: 0 wait states */
PLLCR &= ~1; /* Bypass mode */
timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true);
RECALC_DELAYS(CPUFREQ_DEFAULT);
/* Power down PLL, but keep CRSEL and CLSEL */
PLLCR = 0x00800200 | (PLLCR & 0x70400000);
CSCR0 = 0x00000180; /* Flash: 0 wait states */
CSCR1 = 0x00000180; /* LCD: 0 wait states */
#if CONFIG_USBOTG == USBOTG_ISP1362 #if CONFIG_USBOTG == USBOTG_ISP1362
CSCR3 = 0x00000180; /* USBOTG: 0 wait states */ CSCR3 = 0x00000180; /* USBOTG: 0 wait states */
#endif #endif
DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */
cpu_frequency = CPUFREQ_DEFAULT; cpu_frequency = CPUFREQ_DEFAULT;
IDECONFIG1 = 0x10100000 | (1 << 13) | (1 << 10); IDECONFIG1 = 0x10100000 | (1 << 13) | (1 << 10);
/* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */ /* SRE active on write (H300 USBOTG) | BUFEN2 enable | CS2Post | CS2Pre */
IDECONFIG2 = 0x40000 | (0 << 8); /* TA enable + CS2wait */ IDECONFIG2 = 0x40000; /* TA enable 2 */
#ifdef HAVE_SERIAL pll_initialized = false;
UBG10 = BAUDRATE_DIV_DEFAULT >> 8; break;
UBG20 = BAUDRATE_DIV_DEFAULT & 0xff;
#endif
break;
} }
#ifdef HAVE_SERIAL
UBG10 = BAUDRATE_DIV_NORMAL >> 8;
UBG20 = BAUDRATE_DIV_NORMAL & 0xff;
#endif
} }

8
firmware/target/coldfire/system-target.h
View file

@ -215,11 +215,11 @@ extern void cf_set_cpu_frequency(long frequency);
/* 11.2896 MHz */ /* 11.2896 MHz */
#define CPUFREQ_DEFAULT_MULT 1 #define CPUFREQ_DEFAULT_MULT 1
#define CPUFREQ_DEFAULT (CPUFREQ_DEFAULT_MULT * CPU_FREQ) #define CPUFREQ_DEFAULT (CPUFREQ_DEFAULT_MULT * CPU_FREQ)
/* 45.1584 MHz */ /* 22.5792 MHz */
#define CPUFREQ_NORMAL_MULT 4 #define CPUFREQ_NORMAL_MULT 2
#define CPUFREQ_NORMAL (CPUFREQ_NORMAL_MULT * CPU_FREQ) #define CPUFREQ_NORMAL (CPUFREQ_NORMAL_MULT * CPU_FREQ)
/* 124.1856 MHz */ /* 112.896 MHz */
#define CPUFREQ_MAX_MULT 11 #define CPUFREQ_MAX_MULT 10
#define CPUFREQ_MAX (CPUFREQ_MAX_MULT * CPU_FREQ) #define CPUFREQ_MAX (CPUFREQ_MAX_MULT * CPU_FREQ)
#endif /* SYSTEM_TARGET_H */ #endif /* SYSTEM_TARGET_H */