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

diff --git a/xorg-server/hw/kdrive/src/kmap.c b/xorg-server/hw/kdrive/src/kmap.c
new file mode 100644
index 000000000..ce1e28ae4
--- /dev/null
+++ b/xorg-server/hw/kdrive/src/kmap.c
@@ -0,0 +1,178 @@
+/*
+ * 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.
+ */
+
+#include <kdrive-config.h>
+#include "kdrive.h"
+
+#include <errno.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#ifdef HAVE_ASM_MTRR_H
+#include <asm/mtrr.h>
+#endif
+
+#include <sys/ioctl.h>
+
+void *
+KdMapDevice (CARD32 addr, CARD32 size)
+{
+#ifdef WINDOWS
+    void    *a;
+    void    *d;
+
+    d = VirtualAlloc (NULL, size, MEM_RESERVE, PAGE_NOACCESS);
+    if (!d)
+	return NULL;
+    DRAW_DEBUG ((DEBUG_S3INIT, "Virtual address of 0x%x is 0x%x", addr, d));
+    a = VirtualCopyAddr (addr);
+    DRAW_DEBUG ((DEBUG_S3INIT, "Translated address is 0x%x", a));
+    if (!VirtualCopy (d, a, size, 
+		      PAGE_READWRITE|PAGE_NOCACHE|PAGE_PHYSICAL))
+    {
+	DRAW_DEBUG ((DEBUG_FAILURE, "VirtualCopy failed %d",
+		    GetLastError ()));
+	return NULL;
+    }
+    DRAW_DEBUG ((DEBUG_S3INIT, "Device mapped successfully"));
+    return d;
+#endif
+#ifdef linux
+    void    *a;
+    int	    fd;
+
+#ifdef __arm__
+    fd = open ("/dev/mem", O_RDWR|O_SYNC);
+#else
+    fd = open ("/dev/mem", O_RDWR);
+#endif
+    if (fd < 0)
+	FatalError ("KdMapDevice: failed to open /dev/mem (%s)\n",
+		    strerror (errno));
+    
+    a = mmap ((caddr_t) 0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, addr);
+    close (fd);
+    if ((long) a == -1)
+	FatalError ("KdMapDevice: failed to map frame buffer (%s)\n",
+		    strerror (errno));
+    return a;
+#endif
+#ifdef VXWORKS
+    return (void *) addr;
+#endif
+}
+
+void
+KdUnmapDevice (void *addr, CARD32 size)
+{
+#ifdef WINDOWS
+    VirtualFree (addr, size, MEM_DECOMMIT);
+    VirtualFree (addr, 0, MEM_RELEASE);
+#endif
+#ifdef linux
+    munmap (addr, size);
+#endif
+#ifdef VXWORKS
+    ;
+#endif
+}
+
+#ifdef HAVE_ASM_MTRR_H
+static int  mtrr;
+#endif
+
+void
+KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
+{
+#ifdef HAVE_ASM_MTRR_H
+    struct mtrr_sentry  sentry;
+    unsigned long    	base, bound;
+    unsigned int	type = MTRR_TYPE_WRBACK;
+
+    if (addr < 0x100000)
+	return;
+    if (!mtrr)
+	mtrr = open ("/proc/mtrr", 2);
+    if (mtrr > 0)
+    {
+	unsigned long nsize;
+	base = addr & ~((1<<22)-1);
+	bound = ((addr + size) + ((1<<22) - 1)) & ~((1<<22) - 1);
+	nsize = 1;
+	while (nsize < (bound - base))
+	    nsize <<= 1;
+	switch (mode) {
+	case KD_MAPPED_MODE_REGISTERS:
+	    type = MTRR_TYPE_UNCACHABLE;
+	    break;
+	case KD_MAPPED_MODE_FRAMEBUFFER:
+	    type = MTRR_TYPE_WRCOMB;
+	    break;
+	}
+	sentry.base = base;
+	sentry.size = nsize;
+	sentry.type = type;
+	
+	if (ioctl (mtrr, MTRRIOC_ADD_ENTRY, &sentry) < 0)
+	    ErrorF ("MTRRIOC_ADD_ENTRY failed 0x%x 0x%x %d (%s)\n",
+		    base, bound - base, type, strerror(errno));
+    }
+#endif
+}
+
+void
+KdResetMappedMode (CARD32 addr, CARD32 size, int mode)
+{
+#ifdef HAVE_ASM_MTRR_H
+    struct mtrr_sentry  sentry;
+    unsigned long    	base, bound;
+    unsigned int	type = MTRR_TYPE_WRBACK;
+
+    if (addr < 0x100000)
+	return;
+    if (!mtrr)
+	mtrr = open ("/proc/mtrr", 2);
+    if (mtrr > 0)
+    {
+	unsigned long	nsize;
+	base = addr & ~((1<<22)-1);
+	bound = ((addr + size) + ((1<<22) - 1)) & ~((1<<22) - 1);
+	nsize = 1;
+	while (nsize < (bound - base))
+	    nsize <<= 1;
+	switch (mode) {
+	case KD_MAPPED_MODE_REGISTERS:
+	    type = MTRR_TYPE_UNCACHABLE;
+	    break;
+	case KD_MAPPED_MODE_FRAMEBUFFER:
+	    type = MTRR_TYPE_WRCOMB;
+	    break;
+	}
+	sentry.base = base;
+	sentry.size = nsize;
+	sentry.type = type;
+	
+	if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0)
+	    ErrorF ("MTRRIOC_DEL_ENTRY failed 0x%x 0x%x %d (%s)\n",
+		    base, bound - base, type, strerror(errno));
+    }
+#endif
+}