len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed CPU Sleep setting. It's now permanently enabled.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3434 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2003-03-12 15:30:59 +00:00
parent 3ca8d3589e
commit 72f75f36a5
6 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/lang/english.lang
View file

@ -1381,8 +1381,8 @@ eng: "Size:"
new: new:
id: LANG_CPU_SLEEP id: LANG_CPU_SLEEP
desc: in system_settings_menu() desc: in system_settings_menu() (removed)
eng: "Power Saving" eng: ""
new: new:
id: LANG_SETTINGS_LOADED1 id: LANG_SETTINGS_LOADED1

9
apps/settings.c
View file

@ -105,7 +105,7 @@ offset abs
0x23 0x37 <rec. left gain (bit 0-3)> 0x23 0x37 <rec. left gain (bit 0-3)>
0x24 0x38 <rec. right gain (bit 0-3)> 0x24 0x38 <rec. right gain (bit 0-3)>
0x25 0x39 <disk poweroff flag (bit 0), MP3 buffer margin (bit 1-3), 0x25 0x39 <disk poweroff flag (bit 0), MP3 buffer margin (bit 1-3),
Trickle charge flag (bit 4), CPU sleep flag (bit 5)> Trickle charge flag (bit 4)>
0x26 0x40 <runtime low byte> 0x26 0x40 <runtime low byte>
0x27 0x41 <runtime high byte> 0x27 0x41 <runtime high byte>
0x28 0x42 <topruntime low byte> 0x28 0x42 <topruntime low byte>
@ -357,8 +357,7 @@ int settings_save( void )
config_block[0x25] = (unsigned char) config_block[0x25] = (unsigned char)
((global_settings.disk_poweroff & 1) | ((global_settings.disk_poweroff & 1) |
((global_settings.buffer_margin & 7) << 1) | ((global_settings.buffer_margin & 7) << 1) |
((global_settings.trickle_charge & 1) << 4) | ((global_settings.trickle_charge & 1) << 4));
((global_settings.cpu_sleep & 1) << 5));
{ {
static long lasttime = 0; static long lasttime = 0;
@ -522,8 +521,6 @@ void settings_apply(void)
global_settings.lang_file); global_settings.lang_file);
lang_load(buf); lang_load(buf);
} }
cpu_sleep(global_settings.cpu_sleep);
} }
/* /*
@ -649,7 +646,6 @@ void settings_load(void)
global_settings.disk_poweroff = config_block[0x25] & 1; global_settings.disk_poweroff = config_block[0x25] & 1;
global_settings.buffer_margin = (config_block[0x25] >> 1) & 7; global_settings.buffer_margin = (config_block[0x25] >> 1) & 7;
global_settings.trickle_charge = (config_block[0x25] >> 4) & 1; global_settings.trickle_charge = (config_block[0x25] >> 4) & 1;
global_settings.cpu_sleep = (config_block[0x25] >> 5) & 1;
} }
if (config_block[0x27] != 0xff) if (config_block[0x27] != 0xff)
@ -1509,7 +1505,6 @@ void settings_reset(void) {
global_settings.lang_file[0] = 0; global_settings.lang_file[0] = 0;
global_settings.runtime = 0; global_settings.runtime = 0;
global_settings.topruntime = 0; global_settings.topruntime = 0;
global_settings.cpu_sleep = true;
global_settings.fade_on_stop = true; global_settings.fade_on_stop = true;
} }

1
apps/settings.h
View file

@ -149,7 +149,6 @@ struct user_settings
int scroll_delay; /* delay (in 1/10s) before starting scroll */ int scroll_delay; /* delay (in 1/10s) before starting scroll */
int scroll_step; /* pixels to advance per update */ int scroll_step; /* pixels to advance per update */
bool cpu_sleep; /* Use sleep instruction when idle? */
bool fade_on_stop; /* fade on pause/unpause/stop */ bool fade_on_stop; /* fade on pause/unpause/stop */
}; };

8
apps/settings_menu.c
View file

@ -548,13 +548,6 @@ static bool poweroff(void)
} }
#endif #endif
static bool cpu_sleep_set(void)
{
bool result = set_bool(str(LANG_CPU_SLEEP), &global_settings.cpu_sleep);
cpu_sleep(global_settings.cpu_sleep);
return result;
}
static bool buffer_margin(void) static bool buffer_margin(void)
{ {
return set_int(str(LANG_MP3BUFFER_MARGIN), "s", return set_int(str(LANG_MP3BUFFER_MARGIN), "s",
@ -755,7 +748,6 @@ static bool system_settings_menu(void)
#ifdef HAVE_ATA_POWER_OFF #ifdef HAVE_ATA_POWER_OFF
{ str(LANG_POWEROFF), poweroff }, { str(LANG_POWEROFF), poweroff },
#endif #endif
{ str(LANG_CPU_SLEEP), cpu_sleep_set },
#ifndef SIMULATOR #ifndef SIMULATOR
{ str(LANG_BATTERY_CAPACITY), battery_capacity }, { str(LANG_BATTERY_CAPACITY), battery_capacity },
#endif #endif

1
firmware/export/thread.h
View file

@ -30,6 +30,5 @@ void sleep_thread(void);
void wake_up_thread(void); void wake_up_thread(void);
void init_threads(void); void init_threads(void);
int thread_stack_usage(int threadnum); int thread_stack_usage(int threadnum);
void cpu_sleep(bool enabled);
#endif #endif

8
firmware/thread.c
View file

@ -33,7 +33,6 @@ struct regs
}; };
int num_threads; int num_threads;
bool cpu_sleep_enabled;
static volatile int num_sleepers; static volatile int num_sleepers;
static int current_thread; static int current_thread;
static struct regs thread_contexts[MAXTHREADS] __attribute__ ((section(".idata"))); static struct regs thread_contexts[MAXTHREADS] __attribute__ ((section(".idata")));
@ -104,7 +103,7 @@ void switch_thread(void)
/* Do nothing */ /* Do nothing */
#else #else
while (cpu_sleep_enabled && num_sleepers == num_threads) while (num_sleepers == num_threads)
{ {
/* Enter sleep mode, woken up on interrupt */ /* Enter sleep mode, woken up on interrupt */
SBYCR &= 0x7F; SBYCR &= 0x7F;
@ -125,11 +124,6 @@ void switch_thread(void)
panicf("Stkov %s", thread_name[next]); panicf("Stkov %s", thread_name[next]);
} }
void cpu_sleep(bool enabled)
{
cpu_sleep_enabled = enabled;
}
void sleep_thread(void) void sleep_thread(void)
{ {
++num_sleepers; ++num_sleepers;