Revert "os: drop unused TimerCheck()"
The NVIDIA driver uses this function.
This reverts commit 1dc648b1b7
.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
parent
3fb85ab045
commit
c4470c3dca
|
@ -859,7 +859,7 @@ Similarly, the X server or an extension may need to wait for some timeout.
|
||||||
Early X releases implemented this functionality using block and wakeup handlers,
|
Early X releases implemented this functionality using block and wakeup handlers,
|
||||||
but this has been rewritten to use a general timer facilty, and the
|
but this has been rewritten to use a general timer facilty, and the
|
||||||
internal screen saver facilities reimplemented to use Timers.
|
internal screen saver facilities reimplemented to use Timers.
|
||||||
These functions are TimerInit, TimerForce, TimerSet, TimerCancel,
|
These functions are TimerInit, TimerForce, TimerSet, TimerCheck, TimerCancel,
|
||||||
and TimerFree, as defined in Xserver/include/os.h. A callback function will be called
|
and TimerFree, as defined in Xserver/include/os.h. A callback function will be called
|
||||||
when the timer fires, along with the current time, and a user provided argument.
|
when the timer fires, along with the current time, and a user provided argument.
|
||||||
<blockquote><programlisting>
|
<blockquote><programlisting>
|
||||||
|
@ -892,6 +892,8 @@ for the timer entry.
|
||||||
|
|
||||||
Bool TimerForce(OsTimerPtr /* pTimer */)
|
Bool TimerForce(OsTimerPtr /* pTimer */)
|
||||||
|
|
||||||
|
void TimerCheck(void);
|
||||||
|
|
||||||
void TimerCancel(OsTimerPtr /* pTimer */)
|
void TimerCancel(OsTimerPtr /* pTimer */)
|
||||||
|
|
||||||
void TimerFree(OsTimerPtr /* pTimer */)
|
void TimerFree(OsTimerPtr /* pTimer */)
|
||||||
|
@ -902,6 +904,7 @@ TimerInit frees any existing timer entries. TimerForce forces a call to the time
|
||||||
callback function and returns true if the timer entry existed, else it returns false and
|
callback function and returns true if the timer entry existed, else it returns false and
|
||||||
does not call the callback function. TimerCancel will cancel the specified timer.
|
does not call the callback function. TimerCancel will cancel the specified timer.
|
||||||
TimerFree calls TimerCancel and frees the specified timer.
|
TimerFree calls TimerCancel and frees the specified timer.
|
||||||
|
Calling TimerCheck will force the server to see if any timer callbacks should be called.
|
||||||
</para>
|
</para>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
|
@ -5037,6 +5040,7 @@ mi and fb implementations.</para>
|
||||||
<row><entry><function>StoreColors</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>
|
<row><entry><function>StoreColors</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>
|
||||||
<row><entry><function>Subtract</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>
|
<row><entry><function>Subtract</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>
|
||||||
<row><entry><function>TimerCancel</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
<row><entry><function>TimerCancel</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
||||||
|
<row><entry><function>TimerCheck</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
||||||
<row><entry><function>TimerForce</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
<row><entry><function>TimerForce</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
||||||
<row><entry><function>TimerFree</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
<row><entry><function>TimerFree</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
||||||
<row><entry><function>TimerInit</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
<row><entry><function>TimerInit</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
|
||||||
|
|
|
@ -127,6 +127,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr timer,
|
||||||
OsTimerCallback func,
|
OsTimerCallback func,
|
||||||
void *arg);
|
void *arg);
|
||||||
|
|
||||||
|
extern _X_EXPORT void TimerCheck(void);
|
||||||
extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
|
extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
|
||||||
extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ );
|
extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ );
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ SOFTWARE.
|
||||||
* OS Dependent input routines:
|
* OS Dependent input routines:
|
||||||
*
|
*
|
||||||
* WaitForSomething
|
* WaitForSomething
|
||||||
* TimerForce, TimerSet, TimerFree
|
* TimerForce, TimerSet, TimerCheck, TimerFree
|
||||||
*
|
*
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
|
|
||||||
|
@ -373,6 +373,12 @@ TimerFree(OsTimerPtr timer)
|
||||||
free(timer);
|
free(timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
TimerCheck(void)
|
||||||
|
{
|
||||||
|
DoTimers(GetTimeInMillis());
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TimerInit(void)
|
TimerInit(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue