[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k Avoid a use o...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/730b6b3ff1f7
branches:  trunk
changeset: 10616:730b6b3ff1f7
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Tue Nov 03 15:52:57 2020 +0000

description:
Avoid a use of __UNVOLATILE(3).  Tested on XM6i.

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h    |   4 +-
 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c  |   4 +-
 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h |  24 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diffs (99 lines):

diff -r 5a485f2f9510 -r 730b6b3ff1f7 external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h       Tue Nov 03 15:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h       Tue Nov 03 15:52:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.5 2020/07/22 21:24:20 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -79,7 +79,7 @@
     int scr_height;             /* screen height       */
     int dpi;                    /* dots per inch       */
     uint8_t *fb;                /* frame buffer VA     */
-    volatile FbReg *reg;        /* control register VA */
+    FbReg *reg;                 /* control register VA */
     X68kFbReg x68kreg;          /* control register    */
     int mapsize;                /* size of mapped memory */
     ColormapPtr installedMap;   /* installed colormap    */
diff -r 5a485f2f9510 -r 730b6b3ff1f7 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c     Tue Nov 03 15:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c     Tue Nov 03 15:52:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.5 2020/11/03 15:25:21 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -113,7 +113,7 @@
     x68kRegSetup(pPriv);
 
     /* unmap and close frame buffer */
-    if ( munmap(__UNVOLATILE(pPriv->reg), pPriv->mapsize) == -1 )
+    if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
         ErrorF("Can't unmap frame buffer");
     close(pPriv->fd);
 }
diff -r 5a485f2f9510 -r 730b6b3ff1f7 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h    Tue Nov 03 15:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h    Tue Nov 03 15:52:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kReg.h,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kReg.h,v 1.4 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -28,11 +28,11 @@
  * CRT controller
  */
 typedef struct {
-    u_short r00, r01, r02, r03, r04, r05, r06, r07;
-    u_short r08, r09, r10, r11, r12, r13, r14, r15;
-    u_short r16, r17, r18, r19, r20, r21, r22, r23;
+    volatile u_short r00, r01, r02, r03, r04, r05, r06, r07;
+    volatile u_short r08, r09, r10, r11, r12, r13, r14, r15;
+    volatile u_short r16, r17, r18, r19, r20, r21, r22, r23;
     char pad0[0x450];
-    u_short ctrl;
+    volatile u_short ctrl;
     char pad1[0x1b7e];
 } Crtc;
 
@@ -47,11 +47,11 @@
  * video controller
  */
 typedef struct {
-    u_short r0;
+    volatile u_short r0;
     char pad0[0xfe];
-    u_short r1;
+    volatile u_short r1;
     char pad1[0xfe];
-    u_short r2;
+    volatile u_short r2;
     char pad2[0x19fe];
 } Videoc;
 
@@ -63,9 +63,9 @@
 
 /* system port */
 typedef struct {
-    u_short r1, r2, r3, r4;
+    volatile u_short r1, r2, r3, r4;
     u_short pad0[2];
-    u_short r5, r6;
+    volatile u_short r5, r6;
     u_short pad[0x1ff0];
 } Sysport;
 
@@ -74,8 +74,8 @@
  */
 typedef struct {
     Crtc crtc;
-    u_short gpal[256];    /* graphic palette */
-    u_short tpal[256];     /* text palette */
+    volatile u_short gpal[256];    /* graphic palette */
+    volatile u_short tpal[256];     /* text palette */
     Videoc videoc;
     u_short pad0[0xa000];
     Sysport sysport;