Changeset 157 for trunk/src/os2ahci/libc.c

Timestamp:

May 8, 2013, 5:10:33 PM (12 years ago)

Author:

David Azarewicz

Message:

Fixed up timer functions

File:

• trunk/src/os2ahci/libc.c (modified) (9 diffs)

trunk/src/os2ahci/libc.c

@@ -40 +40 @@
 /* ------------------------ typedefs and structures ------------------------ */
 
+#ifdef NOT_USED
 /* mdelay() calibration status */
 typedef enum {
@@ -47 +48 @@
   MD_CALIBRATION_DONE                 /* calibration complete */
 } MDCAL;
+static void _cdecl _far mdelay_timer_callback  (ULONG timer_handle,
+                                                ULONG parm1,
+                                                ULONG parm2);
+static int              mdelay_cal_end         (void);
+#endif
 
 /* -------------------------- function prototypes -------------------------- */
@@ -54 +60 @@
                                                 int base,
                                                 int zero, int flen);
-static void _cdecl _far mdelay_timer_callback  (ULONG timer_handle,
-                                                ULONG parm1,
-                                                ULONG parm2);
-static int              mdelay_cal_end         (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -92 +94 @@
 };
 
+#ifdef NOT_USED
 /* delay loop calibration data */
 volatile MDCAL mdelay_cal_status = 0;     /* delay loop calibration status */
 volatile u32   mdelay_loops_per_ms = 0;   /* delay loop counter */
+#endif
 
 /* very small heap for dynamic memory management */
@@ -684 +688 @@
 }
 
+#ifdef NOT_USED
 /******************************************************************************
  * Calibrate 'mdelay()' loop. This is done by setting up a 1 second timer
@@ -764 +769 @@
   mdelay_cal_status = MD_CALIBRATION_DONE;
 }
-
-/******************************************************************************
- * Sleep specified number of milliseonds. This is implemented by yielding the
- * CPU until the system timer value indicates we're done. This function can
+#endif
+
+/******************************************************************************
+ * Setup the millisecond timer. This is implemented by blocking (yielding the
+ * CPU) until the system timer value indicates we're done. This function can
  * only be called at task time, or from a context hook.
  *
@@ -773 +779 @@
  *       can lead to intervals up to 55ms (18.2 timer interrupts per second).
  */
+void timer_init(TIMER far *pTimer, u32 Milliseconds)
+{
+  pTimer->Start = gis->msecs;
+  pTimer->End = pTimer->Start + Milliseconds;
+}
+
+/******************************************************************************
+ * Check the millisecond timer. Block if not done.
+ */
+int timer_check_and_block(TIMER far *pTimer)
+{
+  u32 current;
+
+  current = gis->msecs;
+  if (pTimer->Start < pTimer->End) {
+    if ((current >= pTimer->End) || (current < pTimer->Start)) return 1;
+  } else {
+    if ((current >= pTimer->End) && (current < pTimer->Start)) return 1;
+  }
+  DevHelp_ProcBlock((ULONG)&timer_check_and_block, 1, WAIT_IS_INTERRUPTABLE);
+  return 0;
+}
+
+/******************************************************************************
+ * Sleep specified number of milliseonds.
+ */
 void msleep(u32 millies)
 {
-  ULONG start;
-  ULONG end;
-  ULONG event_id;
-
-  if (gis == NULL) {
-    /* no global info segment; use mdelay() */
-    mdelay(millies);
-    return;
-  }
-
-  start = gis->msecs;
-  end = start + millies;
-  event_id = (ULONG)&msleep;
-
-  if (end < start) {
-    /* wrap-around; wait until 'msecs' has wrapped, too */
-    while (gis->msecs >= start) {
-      DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
-    }
-  }
-
-  while (gis->msecs <= end) {
-    DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
-  }
+  TIMER Timer;
+
+  timer_init(&Timer, millies);
+  while (!timer_check_and_block(&Timer));
 }
 
@@ -885 +897 @@
 }
 
+#ifdef NOT_USED
 /******************************************************************************
  * Timer callback handler for 'mdelay_calibrate()'
@@ -904 +917 @@
   return(mdelay_cal_status == MD_CALIBRATION_END);
 }
-
+#endif