Module Name: xsrc
Committed By: tsutsui
Date: Tue Nov 3 15:52:57 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kFb.c
x68kReg.h
Log Message:
Avoid a use of __UNVOLATILE(3). Tested on XM6i.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
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/xorg-server/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5 Wed Jul 22 21:24:20 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h Tue Nov 3 15:52:57 2020
@@ -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 @@ typedef struct _X68kScreenRec {
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 */
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5 Tue Nov 3 15:25:21 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c Tue Nov 3 15:52:57 2020
@@ -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 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
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);
}
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3 Sat Aug 1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h Tue Nov 3 15:52:57 2020
@@ -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 @@ typedef struct {
* 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 @@ typedef struct {
/* 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 {
*/
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;
