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, 334 insertions, 0 deletions

diff --git a/xorg-server/hw/kdrive/chips/chips.c b/xorg-server/hw/kdrive/chips/chips.c
new file mode 100644
index 000000000..b419863eb
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/chips.c
@@ -0,0 +1,334 @@
+/*
+ * Copyright © 2001 Keith Packard
+ *
+ * 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 Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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 "chips.h"
+#include "kaa.h"
+#include <sys/io.h>
+
+#undef CHIPS_DEBUG
+
+static Bool
+chipsCardInit (KdCardInfo *card)
+{
+    ChipsCardInfo	*chipsc;
+
+    chipsc = (ChipsCardInfo *) xalloc (sizeof (ChipsCardInfo));
+    if (!chipsc)
+	return FALSE;
+    
+    iopl (3);
+    
+    if (!vesaInitialize (card, &chipsc->vesa))
+    {
+	xfree (chipsc);
+	return FALSE;
+    }
+    
+#ifdef USE_PCI
+    chipsc->window = (CARD32 *) (chipsc->cop_base + 0x10000);
+#else
+    chipsc->window = 0;
+#endif
+    card->driver = chipsc;
+    
+    return TRUE;
+}
+
+static Bool
+chipsScreenInit (KdScreenInfo *screen)
+{
+    ChipsScreenInfo	*chipss;
+    int			screen_size, memory;
+
+    chipss = (ChipsScreenInfo *) xalloc (sizeof (ChipsScreenInfo));
+    if (!chipss)
+	return FALSE;
+    memset (chipss, '\0', sizeof (ChipsScreenInfo));
+    if (!vesaScreenInitialize (screen, &chipss->vesa))
+    {
+	xfree (chipss);
+	return FALSE;
+    }
+
+    if (chipss->vesa.mapping != VESA_LINEAR)
+	screen->dumb = TRUE;
+    if (!screen->dumb)
+    {
+	chipss->mmio_base = (CARD8 *) KdMapDevice (CHIPS_MMIO_BASE(chipss),
+						   CHIPS_MMIO_SIZE(chipss));
+	
+	if (chipss->mmio_base)
+	{
+	    KdSetMappedMode (CHIPS_MMIO_BASE(chipss),
+			     CHIPS_MMIO_SIZE(chipss),
+			     KD_MAPPED_MODE_REGISTERS);
+	}
+	else
+	    screen->dumb = TRUE;
+    }
+    else
+	chipss->mmio_base = 0;
+
+    chipss->screen = chipss->vesa.fb;
+    memory = chipss->vesa.fb_size;
+    
+    screen_size = screen->fb[0].byteStride * screen->height;
+    
+    if (chipss->screen && memory >= screen_size + 2048)
+    {
+	memory -= 2048;
+	chipss->cursor_base = chipss->screen + memory - 2048;
+    }
+    else
+	chipss->cursor_base = 0;
+    memory -= screen_size;
+    if (memory > screen->fb[0].byteStride)
+    {
+	chipss->off_screen = chipss->screen + screen_size;
+	chipss->off_screen_size = memory;
+    }
+    else
+    {
+	chipss->off_screen = 0;
+	chipss->off_screen_size = 0;
+    }
+    screen->driver = chipss;
+    return TRUE;
+}
+
+static Bool
+chipsInitScreen (ScreenPtr pScreen)
+{
+    return vesaInitScreen (pScreen);
+}
+
+#ifdef RANDR
+static Bool
+chipsRandRSetConfig (ScreenPtr		pScreen,
+		      Rotation		rotation,
+		      int		rate,
+		      RRScreenSizePtr	pSize)
+{
+    kaaWaitSync (pScreen);
+
+    if (!vesaRandRSetConfig (pScreen, rotation, rate, pSize))
+	return FALSE;
+    
+    return TRUE;
+}
+
+static void
+chipsRandRInit (ScreenPtr pScreen)
+{
+    rrScrPriv(pScreen);
+
+    pScrPriv->rrSetConfig = chipsRandRSetConfig;
+}
+#endif
+
+static Bool
+chipsFinishInitScreen (ScreenPtr pScreen)
+{
+    Bool    ret;
+    ret = vesaFinishInitScreen (pScreen);
+#ifdef RANDR
+    chipsRandRInit (pScreen);
+#endif
+    return ret;
+}
+
+static Bool
+chipsCreateResources (ScreenPtr pScreen)
+{
+    return vesaCreateResources (pScreen);
+}
+
+CARD8
+chipsReadXR (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8 value;
+    outb (index, 0x3d6);
+    value = inb (0x3d7);
+    return value;
+}
+
+void
+chipsWriteXR (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3d6);
+    outb (value, 0x3d7);
+}
+
+#if 0
+static CARD8
+chipsReadFR (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8 value;
+    outb (index, 0x3d0);
+    value = inb (0x3d1);
+    return value;
+}
+
+static void
+chipsWriteFR (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3d0);
+    outb (value, 0x3d1);
+}
+
+static CARD8
+chipsReadSeq (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8   value;
+    outb (index, 0x3c4);
+    value = inb (0x3c5);
+    return value;
+}
+
+static void
+chipsWriteSeq (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3c4);
+    outb (value, 0x3c5);
+}
+#endif
+
+static void
+chipsPreserve (KdCardInfo *card)
+{
+    vesaPreserve(card);
+}
+
+static void
+chipsSetMMIO (ChipsCardInfo *chipsc)
+{
+}
+
+static void
+chipsResetMMIO (ChipsCardInfo *chipsc)
+{
+}
+
+static Bool
+chipsEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    ChipsCardInfo	*chipsc = pScreenPriv->card->driver;
+
+    if (!vesaEnable (pScreen))
+	return FALSE;
+    chipsSetMMIO (chipsc);
+    return TRUE;
+}
+
+#if 0
+static Bool
+chipsDPMS (ScreenPtr pScreen, int mode)
+{
+    KdScreenPriv(pScreen);
+    chipsScreenInfo(pScreenPriv);
+    
+    ErrorF ("seqreg 0x01 0x%x\n", chipsReadSeq (chipss, 0x1));
+    ErrorF ("dpmsreg XR61 0x%x\n", chipsReadXR (chipss, 0x61));
+    ErrorF ("dpmsreg XR73 0x%x\n", chipsReadXR (chipss, 0x73));
+    
+    ErrorF ("flat panel FR05 0x%x\n", chipsReadFR (chipss, 0x5));
+    ErrorF ("flat panel XR52 0x%x\n", chipsReadXR (chipss, 0x52));
+    return TRUE;
+}
+#endif
+
+static void
+chipsDisable (ScreenPtr pScreen)
+{
+    vesaDisable (pScreen);
+}
+
+static void
+chipsRestore (KdCardInfo *card)
+{
+    ChipsCardInfo	*chipsc = card->driver;
+
+    chipsResetMMIO (chipsc);
+    vesaRestore (card);
+}
+
+static void
+chipsScreenFini (KdScreenInfo *screen)
+{
+    ChipsScreenInfo	*chipss = (ChipsScreenInfo *) screen->driver;
+
+    if (chipss->mmio_base)
+    {
+	KdUnmapDevice ((void *) chipss->mmio_base, CHIPS_MMIO_SIZE(chipss));
+	KdResetMappedMode (CHIPS_MMIO_BASE(chipss),
+			   CHIPS_MMIO_SIZE(chipss),
+			   KD_MAPPED_MODE_REGISTERS);
+    }
+    vesaScreenFini (screen);
+    xfree (chipss);
+    screen->driver = 0;
+}
+
+static void
+chipsCardFini (KdCardInfo *card)
+{
+    vesaCardFini (card);
+}
+
+#define chipsCursorInit	(void *) 0
+#define chipsCursorEnable	(void *) 0
+#define chipsCursorDisable	(void *) 0
+#define chipsCursorFini	(void *) 0
+#define chipsRecolorCursor	(void *) 0
+
+KdCardFuncs	chipsFuncs = {
+    chipsCardInit,	    /* cardinit */
+    chipsScreenInit,	    /* scrinit */
+    chipsInitScreen,	    /* initScreen */
+    chipsFinishInitScreen,  /* finishInitScreen */
+    chipsCreateResources,   /* createRes */
+    chipsPreserve,	    /* preserve */
+    chipsEnable,	    /* enable */
+    vesaDPMS,		    /* dpms */
+    chipsDisable,	    /* disable */
+    chipsRestore,	    /* restore */
+    chipsScreenFini,	    /* scrfini */
+    chipsCardFini,	    /* cardfini */
+    
+    chipsCursorInit,	    /* initCursor */
+    chipsCursorEnable,    /* enableCursor */
+    chipsCursorDisable,   /* disableCursor */
+    chipsCursorFini,	    /* finiCursor */
+    chipsRecolorCursor,   /* recolorCursor */
+    
+    chipsDrawInit,        /* initAccel */
+    chipsDrawEnable,      /* enableAccel */
+    chipsDrawDisable,     /* disableAccel */
+    chipsDrawFini,        /* finiAccel */
+    
+    vesaGetColors,    	    /* getColors */
+    vesaPutColors,	    /* putColors */
+};