len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix checking for CONFIG_CHARGING

Browse source 
Change-Id: I53b9a129679fd7b322770025106ef92033226d2a
This commit is contained in:
Mihail Zenkov 2016-03-30 12:50:40 +00:00 • committed by Gerrit Rockbox
parent e599810ffa
commit ce90c0481a
4 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/debug_menu.c
View file

@ -111,7 +111,7 @@
#endif #endif
#include "appevents.h" #include "appevents.h"
#if defined(HAVE_AS3514) && defined(CONFIG_CHARGING) #if defined(HAVE_AS3514) && CONFIG_CHARGING
#include "ascodec.h" #include "ascodec.h"
#endif #endif
@ -1107,8 +1107,7 @@ static bool view_battery(void)
/* Conversion disabled */ /* Conversion disabled */
lcd_puts(0, line++, "T Battery: ?"); lcd_puts(0, line++, "T Battery: ?");
} }
#elif defined(HAVE_AS3514) && CONFIG_CHARGING
#elif defined(HAVE_AS3514) && defined(CONFIG_CHARGING)
static const char * const chrgstate_strings[] = static const char * const chrgstate_strings[] =
{ {
[CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled", [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled",

2
firmware/export/ascodec.h
View file

@ -45,7 +45,7 @@ int ascodec_readbytes(unsigned int index, unsigned int len, unsigned char *data)
void ascodec_wait_adc_finished(void); void ascodec_wait_adc_finished(void);
#ifdef CONFIG_CHARGING #if CONFIG_CHARGING
bool ascodec_endofch(void); bool ascodec_endofch(void);
bool ascodec_chg_status(void); bool ascodec_chg_status(void);
void ascodec_monitor_endofch(void); void ascodec_monitor_endofch(void);

2
firmware/export/powermgmt.h
View file

@ -49,7 +49,7 @@ enum charge_state_type
/* tells what the charger is doing */ /* tells what the charger is doing */
extern enum charge_state_type charge_state; extern enum charge_state_type charge_state;
#ifdef CONFIG_CHARGING #if CONFIG_CHARGING
/* /*
* Flag that the charger has been plugged in/removed: this is set for exactly * Flag that the charger has been plugged in/removed: this is set for exactly
* one time through the power loop when the charger has been plugged in. * one time through the power loop when the charger has been plugged in.

4
firmware/target/arm/as3525/ascodec-as3525.c
View file

@ -297,7 +297,7 @@ void ascodec_init(void)
/* Generate irq for usb+charge status change */ /* Generate irq for usb+charge status change */
ascodec_write(AS3514_IRQ_ENRD0, ascodec_write(AS3514_IRQ_ENRD0,
#ifdef CONFIG_CHARGING /* m200v4 can't charge */ #if CONFIG_CHARGING /* m200v4 can't charge */
IRQ_CHGSTAT | IRQ_ENDOFCH | IRQ_CHGSTAT | IRQ_ENDOFCH |
#endif #endif
IRQ_USBSTAT); IRQ_USBSTAT);
@ -530,7 +530,7 @@ void ascodec_wait_adc_finished(void)
semaphore_wait(&adc_done_sem, TIMEOUT_BLOCK); semaphore_wait(&adc_done_sem, TIMEOUT_BLOCK);
} }
#ifdef CONFIG_CHARGING #if CONFIG_CHARGING
bool ascodec_endofch(void) bool ascodec_endofch(void)
{ {
bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH; bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH;