Changeset 1988 for trunk

Timestamp:

Jun 5, 2005, 2:51:37 AM (20 years ago)

Author:

bird

Message:

HTIMER is 0 to 64k and global. Use ~0U for invalid handle. (untested)

File:

• trunk/src/emx/src/lib/sys/b_signalTimer.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/lib/sys/b_signalTimer.c

@@ -64 +64 @@
 static volatile unsigned        gfTerminate;
 /** Timer handle. */
-static volatile HTIMER          ghTimer;
+static volatile HTIMER          ghTimer = ~0U;
 
 
@@ -162 +162 @@
             {
                 __atomic_xchg(&gfOneShot, 0);
-                __atomic_xchg((volatile unsigned *)(void *)&ghTimer, 0);
+                __atomic_xchg((volatile unsigned *)(void *)&ghTimer, ~0U);
                 if (guInterval)
                 {
@@ -225 +225 @@
 
     /* kill timer. */
-    HTIMER hTimer = ghTimer;
-    if (hTimer)
-    {
-        ghTimer = NULLHANDLE;
+    HTIMER hTimer = (HTIMER)__atomic_xchg((volatile unsigned *)(void *)&ghTimer, ~0U);
+    if (hTimer != ~0U)
         DosStopTimer(hTimer);
-    }
 
     __atomic_xchg(&gtidWorker, 0);
@@ -273 +270 @@
 
         /* kill timer. */
-        HTIMER hTimer = ghTimer;
-        if (hTimer)
-        {
-            ghTimer = NULLHANDLE;
+        HTIMER hTimer = (HTIMER)__atomic_xchg((volatile unsigned *)(void *)&ghTimer, ~0U);
+        if (hTimer != ~0U)
             DosStopTimer(hTimer);
-        }
-
-        /* kill the thread (it should've got the clue by now, but just in case) */
+
+        /* kill the thread (it should've taken the hints by now, but just in case) */
         TID tid = gtidWorker;
         if (tid)
@@ -396 +390 @@
     {
         __atomic_xchg(&gfArmed, 0);
-        if (ghTimer)
-        {
-            HTIMER hTimer = ghTimer;
+        HTIMER hTimer = (HTIMER)__atomic_xchg((volatile unsigned *)(void *)&ghTimer, ~0U);
+        if (hTimer != ~0U)
             rc = DosStopTimer(hTimer);
-            ghTimer = NULLHANDLE;
-        }
     }
 
@@ -438 +429 @@
             ghevTimer = NULLHANDLE;
             gfTerminate = 0;
-            ghTimer = NULLHANDLE;
+            ghTimer = ~0U;
             rc = DosCreateEventSem(NULL, (PHEV)&ghevTimer, DC_SEM_SHARED, FALSE);
             if (!rc)