summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s5l8700
diff options
context:
space:
mode:
authorMichael Sparmann <theseven@rockbox.org>2010-06-21 16:54:25 +0000
committerMichael Sparmann <theseven@rockbox.org>2010-06-21 16:54:25 +0000
commitb59d6642e21d3b9a7c64824780742aaa2294fee3 (patch)
tree52bfab1fe78c0f9545834481eb988b29cb2dc8e9 /firmware/target/arm/s5l8700
parent35e8b1429a2cdcf6580f6d25890fed9865165d0b (diff)
downloadrockbox-b59d6642e21d3b9a7c64824780742aaa2294fee3.tar.gz
rockbox-b59d6642e21d3b9a7c64824780742aaa2294fee3.zip
Fix ata_idle_notify on iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27020 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r--firmware/target/arm/s5l8700/ata-nand-s5l8700.c1
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
index ad87d9ea73..a5dcb4b874 100644
--- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
+++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
@@ -19,7 +19,6 @@
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21#include "config.h" 21#include "config.h"
22#include "ata_idle_notify.h"
23#include "system.h" 22#include "system.h"
24#include <string.h> 23#include <string.h>
25#include "thread.h" 24#include "thread.h"
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
index b7e1f8494b..86eda75768 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
@@ -31,6 +31,7 @@
31#include <mmu-arm.h> 31#include <mmu-arm.h>
32#include <string.h> 32#include <string.h>
33#include "led.h" 33#include "led.h"
34#include "ata_idle_notify.h"
34 35
35 36
36#define NAND_CMD_READ 0x00 37#define NAND_CMD_READ 0x00
@@ -92,7 +93,7 @@ int nand_powered = 0;
92int nand_interleaved = 0; 93int nand_interleaved = 0;
93int nand_cached = 0; 94int nand_cached = 0;
94long nand_last_activity_value = -1; 95long nand_last_activity_value = -1;
95static long nand_stack[32]; 96static long nand_stack[DEFAULT_STACK_SIZE];
96 97
97static struct mutex nand_mtx; 98static struct mutex nand_mtx;
98static struct wakeup nand_wakeup; 99static struct wakeup nand_wakeup;
@@ -721,7 +722,10 @@ static void nand_thread(void)
721 { 722 {
722 if (TIME_AFTER(current_tick, nand_last_activity_value + HZ / 5) 723 if (TIME_AFTER(current_tick, nand_last_activity_value + HZ / 5)
723 && nand_powered) 724 && nand_powered)
725 {
726 call_storage_idle_notifys(false);
724 nand_power_down(); 727 nand_power_down();
728 }
725 sleep(HZ / 10); 729 sleep(HZ / 10);
726 } 730 }
727} 731}