summaryrefslogtreecommitdiff
path: root/src/d/d_timer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/d_timer.cpp')
-rw-r--r--src/d/d_timer.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index c15c57c8a3..4f42309a44 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -354,21 +354,10 @@ asm void dTimer_c::end(int param_0) {
#pragma pop
/* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text deleteRequest__8dTimer_cFv */
-#ifndef NONMATCHING
int dTimer_c::deleteRequest() {
mDeleteCheck = 8;
return 1;
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::deleteRequest() {
- nofralloc
-#include "asm/d/d_timer/deleteRequest__8dTimer_cFv.s"
-}
-#pragma pop
-#endif
/* 8025D9F0-8025DA54 258330 0064+00 3/3 0/0 0/0 .text getTimeMs__8dTimer_cFv */
#pragma push
@@ -381,15 +370,9 @@ asm void dTimer_c::getTimeMs() {
#pragma pop
/* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text getLimitTimeMs__8dTimer_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::getLimitTimeMs() {
- nofralloc
-#include "asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s"
+int dTimer_c::getLimitTimeMs() {
+ return mTime4 / OS_TIMER_CLOCK_MS;
}
-#pragma pop
-
/* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text getRestTimeMs__8dTimer_cFv */
#pragma push
#pragma optimization_level 0