Module Name: xsrc
Committed By: christos
Date: Mon May 30 11:00:18 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaInit.c
amigaIo.c amigaKbd.c amigaMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.h
clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c clstuff.h
clwindow.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina: amigaGX.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h s3bcach.c
s3fcach.c s3ss.c s3text.c
Log Message:
finish making this compile, with a few warnings. Mainly fix prototypes,
remove duplicate struct decls, add includes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3 Mon May 30 02:42:40 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h Mon May 30 07:00:17 2011
@@ -26,12 +26,12 @@
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/device.h>
-#include "dev/kbdreg.h"
-#include "dev/vuid_event.h"
-#include "dev/grfabs_reg.h"
-#include "dev/viewioctl.h"
-#include "dev/grfioctl.h"
-#include "dev/grfvar.h"
+#include <dev/kbdreg.h>
+#include <dev/vuid_event.h>
+#include <dev/grfabs_reg.h>
+#include <dev/viewioctl.h>
+#include <dev/grfioctl.h>
+#include <dev/grfvar.h>
/* X headers */
#include "Xos.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3 Sat Jan 17 17:23:28 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c Mon May 30 07:00:17 2011
@@ -55,6 +55,7 @@
#define NEED_EVENTS
#include "amiga.h"
+#include "mi.h"
Bool amigaActiveZaphod = TRUE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2 Wed Mar 30 04:50:44 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c Mon May 30 07:00:17 2011
@@ -52,6 +52,10 @@
#include <sys/resource.h>
#include <unistd.h>
#include "mipointer.h"
+#include "mfb.h"
+#include "cfb.h"
+#include "cfb16.h"
+#include "cfb32.h"
/* maximum pixmap depth */
#ifndef AMIGAMAXDEPTH
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c Mon May 30 07:00:17 2011
@@ -47,6 +47,7 @@
#define NEED_EVENTS
#include "amiga.h"
+#include "mi.h"
Bool amigaEmulateMiddleButton = FALSE;
Bool amigaEmulateRightButton = FALSE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4 Mon May 30 02:42:40 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c Mon May 30 07:00:17 2011
@@ -41,11 +41,27 @@
********************************************************/
#define NEED_EVENTS
-#include "amiga.h"
+#include "amiga.h"
#include "keysym.h"
#ifdef CV64_SUPPORT
-#include "s3/amigaCV.h"
+
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "regionstr.h"
+#include "mistruct.h"
+#include "mifillarc.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+#include "cfb.h"
+#include "cfbmskbits.h"
+#include "cfb8bit.h"
+#include "fastblt.h"
+#include "mergerop.h"
+#include "s3/amigaCV.h"
+#include "mi.h"
#endif
#ifdef XKB
@@ -56,8 +72,6 @@
#ifdef CV64_SUPPORT
extern ScreenPtr amigaCVsavepScreen;
-extern void amigaCVadjustVirtual (volatile char *);
-extern void amigaCVRestoreCursor();
#endif
extern int amigaVideoMode;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h Mon May 30 07:00:17 2011
@@ -51,8 +51,6 @@
in the other modes. (thus 8x1x8=64 bytes) */
#define PAT_MEM_OFF (1280*1*1024)
-#include "dev/grf_clreg.h"
-
#define Map(m) \
do { WGfx(ba, GCT_ID_READ_MAP_SELECT, m & 3 ); WSeq(ba, SEQ_ID_MAP_MASK, (1 << (m & 3))); } while (0)
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c Mon May 30 07:00:17 2011
@@ -32,6 +32,8 @@
*/
/* $XConsortium: cfbbitblt.c,v 5.51 94/05/27 11:00:56 dpw Exp $ */
+#include "amiga.h"
+
#include "X.h"
#include "Xmd.h"
#include "Xproto.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c Mon May 30 07:00:17 2011
@@ -31,6 +31,7 @@
*/
/* $XConsortium: cfbblt.c,v 1.13 94/04/17 20:28:44 dpw Exp $ */
+#include "amiga.h"
#include "X.h"
#include "Xmd.h"
@@ -47,7 +48,7 @@
#include "mergerop.h"
#include <stdio.h>
-#include "clstuff.h" /* defines for blitting */
+#include "clstuff.h"
#include "amigaCL.h"
/*static unsigned char *clregs,*clfb;*/
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c Mon May 30 07:00:17 2011
@@ -30,6 +30,8 @@
/* $XConsortium: cfbfillrct.c,v 5.18 94/04/17 20:28:47 dpw Exp $ */
+#include "amiga.h"
+
#include "X.h"
#include "Xmd.h"
#include "servermd.h"
@@ -42,6 +44,7 @@
#include "cfb.h"
#include "cfbmskbits.h"
#include "mergerop.h"
+#include "clstuff.h"
#include "amigaCL.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c Mon May 30 07:00:18 2011
@@ -47,6 +47,7 @@
******************************************************************/
/* $XConsortium: cfbgc.c,v 5.62 94/04/17 20:28:49 dpw Exp $ */
+#include "amiga.h"
#include "X.h"
#include "Xmd.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c:1.2 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c Mon May 30 07:00:18 2011
@@ -27,6 +27,7 @@
* Author: Keith Packard, MIT X Consortium
*/
+#include "amiga.h"
#include "X.h"
#include "Xmd.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h Mon May 30 07:00:18 2011
@@ -4,6 +4,8 @@
typedef volatile unsigned char vuchar;
typedef vuchar * vucharptr;
+#if 0
+/* in <dev/grfioctl.h> */
struct grfdyninfo {
int gdi_fbx; /* frame buffer x offset */
int gdi_fby; /* frame buffer y offset */
@@ -36,6 +38,7 @@
/* new for banked pager support */
int gd_bank_size; /* size of a bank (or 0) */
};
+#endif
#define InitCLBlt(regs,width,rop,memclk)\
@@ -207,6 +210,7 @@
}\
#define amigaInfo(s) (&amigaFbs[(s)->myNum])
+#if 0
typedef struct {
unsigned char* fb; /* Frame buffer itself */
@@ -216,7 +220,14 @@
void (*EnterLeave)();/* screen switch */
int type; /* index into the amigaFbData table */
} fbFd;
+#endif
+void
+clFillRectSolidCopy(
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int nBox,
+ BoxPtr pBox);
extern fbFd amigaFbs[];
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c:1.3 Mon May 23 15:42:53 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c Mon May 30 07:00:18 2011
@@ -47,10 +47,13 @@
******************************************************************/
+#include "amiga.h"
+
#include "X.h"
#include "scrnintstr.h"
#include "windowstr.h"
#include "cfb.h"
+#include "gcstruct.h"
#include "mistruct.h"
#include "regionstr.h"
#include "cfbmskbits.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c:1.2 Sat Apr 10 22:46:33 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c Mon May 30 07:00:18 2011
@@ -40,12 +40,16 @@
#include "fontstruct.h"
#include "dixfontstr.h"
#include "cfb.h"
+#include "cfb16.h"
+#include "cfb32.h"
#include "cfbmskbits.h"
#include "cfb8bit.h"
#include "fastblt.h"
#include "mergerop.h"
#include "amigaGX.h"
#include "migc.h"
+#include "mi.h"
+#include "mispans.h"
/* make cfb somewhat more consistent.. */
@@ -2054,10 +2058,11 @@
}
void
-amiga8GXValidateGC (pGC, changes, pDrawable, bpp)
- GCPtr pGC;
- Mask changes;
- DrawablePtr pDrawable;
+amiga8GXValidateGC(
+ GCPtr pGC,
+ Mask changes,
+ DrawablePtr pDrawable,
+ int bpp)
{
int mask; /* stateChanges */
int index; /* used for stepping through bitfields */
@@ -2454,10 +2459,11 @@
}
void
-amiga16GXValidateGC (pGC, changes, pDrawable, bpp)
- GCPtr pGC;
- Mask changes;
- DrawablePtr pDrawable;
+amiga16GXValidateGC(
+ GCPtr pGC,
+ Mask changes,
+ DrawablePtr pDrawable,
+ int bpp)
{
int mask; /* stateChanges */
int index; /* used for stepping through bitfields */
@@ -2640,8 +2646,9 @@
if ((width <= 32) && !(width & (width - 1)))
{
cfb16CopyRotatePixmap(pGC->tile.pixmap,
- &cfbGetCompositeClip(pGC),
- xrot, yrot);
+ &pGC->pRotatedPixmap,
+ /* &cfbGetCompositeClip(pGC), */
+ xrot, yrot);
new_pix = TRUE;
}
}
@@ -2848,10 +2855,11 @@
}
void
-amiga24GXValidateGC (pGC, changes, pDrawable, bpp)
- GCPtr pGC;
- Mask changes;
- DrawablePtr pDrawable;
+amiga24GXValidateGC(
+ GCPtr pGC,
+ Mask changes,
+ DrawablePtr pDrawable,
+ int bpp)
{
int mask; /* stateChanges */
int index; /* used for stepping through bitfields */
@@ -3255,8 +3263,8 @@
miDestroyGC (pGC);
}
-amigaGXCreateGC (pGC)
- GCPtr pGC;
+Bool
+amigaGXCreateGC(GCPtr pGC)
{
amigaGXPrivGCPtr gxPriv;
if (pGC->depth == 1)
@@ -3354,9 +3362,10 @@
return cfb32DestroyWindow (pWin);
}
-amiga8GXChangeWindowAttributes (pWin, mask)
- WindowPtr pWin;
- Mask mask;
+Bool
+amiga8GXChangeWindowAttributes(
+ WindowPtr pWin,
+ Mask mask)
{
#if 0
amigaGXStipplePtr stipple;
@@ -3507,9 +3516,10 @@
return (TRUE);
}
-amiga16GXChangeWindowAttributes (pWin, mask)
- WindowPtr pWin;
- Mask mask;
+Bool
+amiga16GXChangeWindowAttributes(
+ WindowPtr pWin,
+ Mask mask)
{
#if 0
amigaGXStipplePtr stipple;
@@ -3660,9 +3670,10 @@
return (TRUE);
}
-amiga24GXChangeWindowAttributes (pWin, mask)
- WindowPtr pWin;
- Mask mask;
+Bool
+amiga24GXChangeWindowAttributes(
+ WindowPtr pWin,
+ Mask mask)
{
#if 0
amigaGXStipplePtr stipple;
@@ -4163,15 +4174,10 @@
REGION_DESTROY(pWin->drawable.pScreen, prgnDst);
}
-#if NeedFunctionPrototypes
+Bool
amigaGXInit (
ScreenPtr pScreen,
fbFd *fb)
-#else
-amigaGXInit (pScreen, fb)
- ScreenPtr pScreen;
- fbFd *fb;
-#endif
{
Uint mode;
register long r;
@@ -4312,19 +4318,19 @@
* boxes, we may not want to start grabbing bits at psrc but at some offset
* further on.)
*/
-amiga24GXSetScanline(inf, acm, y, xOrigin, xStart, xEnd, psrc, alu, pdstBase,
- widthDst, planemask)
- fbFd *inf;
- struct ACM *acm;
- int y;
- int xOrigin; /* where this scanline starts */
- int xStart; /* first bit to use from scanline */
- int xEnd; /* last bit to use from scanline + 1 */
- register unsigned int *psrc;
- register int alu; /* raster op */
- int *pdstBase; /* start of the drawable */
- int widthDst; /* width of drawable in pixels */
- unsigned long planemask;
+void
+amiga24GXSetScanline(
+ fbFd *inf,
+ struct ACM *acm,
+ int y,
+ int xOrigin, /* where this scanline starts */
+ int xStart, /* first bit to use from scanline */
+ int xEnd, /* last bit to use from scanline + 1 */
+ unsigned int *psrc,
+ int alu, /* raster op */
+ int *pdstBase, /* start of the drawable */
+ int widthDst, /* width of drawable in pixels */
+ unsigned long planemask)
{
int w; /* width of scanline in bits */
Uint dst, dim;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.5 Mon May 30 02:42:40 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h Mon May 30 07:00:18 2011
@@ -531,7 +531,7 @@
void amigaCVImageReadNoMem(int, int, int, int, char *, int, int, int, unsigned long, fbFd *);
void amigaCVImageFillNoMem(int, int, int, int, char *, int, int, int, int, int, short, unsigned long, fbFd *);
void amigaCVImageStipple(int, int, int, int, char *, int, int, int, int, int, Pixel, short, unsigned long, fbFd *);
-void amigaCVImageOpStipple(int, int, int, int, char *, int, int, int , int , int , Pixel, Pixel, short, unsigned long, fbFd *);
+void amigaCVImageOpStipple(int, int, int, int, char *, int, int, int, int, int, Pixel, Pixel, short, unsigned long, fbFd *);
/* amigaCVline.c */
void amigaCVLine(DrawablePtr, GCPtr, int, int, DDXPointPtr);
@@ -546,7 +546,7 @@
void amigaCVSegment(DrawablePtr, GCPtr, int, xSegment *);
/* s3bcach.c */
-void s3CacheMoveBlock(int, int , int , int , int , int , unsigned int);
+void s3CacheMoveBlock(int, int, int, int, int, int, unsigned int);
/* s3font.c */
Bool s3RealizeFont(ScreenPtr, FontPtr);
@@ -556,16 +556,16 @@
void s3SetSpans(DrawablePtr, GCPtr, char *, DDXPointPtr, int *, int, int);
/* s3text.c */
-void s3SimpleStipple(int, int , int, int , unsigned char *, int , fbFd *);
-void s3FontStipple(int, int , int, int , unsigned char *, int , Pixel);
+void s3SimpleStipple(int, int, int, int, unsigned char *, int, fbFd *);
+void s3FontStipple(int, int, int, int, unsigned char *, int, Pixel);
int s3NoCPolyText(DrawablePtr, GCPtr, int, int, int, char *, Bool);
int s3NoCImageText(DrawablePtr, GCPtr, int, int, int, char *, Bool);
/* xf86text.c */
void xf86InitText(void (*GlyphWriteFunc )(), int (*NoCPolyTextFunc )(), int (*NoCImageTextFunc )());
-int xf86PolyText8(DrawablePtr, GCPtr, int, int , int, char *);
-int xf86PolyText16(DrawablePtr, GCPtr, int, int , int, unsigned short *);
-void xf86ImageText8(DrawablePtr, GCPtr, int, int , int, char *);
-void xf86ImageText16(DrawablePtr, GCPtr, int, int , int, unsigned short *);
+int xf86PolyText8(DrawablePtr, GCPtr, int, int, int, char *);
+int xf86PolyText16(DrawablePtr, GCPtr, int, int, int, unsigned short *);
+void xf86ImageText8(DrawablePtr, GCPtr, int, int, int, char *);
+void xf86ImageText16(DrawablePtr, GCPtr, int, int, int, unsigned short *);
#endif /* _REGS3_H */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c Mon May 30 07:00:18 2011
@@ -32,6 +32,8 @@
*/
#include "amiga.h"
+#include "gcstruct.h"
+#include "cfb.h"
#include "amigaCV.h"
#include "xf86bcache.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c Mon May 30 07:00:18 2011
@@ -34,6 +34,8 @@
*/
#include "amiga.h"
+#include "gcstruct.h"
+#include "cfb.h"
#include "amigaCV.h"
#include "xf86bcache.h"
#include "xf86fcache.h"
@@ -163,12 +165,13 @@
* call the glyph output routine.
*/
void
-s3GlyphWrite(x, y, count, chars, fentry, pGC, pBox, numRects)
- int x, y, count;
- unsigned char *chars;
- CacheFont8Ptr fentry;
- GCPtr pGC;
- BoxPtr pBox;
+s3GlyphWrite(
+ int x, int y, int count,
+ unsigned char *chars,
+ CacheFont8Ptr fentry,
+ GCPtr pGC,
+ BoxPtr pBox,
+ int numRects)
{
fbFd *inf = amigaInfo(amigaCVsavepScreen);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c Mon May 30 07:00:18 2011
@@ -75,6 +75,8 @@
#include "scrnintstr.h"
#include "cfb.h"
+#include "cfb16.h"
+#include "cfb32.h"
#include "cfbmskbits.h"
#include "amigaCV.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c Mon May 30 07:00:18 2011
@@ -34,20 +34,21 @@
*/
#include "amiga.h"
-#include "amigaCV.h"
#include "gcstruct.h"
#include "fontstruct.h"
#include "dixfontstr.h"
#include "cfb.h"
+#include "amigaCV.h"
extern unsigned char s3SwapBits[256];
extern short s3alu[];
-__inline__ s3SimpleStipple(x, y, width, height, pb, pwidth, inf)
-int x, y;
-int width, height, pwidth;
-unsigned char *pb;
- fbFd *inf;
+void s3SimpleStipple(
+ int x, int y,
+ int width, int height,
+ unsigned char *pb,
+ int pwidth,
+ fbFd *inf)
{
volatile caddr_t vgaBase = (inf->regs);
@@ -99,13 +100,13 @@
* with no tiling and starting from (0,0) in the source bitmap. - Jon.
*/
__inline__ static void
-s3PolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
- DrawablePtr pDrawable;
- GC *pGC;
- int x, y;
- unsigned int nglyph;
- CharInfoPtr *ppci; /* array of character info */
- unsigned char *pglyphBase; /* start of array of glyphs */
+s3PolyGlyphBlt(
+ DrawablePtr pDrawable,
+ GC *pGC,
+ int x, int y,
+ unsigned int nglyph,
+ CharInfoPtr *ppci, /* array of character info */
+ unsigned char *pglyphBase) /* start of array of glyphs */
{
int width, height;
int nbyLine; /* bytes per line of padded pixmap */
@@ -174,11 +175,12 @@
__dolog ("Leaving s3PolyGlyphBlt\n");
}
-void s3FontStipple(x, y, width, height, pb, pwidth, id)
-int x, y;
-int width, height, pwidth;
-Pixel id;
-unsigned char *pb;
+void s3FontStipple(
+ int x, int y,
+ int width, int height,
+ unsigned char *pb,
+ int pwidth,
+ Pixel id)
{
fbFd *inf = amigaInfo(amigaCVsavepScreen);
volatile caddr_t vgaBase = (inf->regs);
@@ -205,14 +207,14 @@
}
int
-s3NoCPolyText(pDraw, pGC, x, y, count, chars, is8bit)
- DrawablePtr pDraw;
- GCPtr pGC;
- int x;
- int y;
- int count;
- char *chars;
- Bool is8bit;
+s3NoCPolyText(
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ char *chars,
+ Bool is8bit)
{
int i;
BoxPtr pBox;
@@ -323,14 +325,14 @@
*/
int
-s3NoCImageText(pDraw, pGC, x, y, count, chars, is8bit)
- DrawablePtr pDraw;
- GCPtr pGC;
- int x;
- int y;
- int count;
- char *chars;
- Bool is8bit;
+s3NoCImageText(
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ char *chars,
+ Bool is8bit)
{
ExtentInfoRec info; /* used by QueryGlyphExtents() */
XID gcvals[3];
