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

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

3 files changed, 269 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/thread/beos/SDL_syssem.c b/distrib/sdl-1.2.15/src/thread/beos/SDL_syssem.c
new file mode 100644
index 0000000..eba1944
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/thread/beos/SDL_syssem.c
@@ -0,0 +1,142 @@
+/*
+    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"
+
+/* Semaphores in the BeOS environment */
+
+#include <be/kernel/OS.h>
+
+#include "SDL_thread.h"
+
+
+struct SDL_semaphore {
+	sem_id id;
+};
+
+/* Create a counting semaphore */
+SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
+{
+	SDL_sem *sem;
+
+	sem = (SDL_sem *)SDL_malloc(sizeof(*sem));
+	if ( sem ) {
+		sem->id = create_sem(initial_value, "SDL semaphore");
+		if ( sem->id < B_NO_ERROR ) {
+			SDL_SetError("create_sem() failed");
+			SDL_free(sem);
+			sem = NULL;
+		}
+	} else {
+		SDL_OutOfMemory();
+	}
+	return(sem);
+}
+
+/* Free the semaphore */
+void SDL_DestroySemaphore(SDL_sem *sem)
+{
+	if ( sem ) {
+		if ( sem->id >= B_NO_ERROR ) {
+			delete_sem(sem->id);
+		}
+		SDL_free(sem);
+	}
+}
+
+int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
+{
+	int32 val;
+	int retval;
+
+	if ( ! sem ) {
+		SDL_SetError("Passed a NULL semaphore");
+		return -1;
+	}
+
+  tryagain:
+	if ( timeout == SDL_MUTEX_MAXWAIT ) {
+		val = acquire_sem(sem->id);
+	} else {
+		timeout *= 1000; /* BeOS uses a timeout in microseconds */
+		val = acquire_sem_etc(sem->id, 1, B_RELATIVE_TIMEOUT, timeout);
+	}
+	switch (val) {
+	    case B_INTERRUPTED:
+		goto tryagain;
+	    case B_NO_ERROR:
+		retval = 0;
+		break;
+	    case B_TIMED_OUT:
+		retval = SDL_MUTEX_TIMEDOUT;
+		break;
+	    case B_WOULD_BLOCK:
+		retval = SDL_MUTEX_TIMEDOUT;
+		break;
+	    default:
+		SDL_SetError("acquire_sem() failed");
+		retval = -1;
+		break;
+	}
+
+	return retval;
+}
+
+int SDL_SemTryWait(SDL_sem *sem)
+{
+	return SDL_SemWaitTimeout(sem, 0);
+}
+
+int SDL_SemWait(SDL_sem *sem)
+{
+	return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT);
+}
+
+/* Returns the current count of the semaphore */
+Uint32 SDL_SemValue(SDL_sem *sem)
+{
+	int32 count;
+	Uint32 value;
+
+	value = 0;
+	if ( sem ) {
+		get_sem_count(sem->id, &count);
+		if ( count > 0 ) {
+			value = (Uint32)count;
+		}
+	}
+	return value;
+}
+
+/* Atomically increases the semaphore's count (not blocking) */
+int SDL_SemPost(SDL_sem *sem)
+{
+	if ( ! sem ) {
+		SDL_SetError("Passed a NULL semaphore");
+		return -1;
+	}
+
+	if ( release_sem(sem->id) != B_NO_ERROR ) {
+		SDL_SetError("release_sem() failed");
+		return -1;
+	}
+	return 0;
+}
diff --git a/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread.c b/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread.c
new file mode 100644
index 0000000..63b5207
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread.c
@@ -0,0 +1,96 @@
+/*
+    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"
+
+/* BeOS thread management routines for SDL */
+
+#include <stdio.h>
+#include <signal.h>
+#include <be/kernel/OS.h>
+
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+#include "../SDL_systhread.h"
+
+
+static int sig_list[] = {
+	SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGWINCH, 0
+};
+
+void SDL_MaskSignals(sigset_t *omask)
+{
+	sigset_t mask;
+	int i;
+
+	sigemptyset(&mask);
+	for ( i=0; sig_list[i]; ++i ) {
+		sigaddset(&mask, sig_list[i]);
+	}
+	sigprocmask(SIG_BLOCK, &mask, omask);
+}
+void SDL_UnmaskSignals(sigset_t *omask)
+{
+	sigprocmask(SIG_SETMASK, omask, NULL);
+}
+
+static int32 RunThread(void *data)
+{
+	SDL_RunThread(data);
+	return(0);
+}
+
+int SDL_SYS_CreateThread(SDL_Thread *thread, void *args)
+{
+	/* Create the thread and go! */
+	thread->handle=spawn_thread(RunThread, "SDL", B_NORMAL_PRIORITY, args);
+	if ( (thread->handle == B_NO_MORE_THREADS) ||
+	     (thread->handle == B_NO_MEMORY) ) {
+		SDL_SetError("Not enough resources to create thread");
+		return(-1);
+	}
+	resume_thread(thread->handle);
+	return(0);
+}
+
+void SDL_SYS_SetupThread(void)
+{
+	/* Mask asynchronous signals for this thread */
+	SDL_MaskSignals(NULL);
+}
+
+Uint32 SDL_ThreadID(void)
+{
+	return((Uint32)find_thread(NULL));
+}
+
+void SDL_SYS_WaitThread(SDL_Thread *thread)
+{
+	status_t the_status;
+
+	wait_for_thread(thread->handle, &the_status);
+}
+
+void SDL_SYS_KillThread(SDL_Thread *thread)
+{
+	kill_thread(thread->handle);
+}
diff --git a/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread_c.h b/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread_c.h
new file mode 100644
index 0000000..f82548e
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/thread/beos/SDL_systhread_c.h
@@ -0,0 +1,31 @@
+/*
+    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 <signal.h>
+#include <be/kernel/OS.h>
+
+typedef thread_id SYS_ThreadHandle;
+
+/* Functions needed to work with system threads in other portions of SDL */
+extern void SDL_MaskSignals(sigset_t *omask);
+extern void SDL_UnmaskSignals(sigset_t *omask);