Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 240 insertions, 0 deletions

diff --git a/xorg-server/hw/kdrive/mga/mga.c b/xorg-server/hw/kdrive/mga/mga.c
new file mode 100644
index 000000000..2ae35d143
--- /dev/null
+++ b/xorg-server/hw/kdrive/mga/mga.c
@@ -0,0 +1,240 @@
+/*
+ * Copyright © 2003 Anders Carlsson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Anders Carlsson not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Anders Carlsson makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "mga.h"
+
+static Bool
+mgaCardInit (KdCardInfo *card)
+{
+    MgaCardInfo *mgac;
+
+    mgac = (MgaCardInfo *) xalloc (sizeof (MgaCardInfo));
+    if (!mgac)
+	return FALSE;
+
+    mgaMapReg (card, mgac);
+
+    if (!vesaInitialize (card, &mgac->vesa))
+    {
+	xfree (mgac);
+	return FALSE;
+    }
+
+    mgac->fifo_size = 0;
+    
+    card->driver = mgac;
+
+    return TRUE;
+}
+
+static Bool
+mgaScreenInit (KdScreenInfo *screen)
+{
+    MgaScreenInfo *mgas;
+
+    mgas = (MgaScreenInfo *) xalloc (sizeof (MgaScreenInfo));
+    if (!mgas)
+	return FALSE;
+    memset (mgas, '\0', sizeof (MgaScreenInfo));
+    if (!vesaScreenInitialize (screen, &mgas->vesa))
+    {
+	xfree (mgas);
+	return FALSE;
+    }
+#if 0    
+    /* if (!mgac->reg)
+       screen->dumb = TRUE; */
+
+    if (mgas->vesa.mapping != VESA_LINEAR)
+	screen->dumb = TRUE;
+
+    fprintf (stderr, "vesa mapping is %d\n", mgas->vesa.mapping);
+#endif
+    screen->driver = mgas;
+    return TRUE;
+}
+
+static Bool
+mgaInitScreen (ScreenPtr pScreen)
+{
+    return vesaInitScreen (pScreen);
+}
+
+static Bool
+mgaFinishInitScreen (ScreenPtr pScreen)
+{
+    Bool ret;
+
+    ret = vesaFinishInitScreen (pScreen);
+
+    return ret;
+}
+
+static Bool
+mgaCreateResources (ScreenPtr pScreen)
+{
+    return vesaCreateResources (pScreen);
+}
+
+static void
+mgaPreserve (KdCardInfo *card)
+{
+    vesaPreserve (card);
+}
+
+Bool
+mgaMapReg (KdCardInfo *card, MgaCardInfo *mgac)
+{
+    mgac->reg_base = (CARD8 *) KdMapDevice (MGA_REG_BASE (card),
+					    MGA_REG_SIZE (card));
+
+    if (!mgac->reg_base)
+    {
+	return FALSE;
+    }
+
+    KdSetMappedMode (MGA_REG_BASE (card),
+		     MGA_REG_SIZE (card),
+		     KD_MAPPED_MODE_REGISTERS);
+
+    return TRUE;
+}
+
+void
+mgaUnmapReg (KdCardInfo *card, MgaCardInfo *mgac)
+{
+    if (mgac->reg_base)
+    {
+	KdResetMappedMode (MGA_REG_BASE (card),
+			   MGA_REG_SIZE (card),
+			   KD_MAPPED_MODE_REGISTERS);
+	KdUnmapDevice ((void *) mgac->reg_base, MGA_REG_SIZE (card));
+	mgac->reg_base = 0;
+	/* mgac->reg = 0; */
+    }
+}
+
+void
+mgaSetMMIO (KdCardInfo *card, MgaCardInfo *mgac)
+{
+    if (!mgac->reg_base)
+	mgaMapReg (card, mgac);
+}
+
+void
+mgaResetMMIO (KdCardInfo *card, MgaCardInfo *mgac)
+{
+    mgaUnmapReg (card, mgac);
+}
+
+static Bool
+mgaDPMS (ScreenPtr pScreen, int mode)
+{
+    /* XXX */
+    return TRUE;
+}
+
+static Bool
+mgaEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv (pScreen);
+    MgaCardInfo *mgac = pScreenPriv->card->driver;
+
+    if (!vesaEnable (pScreen))
+	return FALSE;
+    
+    mgaSetMMIO (pScreenPriv->card, mgac);
+    mgaDPMS (pScreen, KD_DPMS_NORMAL);
+    
+    return TRUE;
+}
+
+static void
+mgaDisable (ScreenPtr pScreen)
+{
+    KdScreenPriv (pScreen);
+    MgaCardInfo *mgac = pScreenPriv->card->driver;
+
+    mgaResetMMIO (pScreenPriv->card, mgac);
+
+    vesaDisable (pScreen);
+}
+
+static void
+mgaRestore (KdCardInfo *card)
+{
+    MgaCardInfo *mgac = card->driver;
+    
+    mgaResetMMIO (card, mgac);
+    vesaRestore (card);
+}
+
+static void
+mgaScreenFini (KdScreenInfo *screen)
+{
+    MgaScreenInfo *mgas = (MgaScreenInfo *) screen->driver;
+
+    vesaScreenFini (screen);
+    xfree (mgas);
+    screen->driver = 0;
+}
+
+static void
+mgaCardFini (KdCardInfo *card)
+{
+    MgaCardInfo *mgac = (MgaCardInfo *)card->driver;
+
+    mgaUnmapReg (card, mgac);
+    vesaCardFini (card);
+}
+
+KdCardFuncs mgaFuncs = {
+    mgaCardInit,	/* cardinit */
+    mgaScreenInit,	/* scrinit */
+    mgaInitScreen,	/* initScreen */
+    mgaFinishInitScreen, /* finishInitScreen */
+    mgaCreateResources,	/* createRes */
+    mgaPreserve,	/* preserve */
+    mgaEnable,		/* enable */
+    mgaDPMS,		/* dpms */
+    mgaDisable,		/* disable */
+    mgaRestore,		/* restore */
+    mgaScreenFini,	/* scrfini */
+    mgaCardFini,	/* cardfini */
+    
+    0,			/* initCursor */
+    0,			/* enableCursor */
+    0,			/* disableCursor */
+    0,			/* finiCursor */
+    0,			/* recolorCursor */
+    
+    mgaDrawInit,	/* initAccel */
+    mgaDrawEnable,	/* enableAccel */
+    mgaDrawDisable,	/* disableAccel */
+    mgaDrawFini,	/* finiAccel */
+    
+    vesaGetColors,    	 /* getColors */
+    vesaPutColors,	 /* putColors */
+};
+