diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml index 0c5607448..8862b31bf 100644 --- a/doc/Xserver-spec.xml +++ b/doc/Xserver-spec.xml @@ -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, but this has been rewritten to use a general timer facilty, and the internal screen saver facilities reimplemented to use Timers. -These functions are TimerInit, TimerForce, TimerSet, TimerCheck, TimerCancel, +These functions are TimerInit, TimerForce, TimerSet, TimerCancel, 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.
@@ -892,8 +892,6 @@ for the timer entry. Bool TimerForce(OsTimerPtr /* pTimer */) - void TimerCheck(void); - void TimerCancel(OsTimerPtr /* pTimer */) void TimerFree(OsTimerPtr /* pTimer */) @@ -904,7 +902,6 @@ 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 does not call the callback function. TimerCancel will cancel 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. @@ -5048,7 +5045,6 @@ mi and fb implementations. |
StoreColors ddx Screen |
Subtract mi Screen -
TimerCancel os |
TimerCheck os |
TimerForce os |
TimerFree os diff --git a/include/os.h b/include/os.h index c28849de1..929769fb3 100644 --- a/include/os.h +++ b/include/os.h @@ -127,7 +127,6 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr timer, OsTimerCallback func, void *arg); -extern _X_EXPORT void TimerCheck(void); extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ ); extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ ); diff --git a/os/WaitFor.c b/os/WaitFor.c index a616850ab..973a3495d 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -48,7 +48,7 @@ SOFTWARE. * OS Dependent input routines: * * WaitForSomething - * TimerForce, TimerSet, TimerCheck, TimerFree + * TimerForce, TimerSet, TimerFree * *****************************************************************/ @@ -373,12 +373,6 @@ TimerFree(OsTimerPtr timer) free(timer); } -void -TimerCheck(void) -{ - DoTimers(GetTimeInMillis()); -} - void TimerInit(void) {
TimerInit os