summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/gui.c2
-rwxr-xr-xamiga/schedule.c16
-rwxr-xr-xamiga/schedule.h3
3 files changed, 5 insertions, 16 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 5d11bdae4..e76a01e66 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2745,7 +2745,7 @@ void ami_get_msg(void)
if(signal & schedulesig) {
if((timermsg = (struct TimerRequest *)GetMsg(msgport))) {
ReplyMsg((struct Message *)timermsg);
- schedule_run(FALSE);
+ schedule_run();
}
}
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 7b54dc8f3..6f2037d7e 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -37,7 +37,7 @@ struct nscallback
struct TimeRequest *treq;
};
-PblHeap *schedule_list;
+static PblHeap *schedule_list;
/**
* Remove timer event
@@ -202,27 +202,15 @@ static int ami_schedule_compare(const void *prev, const void *next)
/* exported function documented in amiga/schedule.h */
-void schedule_run(BOOL poll)
+void schedule_run(void)
{
struct nscallback *nscb;
void (*callback)(void *p);
void *p;
- struct TimeVal tv;
nscb = pblHeapGetFirst(schedule_list);
-
if(nscb == -1) return;
- if(poll) {
- /* Ensure the scheduled event time has passed (CmpTime<=0)
- * For timer signalled events this must *always* be true,
- * so we save some time by only checking if we're polling.
- */
-
- GetSysTime(&tv);
- if(CmpTime(&tv, &nscb->tv) > 0) return;
- }
-
callback = nscb->callback;
p = nscb->p;
ami_schedule_remove_timer_event(nscb);
diff --git a/amiga/schedule.h b/amiga/schedule.h
index 9546df94f..9fcec9a82 100755
--- a/amiga/schedule.h
+++ b/amiga/schedule.h
@@ -60,6 +60,7 @@ void ami_schedule_free(void);
* venture to later scheduled events until the next time it is called -
* immediately afterwards, if we're in a timer signalled loop.
*/
-void schedule_run(BOOL poll);
+void schedule_run(void);
#endif
+