Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 73 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/timer/nds/SDL_systimer.c b/distrib/sdl-1.2.15/src/timer/nds/SDL_systimer.c
new file mode 100644
index 0000000..bf54f42
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/timer/nds/SDL_systimer.c
@@ -0,0 +1,73 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_error.h"
+#include "../SDL_timer_c.h"
+
+#include <nds.h>
+
+#define timers2ms(tlow,thigh)(tlow | (thigh<<16)) >> 5
+
+
+void SDL_StartTicks(void)
+{
+   TIMER0_DATA=0; 
+   TIMER1_DATA=0; 
+   TIMER0_CR=TIMER_ENABLE|TIMER_DIV_1024; 
+   TIMER1_CR=TIMER_ENABLE|TIMER_CASCADE;
+}
+
+Uint32 SDL_GetTicks(void)
+{
+	return timers2ms(TIMER0_DATA, TIMER1_DATA);
+}
+
+void SDL_Delay(Uint32 ms)
+{
+   Uint32 now; 
+   now=timers2ms(TIMER0_DATA, TIMER1_DATA); 
+   while((Uint32)timers2ms(TIMER0_DATA, TIMER1_DATA)<now+ms); 
+
+}
+
+/* This is only called if the event thread is not running */
+int SDL_SYS_TimerInit(void)
+{
+	return 0;
+}
+
+void SDL_SYS_TimerQuit(void)
+{
+}
+
+int SDL_SYS_StartTimer(void)
+{
+	SDL_SetError("Timers not implemented on NDS");
+	return -1;
+}
+
+void SDL_SYS_StopTimer(void)
+{
+}