summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2018-07-28 14:55:52 +0200
committerWilliam Wilgus <me.theuser@yahoo.com>2018-07-28 14:55:52 +0200
commit568b81202ebd24a3f7e9efe0558b5f6beed05b44 (patch)
tree0ccba4ad99311b8268c43adc7370d95da9f7337b
parent6f0320a9535bc1aa81d83fa879ac14d5ee603658 (diff)
downloadrockbox-568b812.tar.gz
rockbox-568b812.tar.bz2
rockbox-568b812.zip
Fix Red on PowerSave in Simulator
Change-Id: Ic5d9de230efceabc2c428e5c78fa6596a5a34840
-rw-r--r--firmware/export/config/sansac200v2.h2
-rw-r--r--firmware/export/config/sansaclip.h2
-rw-r--r--firmware/export/config/sansaclipplus.h2
-rw-r--r--firmware/export/config/sansaclipv2.h2
-rw-r--r--firmware/export/config/sansaclipzip.h2
-rw-r--r--firmware/export/config/sansae200v2.h2
-rw-r--r--firmware/export/config/sansafuze.h2
-rw-r--r--firmware/export/config/sansafuzev2.h2
-rw-r--r--firmware/target/arm/as3525/sd-as3525.c2
9 files changed, 10 insertions, 8 deletions
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 98fbb570fb..31cedb3866 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -196,7 +196,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index f0300c2ac1..09151647e2 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -189,7 +189,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 9a307420f4..f590a0f6e2 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -206,7 +206,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP)
#endif
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index 81a0d4703f..e35341fa60 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -200,7 +200,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 8464603c34..42200bfd5f 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -205,7 +205,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK | POWERSV_DISP)
#endif
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 50e1843189..5c652a0e13 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -216,7 +216,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index dedf8c44da..40c373d103 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -222,7 +222,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index 3190930b56..694d77ae61 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -224,7 +224,7 @@
/*define this to enable CPU voltage scaling on AMS devices*/
#define HAVE_ADJUSTABLE_CPU_VOLTAGE
-#ifndef BOOTLOADER
+#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
/*define this with flags for power saving options device supports*/
#define CONFIG_POWER_SAVING (POWERSV_CPU | POWERSV_I2C | POWERSV_DISK)
#endif
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 9e4a86acbe..2c04508089 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -215,6 +215,7 @@ static void enable_controller_mci(bool on)
/* AMS v1 have two different drive interfaces MCI_SD(XPD) and GGU_IDE */
static void enable_controller(bool on, const int drive)
{
+ (void) on;
if (drive == INTERNAL_AS3525)
{
@@ -235,6 +236,7 @@ static void enable_controller(bool on, const int drive)
else
enable_controller_mci(on);
#endif
+
}
#ifdef HAVE_HOTSWAP