From e4a46c8d8805e7a0e7a49de00bd52d9e5681f429 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Thu, 26 Oct 2017 16:32:53 -0400 Subject: Fix a few missed things in 16454efc (and hopefully clear the red). Change-Id: I2ce88e4c41e6e08efbfbdf261122318dfb0f8b0f --- firmware/target/arm/rk27xx/ata-nand-rk27xx.c | 27 ++++++++++++++++++++++ .../target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 4 ---- 2 files changed, 27 insertions(+), 4 deletions(-) (limited to 'firmware/target') 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; -- cgit v1.2.3