 @@ -1,14 +1,14 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -69,27 +69,27 @@
  * X68k dependent screen record
  */
 typedef struct _X68kScreenRec {
     int type;                   /* frame buffer type   */
     int class;                  /* visual class        */
     int fd;                     /* file descriptor     */
     int depth;                  /* depth               */
     int fb_width;               /* frame buffer width  */
     int fb_height;              /* frame buffer height */
     int scr_width;              /* screen width        */
     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    */
 } X68kScreenRec;
 /*
  * frame buffer procedures
  */
 typedef struct _X68kFbProcRec {
     Bool (*open)(X68kScreenRec *);		 /* open procedure       */
     Bool (*init)(ScreenPtr, int, char *[]);      /* initialize procedure */
     void (*close)(X68kScreenRec *);		 /* close procedure      */
 } X68kFbProcRec;

 @@ -1,14 +1,14 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -103,27 +103,27 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 , 1, 33, 513,
 , 0,  0,   0,
 , 0,  0,   0,
 , 0,  0,   0,
 x0417, 0,  0,   0, 0 },
         { 0x0004, 0x21e4, 0x0020 },
     };
     /* change video mode */
     pPriv->x68kreg = (cons_dwidth == 640) ? graphNone_mode19 : graphNone_mode16;
     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);
+}
 /*-------------------------------------------------------------------------
  * function "x68kRegSetup"
+ *
  *  purpose:  set up CRT controller and Video controller
  *            with register values in pPriv->x68kreg
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 #define CRTCSET(r) pPriv->reg->crtc.r = pPriv->x68kreg.crtc.r

 @@ -1,14 +1,14 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -18,73 +18,73 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *-----------------------------------------------------------------------*/
 /*
  * CRT controller
  */
 typedef struct {
-    u_short r00, r01, r02, r03, r04, r05, r06, r07;
+    volatile u_short r00, r01, r02, r03, r04, r05, r06, r07;
-    u_short r08, r09, r10, r11, r12, r13, r14, r15;
+    volatile u_short r08, r09, r10, r11, r12, r13, r14, r15;
-    u_short r16, r17, r18, r19, r20, r21, r22, r23;
+    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;
 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;
     u_short ctrl;
 } X68kCrtc;
 /*
  * 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;
 typedef struct {
     u_short r0;
     u_short r1;
     u_short r2;
 } X68kVideoc;
 /* 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;
 /*
  * control registers
  */
 typedef struct {
     Crtc crtc;
-    u_short gpal[256];    /* graphic palette */
+    volatile u_short gpal[256];    /* graphic palette */
-    u_short tpal[256];     /* text palette */
+    volatile u_short tpal[256];     /* text palette */
     Videoc videoc;
     u_short pad0[0xa000];
     Sysport sysport;
 } FbReg;
 typedef struct {
     X68kCrtc crtc;
     X68kVideoc videoc;
     char dotClock;
 } X68kFbReg;
 /* EOF x68kReg.h */