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/armv7 - Fixed incorrect addresses in Tegra2 options
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
armv7
/
platform_tegra2.c
diff --git
a/KernelLand/Kernel/arch/armv7/platform_tegra2.c
b/KernelLand/Kernel/arch/armv7/platform_tegra2.c
index
21ff862
..
54f5c24
100644
(file)
--- a/
KernelLand/Kernel/arch/armv7/platform_tegra2.c
+++ b/
KernelLand/Kernel/arch/armv7/platform_tegra2.c
@@
-6,7
+6,9
@@
* - Tegra2 Core code
*/
#include <acess.h>
* - Tegra2 Core code
*/
#include <acess.h>
+#include <timers.h> // MicroSleep
#include "platform_tegra2.h"
#include "platform_tegra2.h"
+#include "include/options.h"
// === CONSTANTS ===
#define TIMER0_INT (0*32+0) // Pri #0
// === CONSTANTS ===
#define TIMER0_INT (0*32+0) // Pri #0
@@
-22,12
+24,16
@@
extern void Timer_CallTimers(void);
// === PROTORTYPES ===
void Timer_IRQHandler_SysClock(int IRQ, void *_unused);
// === PROTORTYPES ===
void Timer_IRQHandler_SysClock(int IRQ, void *_unused);
+void Timer_IRQHandler_Timer2(int IRQ, void *_unused);
+void Timer_IRQHandler_Timer3(int IRQ, void *_unused);
+void Timer_IRQHandler_Timer4(int IRQ, void *_unused);
void Time_Setup(void);
void Time_Setup(void);
+tTime Time_GetTickOffset(void); // TODO: move to header
// === GLOBALS ===
// - Addresses for the GIC to use
// === GLOBALS ===
// - Addresses for the GIC to use
-tPAddr gGIC_InterfaceAddr =
0x50040000
;
-tPAddr gGIC_DistributorAddr =
0x50041000
;
+tPAddr gGIC_InterfaceAddr =
GICI_PADDR
;
+tPAddr gGIC_DistributorAddr =
GICD_PADDR
;
// - Map of timer registers
volatile struct sTimersMap *gpTimersMap;
volatile struct sClockResetMap *gpClockResetMap;
// - Map of timer registers
volatile struct sTimersMap *gpTimersMap;
volatile struct sClockResetMap *gpClockResetMap;
@@
-69,6
+75,11
@@
void Time_MicroSleep(Uint16 Microsecs)
;
}
;
}
+tTime Time_GetTickOffset(void)
+{
+ return (gpTimersMap->TIMERUS.CNTR_1US/1000) % 100;
+}
+
void Time_Setup(void)
{
gpTimersMap = (void*)MM_MapHWPages(0x60005000, 1);
void Time_Setup(void)
{
gpTimersMap = (void*)MM_MapHWPages(0x60005000, 1);
UCC
git Repository :: git.ucc.asn.au