diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2017-10-26 16:32:53 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2017-10-26 16:32:53 -0400 |
commit | e4a46c8d8805e7a0e7a49de00bd52d9e5681f429 (patch) | |
tree | 538f56d0a1904ceba1fd629d0fe02244e2df503e | |
parent | 1654efc31339972d0e6bd41a499fcffc0a45822e (diff) | |
download | rockbox-e4a46c8d8805e7a0e7a49de00bd52d9e5681f429.tar.gz rockbox-e4a46c8d8805e7a0e7a49de00bd52d9e5681f429.zip |
Fix a few missed things in 16454efc (and hopefully clear the red).
Change-Id: I2ce88e4c41e6e08efbfbdf261122318dfb0f8b0f
-rw-r--r-- | firmware/export/storage.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ata-nand-rk27xx.c | 27 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 4 | ||||
-rw-r--r-- | firmware/usb.c | 3 |
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) {} | |||
188 | #define storage_spin sd_spin | 188 | #define storage_spin sd_spin |
189 | 189 | ||
190 | #define storage_enable(on) sd_enable(on) | 190 | #define storage_enable(on) sd_enable(on) |
191 | #define storage_sleepnow() sd_sleepnow() | 191 | #define storage_sleepnow() do {} while (0) |
192 | #define storage_disk_is_active() 0 | 192 | #define storage_disk_is_active() 0 |
193 | #define storage_soft_reset() (void)0 | 193 | #define storage_soft_reset() (void)0 |
194 | #ifdef HAVE_STORAGE_FLUSH | 194 | #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) | |||
116 | return 1; | 116 | return 1; |
117 | } | 117 | } |
118 | #endif | 118 | #endif |
119 | |||
120 | int nand_event(long id, intptr_t data) | ||
121 | { | ||
122 | int rc = 0; | ||
123 | |||
124 | #if 0 /* The NAND functions do nothing right now; just provide template */ | ||
125 | if (LIKELY(id == Q_STORAGE_TICK)) | ||
126 | { | ||
127 | if (!nand_powered || | ||
128 | TIME_BEFORE(current_tick, nand_last_activity() + HZ / 5)) | ||
129 | { | ||
130 | STG_EVENT_ASSERT_ACTIVE(STORAGE_NAND); | ||
131 | } | ||
132 | } | ||
133 | else if (id == Q_STORAGE_SLEEPNOW) | ||
134 | { | ||
135 | nand_power_down(); | ||
136 | } | ||
137 | else | ||
138 | { | ||
139 | rc = storage_event_default_handler(id, data, nand_last_activity(), | ||
140 | STORAGE_NAND); | ||
141 | } | ||
142 | #endif | ||
143 | return rc; | ||
144 | (void)id; (void)data; | ||
145 | } | ||
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) | |||
1375 | (void)on; | 1375 | (void)on; |
1376 | } | 1376 | } |
1377 | 1377 | ||
1378 | void sd_sleepnow(void) | ||
1379 | { | ||
1380 | } | ||
1381 | |||
1382 | bool sd_disk_is_active(void) | 1378 | bool sd_disk_is_active(void) |
1383 | { | 1379 | { |
1384 | return false; | 1380 | 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 @@ | |||
45 | /* Conditions under which we want the entire driver */ | 45 | /* Conditions under which we want the entire driver */ |
46 | #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \ | 46 | #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \ |
47 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ | 47 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ |
48 | (defined(HAVE_USBSTACK) && defined(IPOD_NANO2G)) || \ | ||
48 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ | 49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ |
49 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ | 50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ |
50 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ | 51 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
51 | (CONFIG_USBOTG == USBOTG_JZ4740) | 52 | (CONFIG_USBOTG == USBOTG_JZ4740) |
53 | /* TODO: condition should be reset to be only the original | ||
54 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) */ | ||
52 | #define USB_FULL_INIT | 55 | #define USB_FULL_INIT |
53 | #endif | 56 | #endif |
54 | 57 | ||