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
Bugfix in NE2K driver (didn't wait for the DMA to be ready)
[tpg/acess2.git]
/
Kernel
/
time.c
diff --git
a/Kernel/time.c
b/Kernel/time.c
index
dcc4f79
..
54ef08f
100644
(file)
--- a/
Kernel/time.c
+++ b/
Kernel/time.c
@@
-17,25
+17,15
@@
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 ===
-/**
- * \fn Sint64 now()
- * \brief Return the current timestamp
- */
-Sint64 now(void)
-{
- return giTimestamp;
-}
-
/**
* \fn void Timer_CallTimers()
*/
/**
* \fn void Timer_CallTimers()
*/
@@
-95,7
+85,9
@@
void Time_RemoveTimer(int ID)
void Time_Delay(int Delay)
{
Sint64 dest = giTimestamp + Delay;
void Time_Delay(int Delay)
{
Sint64 dest = giTimestamp + Delay;
+ //Log("Time_Delay: dest = %lli", dest);
while(dest > giTimestamp) Threads_Yield();
while(dest > giTimestamp) Threads_Yield();
+ //Log("Time_Delay: giTimestamp = %lli", giTimestamp);
}
// === EXPORTS ===
}
// === EXPORTS ===
UCC
git Repository :: git.ucc.asn.au