summaryrefslogtreecommitdiff
path: root/firmware/thread.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-05-17 16:19:58 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-05-17 16:19:58 +0000
commitd587247ebdde98058bcd90911e1d10147bd1fab5 (patch)
treecd0d59da67f96eb7d9fdc40bb88e9c611bedba58 /firmware/thread.c
parentc8c0f4590bd0564689cbc28155d368b84d17f369 (diff)
downloadrockbox-d587247ebdde98058bcd90911e1d10147bd1fab5.tar.gz
rockbox-d587247ebdde98058bcd90911e1d10147bd1fab5.zip
Actually remove the ata lock hack code for that had been used for iPod Video 60/80. It has been disabled for awhile anyway and the problem that nescessitated it really appears resolved.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17558 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/thread.c')
-rw-r--r--firmware/thread.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/firmware/thread.c b/firmware/thread.c
index e8d05d5305..71656e1711 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -161,13 +161,6 @@ void switch_thread(void)
161 * Processor-specific section 161 * Processor-specific section
162 */ 162 */
163 163
164#if 0 /* defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64 */
165/* Support a special workaround object for large-sector disks */
166#define IF_NO_SKIP_YIELD(...) __VA_ARGS__
167#else
168#define IF_NO_SKIP_YIELD(...)
169#endif
170
171#if defined(CPU_ARM) 164#if defined(CPU_ARM)
172/*--------------------------------------------------------------------------- 165/*---------------------------------------------------------------------------
173 * Start the thread running and terminate it if it returns 166 * Start the thread running and terminate it if it returns
@@ -1952,9 +1945,8 @@ void switch_thread(void)
1952#endif 1945#endif
1953 1946
1954#ifdef HAVE_PRIORITY_SCHEDULING 1947#ifdef HAVE_PRIORITY_SCHEDULING
1955 IF_NO_SKIP_YIELD( if (thread->skip_count != -1) )
1956 /* Reset the value of thread's skip count */ 1948 /* Reset the value of thread's skip count */
1957 thread->skip_count = 0; 1949 thread->skip_count = 0;
1958#endif 1950#endif
1959 1951
1960 for (;;) 1952 for (;;)
@@ -2010,7 +2002,6 @@ void switch_thread(void)
2010 * priority threads are runnable. The highest priority runnable 2002 * priority threads are runnable. The highest priority runnable
2011 * thread(s) are never skipped. */ 2003 * thread(s) are never skipped. */
2012 if (priority <= max || 2004 if (priority <= max ||
2013 IF_NO_SKIP_YIELD( thread->skip_count == -1 || )
2014 (diff = priority - max, ++thread->skip_count > diff*diff)) 2005 (diff = priority - max, ++thread->skip_count > diff*diff))
2015 { 2006 {
2016 cores[core].running = thread; 2007 cores[core].running = thread;
@@ -2155,8 +2146,7 @@ unsigned int wakeup_thread(struct thread_entry **list)
2155 if (bl == NULL) 2146 if (bl == NULL)
2156 { 2147 {
2157 /* No inheritance - just boost the thread by aging */ 2148 /* No inheritance - just boost the thread by aging */
2158 IF_NO_SKIP_YIELD( if (thread->skip_count != -1) ) 2149 thread->skip_count = thread->priority;
2159 thread->skip_count = thread->priority;
2160 current = cores[CURRENT_CORE].running; 2150 current = cores[CURRENT_CORE].running;
2161 } 2151 }
2162 else 2152 else