Module Name: xsrc Committed By: christos Date: Mon May 23 19:42:53 UTC 2011
Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.c amigaCL.h clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c clwindow.c Log Message: more prototypes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c \ 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.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.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/cirrus/amigaCL.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.2 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c Mon May 23 15:42:53 2011 @@ -49,19 +49,8 @@ #include "migc.h" -Bool clCreateGC(); -void clCopyWindow(); - - -#if NeedFunctionPrototypes -amigaCLGXInit ( - ScreenPtr pScreen, - fbFd *fb) -#else -amigaCLGXInit (pScreen, fb) - ScreenPtr pScreen; - fbFd *fb; -#endif +Bool +amigaCLGXInit(ScreenPtr pScreen, fbFd *fb) { #if 0 if (serverGeneration != amigaCLGeneration) 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h Mon May 23 15:42:53 2011 @@ -253,3 +253,22 @@ #define amigaInfo(s) (&amigaFbs[(s)->myNum]) + +/* amigaCL.c */ +Bool amigaCLGXInit(ScreenPtr, fbFd *); +/* clgc.c */ +void clValidateGC(GCPtr, unsigned long, DrawablePtr); +Bool clCreateGC(GCPtr); +GCOps *clMatchCommon(GCPtr, cfbPrivGCPtr); +/* clbitblt.c */ +void clDoBitblt(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr, + unsigned long); +RegionPtr clCopyArea(DrawablePtr, DrawablePtr, GC *, int, int, int, int, int, + int); +/* clfillrct.c */ +void clPolyFillRect(DrawablePtr, GCPtr, int, xRectangle *); +/* clwindow.c */ +void clCopyWindow(WindowPtr, DDXPointRec, RegionPtr); + +void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr, + DDXPointPtr, unsigned long); 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c Mon May 23 15:42:53 2011 @@ -46,20 +46,18 @@ #include "fastblt.h" #define MFB_CONSTS_ONLY #include "maskbits.h" - -void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr, - DDXPointPtr, unsigned long); - +#include "amigaCL.h" void -clDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +clDoBitblt( + DrawablePtr pSrc, DrawablePtr pDst, + int alu, + RegionPtr prgnDst, + DDXPointPtr pptSrc, + unsigned long planemask) { - void (*blt)() = cfbDoBitbltGeneral; + void (*blt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr, + unsigned long) = cfbDoBitbltGeneral; if ((planemask & PMSK) == PMSK) { switch (alu) { case GXcopy: @@ -77,16 +75,16 @@ } RegionPtr -clCopyArea(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; +clCopyArea( + DrawablePtr pSrcDrawable, + DrawablePtr pDstDrawable, + GC *pGC, + int srcx, int srcy, + int width, int height, + int dstx, int dsty) { - void (*doBitBlt) (); + void (*doBitBlt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr, + unsigned long) = cfbDoBitbltGeneral; doBitBlt = clDoBitbltCopy; if (pGC->alu != GXcopy || (pGC->planemask & PMSK) != PMSK) 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c Mon May 23 15:42:53 2011 @@ -48,6 +48,7 @@ #include <stdio.h> #include "clstuff.h" /* defines for blitting */ +#include "amigaCL.h" /*static unsigned char *clregs,*clfb;*/ #ifdef notdef /* XXX fails right now, walks off end of pixmaps */ @@ -61,12 +62,13 @@ #endif void -MROP_NAME(clDoBitblt)(pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +MROP_NAME(clDoBitblt)( + DrawablePtr pSrc, + DrawablePtr pDst, + int alu, + RegionPtr prgnDst, + DDXPointPtr pptSrc, + unsigned long planemask) { unsigned long *psrcBase, *pdstBase; /* start of src and dst bitmaps */ 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c Mon May 23 15:42:53 2011 @@ -42,18 +42,17 @@ #include "cfb.h" #include "cfbmskbits.h" #include "mergerop.h" +#include "amigaCL.h" -void clFillRectSolidCopy(); - #define NUM_STACK_RECTS 1024 void -clPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +clPolyFillRect( + DrawablePtr pDrawable, + GCPtr pGC, + int nrectFill, /* number of rectangles to fill */ + xRectangle *prectInit) /* Pointer to first rectangle to fill */ { xRectangle *prect; RegionPtr prgnClip; 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c Mon May 23 15:42:53 2011 @@ -97,10 +97,8 @@ # define ZeroPolyArc miZeroPolyArc #endif +#include "amigaCL.h" -void clPolyFillRect(); -RegionPtr clCopyArea(); -void clValidateGC(); GCFuncs clGCFuncs = { clValidateGC, @@ -231,9 +229,7 @@ }; GCOps * -clMatchCommon (pGC, devPriv) - GCPtr pGC; - cfbPrivGCPtr devPriv; +clMatchCommon(GCPtr pGC, cfbPrivGCPtr devPriv) { if (pGC->lineWidth != 0) return 0; @@ -275,8 +271,7 @@ } Bool -clCreateGC(pGC) - register GCPtr pGC; +clCreateGC(GCPtr pGC) { cfbPrivGC *pPriv; @@ -318,10 +313,7 @@ */ void -clValidateGC(pGC, changes, pDrawable) - register GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +clValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { int mask; /* stateChanges */ int index; /* used for stepping through bitfields */ 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.1 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.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c Mon May 23 15:42:53 2011 @@ -111,12 +111,14 @@ # endif #endif +#include "amigaCL.h" + void -RROP_NAME(clFillRectSolid) (pDrawable, pGC, nBox, pBox) - DrawablePtr pDrawable; - GCPtr pGC; - int nBox; - BoxPtr pBox; +RROP_NAME(clFillRectSolid)( + DrawablePtr pDrawable, + GCPtr pGC, + int nBox, + BoxPtr pBox) { register int m; register unsigned long *pdst; @@ -227,4 +229,3 @@ #endif } } - 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.2 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.2 Fri Oct 15 03:56:18 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c Mon May 23 15:42:53 2011 @@ -54,11 +54,10 @@ #include "mistruct.h" #include "regionstr.h" #include "cfbmskbits.h" +#include "amigaCL.h" extern WindowPtr *WindowTable; -extern void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr, - DDXPointPtr, unsigned long); /* UNCLEAN! this code calls the bitblt helper code directly. @@ -69,10 +68,10 @@ void -clCopyWindow(pWin, ptOldOrg, prgnSrc) - WindowPtr pWin; - DDXPointRec ptOldOrg; - RegionPtr prgnSrc; +clCopyWindow( + WindowPtr pWin, + DDXPointRec ptOldOrg, + RegionPtr prgnSrc) { DDXPointPtr pptSrc; register DDXPointPtr ppt;