Module Name: src
Committed By: andvar
Date: Sun Aug 27 19:48:19 UTC 2023
Modified Files:
src/sys/arch/amiga/dev: grf_cl.c
Log Message:
amiga/grfcl(4): return prx, pry definition/assigment lost with rev 1.49,
however under CL_SHIFTSPRITE code block only, where it is used.
Fixes build with the CL_SHIFTSPRITE enabled option.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/grf_cl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.56 src/sys/arch/amiga/dev/grf_cl.c:1.57
--- src/sys/arch/amiga/dev/grf_cl.c:1.56 Tue Feb 14 20:27:17 2023
+++ src/sys/arch/amiga/dev/grf_cl.c Sun Aug 27 19:48:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cl.c,v 1.56 2023/02/14 20:27:17 andvar Exp $ */
+/* $NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $ */
/*
* Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.56 2023/02/14 20:27:17 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $");
#include "grfcl.h"
#include "ite.h"
@@ -908,6 +908,7 @@ cl_setmousepos(struct grf_softc *gp, str
volatile char *ba = gp->g_regkva;
short rx, ry;
#ifdef CL_SHIFTSPRITE
+ short prx, pry;
volatile char *fb = gp->g_fbkva;
volatile char *sprite = fb + (cl_fbsize - 1024);
#endif
@@ -926,6 +927,8 @@ cl_setmousepos(struct grf_softc *gp, str
* and kind of buggy anyhow).
*/
#ifdef CL_SHIFTSPRITE
+ prx = cl_cursprite.pos.x - cl_cursprite.hot.x;
+ pry = cl_cursprite.pos.y - cl_cursprite.hot.y;
if (rx < 0 || ry < 0 || prx < 0 || pry < 0) {
writeshifted(sprite, rx < 0 ? -rx : 0, ry < 0 ? -ry : 0);
}
