From d587247ebdde98058bcd90911e1d10147bd1fab5 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 May 2008 16:19:58 +0000 Subject: 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 --- firmware/thread.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'firmware/thread.c') 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) * Processor-specific section */ -#if 0 /* defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64 */ -/* Support a special workaround object for large-sector disks */ -#define IF_NO_SKIP_YIELD(...) __VA_ARGS__ -#else -#define IF_NO_SKIP_YIELD(...) -#endif - #if defined(CPU_ARM) /*--------------------------------------------------------------------------- * Start the thread running and terminate it if it returns @@ -1952,9 +1945,8 @@ void switch_thread(void) #endif #ifdef HAVE_PRIORITY_SCHEDULING - IF_NO_SKIP_YIELD( if (thread->skip_count != -1) ) /* Reset the value of thread's skip count */ - thread->skip_count = 0; + thread->skip_count = 0; #endif for (;;) @@ -2010,7 +2002,6 @@ void switch_thread(void) * priority threads are runnable. The highest priority runnable * thread(s) are never skipped. */ if (priority <= max || - IF_NO_SKIP_YIELD( thread->skip_count == -1 || ) (diff = priority - max, ++thread->skip_count > diff*diff)) { cores[core].running = thread; @@ -2155,8 +2146,7 @@ unsigned int wakeup_thread(struct thread_entry **list) if (bl == NULL) { /* No inheritance - just boost the thread by aging */ - IF_NO_SKIP_YIELD( if (thread->skip_count != -1) ) - thread->skip_count = thread->priority; + thread->skip_count = thread->priority; current = cores[CURRENT_CORE].running; } else -- cgit v1.2.3