Revert "Fix Red on PowerSave in Simulator"

This reverts commit 568b81202ebd24a3f7e9efe0558b5f6beed05b44.

Change-Id: I2af42cd53d0ce490bf96c68288e9fbde034c0069

9 files changed, 8 insertions, 10 deletions

diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 31cedb3866..98fbb570fb 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 09151647e2..f0300c2ac1 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 f590a0f6e2..9a307420f4 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 e35341fa60..81a0d4703f 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 42200bfd5f..8464603c34 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 5c652a0e13..50e1843189 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 40c373d103..dedf8c44da 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 694d77ae61..3190930b56 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
 
-#if (!defined(BOOTLOADER)) && (!defined(SIMULATOR))
+#ifndef BOOTLOADER
 /*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 2c04508089..9e4a86acbe 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -215,7 +215,6 @@ 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)
     {
@@ -236,7 +235,6 @@ static void enable_controller(bool on, const int drive)
     else
         enable_controller_mci(on);
 #endif
-
 }
 
 #ifdef HAVE_HOTSWAP