Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a few missed things in 16454efc (and hopefully clear the red).

Browse source 
Change-Id: I2ce88e4c41e6e08efbfbdf261122318dfb0f8b0f
This commit is contained in:
Michael Sevakis 2017-10-26 16:32:53 -04:00
parent 1654efc313
commit e4a46c8d88
4 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/storage.h
View file

@ -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

27
firmware/target/arm/rk27xx/ata-nand-rk27xx.c
View file

@ -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;
}

4
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
View file

@ -1375,10 +1375,6 @@ void sd_enable(bool on)
(void)on;
}
void sd_sleepnow(void)
{
}
bool sd_disk_is_active(void)
{
return false;

3
firmware/usb.c
View file

@ -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