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

diff --git a/xorg-server/hw/kdrive/src/vga.c b/xorg-server/hw/kdrive/src/vga.c
new file mode 100644
index 000000000..862f074a2
--- /dev/null
+++ b/xorg-server/hw/kdrive/src/vga.c
@@ -0,0 +1,328 @@
+/*
+ * Copyright © 1999 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 "vga.h"
+#include <stdio.h>
+
+#ifdef linux
+#ifdef __i386__
+#define extern static
+#include <sys/io.h>
+#undef extern
+
+#define _VgaInb(r)	inb(r)
+#define _VgaOutb(v,r)	outb(v,r)
+#else
+#define _VgaInb(r)	0
+#define _VgaOutb(v,r)	
+#endif
+
+#define _VgaByteAddr(a)	((VGAVOL8 *) (a))
+#define _VgaBytePort(a)	(a)
+#endif
+
+#ifdef VXWORKS
+#define _VgaInb(r)  0
+#define _VgaOutb(v,r)   0
+
+#define _VgaByteAddr(a)     ((VGAVOL8 *) ((VGA32) (a) ^ 3))
+#define _VgaBytePort(a)	    0
+
+#undef stderr
+#define stderr stdout
+
+#endif
+
+#undef VGA_DEBUG_REGISTERS
+#ifdef VGA_DEBUG_REGISTERS
+#define VGA_DEBUG(a)	fprintf a
+#else
+#define VGA_DEBUG(a)
+#endif
+
+VGA8
+VgaInb (VGA16 r)
+{
+    return _VgaInb(r);
+}
+
+void
+VgaOutb (VGA8 v, VGA16 r)
+{
+    _VgaOutb (v,r);
+}
+	
+VGA8
+VgaReadMemb (VGA32 addr)
+{
+    return *_VgaByteAddr(addr);
+}
+
+void
+VgaWriteMemb (VGA8 v, VGA32 addr)
+{
+    *_VgaByteAddr(addr) = v;
+}
+
+VGA8
+VgaFetch (VgaCard *card, VGA16 reg)
+{
+    VgaMap	map;
+    VGA8	value = 0;
+
+    (*card->map) (card, reg, &map, VGAFALSE);
+    switch (map.access) {
+    case VgaAccessMem:
+	value = VgaReadMemb (map.port);
+	VGA_DEBUG ((stderr, "%08x -> %2x\n", map.port, value));
+	break;
+    case VgaAccessIo:
+	value = _VgaInb (map.port);
+	VGA_DEBUG ((stderr, "%4x    -> %2x\n", map.port, value));
+	break;
+    case VgaAccessIndMem:
+	VgaWriteMemb (map.index, map.port + map.addr);
+	value = VgaReadMemb (map.port + map.value);
+	VGA_DEBUG ((stderr, "%4x/%2x -> %2x\n", map.port, map.index, value));
+	break;
+    case VgaAccessIndIo:
+	_VgaOutb (map.index, map.port + map.addr);
+	value = _VgaInb (map.port + map.value);
+	VGA_DEBUG ((stderr, "%4x/%2x -> %2x\n", map.port, map.index, value));
+	break;
+    case VgaAccessDone:
+	value = map.value;
+	VGA_DEBUG ((stderr, "direct %4x -> %2x\n", reg, value));
+	break;
+    }
+    return value;
+}
+
+void
+VgaStore (VgaCard *card, VGA16 reg, VGA8 value)
+{
+    VgaMap  map;
+
+    map.value = value;
+    (*card->map) (card, reg, &map, VGATRUE);
+    switch (map.access) {
+    case VgaAccessMem:
+	VGA_DEBUG ((stderr, "%8x <- %2x\n", map.port, value));
+	VgaWriteMemb (map.value, map.port);
+	break;
+    case VgaAccessIo:
+	VGA_DEBUG ((stderr, "%4x    <- %2x\n", map.port, value));
+	_VgaOutb (value, map.port);
+	break;
+    case VgaAccessIndMem:
+	VgaWriteMemb (map.index, map.port + map.addr);
+	VgaWriteMemb (value, map.port + map.value);
+	VGA_DEBUG ((stderr, "%4x/%2x <- %2x\n", map.port, map.index, value));
+	break;
+    case VgaAccessIndIo:
+	VGA_DEBUG ((stderr, "%4x/%2x <- %2x\n", map.port, map.index, value));
+	_VgaOutb (map.index, map.port + map.addr);
+	_VgaOutb (value, map.port + map.value);
+	break;
+    case VgaAccessDone:
+	VGA_DEBUG ((stderr, "direct %4x <- %2x\n", reg, value));
+	break;
+    }
+}
+
+void
+VgaPreserve (VgaCard *card)
+{
+    VgaSave *s;
+    VGA16   id;
+
+    for (s = card->saves; s->first != VGA_REG_NONE; s++)
+    {
+	for (id = s->first; id <= s->last; id++)
+	{
+	    card->values[id].cur = VgaFetch (card, id);
+	    card->values[id].save = card->values[id].cur;
+	    card->values[id].flags = VGA_VALUE_VALID | VGA_VALUE_SAVED;
+	}
+    }
+}
+
+void
+VgaRestore (VgaCard *card)
+{
+    VgaSave *s;
+    VGA16   id;
+
+    for (s = card->saves; s->first != VGA_REG_NONE; s++)
+    {
+	for (id = s->first; id <= s->last; id++)
+	{
+	    if (card->values[id].flags & VGA_VALUE_SAVED)
+	    {
+		VgaStore (card, id, card->values[id].save);
+		card->values[id].cur = card->values[id].save;
+	    }
+	}
+    }
+}
+
+void
+VgaFinish (VgaCard *card)
+{
+    VGA16   id;
+
+    for (id = 0; id < card->max; id++)
+	card->values[id].flags = 0;
+}
+
+void
+VgaInvalidate (VgaCard *card)
+{
+    VGA16   id;
+
+    for (id = 0; id < card->max; id++)
+	card->values[id].flags &= ~VGA_VALUE_VALID;
+}
+
+
+static void
+_VgaSync (VgaCard *card, VGA16 id)
+{
+    if (!(card->values[id].flags & VGA_VALUE_VALID))
+    {
+	card->values[id].cur = VgaFetch (card, id);
+	card->values[id].flags |= VGA_VALUE_VALID;
+    }
+}
+
+void
+VgaSet (VgaCard *card, VgaReg *reg, VGA32 value)
+{
+    VGA8    v, mask, new;
+    
+    while (reg->len)
+    {
+	if (reg->id != VGA_REG_NONE)
+	{
+	    _VgaSync (card, reg->id);
+	    mask = ((1 << reg->len) - 1);
+	    new = value & mask;
+	    mask <<= reg->base;
+	    new <<= reg->base;
+	    v = card->values[reg->id].cur;
+	    v = (v & ~mask) | new;
+	    card->values[reg->id].cur = v;
+	    card->values[reg->id].flags |= VGA_VALUE_MODIFIED|VGA_VALUE_DIRTY;
+	}
+	value >>= reg->len;
+	reg++;
+    }
+}
+
+void
+VgaFlushReg (VgaCard *card, VgaReg *reg)
+{
+    while (reg->len)
+    {
+	if (reg->id != VGA_REG_NONE)
+	{
+	    if (card->values[reg->id].flags & VGA_VALUE_DIRTY)
+	    {
+		VgaStore (card, reg->id, card->values[reg->id].cur);
+		card->values[reg->id].flags &= ~VGA_VALUE_DIRTY;
+	    }
+	}
+	reg++;
+    }
+    
+}
+
+void
+VgaSetImm (VgaCard *card, VgaReg *reg, VGA32 value)
+{
+    VgaSet (card, reg, value);
+    VgaFlushReg (card, reg);
+}
+
+VGA32
+VgaGet (VgaCard *card, VgaReg *reg)
+{
+    VGA32   value, offset, v;
+    VGA8    mask;
+
+    value = 0;
+    offset = 0;
+    while (reg->len)
+    {
+	if (reg->id != VGA_REG_NONE)
+	{
+	    _VgaSync (card, reg->id);
+	    mask = ((1 << reg->len) - 1);
+	    v = (card->values[reg->id].cur >> reg->base) & mask;
+	    value |= (v << offset);
+	}
+	offset += reg->len;
+	reg++;
+    }
+    return value;
+}
+
+VGA32
+VgaGetImm (VgaCard *card, VgaReg *reg)
+{
+    VgaReg  *r = reg;
+    
+    while (r->len)
+    {
+	if (r->id != VGA_REG_NONE)
+	    card->values[r->id].flags &= ~VGA_VALUE_VALID;
+	r++;
+    }
+    return VgaGet (card, reg);
+}
+
+void
+VgaFlush (VgaCard *card)
+{
+    VGA16   id;
+
+    for (id = 0; id < card->max; id++)
+    {
+	if (card->values[id].flags & VGA_VALUE_DIRTY)
+	{
+	    VgaStore (card, id, card->values[id].cur);
+	    card->values[id].flags &= ~VGA_VALUE_DIRTY;
+	}
+    }
+}
+
+void
+VgaFill (VgaCard *card, VGA16 low, VGA16 high)
+{
+    VGA16   id;
+
+    for (id = low; id < high; id++)
+	_VgaSync (card, id);
+}