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

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 51 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/video/fbcon/matrox_mmio.h b/distrib/sdl-1.2.15/src/video/fbcon/matrox_mmio.h
new file mode 100644
index 0000000..a1cf203
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/video/fbcon/matrox_mmio.h
@@ -0,0 +1,51 @@
+/*
+    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"
+
+/* MGA register definitions */
+
+#include "matrox_regs.h"
+
+/* MGA control macros */
+
+#define mga_in8(reg)		*(volatile Uint8  *)(mapped_io + (reg))
+#define mga_in32(reg)		*(volatile Uint32 *)(mapped_io + (reg))
+
+#define mga_out8(reg,v)		*(volatile Uint8  *)(mapped_io + (reg)) = v;
+#define mga_out32(reg,v)	*(volatile Uint32 *)(mapped_io + (reg)) = v;
+
+
+/* Wait for fifo space */
+#define mga_wait(space)							\
+{									\
+	while ( mga_in8(MGAREG_FIFOSTATUS) < space )			\
+		;							\
+}
+
+
+/* Wait for idle accelerator */
+#define mga_waitidle()							\
+{									\
+	while ( mga_in32(MGAREG_STATUS) & 0x10000 )			\
+		;							\
+}
+