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

diff --git a/xorg-server/hw/kdrive/pm2/pm2.h b/xorg-server/hw/kdrive/pm2/pm2.h
new file mode 100644
index 000000000..e05903365
--- /dev/null
+++ b/xorg-server/hw/kdrive/pm2/pm2.h
@@ -0,0 +1,162 @@
+#ifndef _PM2_H_
+#define _PM2_H_
+#include <vesa.h>
+#include "kxv.h"
+#include "klinux.h"
+
+#include "glint_regs.h"
+
+typedef volatile CARD8	VOL8;
+typedef volatile CARD16	VOL16;
+typedef volatile CARD32	VOL32;
+
+#define PM2_REG_BASE(c)		((c)->attr.address[0] & 0xFFFFC000)
+#define PM2_REG_SIZE(c)		(0x10000)
+
+typedef struct _PM2CardInfo {
+    VesaCardPrivRec vesa;
+    CARD8 *reg_base;
+
+    int InFifoSpace;
+    int	FIFOSize;
+
+    int	pprod;
+    int	bppalign;
+
+    int	ClippingOn;
+
+    int	ROP;
+
+    int x;
+    int	y;
+    int	w;
+    int	h;
+
+    int	FrameBufferReadMode;
+    int	BppShift;
+    int	BltScanDirection;
+
+    int	RasterizerSwap;
+    int	PixelWidth;
+    int	TexMapFormat;
+    int	startxdom;
+    int	startxsub;
+    int	starty;
+    int	count;
+    int	dy;
+    int	dxdom;
+
+    int	planemask;
+} PM2CardInfo;
+
+#define getPM2CardInfo(kd)	((PM2CardInfo *) ((kd)->card->driver))
+#define pmCardInfo(kd)	PM2CardInfo	*pm2c = getPM2CardInfo(kd)
+
+typedef struct _PM2ScreenInfo {
+    VesaScreenPrivRec vesa;
+    CARD8 *cursor_base;
+    CARD8 *screen;
+    CARD8 *off_screen;
+    int	 off_screen_size;
+    KdVideoAdaptorPtr pAdaptor;
+    KaaScreenInfoRec kaa;
+} PM2ScreenInfo;
+
+#define getPM2ScreenInfo(kd) ((PM2ScreenInfo *) ((kd)->screen->driver))
+#define pmScreenInfo(kd)    PM2ScreenInfo *pm2s = getPM2ScreenInfo(kd)
+
+Bool 
+pmCardInit (KdCardInfo *card);
+
+Bool 
+pmScreenInit (KdScreenInfo *screen);
+
+Bool        
+pmDrawInit(ScreenPtr);
+
+void
+pmDrawEnable (ScreenPtr);
+
+void
+pmDrawDisable (ScreenPtr);
+
+void
+pmDrawFini (ScreenPtr);
+
+
+extern KdCardFuncs  PM2Funcs;
+
+#define MMIO_OUT32(base, offset, val) 				\
+do { 								\
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
+} while (0)
+
+#  define MMIO_IN32(base, offset) 				\
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))
+
+#define GLINT_WRITE_REG(v,r) 					\
+	MMIO_OUT32(mmio,(unsigned long)(r), (v))
+
+#define GLINT_READ_REG(r) 					\
+	MMIO_IN32(mmio,(unsigned long)(r))
+
+#define GLINT_SLOW_WRITE_REG(v,r)				\
+do{								\
+	GLINT_WAIT(card->FIFOSize);		     		\
+        GLINT_WRITE_REG(v,r);					\
+}while(0)
+
+#define REPLICATE(r)						\
+{								\
+	if (pScreenPriv->screen->fb[0].bitsPerPixel == 16) {	\
+		r &= 0xFFFF;					\
+		r |= (r<<16);					\
+	} else							\
+	if (pScreenPriv->screen->fb[0].bitsPerPixel == 8) { 	\
+		r &= 0xFF;					\
+		r |= (r<<8);					\
+		r |= (r<<16);					\
+	}							\
+}
+
+#define DO_PLANEMASK(planemask)					\
+{ 								\
+	if (planemask != card->planemask) {			\
+		card->planemask = planemask;			\
+		REPLICATE(planemask); 				\
+		GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\
+	}							\
+} 
+
+#define LOADROP(rop)						\
+{								\
+	if (card->ROP != rop)	{				\
+		GLINT_WRITE_REG(rop<<1|UNIT_ENABLE, LogicalOpMode);	\
+		card->ROP = rop;				\
+	}							\
+}
+
+#define GLINT_WAIT(n)						\
+do{								\
+	if (card->InFifoSpace>=(n))				\
+	    card->InFifoSpace -= (n);				\
+	else {							\
+	    int tmp;						\
+	    while((tmp=GLINT_READ_REG(InFIFOSpace))<(n));	\
+	    /* Clamp value due to bugs in PM3 */		\
+	    if (tmp > card->FIFOSize)				\
+		tmp = card->FIFOSize;				\
+	    card->InFifoSpace = tmp - (n);			\
+	}							\
+}while(0)
+
+#define CHECKCLIPPING						\
+{								\
+	if (card->ClippingOn) {					\
+		card->ClippingOn = FALSE;			\
+		GLINT_WAIT(1);					\
+		GLINT_WRITE_REG(0, ScissorMode);		\
+	}							\
+}
+
+#endif /* _PM2_H_ */