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

diff --git a/xorg-server/hw/kdrive/r128/r128.h b/xorg-server/hw/kdrive/r128/r128.h
new file mode 100644
index 000000000..ae9ae03aa
--- /dev/null
+++ b/xorg-server/hw/kdrive/r128/r128.h
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+#ifndef _R128_H_
+#define _R128_H_
+#include <vesa.h>
+
+#define R128_REG_BASE(c)	    ((c)->attr.address[1])
+#define R128_REG_SIZE(c)	    (0x4000)
+
+#define R128_OUT32(mmio, a, v) (*(VOL32 *) ((mmio) + (a)) = (v))
+#define R128_IN32(mmio, a) (*(VOL32 *) ((mmio) + (a)))
+
+#define R128_REG_GUI_STAT		0x1740
+#define R128_REG_DEFAULT_OFFSET 	0x16e0
+#define R128_REG_DEFAULT_PITCH		0x16e4
+#define R128_REG_DP_GUI_MASTER_CNTL	0x146c
+#define R128_REG_DP_BRUSH_FRGD_CLR      0x147c
+#define R128_REG_DP_WRITE_MASK          0x16cc
+#define R128_REG_DP_CNTL                0x16c0
+#define R128_REG_DST_WIDTH_HEIGHT       0x1598
+#define R128_REG_DST_Y_X                0x1438
+#define R128_REG_PC_NGUI_CTLSTAT	0x0184
+#define R128_REG_DST_HEIGHT_WIDTH       0x143c
+#define R128_REG_SRC_Y_X                0x1434
+#define R128_DEFAULT_SC_BOTTOM_RIGHT    0x16e8
+#define R128_AUX_SC_CNTL                0x1660
+#define R128_SC_TOP_LEFT                0x16ec
+#define R128_SC_BOTTOM_RIGHT            0x16f0
+
+#define R128_GMC_DST_DATATYPE_SHIFT     8
+#define R128_GMC_CLR_CMP_CNTL_DIS       (1 << 28)
+#define R128_GMC_AUX_CLIP_DIS           (1 << 29)
+#define R128_GMC_BRUSH_SOLID_COLOR      (13 << 4)
+#define R128_GMC_SRC_DATATYPE_COLOR     (3 << 12)
+#define R128_GMC_ROP3_SHIFT		16
+#define R128_DST_X_LEFT_TO_RIGHT        (1 <<  0)
+#define R128_DST_Y_TOP_TO_BOTTOM        (1 <<  1)
+#define R128_GUI_ACTIVE			(1 << 31)
+#define R128_PC_BUSY                    (1 << 31)
+#define R128_DP_SRC_SOURCE_MEMORY       (2 << 24)
+#define R128_DEFAULT_SC_RIGHT_MAX       (0x1fff <<  0)
+#define R128_DEFAULT_SC_BOTTOM_MAX      (0x1fff << 16)
+
+typedef volatile CARD8	VOL8;
+typedef volatile CARD16	VOL16;
+typedef volatile CARD32	VOL32;
+			 
+typedef struct _r128CardInfo {
+    VesaCardPrivRec vesa;
+    CARD8 *reg_base;
+    int fifo_size;
+} R128CardInfo;
+
+#define getR128CardInfo(kd) ((R128CardInfo *) ((kd)->card->driver))
+#define r128CardInfo(kd)	R128CardInfo *r128c = getR128CardInfo(kd)
+
+typedef struct _r128ScreenInfo {
+    VesaScreenPrivRec vesa;
+    CARD8 *screen;
+    CARD8 *off_screen;
+    int off_screen_size;
+
+    KaaScreenInfoRec kaa;
+
+    int pitch;
+    int datatype;
+
+    int dp_gui_master_cntl;
+} R128ScreenInfo;
+
+#define getR128ScreenInfo(kd) ((R128ScreenInfo *) ((kd)->screen->driver))
+#define r128ScreenInfo(kd)    R128ScreenInfo *r128s = getR128ScreenInfo(kd)
+
+Bool
+r128MapReg (KdCardInfo *card, R128CardInfo *r128c);
+
+void
+r128UnmapReg (KdCardInfo *card, R128CardInfo *r128c);
+
+void
+r128SetMMIO (KdCardInfo *card, R128CardInfo *r128c);
+
+void
+r128ResetMMIO (KdCardInfo *card, R128CardInfo *r128c);
+
+Bool
+r128DrawSetup (ScreenPtr pScreen);
+
+Bool
+r128DrawInit (ScreenPtr pScreen);
+
+void
+r128DrawEnable (ScreenPtr pScreen);
+
+void
+r128DrawDisable (ScreenPtr pScreen);
+
+void
+r128DrawFini (ScreenPtr pScreen);
+
+extern KdCardFuncs  r128Funcs;
+
+#endif /* _R128_H_ */