Module Name: xsrc
Committed By: christos
Date: Mon May 30 06:42:41 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c
amigaFbs.c amigaKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
amigaCVCursor.c amigaCVblt.c amigaCVbstor.c amigaCVfrect.c
amigaCVim.c amigaCVscrin.c
Log Message:
Ok, s3 is fixed. Now retina and cirrus
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.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.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h Mon May 30 02:42:40 2011
@@ -465,7 +465,7 @@
extern void amigaBlockHandler(
int,
pointer,
- struct timeval **,
+ pointer,
pointer
);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c Mon May 30 02:42:40 2011
@@ -41,7 +41,22 @@
#define NEED_EVENTS
#include "amiga.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 "migc.h"
#endif
#define GetCursorPrivate(s) (&(GetScreenPrivate(s)->hardwareCursor))
@@ -86,7 +101,6 @@
PixmapPtr src, dst;
BoxRec box;
RegionRec rgnDst;
- extern int mfbDoBitblt();
if (!(src = GetScratchPixmapHeader(pScreen, bits->width, bits->height,
/*bpp*/ 1, /*depth*/ 1,
@@ -103,7 +117,7 @@
box.x2 = w;
box.y2 = h;
REGION_INIT(pScreen, &rgnDst, &box, 1);
- mfbDoBitblt(src, dst, GXcopy, &rgnDst, ptSrc);
+ mfbDoBitblt(&src->drawable, &dst->drawable, GXcopy, &rgnDst, ptSrc);
REGION_UNINIT(pScreen, &rgnDst);
FreeScratchPixmapHeader(src);
FreeScratchPixmapHeader(dst);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c Mon May 30 02:42:40 2011
@@ -162,8 +162,6 @@
ScreenPtr pScreen)
{
SetupScreen(pScreen);
- extern void amigaBlockHandler();
- extern void amigaWakeupHandler();
static ScreenPtr autoRepeatScreen;
extern miPointerScreenFuncRec amigaPointerScreenFuncs;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3 Sat Jan 17 17:23:28 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c Mon May 30 02:42:40 2011
@@ -795,14 +795,15 @@
}
/*ARGSUSED*/
-void amigaBlockHandler(nscreen, pbdata, pptv, pReadmask)
- int nscreen;
- pointer pbdata;
- struct timeval **pptv;
- pointer pReadmask;
+void amigaBlockHandler(
+ int nscreen,
+ pointer pbdata,
+ pointer pv,
+ pointer pReadmask)
{
KeybdCtrl* ctrl = &((DeviceIntPtr)LookupKeyboardDevice())->kbdfeed->ctrl;
static struct timeval artv = { 0, 0 }; /* autorepeat timeval */
+ struct timeval **pptv = pv;
if (!autoRepeatKeyDown)
return;
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.4 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.4 Sat May 28 09:20:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h Mon May 30 02:42:40 2011
@@ -522,14 +522,16 @@
/* amigaCVim.c */
void amigaCVImageInit(fbFd *);
-void amigaCVImageWrite(int, int, int, int, char *, int, int, int, int, unsigned long, fbFd *);
+void amigaCVImageWrite(int, int, int, int, char *, int, int, int, short,
+ unsigned long, fbFd *);
void amigaCVImageRead(int, int, int, int, char *, int, int, int, unsigned long, fbFd *);
-void amigaCVImageFill(int, int, int, int, char *, int, int, int, int, int, int, unsigned long, fbFd *);
-void amigaCVImageWriteNoMem(int, int, int, int, char *, int, int, int, int, unsigned long, fbFd *);
+void amigaCVImageFill(int, int, int, int, char *, int, int, int, int, int,
+ short, unsigned long, fbFd *);
+void amigaCVImageWriteNoMem(int, int, int, int, char *, int, int, int, short, unsigned long, fbFd *);
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, int, unsigned long, fbFd *);
-void amigaCVImageStipple(int, int, int, int, char *, int, int, int, int, int, Pixel, int, unsigned long, fbFd *);
-void amigaCVImageOpStipple(int, int, int, int, char *, int, int, int , int , int , Pixel, Pixel, 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 *);
/* amigaCVline.c */
void amigaCVLine(DrawablePtr, GCPtr, int, int, DDXPointPtr);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c:1.4 Fri Oct 15 03:56:18 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c Mon May 30 02:42:40 2011
@@ -89,24 +89,18 @@
int amigaCVGeneration;
-extern void amigaCVImageWriteNoMem();
-extern void amigaCVImageRead();
-extern void amigaCVImageWrite();
-extern void amigaCVImageFill();
-extern void amigaCVImageFillNoMem ();
-
void
-amigaCVFindOrdering(pSrcDrawable, pDstDrawable, pGC, numRects, boxes, srcx, srcy, dstx, dsty, ordering)
- DrawablePtr pSrcDrawable;
- DrawablePtr pDstDrawable;
- GC *pGC;
- int numRects;
- BoxPtr boxes;
- int srcx;
- int srcy;
- int dstx;
- int dsty;
- unsigned int *ordering;
+amigaCVFindOrdering(
+ DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GC *pGC,
+ int numRects,
+ BoxPtr boxes,
+ int srcx,
+ int srcy,
+ int dstx,
+ int dsty,
+ unsigned int *ordering)
{
int i, j, y;
int xMax, yMin, yMax;
@@ -173,14 +167,13 @@
RegionPtr
-amigaCVCopyArea(pSrcDrawable, pDstDrawable,
- pGC, srcx, srcy, width, height, dstx, dsty)
- register DrawablePtr pSrcDrawable;
- register DrawablePtr pDstDrawable;
- GC *pGC;
- int srcx, srcy;
- int width, height;
- int dstx, dsty;
+amigaCVCopyArea(
+ DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GC *pGC,
+ int srcx, int srcy,
+ int width, int height,
+ int dstx, int dsty)
{
RegionPtr prgnSrcClip; /* may be a new region, or just a copy */
Bool freeSrcClip = FALSE;
@@ -532,15 +525,14 @@
RegionPtr
-amigaCVCopyPlane(pSrcDrawable, pDstDrawable,
- pGC, srcx, srcy, width, height, dstx, dsty, bitPlane)
- DrawablePtr pSrcDrawable;
- DrawablePtr pDstDrawable;
- GCPtr pGC;
- int srcx, srcy;
- int width, height;
- int dstx, dsty;
- unsigned long bitPlane;
+amigaCVCopyPlane(
+ DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ int srcx, int srcy,
+ int width, int height,
+ int dstx, int dsty,
+ unsigned long bitPlane)
{
PixmapPtr pBitmap = NULL;
RegionPtr prgnSrcClip; /* may be a new region, or just a copy */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.3 Sat May 28 09:20:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c Mon May 30 02:42:40 2011
@@ -36,20 +36,24 @@
#include <signal.h>
#define NEED_EVENTS
-#include <X.h>
-#include "Xproto.h"
-#include "misc.h"
-#include "input.h"
-#include "cursorstr.h"
-#include "regionstr.h"
-#include "scrnintstr.h"
-#include "servermd.h"
-#include "windowstr.h"
-#include "inputstr.h"
-#include "mfb.h"
-#include "migc.h"
-#include "amiga.h"
-#include "amigaCV.h"
+#include "amiga.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 "amigaCV.h"
+#include "migc.h"
static Bool amigaCVRealizeCursor();
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c Mon May 30 02:42:41 2011
@@ -35,11 +35,10 @@
* Modified for the CyberVision 64 by Michael Teske
*/
+#if 0
#include "amiga.h"
#include "cfb.h"
#if 0
-#include "cfb16.h"
-#include "cfb32.h"
#endif
#include "X.h"
#include "mibstore.h"
@@ -48,6 +47,27 @@
#include "pixmapstr.h"
#include "windowstr.h"
#include "amigaCV.h"
+#endif
+#include "amiga.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 "cfb16.h"
+#include "cfb32.h"
+#include "fastblt.h"
+#include "mergerop.h"
+#include "amigaCV.h"
+#include "migc.h"
/* Externs from amigaCV.c */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c Mon May 30 02:42:41 2011
@@ -88,9 +88,27 @@
* Modified for the CyberVision 64 by Michael Teske
*/
-#include "amiga.h"
-#include "cfb.h"
#include <stdio.h>
+#include "amiga.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 "amigaCV.h"
+#include "migc.h"
+#include "mi.h"
+#include <stdio.h>
Bool UseCVHardwareCursor = FALSE;
int amigaVirtualWidth = 0;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c:1.2 Sun Jan 25 00:15:26 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c Mon May 30 02:42:41 2011
@@ -70,6 +70,7 @@
#include "fastblt.h"
#include "mergerop.h"
#include "amigaCV.h"
+#include "mispans.h"
#include "migc.h"
extern int cfb16ScreenPrivateIndex, cfb32ScreenPrivateIndex;
@@ -80,27 +81,6 @@
extern RegionPtr cfb8BitBlt(), cfb16BitBlt(), cfb32BitBlt();
-
-extern void
-amigaCVImageOpStipple (
- int, int, int, int,char *, int, int, int, int, int, Pixel, Pixel,
- short, unsigned long, fbFd *);
-
-extern void
-amigaCVImageStipple (
- int, int, int, int,char *, int, int, int, int, int, Pixel,
- short, unsigned long, fbFd *);
-
-
-extern void
-amigaCVImageFill (int,int,int,int,char *,int,int,int,int,int,
- short, unsigned long,fbFd *);
-
-extern void
-amigaCVImageWrite (int,int,int,int,char *,int,int,int,short,
- unsigned long, fbFd *);
-
-
/* Externs from amigaCV.c */
extern short s3alu[];
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c Mon May 30 02:42:41 2011
@@ -34,8 +34,24 @@
*/
-#include "amiga.h"
-#include "amigaCV.h"
+#include "amiga.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 "amigaCV.h"
+#include "migc.h"
#include "xf86bcache.h"
#include "xf86fcache.h"
