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

Slightly more correct initialization of the power/charging code

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3940 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2003-08-25 08:57:49 +00:00
parent 71316085de
commit 53ee344743
5 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/main.c
View file

@ -146,7 +146,7 @@ void init(void)
button_init(); button_init();
power_init(); /* moved up from below mpeg_init, hope that's not harmful */ powermgmt_init();
if (coldstart && charger_inserted()) if (coldstart && charger_inserted())
{ {

10
firmware/drivers/power.c
View file

@ -24,11 +24,19 @@
#include "power.h" #include "power.h"
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL
bool charger_enabled = 0; bool charger_enabled;
#endif #endif
#ifndef SIMULATOR #ifndef SIMULATOR
void power_init(void)
{
#ifdef HAVE_CHARGE_CTRL
PBIOR |= 0x20; /* Set charging control bit to output */
charger_enable(false); /* Default to charger OFF */
#endif
}
bool charger_inserted(void) bool charger_inserted(void)
{ {
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL

1
firmware/export/power.h
View file

@ -23,6 +23,7 @@
extern bool charger_enabled; extern bool charger_enabled;
#endif #endif
void power_init(void);
bool charger_inserted(void); bool charger_inserted(void);
void charger_enable(bool on); void charger_enable(bool on);
void ide_power_enable(bool on); void ide_power_enable(bool on);

2
firmware/export/powermgmt.h
View file

@ -80,7 +80,7 @@ extern int charge_state; /* tells what the charger is doing (for info di
extern unsigned short power_history[POWER_HISTORY_LEN]; extern unsigned short power_history[POWER_HISTORY_LEN];
/* Start up power management thread */ /* Start up power management thread */
void power_init(void); void powermgmt_init(void);
#endif /* SIMULATOR */ #endif /* SIMULATOR */

4
firmware/powermgmt.c
View file

@ -685,8 +685,10 @@ static void power_thread(void)
} }
} }
void power_init(void) void powermgmt_init(void)
{ {
power_init();
/* init history to 0 */ /* init history to 0 */
memset(power_history, 0x00, sizeof(power_history)); memset(power_history, 0x00, sizeof(power_history));
/* initialize the history with a single sample to prevent level /* initialize the history with a single sample to prevent level