Changeset 757 for trunk/src

Timestamp:

Aug 31, 1999, 5:39:21 PM (26 years ago)

Author:

phaller

Message:

Fix: minimum and maximum resolution supported

Location:

trunk/src/winmm

Files:

• os2timer.cpp (modified) (4 diffs)
• os2timer.h (modified) (2 diffs)
• time.cpp (modified) (3 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.8 1999-08-31 15:04:10 phaller Exp $ */
+/* $Id: os2timer.cpp,v 1.9 1999-08-31 15:39:20 phaller Exp $ */
 
 /*
@@ -170 +170 @@
 /*****************************************************************************
  * Name      : OS2TimerResolution::queryCurrentResolution
- * Purpose   : determine the maximum resolution currently requested
+ * Purpose   : determine the minimum resolution currently requested
  * Parameters:
  * Variables :
@@ -183 +183 @@
 {
   OS2TimerResolution *timeRes = OS2TimerResolution::sTimerResolutions;
-  int                iMax = -1;
+  int                iMin = -1;
 
   if (timeRes != NULL)              // do we have an entry yet?
@@ -190 +190 @@
          timeRes = timeRes->next)
     {
-      if (timeRes->dwPeriod < iMax) // determine minimum time period
-        iMax = timeRes->dwPeriod;
-    }
-
-  return iMax;
+      if (timeRes->dwPeriod < iMin) // determine minimum time period
+        iMin = timeRes->dwPeriod;
+    }
+
+  return iMin;
 }
 

trunk/src/winmm/os2timer.h

@@ -1 @@
-/* $Id: os2timer.h,v 1.4 1999-08-31 15:04:11 phaller Exp $ */
+/* $Id: os2timer.h,v 1.5 1999-08-31 15:39:21 phaller Exp $ */
 
 #ifndef __OS2TIMER_H__
@@ -17 +17 @@
  #define HTIMER int
 #endif
+
+
+/****************************************************************************
+ * Definitions                                                              *
+ ****************************************************************************/
+
+#define OS2TIMER_RESOLUTION_MINIMUM 33
+#define OS2TIMER_RESOLUTION_MAXIMUM 65535
 
 

trunk/src/winmm/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.1 1999-08-31 15:04:11 phaller Exp $ */
+/* $Id: time.cpp,v 1.2 1999-08-31 15:39:21 phaller Exp $ */
 
 /*
@@ -64 +64 @@
   dprintf(("WINMM:timeGetDevCaps Not really Implemented\n"));
 
-  ptc->wPeriodMin = 1;
-  ptc->wPeriodMax = 20;
+  ptc->wPeriodMin = OS2TIMER_RESOLUTION_MINIMUM;
+  ptc->wPeriodMax = OS2TIMER_RESOLUTION_MAXIMUM;
 
   return TIMERR_NOERROR;
@@ -163 +163 @@
   OS2Timer *timer;
 
+  // check parameters
+  if ((wDelay < OS2TIMER_RESOLUTION_MINIMUM) ||
+      (wDelay > OS2TIMER_RESOLUTION_MINIMUM))
+    return NULL;
+
+   if (wResolution == 0)
+     wResolution = OS2TIMER_RESOLUTION_MINIMUM;
+   else
+     if ((wResolution < OS2TIMER_RESOLUTION_MINIMUM) ||
+         (wResolution > OS2TIMER_RESOLUTION_MINIMUM))
+      return NULL;
+
   timer = new OS2Timer();
   if(timer == NULL)