Module Name: xsrc
Committed By: christos
Date: Wed May 25 17:38:44 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c
amigaFbs.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.c amigaCV.h
amigaCVCursor.c amigaCVim.c xf86bcache.c xf86bcache.h xf86fcache.c
xf86fcache.h
Log Message:
more prototype work.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h
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.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h Wed May 25 13:38:44 2011
@@ -194,73 +194,120 @@
extern int amigaXdebug; /* Flag for debugging output to /tmp/xlog */
-extern Bool amigaCursorInitialize(
-#if NeedFunctionPrototypes
- ScreenPtr /* pScreen */
-#endif
+
+/*-
+ * TVTOMILLI(tv)
+ * Given a struct timeval, convert its time into milliseconds...
+ */
+#define TVTOMILLI(tv) (((tv).tv_usec/1000)+((tv).tv_sec*1000))
+#define TRACE(f) do { ErrorF("[%s #%d] ",__FILE__,__LINE__); ErrorF f; } while(0)
+
+/* amigaC.c */
+extern Bool amigaCInit(
+ int,
+ ScreenPtr,
+ int,
+ char **
);
-extern void amigaDisableCursor(
-#if NeedFunctionPrototypes
- ScreenPtr /* pScreen */
-#endif
+extern int xopen_view(
+ void
);
-extern int amigaChangeKbdTranslation(
-#if NeedFunctionPrototypes
- int /* fd */,
- Bool /* makeTranslated */
-#endif
+extern Bool amigaCProbe(
+ ScreenInfo *,
+ int,
+ int,
+ int,
+ char **
);
-extern void amigaNonBlockConsoleOff(
-#if NeedFunctionPrototypes
- void /* no args */
-#endif
+extern Bool amigaCCreate(
+ ScreenInfo *,
+ int,
+ char **
);
-extern void amigaEnqueueEvents(
-#if NeedFunctionPrototypes
- void
-#endif
+/* amigaCfb.c */
+extern void amigaInstallColormap(
+ ColormapPtr /* cmap */
+);
+
+extern void amigaUninstallColormap(
+ ColormapPtr /* cmap */
+);
+
+extern int amigaListInstalledColormaps(
+ ScreenPtr /* pScreen */,
+ Colormap* /* pCmapList */
+);
+
+extern void CGScreenInit(
+ ScreenPtr
+);
+
+extern Bool amigaGRFInit(
+ int,
+ ScreenPtr,
+ int,
+ char **
+);
+
+extern Bool amigaRZ3Init(
+ int,
+ ScreenPtr,
+ int,
+ char **
+);
+
+extern Bool amigaCLInit(
+ int,
+ ScreenPtr,
+ int,
+ char **
);
extern int amigaGXInit(
-#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
fbFd* /* fb */
-#endif
);
-extern Bool amigaSaveScreen(
-#if NeedFunctionPrototypes
- ScreenPtr /* pScreen */,
- int /* on */
-#endif
+/* amigaCursor.c */
+extern void amigaCVSetPanning(
+ fbFd *,
+ unsigned short,
+ unsigned short
);
-extern Bool amigaScreenInit(
-#if NeedFunctionPrototypes
+extern Bool amigaCursorInitialize(
ScreenPtr /* pScreen */
-#endif
);
+extern void amigaDisableCursor(
+ ScreenPtr /* pScreen */
+);
+
+/* amigaFbs.c */
extern pointer amigaMemoryMap(
-#if NeedFunctionPrototypes
size_t /* len */,
off_t /* off */,
int /* fd */
-#endif
);
extern Bool amigaScreenAllocate(
-#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
-#endif
+);
+
+extern Bool amigaSaveScreen(
+ ScreenPtr /* pScreen */,
+ int /* on */
+);
+
+extern Bool amigaScreenInit(
+ ScreenPtr /* pScreen */
);
extern Bool amigaInitCommon(
-#if NeedFunctionPrototypes
int /* scrn */,
ScreenPtr /* pScrn */,
Bool (* /* init1 */)(),
@@ -268,80 +315,33 @@
Bool (* /* cr_cm */)(),
Bool (* /* save */)(),
int /* fb_off */
-#endif
);
-extern Firm_event* amigaKbdGetEvents(
-#if NeedFunctionPrototypes
- int /* fd */,
- Bool /* on */,
- int* /* pNumEvents */,
- Bool* /* pAgain */
-#endif
-);
-
-extern Firm_event* amigaMouseGetEvents(
-#if NeedFunctionPrototypes
- int /* fd */,
- Bool /* on */,
- int* /* pNumEvents */,
- Bool* /* pAgain */
-#endif
-);
-
-extern Firm_event* amigaSerGetEvents(
-#if NeedFunctionPrototypes
- int /* fd */,
- Bool /* on */,
- int* /* pNumEvents */,
- Bool* /* pAgain */
-#endif
+/* amigaInit.c */
+extern void amigaNonBlockConsoleOff(
+ void /* no args */
);
-extern void amigaKbdEnqueueEvent(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* device */,
- Firm_event* /* fe */
-#endif
+extern void OsVendorPreInit(
+ void
);
-extern void amigaMouseEnqueueEvent(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* device */,
- Firm_event* /* fe */,
- Firm_event* /* fe_next */
-#endif
+extern void OsVendorInit(
+ void
);
-extern int amigaKbdProc(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* pKeyboard */,
- int /* what */
-#endif
+extern void InitOutput(
+ ScreenInfo *,
+ int,
+ char **
);
-extern int amigaMouseProc(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* pMouse */,
- int /* what */
-#endif
+extern void InitInput(
+ int,
+ char **
);
-extern void amigaKbdWait(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-/*-
- * TVTOMILLI(tv)
- * Given a struct timeval, convert its time into milliseconds...
- */
-#define TVTOMILLI(tv) (((tv).tv_usec/1000)+((tv).tv_sec*1000))
-#define TRACE(f) do { ErrorF("[%s #%d] ",__FILE__,__LINE__); ErrorF f; } while(0)
-
extern Bool amigaCfbSetupScreen(
-#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
pointer /* pbits */, /* pointer to screen bitmap */
int /* xsize */, /* in pixels */
@@ -350,11 +350,9 @@
int /* dpiy */, /* dots per inch */
int /* width */, /* pixel width of frame buffer */
int /* bpp */ /* bits per pixel of root */
-#endif
);
extern Bool amigaCfbFinishScreenInit(
-#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
pointer /* pbits */, /* pointer to screen bitmap */
int /* xsize */, /* in pixels */
@@ -363,11 +361,9 @@
int /* dpiy */, /* dots per inch */
int /* width */, /* pixel width of frame buffer */
int /* bpp */ /* bits per pixel of root */
-#endif
);
extern Bool amigaCfbScreenInit(
-#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
pointer /* pbits */, /* pointer to screen bitmap */
int /* xsize */, /* in pixels */
@@ -376,26 +372,144 @@
int /* dpiy */, /* dots per inch */
int /* width */, /* pixel width of frame buffer */
int /* bpp */ /* bits per pixel of root */
-#endif
);
-extern void amigaInstallColormap(
-#if NeedFunctionPrototypes
- ColormapPtr /* cmap */
-#endif
+extern Bool amigaCfbCreateGC(
+ GCPtr
);
-extern void amigaUninstallColormap(
-#if NeedFunctionPrototypes
- ColormapPtr /* cmap */
-#endif
+extern void OsVendorFatalError(
+ void
);
-extern int amigaListInstalledColormaps(
-#if NeedFunctionPrototypes
- ScreenPtr /* pScreen */,
- Colormap* /* pCmapList */
-#endif
+extern void DPMSSet(
+ int
+);
+
+extern int DPMSGet(
+ int *
);
+extern Bool DPMSSupported(
+ void
+);
+
+/* amigaIo.c */
+extern void ProcessInputEvents(
+ void
+);
+
+extern void amigaEnqueueEvents(
+ void
+);
+
+extern void AbortDDX(
+ void
+);
+
+extern void ddxGiveUp(
+ void
+);
+
+extern int ddxProcessArgument(
+ int,
+ char *[],
+ int
+);
+
+extern void ddxUseMsg(
+ void
+);
+
+
+/* amigaKbd.c */
+extern int amigaCVChangeMode(
+ int
+);
+
+extern void amigaKbdWait(
+ void
+);
+
+extern int amigaKbdProc(
+ DeviceIntPtr /* pKeyboard */,
+ int /* what */
+);
+
+extern Firm_event* amigaKbdGetEvents(
+ int /* fd */,
+ Bool /* on */,
+ int* /* pNumEvents */,
+ Bool* /* pAgain */
+);
+
+extern void amigaKbdEnqueueEvent(
+ DeviceIntPtr /* device */,
+ Firm_event* /* fe */
+);
+
+extern void amigaEnqueueAutoRepeat(
+ void
+);
+
+extern int amigaChangeKbdTranslation(
+ int /* fd */,
+ Bool /* makeTranslated */
+);
+
+extern Bool LegalModifier(
+ unsigned int,
+ DevicePtr
+);
+
+extern void amigaBlockHandler(
+ int,
+ pointer,
+ struct timeval **,
+ pointer
+);
+
+extern void amigaWakeupHandler(
+ int,
+ pointer,
+ unsigned long,
+ pointer
+);
+
+
+/* amigaMfb.c */
+extern Bool amigaCCInit(
+ int,
+ ScreenPtr,
+ int,
+ char **
+);
+
+/* amigaMouse.c */
+extern int amigaMouseProc(
+ DeviceIntPtr /* pMouse */,
+ int /* what */
+);
+
+extern Firm_event* amigaMouseGetEvents(
+ int /* fd */,
+ Bool /* on */,
+ int* /* pNumEvents */,
+ Bool* /* pAgain */
+);
+
+extern Firm_event* amigaSerGetEvents(
+ int /* fd */,
+ Bool /* on */,
+ int* /* pNumEvents */,
+ Bool* /* pAgain */
+);
+
+extern void amigaMouseEnqueueEvent(
+ DeviceIntPtr /* device */,
+ Firm_event* /* fe */,
+ Firm_event* /* fe_next */
+);
+
+
#endif
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c Wed May 25 13:38:44 2011
@@ -285,13 +285,8 @@
extern miPointerScreenFuncRec amigaPointerScreenFuncs;
-#if NeedFunctionPrototypes
Bool amigaCursorInitialize (
ScreenPtr pScreen)
-#else
-Bool amigaCursorInitialize (pScreen)
- ScreenPtr pScreen;
-#endif
{
SetupCursor (pScreen);
struct grf_position maxsize;
@@ -311,13 +306,8 @@
return TRUE;
}
-#if NeedFunctionPrototypes
void amigaDisableCursor (
ScreenPtr pScreen)
-#else
-void amigaDisableCursor (pScreen)
- ScreenPtr pScreen;
-#endif
{
SetupCursor (pScreen);
struct grf_spriteinfo spriteinfo;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.2 Fri Dec 9 00:44:50 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c Wed May 25 13:38:44 2011
@@ -79,17 +79,10 @@
static unsigned long generation = 0;
-#if NeedFunctionPrototypes
pointer amigaMemoryMap (
size_t len,
off_t off,
int fd)
-#else
-pointer amigaMemoryMap (len, off, fd)
- size_t len;
- off_t off;
- int fd;
-#endif
{
int pagemask, mapsize;
caddr_t addr;
@@ -110,13 +103,8 @@
return mapaddr;
}
-#if NeedFunctionPrototypes
Bool amigaScreenAllocate (
ScreenPtr pScreen)
-#else
-Bool amigaScreenAllocate (pScreen)
- ScreenPtr pScreen;
-#endif
{
amigaScreenPtr pPrivate;
extern int AllocateScreenPrivateIndex();
@@ -136,15 +124,9 @@
return TRUE;
}
-#if NeedFunctionPrototypes
Bool amigaSaveScreen (
ScreenPtr pScreen,
int on)
-#else
-Bool amigaSaveScreen (pScreen, on)
- ScreenPtr pScreen;
- int on;
-#endif
{
int state;
@@ -176,13 +158,8 @@
return ret;
}
-#if NeedFunctionPrototypes
Bool amigaScreenInit (
ScreenPtr pScreen)
-#else
-Bool amigaScreenInit (pScreen)
- ScreenPtr pScreen;
-#endif
{
SetupScreen(pScreen);
extern void amigaBlockHandler();
@@ -230,7 +207,6 @@
return TRUE;
}
-#if NeedFunctionPrototypes
Bool amigaInitCommon (
int scrn,
ScreenPtr pScrn,
@@ -239,16 +215,6 @@
Bool (*cr_cm)(),
Bool (*save)(),
int fb_off)
-#else
-Bool amigaInitCommon (scrn, pScrn, init1, init2, cr_cm, save, fb_off)
- int scrn;
- ScreenPtr pScrn;
- Bool (*init1)();
- void (*init2)();
- Bool (*cr_cm)();
- Bool (*save)();
- int fb_off;
-#endif
{
unsigned char* fb = amigaFbs[scrn].fb;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c:1.4 Thu Aug 3 16:01:05 2006
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c Wed May 25 13:38:44 2011
@@ -55,16 +55,6 @@
extern int cfb16ScreenPrivateIndex, cfb32ScreenPrivateIndex;
-
-
-
-extern void
-amigaCVFindOrdering ();
-
-
-
-
-
short s3alu[16] =
{
MIX_0,
@@ -86,12 +76,6 @@
};
-extern RegionPtr cfb8CopyArea(), cfb16CopyArea(), cfb32CopyArea();
-extern RegionPtr cfb8CopyPlane(), cfb16CopyPlane(), cfb32CopyPlane();
-
-extern RegionPtr cfb8BitBlt(), cfb16BitBlt(), cfb32BitBlt();
-
-
static unsigned long copyPlaneFG, copyPlaneBG;
@@ -103,25 +87,6 @@
int amigaCVGeneration;
-/* externs from amigaCVblt.c */
-extern void amigaCVFindOrdering ();
-extern RegionPtr amigaCVCopyArea();
-extern RegionPtr amigaCVCopyPlane();
-
-/* externs from amigaCVfrect.c */
-extern void amigaCVFillSpans();
-extern void amigaCVPolyFillRect();
-
-/* externs from amigaCVim.c */
-extern void amigaCVImageInit (fbFd *);
-
-
-
-void amigaCVValidateGC ();
-void amigaCVDestroyGC ();
-void amiga8CVValidateGC (), amiga16CVValidateGC (), amiga32CVValidateGC ();
-
-
extern GCFuncs amiga8CVGCFuncs;
extern GCFuncs amiga16CVGCFuncs;
@@ -152,10 +117,7 @@
FONTMINBOUNDS(font,leftSideBearing))
GCOps *
-amigaCVMatchCommon (pGC, devPriv, bpp)
- GCPtr pGC;
- cfbPrivGCPtr devPriv;
- int bpp;
+amigaCVMatchCommon(GCPtr pGC, cfbPrivGCPtr devPriv, int bpp)
{
if (pGC->lineWidth != 0)
return 0;
@@ -166,7 +128,7 @@
if (devPriv->rop != GXcopy)
return 0;
if (pGC->font &&
- FONTWIDTH (pGC->font) <= 32 &&
+ FONTWIDTH(pGC->font) <= 32 &&
FONTMINBOUNDS(pGC->font,characterWidth) >= 0)
{
if (bpp == 8)
@@ -216,35 +178,30 @@
return 0;
}
-extern void amiga8CVValidateGC();
-extern void amiga16CVValidateGC();
-extern void amiga32CVValidateGC();
-
-
void
-amigaCVDestroyGC (pGC)
- GCPtr pGC;
+amigaCVDestroyGC(GCPtr pGC)
{
- amigaCVPrivGCPtr gxPriv = amigaCVGetGCPrivate (pGC);
+ amigaCVPrivGCPtr gxPriv = amigaCVGetGCPrivate(pGC);
#if 0
if (gxPriv->stipple)
- xfree (gxPriv->stipple);
+ xfree(gxPriv->stipple);
#endif
- miDestroyGC (pGC);
+ miDestroyGC(pGC);
}
-amigaCVCreateGC (pGC)
- GCPtr pGC;
+
+Bool
+amigaCVCreateGC(GCPtr pGC)
{
amigaCVPrivGCPtr gxPriv;
if (pGC->depth == 1)
- return mfbCreateGC (pGC);
+ return mfbCreateGC(pGC);
#if AMIGAMAXDEPTH == 32
if (!amigaCfbCreateGC(pGC))
#else
- if (!cfbCreateGC (pGC))
+ if (!cfbCreateGC(pGC))
#endif
return FALSE;
if (pGC->depth == 8)
@@ -273,10 +230,7 @@
void
-amigaCVCopyWindow(pWin, ptOldOrg, prgnSrc)
- WindowPtr pWin;
- DDXPointRec ptOldOrg;
- RegionPtr prgnSrc;
+amigaCVCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
{
RegionPtr prgnDst;
register BoxPtr pbox, pboxOrig;
@@ -286,7 +240,7 @@
unsigned int *ordering;
GC dummyGC;
fbFd *inf = amigaInfo(pWin->drawable.pScreen);
- volatile caddr_t vgaBase = (volatile caddr_t) (inf->regs);
+ volatile caddr_t vgaBase = (volatile caddr_t)(inf->regs);
dummyGC.subWindowMode = ClipByChildren; /* ~IncludeInferiors */
@@ -386,7 +340,8 @@
}
-void amigaCVadjustVirtual (volatile caddr_t ba)
+void
+amigaCVadjustVirtual(volatile caddr_t ba)
{
unsigned char cr50, test;
fbFd *inf = amigaInfo(amigaCVsavepScreen);
@@ -437,10 +392,10 @@
HDE = amigaVirtualWidth / 2;
break;
default: /* ??? */
- __dolog ("wrong depth %d\n", depth);
+ __dolog("wrong depth %d\n", depth);
}
- WCrt (ba, CRT_ID_SCREEN_OFFSET, (HDE & 0xff));
+ WCrt(ba, CRT_ID_SCREEN_OFFSET, (HDE & 0xff));
__dolog("VW %d, HDE %x\n", (int)amigaVirtualWidth, (int)HDE);
@@ -456,15 +411,8 @@
-#if NeedFunctionPrototypes
-amigaCVGXInit (
- ScreenPtr pScreen,
- fbFd *fb)
-#else
-amigaCVGXInit (pScreen, fb)
- ScreenPtr pScreen;
- fbFd *fb;
-#endif
+Bool
+amigaCVGXInit(ScreenPtr pScreen, fbFd *fb)
{
unsigned int mode;
register long r;
@@ -477,11 +425,11 @@
amigaCVScreenPrivateIndex = AllocateScreenPrivateIndex();
if (amigaCVScreenPrivateIndex == -1)
return FALSE;
- amigaCVGCPrivateIndex = AllocateGCPrivateIndex ();
- amigaCVWindowPrivateIndex = AllocateWindowPrivateIndex ();
+ amigaCVGCPrivateIndex = AllocateGCPrivateIndex();
+ amigaCVWindowPrivateIndex = AllocateWindowPrivateIndex();
amigaCVGeneration = serverGeneration;
}
- if (!AllocateGCPrivate(pScreen, amigaCVGCPrivateIndex, sizeof (amigaCVPrivGCRec)))
+ if (!AllocateGCPrivate(pScreen, amigaCVGCPrivateIndex, sizeof(amigaCVPrivGCRec)))
return FALSE;
if (!AllocateWindowPrivate(pScreen, amigaCVWindowPrivateIndex, 0))
return FALSE;
@@ -524,6 +472,3 @@
return TRUE;
}
-
-
-
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.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h Wed May 25 13:38:44 2011
@@ -264,6 +264,42 @@
#define amigaInfo(s) (&amigaFbs[(s)->myNum])
+static __inline unsigned char RAttr(volatile void * ba, short idx) {
+ abort();
+#if 0
+ vgaw (ba, ACT_ADDRESS, idx);
+ return vgar (ba, ACT_ADDRESS_R);
+#endif
+}
+
+static __inline unsigned char RSeq(volatile void * ba, short idx) {
+ abort();
+#if 0
+ vgaw (ba, SEQ_ADDRESS, idx);
+ return vgar (ba, SEQ_ADDRESS_R);
+#endif
+}
+
+static __inline unsigned char RCrt(volatile void * ba, short idx) {
+ abort();
+#if 0
+ vgaw (ba, CRT_ADDRESS, idx);
+ return vgar (ba, CRT_ADDRESS_R);
+#endif
+}
+
+static __inline unsigned char RGfx(volatile void * ba, short idx) {
+ abort();
+#if 0
+ vgaw(ba, GCT_ADDRESS, idx);
+ return vgar (ba, GCT_ADDRESS_R);
+#endif
+}
+
+static __inline void amiga_membarrier() {
+ abort();
+}
+
/* don't forget to init vgaBase and inf before using these macros! */
#if 0
@@ -441,8 +477,91 @@
#define amigaCVSetWindowPrivate(w,p) (\
(w)->devPrivates[amigaCVWindowPrivateIndex].ptr = (pointer) p)
-
-
-
+/* amiga16CVgc.c */
+Bool s3CreateGC16(GCPtr);
+void amiga16CVValidateGC(GCPtr, Mask, DrawablePtr);
+
+/* amiga32CVgc.c */
+Bool s3CreateGC32(GCPtr);
+void amiga32CVValidateGC(GCPtr, Mask, DrawablePtr);
+
+/* amiga8CVgc.c */
+Bool s3CreateGC(GCPtr);
+void amiga8CVValidateGC(GCPtr, Mask, DrawablePtr);
+
+/* amigaCV.c */
+GCOps *amigaCVMatchCommon(GCPtr, cfbPrivGCPtr, int);
+void amigaCVDestroyGC(GCPtr);
+Bool amigaCVCreateGC(GCPtr);
+void amigaCVCopyWindow(WindowPtr, DDXPointRec, RegionPtr);
+void amigaCVadjustVirtual(volatile caddr_t);
+Bool amigaCVGXInit(ScreenPtr, fbFd *);
+
+/* amigaCVCursor.c */
+short swap16(unsigned short);
+Bool amigaCVCursorInit(ScreenPtr);
+void amigaCVRestoreCursor(ScreenPtr);
+void amigaCVRepositionCursor(ScreenPtr);
+void amigaCVSetPanning2(fbFd *, unsigned int, unsigned int);
+void amigaCVRenewCursorColor(ScreenPtr);
+void s3WarpCursor(ScreenPtr, int, int );
+
+/* amigaCVblt.c */
+void amigaCVFindOrdering(DrawablePtr, DrawablePtr, GC *, int, BoxPtr, int, int, int, int, unsigned int *);
+
+/* amigaCVbstor.c */
+void amigaCVSaveAreas(PixmapPtr, RegionPtr, int, int, WindowPtr);
+void amigaCVRestoreAreas(PixmapPtr, RegionPtr, int, int, WindowPtr);
+
+/* amigaCVfrect.c */
+void amigaCVInitFrect(int, int, int);
+void amigaCVPolyFillRect(DrawablePtr, GCPtr, int, xRectangle *);
+void amigaCVFillSpans(DrawablePtr, GCPtr, int, DDXPointPtr, int *, int);
+
+/* amigaCVim.c */
+void amigaCVImageInit(fbFd *);
+void amigaCVImageWrite(int, int, int, int, char *, int, int, int, int, 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 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 *);
+
+/* amigaCVline.c */
+void amigaCVLine(DrawablePtr, GCPtr, int, int, DDXPointPtr);
+
+/* amigaCVplypt.c */
+void amigaCVPolyPoint(DrawablePtr, GCPtr, int, int, xPoint *);
+
+/* amigaCVscrin.c */
+Bool amigaCVInit(int, ScreenPtr, int, char **);
+
+/* amigaCVseg.c */
+void amigaCVSegment(DrawablePtr, GCPtr, int, xSegment *);
+
+/* s3bcach.c */
+void s3CacheMoveBlock(int, int , int , int , int , int , unsigned int);
+
+/* s3font.c */
+Bool s3RealizeFont(ScreenPtr, FontPtr);
+Bool s3UnrealizeFont(ScreenPtr, FontPtr);
+
+/* s3ss.c */
+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);
+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 *);
#endif /* _REGS3_H */
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.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c Wed May 25 13:38:44 2011
@@ -92,9 +92,7 @@
/* fuck the optimizer! */
-#undef vgar
-
-int vgar(volatile caddr_t ba, int idx)
+static int xvgar(volatile caddr_t ba, int idx)
{
register int erg;
asm volatile ("movel %1, %%a0;\
@@ -112,9 +110,9 @@
#define VerticalRetraceWait(ba) \
{ \
- while ((vgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x00) ; \
- while ((vgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x08) ; \
- while ((vgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x00) ; \
+ while ((xvgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x00) ; \
+ while ((xvgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x08) ; \
+ while ((xvgar(ba, GREG_INPUT_STATUS1_R) & 0x08) == 0x00) ; \
}
@@ -437,7 +435,7 @@
if (depth > 8 && depth <= 16) xoff *= 2;
else if (depth > 16) xoff *= 4;
- vgar(ba, ACT_ADDRESS_RESET);
+ xvgar(ba, ACT_ADDRESS_RESET);
#if 0
WAttr(ba, ACT_ID_HOR_PEL_PANNING, (unsigned char)((xoff << 1) & 0x07));
@@ -568,7 +566,7 @@
/* reset colour stack */
/*test = RCrt(vgaBase, CRT_ID_HWGC_MODE);*/
vgaw(vgaBase, CRT_ADDRESS, CRT_ID_HWGC_MODE);
- test = vgar(vgaBase, CRT_ADDRESS_R);
+ test = xvgar(vgaBase, CRT_ADDRESS_R);
/*asm volatile("nop");*/
switch (depth) {
@@ -604,7 +602,7 @@
/*test = RCrt(vgaBase, CRT_ID_HWGC_MODE);*/
/*asm volatile("nop");*/
vgaw(vgaBase, CRT_ADDRESS, CRT_ID_HWGC_MODE);
- test = vgar(vgaBase, CRT_ADDRESS_R);
+ test = xvgar(vgaBase, CRT_ADDRESS_R);
switch (depth) {
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.1 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.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c Wed May 25 13:38:44 2011
@@ -113,43 +113,6 @@
-void amigaCVImageWriteNoMem (
-#if NeedFunctionPrototypes
- int x,
- int y,
- int w,
- int h,
- char *psrc,
- int pwidth,
- int px,
- int py,
- short alu,
- unsigned long planemask, fbFd *inf
-#endif
-);
-
-void
-amigaCVImageFillNoMem (
-#if NeedFunctionPrototypes
- int x,
- int y,
- int w,
- int h,
- char *psrc,
- int pwidth,
- int pw,
- int ph,
- int pox,
- int poy,
- short alu,
- unsigned long planemask,
- fbFd *inf
-#endif
-);
-
-
-extern void amigaCVInitFrect( int, int, int);
-
#define ALIGNMENT 8
#define MAX_PIXMAP_WIDTH 64
#define MIN_PIXMAP_WIDTH 8
@@ -160,14 +123,6 @@
unsigned short s3SwapBits[256];
-extern void s3FontStipple();
-extern void s3GlyphWrite
- (int, int, int, unsigned char *,CacheFont8Ptr, GCPtr, BoxPtr, int);
-
-extern int s3NoCPolyText(DrawablePtr, GCPtr, int, int, int, char*, Bool);
-extern int s3NoCImageText(DrawablePtr, GCPtr, int, int, int, char *, Bool);
-extern void s3CacheMoveBlock();
-
void amigaCVImageInit (fbFd *inf)
{
int i;
@@ -242,7 +197,6 @@
void
-#if NeedFunctionPrototypes
amigaCVImageWrite (
int x,
int y,
@@ -254,20 +208,6 @@
int py,
short alu,
unsigned long planemask, fbFd *inf)
-#else
-amigCVImageWrite (x, y, w, h, psrc, pwidth, px, py, alu, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int px;
- int py;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
int j, offset;
int depth = inf->info.gd_planes;
@@ -338,7 +278,6 @@
}
void
-#if NeedFunctionPrototypes
amigaCVImageRead (
int x,
int y,
@@ -350,19 +289,6 @@
int py,
unsigned long planemask,
fbFd *inf)
-#else
-amigaCVImageRead (x, y, w, h, psrc, pwidth, px, py, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int px;
- int py;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
int j, offset;
int depth = inf->info.gd_planes;
@@ -453,7 +379,6 @@
void
-#if NeedFunctionPrototypes
amigaCVImageFill (
int x,
int y,
@@ -468,22 +393,6 @@
short alu,
unsigned long planemask,
fbFd *inf)
-#else
-amigaCVImageFill (x, y, w, h, psrc, pwidth, pw, ph, pox, poy, alu, planemask)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int pw;
- int ph;
- int pox;
- int poy;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
int j;
char *pline;
@@ -567,7 +476,6 @@
void
-#if NeedFunctionPrototypes
amigaCVImageWriteNoMem (
int x,
int y,
@@ -580,20 +488,6 @@
short alu,
unsigned long planemask,
fbFd *inf)
-#else
-amigaCVImageWriteNoMem (x, y, w, h, psrc, pwidth, px, py, alu, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int px;
- int py;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
int i, j;
int depth = inf->info.gd_planes;
@@ -650,7 +544,6 @@
void
-#if NeedFunctionPrototypes
amigaCVImageReadNoMem (
int x,
int y,
@@ -662,19 +555,6 @@
int py,
unsigned long planemask,
fbFd* inf)
-#else
-amigaCVImageReadNoMem (x, y, w, h, psrc, pwidth, px, py, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int px;
- int py;
- unsigned long planemask;
- fbFd* inf;
-#endif
{
int i, j;
int depth = inf->info.gd_planes;
@@ -742,7 +622,6 @@
void
-#if NeedFunctionPrototypes
amigaCVImageFillNoMem (
int x,
int y,
@@ -757,22 +636,6 @@
short alu,
unsigned long planemask,
fbFd *inf)
-#else
-amigaCVImageFillNoMem (x, y, w, h, psrc, pwidth, pw, ph, pox, poy, alu, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int pw;
- int ph;
- int pox;
- int poy;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
int i, j;
char *pline;
@@ -862,21 +725,23 @@
#define MSKBIT(n) (_internal_s3_mskbits[(n)])
static void
-amigaCVRealImageStipple(x, y, w, h, psrc, pwidth, pw, ph, pox, poy,
- fgPixel, bgPixel, alu, planemask, opaque, inf)
- int x;
- int y;
- int w;
- int h;
- unsigned char *psrc;
- int pw, ph, pox, poy;
- int pwidth;
- Pixel fgPixel;
- Pixel bgPixel;
- short alu;
- Pixel planemask;
- int opaque;
- fbFd *inf;
+amigaCVRealImageStipple(
+ int x,
+ int y,
+ int w,
+ int h,
+ unsigned char *psrc,
+ int pw,
+ int ph,
+ int pox,
+ int poy,
+ int pwidth,
+ Pixel fgPixel,
+ Pixel bgPixel,
+ short alu,
+ Pixel planemask,
+ int opaque,
+ fbFd *inf)
{
int srcx, srch, dstw;
unsigned char *ptmp;
@@ -1024,7 +889,6 @@
}
void
-#if NeedFunctionPrototypes
amigaCVImageStipple (
int x,
int y,
@@ -1040,30 +904,12 @@
short alu,
unsigned long planemask,
fbFd *inf)
-#else
-amigaCVImageStipple (x, y, w, h, psrc, pwidth, pw, ph, pox, poy, fgPixel, alu, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int pw;
- int ph;
- int pox;
- int poy;
- Pixel fgPixel;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
amigaCVRealImageStipple(x, y, w, h, psrc, pwidth, pw, ph, pox, poy,
fgPixel, 0, alu, planemask, 0, inf);
}
-#if NeedFunctionPrototypes
void
amigaCVImageOpStipple (
int x,
@@ -1081,33 +927,8 @@
short alu,
unsigned long planemask,
fbFd *inf)
-#else
-void
-amigaCVImageOpStipple (x, y, w, h, psrc, pwidth, pw,
- ph, pox, poy, fgPixel, bgPixel, alu, planemask, inf)
- int x;
- int y;
- int w;
- int h;
- char *psrc;
- int pwidth;
- int pw, ph, pox, poy;
- Pixel fgPixel;
- Pixel bgPixel;
- short alu;
- unsigned long planemask;
- fbFd *inf;
-#endif
{
amigaCVRealImageStipple(x, y, w, h, psrc, pwidth, pw, ph, pox, poy,
fgPixel, bgPixel, alu, planemask, 1, inf);
}
-
-
-
-
-
-
-
-
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c Wed May 25 13:38:44 2011
@@ -130,16 +130,8 @@
* that is linked to the CachePool structure.
*/
-#ifdef __STDC__
void xf86AddToCachePool( CachePool Pool, short x, short y,
short Width, short Height, unsigned int Id )
-#else
-void xf86AddToCachePool( Pool, x, y, Width, Height, Id )
-CachePool Pool;
-short x, y, Width, Height;
-unsigned int Id;
-#endif
-
{
bitMapRowPtr bptr;
CacheRecPtr CrPtr;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h Wed May 25 13:38:44 2011
@@ -87,41 +87,31 @@
void xf86InitCache(
-#if NeedFunctionPrototypes
void (*/*CacheShiftBlockFunc*/)(int, int, int, int, int, int, unsigned int)
-#endif
);
CachePool xf86CreateCachePool(
-#if NeedFunctionPrototypes
unsigned int /*Alignment*/
-#endif
);
void xf86AddToCachePool(
-#if NeedFunctionPrototypes
CachePool /*Pool*/,
short /*x*/,
short /*y*/,
short /*Width*/,
short /*Heigth*/,
unsigned int /*Id*/
-#endif
);
CacheBlock xf86AllocFromCachePool(
-#if NeedFunctionPrototypes
CachePool /*Pool*/,
short /*Width*/,
short /*Height*/
-#endif
);
void xf86ReleaseToCachePool(
-#if NeedFunctionPrototypes
CachePool /*Pool*/,
CacheBlock /*Block*/
-#endif
);
#endif /* _XF86_BCACHE_H */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c Wed May 25 13:38:44 2011
@@ -62,24 +62,14 @@
*/
void
-#if NeedFunctionPrototypes
xf86InitFontCache(
CachePool FontCache,
int MaxWidth,
int MaxHeight,
void (*FontOpStippleFunc)(
-#if NeedNestedPrototypes
int, int, int, int, unsigned char *, int, Pixel
-#endif
)
)
-#else
-xf86InitFontCache( FontCache, MaxWidth, MaxHeight, FontOpStippleFunc )
- CachePool FontCache;
- int MaxWidth, MaxHeight;
- void (*FontOpStippleFunc)();
-#endif
-
{
xf86FontPool = FontCache;
xf86MaxWidth = MaxWidth / 32;
@@ -91,7 +81,7 @@
/*
* Release all cache blocks to the block allocator.
*/
-void xf86ReleaseFontCache()
+void xf86ReleaseFontCache(void)
{
CacheFont8Ptr CFptr;
int i;
@@ -117,8 +107,7 @@
* Remove a font from the font cache.
*/
void
-xf86UnCacheFont8(font)
- FontPtr font;
+xf86UnCacheFont8(FontPtr font)
{
int i;
CacheFont8Ptr ptr, last;
@@ -156,8 +145,7 @@
* Add a new font to the font cache.
*/
CacheFont8Ptr
-xf86CacheFont8(font)
- FontPtr font;
+xf86CacheFont8(FontPtr font)
{
int c;
unsigned long n;
@@ -231,9 +219,7 @@
* from the block allocator.
*/
void
-xf86loadFontBlock(fentry, block)
- CacheFont8Ptr fentry;
- int block;
+xf86loadFontBlock(CacheFont8Ptr fentry, int block)
{
int i, j, c;
unsigned char chr;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h:1.1 Thu Jan 15 07:07:42 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h Wed May 25 13:38:44 2011
@@ -30,38 +30,32 @@
* Entrypoints into cache code.
*/
-void xf86ReleaseFontCache();
-
void xf86InitFontCache(
-#if NeedFunctionPrototypes
CachePool /*FontCache*/,
int /*RowWidth*/,
int /*RowHeight*/,
void (* /*FontOpStippleFunc*/)(
-#if NeedNestedPrototypes
int, int, int, int, unsigned char *, int, Pixel
-#endif
)
-#endif
);
+void xf86ReleaseFontCache(void);
+
void xf86UnCacheFont8(
-#if NeedFunctionPrototypes
FontPtr /*font*/
-#endif
);
CacheFont8Ptr xf86CacheFont8(
-#if NeedFunctionPrototypes
FontPtr /*font*/
-#endif
);
void xf86loadFontBlock(
-#if NeedFunctionPrototypes
CacheFont8Ptr /*fentry*/,
int /*block*/
-#endif
);
+/* s3fcach.c */
+void s3GlyphWrite(int, int , int , unsigned char *, CacheFont8Ptr, GCPtr, BoxPtr, int );
+
+
#endif /* _XF86_FCACHE_H */
