? ata.patch
? changes
? h300
? h300-boot
? h300-sim
? ondio
? play
? rec
? v2
? tools/codepages
? tools/mkboot
? tools/rdf2binary
? tools/uclpack
Index: apps/misc.c
===================================================================
RCS file: /cvsroot/rockbox/apps/misc.c,v
retrieving revision 1.75
diff -u -r1.75 misc.c
--- apps/misc.c	15 Nov 2006 20:26:33 -0000	1.75
+++ apps/misc.c	25 Nov 2006 12:21:59 -0000
@@ -555,7 +555,7 @@
 
 static void system_flush(void)
 {
-    call_ata_idle_notifys(false); /*doesnt work on usb and shutdown from ata thread */
+    call_ata_idle_notifys(false,true); /*doesnt work on usb and shutdown from ata thread */
     tree_flush();
 }
 
@@ -569,7 +569,7 @@
 #ifdef SIMULATOR
     (void)callback;
     (void)parameter;
-    call_ata_idle_notifys(false);
+    call_ata_idle_notifys(false,true);
     exit(0);
 #else
     int i;
Index: apps/gui/gwps.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/gwps.c,v
retrieving revision 1.54
diff -u -r1.54 gwps.c
--- apps/gui/gwps.c	13 Nov 2006 00:45:21 -0000	1.54
+++ apps/gui/gwps.c	25 Nov 2006 12:22:01 -0000
@@ -141,7 +141,7 @@
             if (wps_state.paused) {
                 settings_save();
 #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
-                call_ata_idle_notifys(false);
+                call_ata_idle_notifys(false,true);
 #endif
             }
         }
@@ -255,7 +255,7 @@
                         audio_pause();
                     settings_save();
 #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
-                    call_ata_idle_notifys(false);   /* make sure resume info is saved */
+                    call_ata_idle_notifys(false,true);   /* make sure resume info is saved */
 #endif
                 }
                 break;
Index: firmware/ata_idle_notify.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/ata_idle_notify.c,v
retrieving revision 1.2
diff -u -r1.2 ata_idle_notify.c
--- firmware/ata_idle_notify.c	8 Nov 2006 01:55:25 -0000	1.2
+++ firmware/ata_idle_notify.c	25 Nov 2006 12:22:02 -0000
@@ -28,10 +28,13 @@
 static int ata_callback_count = 0;
 #endif
 
+
 bool register_ata_idle_func(ata_idle_notify function)
 {
 #if USING_ATA_CALLBACK
     int i;
+    if (ata_callback_count >= MAX_ATA_CALLBACKS)
+        return false;
     for (i=0; i<MAX_ATA_CALLBACKS; i++)
     {
         if (ata_idle_notify_funcs[i] == NULL)
@@ -69,13 +72,15 @@
     return;
 }
 
-bool call_ata_idle_notifys(bool sleep_after)
+bool call_ata_idle_notifys(bool sleep_after, bool force)
 {
     int i;
+    static int lock_until = 0;
     ata_idle_notify function;
-    if (ata_callback_count == 0)
+    if (!force && TIME_BEFORE(current_tick,lock_until) )
         return false;
-    ata_callback_count = 0; /* so we dont re-enter every time the callbacks read/write */
+    lock_until = current_tick * 30 * HZ;
+
     for (i = 0; i < MAX_ATA_CALLBACKS; i++)
     {
         if (ata_idle_notify_funcs[i])
@@ -83,6 +88,7 @@
             function = ata_idle_notify_funcs[i];
             ata_idle_notify_funcs[i] = NULL;
             function();
+            ata_callback_count--;
         }
     }
     if (sleep_after)
Index: firmware/drivers/ata.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/ata.c,v
retrieving revision 1.189
diff -u -r1.189 ata.c
--- firmware/drivers/ata.c	12 Nov 2006 14:17:49 -0000	1.189
+++ firmware/drivers/ata.c	25 Nov 2006 12:22:04 -0000
@@ -1236,7 +1236,7 @@
                         last_seen_mtx_unlock = current_tick;
                     if (TIME_AFTER(current_tick, last_seen_mtx_unlock+(HZ*2)))
                     {
-                        call_ata_idle_notifys(false);
+                        call_ata_idle_notifys(false,false);
                         last_seen_mtx_unlock = 0;
                     }
                 }
@@ -1246,7 +1246,7 @@
                      TIME_AFTER( current_tick, 
                                 last_disk_activity + sleep_timeout ) )
                 {
-                    call_ata_idle_notifys(false);
+                    call_ata_idle_notifys(false,false);
                     ata_perform_sleep();
                     last_sleep = current_tick;
                 }
@@ -1285,7 +1285,7 @@
                 break;
 #endif
             case Q_SLEEP:
-                call_ata_idle_notifys(true);
+                call_ata_idle_notifys(true,false);
                 last_disk_activity = current_tick - sleep_timeout + (HZ/2);
                 break;
                 
Index: firmware/drivers/ata_mmc.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/ata_mmc.c,v
retrieving revision 1.61
diff -u -r1.61 ata_mmc.c
--- firmware/drivers/ata_mmc.c	12 Nov 2006 14:17:49 -0000	1.61
+++ firmware/drivers/ata_mmc.c	25 Nov 2006 12:22:07 -0000
@@ -1013,7 +1013,7 @@
                 {
                     if (!idle_notified)
                     {
-                        call_ata_idle_notifys(false);
+                        call_ata_idle_notifys(false,false);
                         idle_notified = true;
                     }
                 }
Index: firmware/export/ata_idle_notify.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/ata_idle_notify.h,v
retrieving revision 1.4
diff -u -r1.4 ata_idle_notify.h
--- firmware/export/ata_idle_notify.h	8 Nov 2006 03:19:53 -0000	1.4
+++ firmware/export/ata_idle_notify.h	25 Nov 2006 12:22:07 -0000
@@ -44,10 +44,10 @@
 #if USING_ATA_CALLBACK
 extern void ata_idle_notify_init(void);
 extern void unregister_ata_idle_func(ata_idle_notify function, bool run);
-extern bool call_ata_idle_notifys(bool sleep_after);
+extern bool call_ata_idle_notifys(bool sleep_after, bool force);
 #else
 #define unregister_ata_idle_func(f,r)
-#define call_ata_idle_notifys(s)
+#define call_ata_idle_notifys(s,f)
 #define ata_idle_notify_init(s)
 #endif