Must clear done bit on restart of RDOS timer.

open-watcom · Dec 22, 2024 · e14ae58 · e14ae58
1 parent d5021e0
commit e14ae58
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/bld/clib/rdos/c/timer.c b/bld/clib/rdos/c/timer.c
@@ -99,8 +99,8 @@ static void UpdateTimers(  )
                 if( timer->Active.CompletedBitmap[i] & mask ) {
                     if( ( timer->Req.DoneBitmap[i] & mask ) == 0 ) {
                         timer->Req.DoneBitmap[i] |= mask;
-                        FCurrIndex = 32 * i + bit - 4;
-                        FCurrEntry = &timer->Req.EntryArr[FCurrIndex];
+                        FCurrIndex = 32 * i + bit;
+                        FCurrEntry = &timer->Req.EntryArr[FCurrIndex - 4];
                         ( *FCurrEntry->callback )( FCurrEntry->param );
                         FCurrEntry = 0;
                         FCurrIndex = 0;
@@ -198,9 +198,18 @@ static int StopTimer( int index )
 
 static int RestartCurrTimer( long long timeout )
 {
+    int                    i;
+    int                    bit;
+    int                    mask;
+
     if( FCurrEntry == 0 )
         return( 0 );
 
+    i = FCurrIndex / 32;
+    bit = FCurrIndex % 32;
+    mask = 1 << bit;
+    timer->Req.DoneBitmap[i] &= ~mask;
+
     FCurrEntry->timeout = timeout;
     __locked_set_bit( timer->Req.ReqBitmap, FCurrIndex );
     return( 1 );