Merge branch 'master' into 8bitsound

Conflicts:
	source/nds/entry.cpp

1 files changed, 50 insertions, 0 deletions

diff --git a/sdk-modifications/include/ds2_timer.h b/sdk-modifications/include/ds2_timer.h
new file mode 100755
index 0000000..3e5c3bc
--- /dev/null
+++ b/sdk-modifications/include/ds2_timer.h
@@ -0,0 +1,50 @@
+#ifndef __DS2_TIMER_H__

+#define __DS2_TIMER_H__

+
+#ifdef __cplusplus
+extern "C" {
+#endif
+

+/*
+*	Function: register a timer interruptting periodly
+*	channel: timer id, from 0 to 1
+*	period: interrupt period, unit is us, period < 2.5s
+*	handle: interrupt handle, if handle = NULL, the timer will not generate interrupt
+*	arg: argument to the interrupt handle
+*/
+extern int initTimer(unsigned int channel, unsigned int period, void (*handle)(unsigned int), int arg);
+
+/*
+*	Function: set the timer run
+*/
+extern void runTimer(unsigned int channel);
+
+/*
+*	Function: stop timer
+*/
+extern void stopTimer(unsigned int channel);
+
+/*
+*	Function: reset timer
+*/
+extern void resetTimer(unsigned int channel);
+
+/*
+*	Function: read value of timer
+*/
+extern unsigned int readTimer(unsigned int channel);
+

+
+#define SYSTIME_UNIT	42667
+/*
+*	Function: get the elapsed time since DS2 started
+*		it's uint is 42.667us, it will overflow after 50.9 horus since DS2 started
+*/
+extern unsigned int getSysTime(void);
+
+#ifdef __cplusplus
+}
+#endif
+

+#endif //__DS2_TIMER_H__
+