6 files changed, 28 insertions, 15 deletions

diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c
index 8fd1bbf521..81dde33938 100644
--- a/firmware/target/arm/ata-nand-telechips.c
+++ b/firmware/target/arm/ata-nand-telechips.c
@@ -866,6 +866,12 @@ int nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
     return -1;
 }
 
+#ifdef HAVE_STORAGE_FLUSH
+int nand_flush(void)
+{
+    return 0;
+}
+#endif
 
 #ifdef STORAGE_GET_INFO
 void nand_get_info(IF_MD2(int drive,) struct storage_info *info)
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
index b3b1314a50..883c167c78 100644
--- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
+++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
@@ -36,9 +36,6 @@ long last_disk_activity = -1;
 /** static, private data **/ 
 static bool initialized = false;
 
-static long next_yield = 0;
-#define MIN_YIELD_PERIOD 2000
-
 /* API Functions */
 
 void nand_led(bool onoff)
@@ -67,6 +64,10 @@ void nand_sleep(void)
 {
 }
 
+void nand_sleepnow(void)
+{
+}
+
 void nand_spin(void)
 {
 }
@@ -86,6 +87,13 @@ long nand_last_disk_activity(void)
     return 0;
 }
 
+#ifdef HAVE_STORAGE_FLUSH
+int nand_flush(void)
+{
+    return ftl_sync();
+}
+#endif
+
 int nand_init(void)
 {
     if (ftl_init()) return 1;
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
index 76e35ead30..c430a327a2 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
@@ -25,6 +25,7 @@
 #include "lcd.h"
 #include "system.h"
 #include "cpu.h"
+#include "pmu-target.h"
 
 
 /* The Nano 2G has two different LCD types.  What we call "type 0"
@@ -124,10 +125,11 @@ void lcd_set_flip(bool yesno)
     }
 }
 
-
-
-void lcd_off(void)
+void lcd_shutdown(void)
 {
+    pmu_write(0x2b, 0);  /* Kill the backlight, instantly. */
+    pmu_write(0x29, 0);
+
     if (lcd_type == 0)
     {
         s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x232);
@@ -151,6 +153,11 @@ void lcd_off(void)
     }
 }
 
+
+void lcd_off(void)
+{
+}
+
 void lcd_on(void)
 {
 }
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
index 4dd295c21a..ca2b5f2775 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
@@ -103,4 +103,4 @@ void pmu_switch_power(int gate, int onoff)
         if (onoff) newval |= 1 << (2 * (gate - 4));
         pmu_write(0x3C, newval);
     }
-}
\ No newline at end of file
+}
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
index 31f23ff9ff..cba1514aad 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
@@ -32,13 +32,6 @@
 
 void power_off(void)
 {
-    if (ftl_sync() != 0) panicf("Failed to unmount flash!");
-
-    pmu_write(0x2b, 0);  /* Kill the backlight, instantly. */
-    pmu_write(0x29, 0);
-
-    lcd_off();
-
     pmu_switch_power(0, 0);
     pmu_switch_power(2, 0);
     pmu_switch_power(3, 0);
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
index 01d64f1c54..bad9581d8f 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
@@ -52,7 +52,6 @@ int rtc_read_datetime(struct tm *tm)
 int rtc_write_datetime(const struct tm *tm)
 {
     unsigned int i;
-    int rc, oldlevel;
     unsigned char buf[7];
 
     buf[0] = tm->tm_sec;