From 79be2279ecdb7e8a21353521da65043c4366b3b5 Mon Sep 17 00:00:00 2001 From: Olaf Barthel Date: Tue, 2 Aug 2005 10:18:50 +0000 Subject: [PATCH] - In __time_delay() the CheckIO() test was wrong and should have tested for a request still in progress. Fixed. git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15014 87f5fb63-7c3d-0410-a384-fd976d0f7a62 --- library/changes | 4 ++++ library/macros.h | 3 ++- library/unistd_time_delay.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/library/changes b/library/changes index 0ce11fe..df02176 100644 --- a/library/changes +++ b/library/changes @@ -1,3 +1,7 @@ +- In __time_delay() the CheckIO() test was wrong and should have + tested for a request still in progress. Fixed. + + c.lib 1.194 (15.7.2005) - Added getopt_long to libunix.a diff --git a/library/macros.h b/library/macros.h index 5d7207c..6602bd5 100644 --- a/library/macros.h +++ b/library/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.20 2005-05-27 13:19:30 obarthel Exp $ + * $Id: macros.h,v 1.21 2005-08-02 10:18:50 obarthel Exp $ * * :ts=4 * @@ -42,6 +42,7 @@ /****************************************************************************/ +#define BUSY ((struct IORequest *)NULL) #define CANNOT ! #define DO_NOTHING ((void)0) #define NO ! diff --git a/library/unistd_time_delay.c b/library/unistd_time_delay.c index e031041..0dfd7aa 100644 --- a/library/unistd_time_delay.c +++ b/library/unistd_time_delay.c @@ -1,5 +1,5 @@ /* - * $Id: unistd_time_delay.c,v 1.5 2005-03-18 12:38:25 obarthel Exp $ + * $Id: unistd_time_delay.c,v 1.6 2005-08-02 10:18:50 obarthel Exp $ * * :ts=4 * @@ -106,7 +106,7 @@ __time_delay(unsigned long seconds,unsigned long microseconds) { ULONG seconds_now; - if(CheckIO((struct IORequest *)__timer_request)) + if(CheckIO((struct IORequest *)__timer_request) == BUSY) AbortIO((struct IORequest *)__timer_request); WaitIO((struct IORequest *)__timer_request);