Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix Red on PowerSave in Simulator"

Browse source 
This reverts commit 568b81202e.

Change-Id: I2af42cd53d0ce490bf96c68288e9fbde034c0069
This commit is contained in:
William Wilgus 2018-07-28 17:34:16 +02:00
parent c75aac8424
commit 16f10e2abd
9 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config/sansac200v2.h
View file

@ -196,7 +196,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/export/config/sansaclip.h
View file

@ -189,7 +189,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/export/config/sansaclipplus.h
View file

@ -206,7 +206,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP)
#endif #endif

2
firmware/export/config/sansaclipv2.h
View file

@ -200,7 +200,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/export/config/sansaclipzip.h
View file

@ -205,7 +205,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP)
#endif #endif

2
firmware/export/config/sansae200v2.h
View file

@ -216,7 +216,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/export/config/sansafuze.h
View file

@ -222,7 +222,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/export/config/sansafuzev2.h
View file

@ -224,7 +224,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/ /*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE #define HAVE_ADJUSTABLE_CPU_VOLTAGE
#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR)) #ifndef BOOTLOADER
/*define this with flags for power saving options device supports*/ /*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK) #define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif #endif

2
firmware/target/arm/as3525/sd-as3525.c
View file

@ -215,7 +215,6 @@ static void enable_controller_mci(bool on)
/* AMS v1 have two different drive interfaces MCI_SD(XPD) and GGU_IDE */ /* AMS v1 have two different drive interfaces MCI_SD(XPD) and GGU_IDE */
static void enable_controller(bool on, const int drive) static void enable_controller(bool on, const int drive)
{ {
(void) on;
if (drive == INTERNAL_AS3525) if (drive == INTERNAL_AS3525)
{ {
@ -236,7 +235,6 @@ static void enable_controller(bool on, const int drive)
else else
enable_controller_mci(on); enable_controller_mci(on);
#endif #endif
} }
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP