summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-10-26 16:32:53 -0400
committerMichael Sevakis <jethead71@rockbox.org>2017-10-26 16:32:53 -0400
commite4a46c8d8805e7a0e7a49de00bd52d9e5681f429 (patch)
tree538f56d0a1904ceba1fd629d0fe02244e2df503e
parent1654efc31339972d0e6bd41a499fcffc0a45822e (diff)
downloadrockbox-e4a46c8.tar.gz
rockbox-e4a46c8.tar.bz2
rockbox-e4a46c8.zip
Fix a few missed things in 16454efc (and hopefully clear the red).
Change-Id: I2ce88e4c41e6e08efbfbdf261122318dfb0f8b0f
-rw-r--r--firmware/export/storage.h2
-rw-r--r--firmware/target/arm/rk27xx/ata-nand-rk27xx.c27
-rw-r--r--firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c4
-rw-r--r--firmware/usb.c3
4 files changed, 31 insertions, 5 deletions
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index 8a4c95c05b..8ff06c8744 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -188,7 +188,7 @@ static inline void storage_sleep(void) {}
#define storage_spin sd_spin
#define storage_enable(on) sd_enable(on)
- #define storage_sleepnow() sd_sleepnow()
+ #define storage_sleepnow() do {} while (0)
#define storage_disk_is_active() 0
#define storage_soft_reset() (void)0
#ifdef HAVE_STORAGE_FLUSH
diff --git a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
index a32963b44d..e257416cd0 100644
--- a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
+++ b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
@@ -116,3 +116,30 @@ int nand_num_drives(int first_drive)
return 1;
}
#endif
+
+int nand_event(long id, intptr_t data)
+{
+ int rc = 0;
+
+#if 0 /* The NAND functions do nothing right now; just provide template */
+ if (LIKELY(id == Q_STORAGE_TICK))
+ {
+ if (!nand_powered ||
+ TIME_BEFORE(current_tick, nand_last_activity() + HZ / 5))
+ {
+ STG_EVENT_ASSERT_ACTIVE(STORAGE_NAND);
+ }
+ }
+ else if (id == Q_STORAGE_SLEEPNOW)
+ {
+ nand_power_down();
+ }
+ else
+ {
+ rc = storage_event_default_handler(id, data, nand_last_activity(),
+ STORAGE_NAND);
+ }
+#endif
+ return rc;
+ (void)id; (void)data;
+}
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 3ddbff0510..9565551df6 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -1375,10 +1375,6 @@ void sd_enable(bool on)
(void)on;
}
-void sd_sleepnow(void)
-{
-}
-
bool sd_disk_is_active(void)
{
return false;
diff --git a/firmware/usb.c b/firmware/usb.c
index 5e3795dd48..562734c84a 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -45,10 +45,13 @@
/* Conditions under which we want the entire driver */
#if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \
(defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \
+ (defined(HAVE_USBSTACK) && defined(IPOD_NANO2G)) || \
(defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \
(defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \
defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
(CONFIG_USBOTG == USBOTG_JZ4740)
+/* TODO: condition should be reset to be only the original
+ (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) */
#define USB_FULL_INIT
#endif