git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/arm7 - Fixing, manages to start pmm init
[tpg/acess2.git]
/
Kernel
/
time.c
diff --git
a/Kernel/time.c
b/Kernel/time.c
index
9ddf26a
..
3d06b0e
100644
(file)
--- a/
Kernel/time.c
+++ b/
Kernel/time.c
@@
-17,13
+17,12
@@
typedef struct sTimer {
} tTimer;
// === PROTOTYPES ===
} tTimer;
// === PROTOTYPES ===
-Sint64 now(void);
void Timer_CallTimers(void);
// === GLOBALS ===
void Timer_CallTimers(void);
// === GLOBALS ===
-
Uint64
giTicks = 0;
-
Sint64
giTimestamp = 0;
-
Uint64
giPartMiliseconds = 0;
+
volatile Uint64
giTicks = 0;
+
volatile Sint64
giTimestamp = 0;
+
volatile Uint64
giPartMiliseconds = 0;
tTimer gTimers[NUM_TIMERS]; // TODO: Replace by a ring-list timer
// === CODE ===
tTimer gTimers[NUM_TIMERS]; // TODO: Replace by a ring-list timer
// === CODE ===
@@
-85,12
+84,13
@@
void Time_RemoveTimer(int ID)
*/
void Time_Delay(int Delay)
{
*/
void Time_Delay(int Delay)
{
- Sint64 dest = giTimestamp + Delay;
- while(dest > giTimestamp) Threads_Yield();
+ Sint64 dest = now() + Delay;
+ //Log("Time_Delay: dest = %lli", dest);
+ while(dest > now()) Threads_Yield();
+ //Log("Time_Delay: giTimestamp = %lli", giTimestamp);
}
// === EXPORTS ===
}
// === EXPORTS ===
-EXPORT(now);
EXPORT(Time_CreateTimer);
EXPORT(Time_RemoveTimer);
EXPORT(Time_Delay);
EXPORT(Time_CreateTimer);
EXPORT(Time_RemoveTimer);
EXPORT(Time_Delay);
UCC
git Repository :: git.ucc.asn.au