Module Name: xsrc
Committed By: macallan
Date: Fri Sep 23 20:50:54 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h tcx_accel.c
Log Message:
sprinkle volatile for gcc 5.4, also include config.h
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.7 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.8
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.7 Tue Jul 8 17:05:26 2014
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h Fri Sep 23 20:50:54 2016
@@ -61,8 +61,8 @@ typedef struct {
Bool Is8bit;
Bool HasStipROP;
int vramsize; /* size of the 8bit fb */
- uint64_t *rblit;
- uint64_t *rstip;
+ volatile uint64_t *rblit;
+ volatile uint64_t *rstip;
xf86CursorInfoPtr CursorInfoRec;
unsigned int CursorXY;
int CursorBg, CursorFg;
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.9 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.10
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.9 Tue Jul 8 17:05:26 2014
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c Fri Sep 23 20:50:54 2016
@@ -21,7 +21,11 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: tcx_accel.c,v 1.9 2014/07/08 17:05:26 macallan Exp $ */
+/* $NetBSD: tcx_accel.c,v 1.10 2016/09/23 20:50:54 macallan Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <sys/types.h>
@@ -95,7 +99,7 @@ TcxCopy
{
ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
TcxPtr pTcx = GET_TCX_FROM_SCRN(pScreenInfo);
- uint64_t cmd, lcmd;
+ volatile uint64_t cmd, lcmd;
int line, col, leftover, src, dst, xsteps, sstep, dstep, dpitch, x, xoff;
int doff;
@@ -217,7 +221,7 @@ TcxSolid(
ScrnInfoPtr pScreenInfo = xf86Screens[pPixmap->drawable.pScreen->myNum];
TcxPtr pTcx = GET_TCX_FROM_SCRN(pScreenInfo);
int dpitch, dst, line, fullsteps, i;
- uint64_t cmd, rcmd, lcmd, tmpl;
+ volatile uint64_t cmd, rcmd, lcmd, tmpl;
uint32_t pmask;
dpitch = exaGetPixmapPitch(pPixmap) >> pTcx->pitchshift;
