 @@ -1,195 +1,195 @@
-/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.8 2021/03/11 12:08: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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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.
  *-----------------------------------------------------------------------*/
 #include "x68k.h"
 static void x68kRegSetup(X68kScreenRec *pPriv);
 DevPrivateKeyRec x68kScreenPrivateKeyRec;
 static int cons_dwidth;
 /*-------------------------------------------------------------------------
  * function "x68kFbCommonOpen"
+ *
  *  purpose:  open and map frame buffer, and obtain some FB-specific
  *            infomation. then set controller to approppriate mode as
  *            configured in X68kConfig.
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *            (const char *)device   : name of frame buffer device
  *  returns:  (Bool): TRUE  if succeeded
  *                    FALSE otherwise
  *-----------------------------------------------------------------------*/
 Bool
 x68kFbCommonOpen(X68kScreenRec *pPriv, const char *device)
+{
     struct grfinfo gi;
     /* open frame buffer */
     if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
-        ErrorF( "Can't open frame buffer" );
+        ErrorF( "Can't open frame buffer\n" );
         return FALSE;
+    }
     /* get frame buffer infomation */
     if ( ioctl( pPriv->fd, GRFIOCGINFO, &gi ) == -1 ) {
-        ErrorF( "Can't get grfinfo" );
+        ErrorF( "Can't get grfinfo\n" );
         return FALSE;
+    }
     pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
     /* map control registers and frame buffer */
     pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
                                MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
     if ( pPriv->reg == (FbReg *)-1) {
-        ErrorF( "Can't map frame buffer" );
+        ErrorF( "Can't map frame buffer\n" );
         return FALSE;
+    }
     pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
     x68kRegSetup( pPriv );
     cons_dwidth = gi.gd_dwidth;
     return TRUE;
+}
 /*-------------------------------------------------------------------------
  * function "x68kFbCommonClose"
+ *
  *  purpose:  unmap and close frame buffer, and
  *            change video mode to normal ITE mode
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 void
 x68kFbCommonClose(X68kScreenRec *pPriv)
+{
     static const X68kFbReg graphNone_mode16 = {
 	/* CRT mode 16 (768x512 31.5kHz) */
         { 137,14, 28, 124,
 , 5, 40, 552,
 , 0,  0,   0,
 , 0,  0,   0,
 , 0,  0,   0,
 x0416, 0,  0,   0, 0 },
         { 0x0004, 0x21e4, 0x0020 },
     };
     static const X68kFbReg graphNone_mode19 = {
 	/* CRT mode 19 (640x480 31.5kHz VGA mode) */
         {  99,11, 13,  93,
 , 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(pPriv->reg, pPriv->mapsize) == -1 )
-        ErrorF("Can't unmap frame buffer");
+        ErrorF("Can't unmap frame buffer\n");
     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
 #define VIDEOCSET(r) pPriv->reg->videoc.r = pPriv->x68kreg.videoc.r
 static void
 x68kRegSetup(X68kScreenRec *pPriv)
+{
     uint16_t pr20 = pPriv->reg->crtc.r20;
     /* timing registers */
     if ( (pr20 & 0x0003) < (pPriv->x68kreg.crtc.r20 & 0x0003) ||
          ( (pr20 & 0x0003) == (pPriv->x68kreg.crtc.r20 & 0x0003) &&
            (pr20 & 0x0010) < (pPriv->x68kreg.crtc.r20 & 0x0010) ) ) {
         /* to higher resolution */
         CRTCSET(r00); CRTCSET(r01); CRTCSET(r02);CRTCSET(r03);
         CRTCSET(r04); CRTCSET(r05); CRTCSET(r06);CRTCSET(r07);
         CRTCSET(r20);
     } else {
         /* to lower resolution */
         CRTCSET(r20); CRTCSET(r01); CRTCSET(r02);CRTCSET(r03);
         CRTCSET(r04); CRTCSET(r05); CRTCSET(r06);CRTCSET(r07);
         CRTCSET(r00);
+    }
     CRTCSET(r08);
     /* scroll registers */
     CRTCSET(r12); CRTCSET(r13); CRTCSET(r14);CRTCSET(r15);
     CRTCSET(r16); CRTCSET(r17); CRTCSET(r18);CRTCSET(r19);
     /* mode controlling registers */
     VIDEOCSET(r0); VIDEOCSET(r1); VIDEOCSET(r2);
     /* dot clock bit */
     pPriv->reg->sysport.r4 = (pPriv->x68kreg.dotClock)? 0x000e: 0x000c;
+}
 /*-------------------------------------------------------------------------
  * function "x68kSaveScreen"                      [ screen function ]
+ *
  *  purpose:  activate/deactivate screen saver
  *  argument: (ScreenPtr)ipScreen : target screen to save
  *            (int)mode          : on/off
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 Bool
 x68kSaveScreen(ScreenPtr pScreen, Bool on)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
     static int status = FALSE;
     static uint16_t r2;
     if (on == SCREEN_SAVER_ON || on == SCREEN_SAVER_CYCLE) {
         if (!status) {
             r2 = pPriv->reg->videoc.r2;
             pPriv->reg->videoc.r2 = 0x0000;
             status = TRUE;
+        }
     } else {
         if (status) {
             pPriv->reg->videoc.r2 = r2;
             status = FALSE;
+        }
+    }
     return TRUE;
+}
 /* EOF x68kFb.c */

 @@ -1,501 +1,501 @@
-/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.10 2021/03/11 12:08: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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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.
  *-----------------------------------------------------------------------*/
 /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
 /*
 Copyright (c) 1990  X Consortium
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of the X Consortium shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
  */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
                     All Rights Reserved
 Permission  to  use,  copy,  modify,  and  distribute   this
 software  and  its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright no-
 tice  appear  in all copies and that both that copyright no-
 tice and this permission notice appear in  supporting  docu-
 mentation,  and  that the names of Sun or X Consortium
 not be used in advertising or publicity pertaining to
 distribution  of  the software  without specific prior
 written permission. Sun and X Consortium make no
 representations about the suitability of this software for
 any purpose. It is provided "as is" without any express or
 implied warranty.
 SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
 NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
 ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
 ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
 PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  * Copyright (c) 1987 by Adam de Boor, UC Berkeley
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  The University of California
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
  */
 /****************************************************************/
 /* Modified from  sunCG4C.c for X11R3 by Tom Jarmolowski	*/
 /****************************************************************/
 /*
  * Copyright 1991, 1992, 1993 Kaleb S. Keithley
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Kaleb S. Keithley makes no
  * representations about the suitability of this software for
  * any purpose.  It is provided "as is" without express or
  * implied warranty.
  */
 #include "x68k.h"
 #include "mi.h"
 #include "micmap.h"
 #include "fb.h"
 /* local functions */
 static Bool x68kCfbFinishScreenInit(ScreenPtr pScreen, void *pbits,
                                     int xsize, int ysize,
                                     int dpix, int dpiy, int width);
 static void x68kInstallColormap(ColormapPtr cmap);
 static void x68kUninstallColormap(ColormapPtr cmap);
 static int x68kListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapList);
 static void x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs);
 static void x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
                                uint8_t *rmap, uint8_t *gmap, uint8_t *bmap);
 /*-------------------------------------------------------------------------
  * function "x68kGraphOpen"                          [ X68kFBProc function ]
+ *
  *  purpose:  call common frame buffer opening procedure
  *            then set hardware colormap for several static color modes.
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *  returns:  (Bool): TRUE  if successed
  *                    FALSE otherwise
  *-----------------------------------------------------------------------*/
 Bool
 x68kGraphOpen(X68kScreenRec *pPriv)
+{
     if( !x68kFbCommonOpen(pPriv, "/dev/grf1") )
         return FALSE;
     /* initialize hardware colormap
        in cases of static visual class */
     if (pPriv->depth == 15 && pPriv->class == TrueColor) {
         /* for 32768 TrueColor mode */
 	int i;
 	uint16_t x = 0x0001;
 	for ( i = 0; i < 256; ) {
 	    pPriv->reg->gpal[i++] = x;
 	    pPriv->reg->gpal[i++] = x;
 	    x += 0x0202;
+        }
+    }
     if (pPriv->depth == 4 && pPriv->class == StaticGray ) {
         /* for 16 StaticGray mode */
         int i;
         for( i = 0; i < 16; i++ )
             pPriv->reg->gpal[i] = (i*2 << 11) | (i*2 << 6) | (i*2 << 1);
+    }
     return TRUE;
+}
 /*-------------------------------------------------------------------------
  * function "x68kGraphClose"                        [ X68kFBProc function ]
+ *
  *  purpose:  close graphic frame buffer
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 void
 x68kGraphClose(X68kScreenRec *pPriv)
+{
     x68kFbCommonClose(pPriv);
+}
 /*-------------------------------------------------------------------------
  * function "x68kGraphInit"                     [ called by DIX AddScreen ]
+ *
  *  purpose:  initialize graphic frame buffer
  *  argument: (ScreenPtr)pScreen       : DIX screen record
  *            (int)argc, (char **)argv : standard C arguments
  *  returns:  (Bool) : TRUE  if succeeded
  *                     FALSE otherwise
  *-----------------------------------------------------------------------*/
 Bool
 x68kGraphInit(ScreenPtr pScreen, int argc, char *argv[])
+{
     X68kScreenRec *pPriv;
     /* get private screen record set by X68KConfig */
     pPriv = x68kGetScreenRecByType(X68K_FB_GRAPHIC);
     /* store private record into screen */
     if (!dixRegisterPrivateKey(&x68kScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) {
-        ErrorF("dixRegisterPrivateKey failed");
+        ErrorF("dixRegisterPrivateKey failed\n");
         return FALSE;
+    }
     x68kSetScreenPrivate(pScreen, pPriv);
     /* register normal cfb screen functions */
     if (!fbSetupScreen(pScreen, pPriv->fb,
                        pPriv->scr_width, pPriv->scr_height,
                        pPriv->dpi, pPriv->dpi, pPriv->fb_width,
 		       pPriv->depth))
 	return FALSE;
     /* register colormap functions */
     pScreen->InstallColormap = x68kInstallColormap;
     pScreen->UninstallColormap = x68kUninstallColormap;
     pScreen->ListInstalledColormaps = x68kListInstalledColormaps;
     pScreen->StoreColors = x68kStoreColors;
     /* visual initialization and etc.. */
     if (!x68kCfbFinishScreenInit(pScreen, pPriv->fb,
                                  pPriv->scr_width, pPriv->scr_height,
                                  pPriv->dpi, pPriv->dpi, pPriv->fb_width))
         return FALSE;
     if ( !miDCInitialize(pScreen, &x68kPointerScreenFuncs) )
         return FALSE;
     pScreen->whitePixel = 1;
     pScreen->blackPixel = 0;
     if ( !miCreateDefColormap(pScreen) )
         return FALSE;
     return TRUE;
+}
 /*-------------------------------------------------------------------------
  * function "x68kCfbFinishScreenInit"
+ *
  *  purpose:  initialize visuals and perform miscellaneous settings
  *  argument: (ScreenPtr)pScreen     : DIX screen record
  *            (void *)pbits          : frame buffer
  *            (int)xsize, (int)ysize : screen size
  *            (int)dpix, (int)dpiy   : screen resolution in dots per inch
  *            (int)width             : pixel width of frame buffer
  *  returns:  (Bool) : TRUE  if succeeded
  *                     FALSE otherwise
  *-----------------------------------------------------------------------*/
 static Bool
 x68kCfbFinishScreenInit(
     ScreenPtr pScreen,
     void *pbits,
     int xsize, int ysize,
     int dpix, int dpiy,
     int width)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
     VisualPtr	visuals;
     int		nvisuals;
     DepthPtr	depths;
     int		ndepths;
     VisualID	defaultVisual;
     int		rootdepth = 0;
     /* for 15/16bit TrueColor visual mode */
     if (pPriv->depth == 15 && pPriv->class == TrueColor) {
         VisualID *vid = NULL;
         ndepths = 1;
         nvisuals = 1;
         depths = malloc( sizeof(DepthRec) );
         visuals = malloc( sizeof(VisualRec) );
         vid = malloc( sizeof(VisualID) );
         if( !depths || !visuals || !vid ) {
             free( depths );
             free( visuals );
             free( vid );
             return FALSE;
+        }
         depths[0].depth = 15;
         depths[0].numVids = 1;
         depths[0].vids = vid;
         visuals[0].class = TrueColor;
         visuals[0].bitsPerRGBValue = 5;
         visuals[0].ColormapEntries = 1 << 5;
         visuals[0].nplanes = 15;
         visuals[0].vid = *vid = FakeClientID(0);
         visuals[0].greenMask = 0xf800;
         visuals[0].redMask   = 0x07c0;
         visuals[0].blueMask  = 0x003e;
         visuals[0].offsetGreen = 11;
         visuals[0].offsetRed   = 6;
         visuals[0].offsetBlue  = 1;
         rootdepth = 15;
         defaultVisual = *vid;
+    }
     /* for 4/16bit StaticGray visual mode */
     else if (pPriv->depth == 4 && pPriv->class == StaticGray ) {
         VisualID *vid = NULL;
         ndepths = 1;
         nvisuals = 1;
         depths = malloc( sizeof(DepthRec) );
         visuals = malloc( sizeof(VisualRec) );
         vid = malloc( sizeof(VisualID) );
         if( !depths || !visuals || !vid ) {
             free( depths );
             free( visuals );
             free( vid );
             return FALSE;
+        }
         depths[0].depth = 4;
         depths[0].numVids = 1;
         depths[0].vids = vid;
         visuals[0].class = StaticGray;
         visuals[0].bitsPerRGBValue = 4;
         visuals[0].ColormapEntries = 1 << 4;
         visuals[0].nplanes = 4;
         visuals[0].vid = *vid = FakeClientID(0);
         visuals[0].greenMask = 0;
         visuals[0].redMask   = 0;
         visuals[0].blueMask  = 0;
         visuals[0].offsetGreen = 0;
         visuals[0].offsetRed   = 0;
         visuals[0].offsetBlue  = 0;
         rootdepth = 4;
         defaultVisual = *vid;
+    }
     /* for other modes ( supports all visuals ) */
     else if (!miInitVisuals(&visuals, &depths, &nvisuals, &ndepths,
                             &rootdepth, &defaultVisual, 1 << (16 - 1),
 , PseudoColor))
 	return FALSE;
     if (!miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
                       rootdepth, ndepths, depths,
                       defaultVisual, nvisuals, visuals))
 	return FALSE;
     pScreen->CloseScreen = fbCloseScreen;
     pScreen->SaveScreen = x68kSaveScreen;
     return TRUE;
+}
 /*-------------------------------------------------------------------------
  * function "x68kInstallColormap"                      [ screen function ]
+ *
  *  purpose:  install colormap, then update hardware colormap.
  *  argument: (ColormapPtr)cmap : colormap to install
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kInstallColormap(ColormapPtr cmap)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(cmap->pScreen);
     register int i;
     register Entry *pent;
     register VisualPtr pVisual = cmap->pVisual;
     uint8_t   rmap[256], gmap[256], bmap[256];
     unsigned long rMask, gMask, bMask;
     int	oRed, oGreen, oBlue;
     if (cmap == pPriv->installedMap)
 	return;
     if (pPriv->installedMap)
 	WalkTree(pPriv->installedMap->pScreen, TellLostMap,
 		 (void *) &(pPriv->installedMap->mid));
     if (pPriv->class & DynamicClass) {
         if ((cmap->pVisual->class | DynamicClass) == DirectColor) {
             rMask = pVisual->redMask;
             gMask = pVisual->greenMask;
             bMask = pVisual->blueMask;
             oRed = pVisual->offsetRed;
             oGreen = pVisual->offsetGreen;
             oBlue = pVisual->offsetBlue;
             for (i = 0; i < 1<<(pPriv->depth); i++) {
                 rmap[i] = cmap->red[(i & rMask) >> oRed].co.local.red >> 11;
                 gmap[i] = cmap->green[(i & gMask) >> oGreen].co.local.green >> 11;
                 bmap[i] = cmap->blue[(i & bMask) >> oBlue].co.local.blue >> 11;
+            }
         } else {
             for (i = 0, pent = cmap->red;
                  i < pVisual->ColormapEntries;
                  i++, pent++) {
                 if (pent->fShared) {
                     rmap[i] = pent->co.shco.red->color >> 11;
                     gmap[i] = pent->co.shco.green->color >> 11;
                     bmap[i] = pent->co.shco.blue->color >> 11;
+                }
                 else {
                     rmap[i] = pent->co.local.red >> 11;
                     gmap[i] = pent->co.local.green >> 11;
                     bmap[i] = pent->co.local.blue >> 11;
+                }
+            }
+        }
         x68kUpdateColormap(cmap->pScreen, 0, 1<<(pPriv->depth), rmap, gmap, bmap);
+    }
     pPriv->installedMap = cmap;
     WalkTree(cmap->pScreen, TellGainedMap, (void *) &(cmap->mid));
+}
 /*-------------------------------------------------------------------------
  * function "x68kUninstallColormap"                    [ screen function ]
+ *
  *  purpose:  uninstall colormap
  *  argument: (ColormapPtr)cmap : colormap to uninstall
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kUninstallColormap(ColormapPtr cmap)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(cmap->pScreen);
     if (cmap == pPriv->installedMap) {
 	Colormap defMapID = cmap->pScreen->defColormap;
 	if (cmap->mid != defMapID) {
 	    void *retval;
 	    ColormapPtr defMap;
 	    dixLookupResourceByType(&retval, defMapID, RT_COLORMAP,
 		serverClient, DixReadAccess);
 	    defMap = (ColormapPtr) retval;
 	    (*cmap->pScreen->InstallColormap)(defMap);
+	}
+    }
+}
 /*-------------------------------------------------------------------------
  * function "x68kListInstalledColormaps"               [ screen function ]
+ *
  *  purpose:  Get the list of currently installed colormaps.
  *            In X68k, installed colormap in always only one.
  *  argument: (ScreenPtr)pScreen    : screen
  *            (Colormap *)pCmapList : colormap list got
  *  returns:  (int)
  *-----------------------------------------------------------------------*/
 static int
 x68kListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapList)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
     *pCmapList = pPriv->installedMap->mid;
     return 1;
+}
 /*-------------------------------------------------------------------------
  * function "x68kStoreColors"                          [ screen function ]
+ *
  *  purpose:  store specified color items
  *  argument: (ColormapPtr)pmap   : colormap
  *            (int)ndef           : the number of items
  *            (xColorItem *)pdefs : items
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(pmap->pScreen);
     uint8_t     rmap[256], gmap[256], bmap[256];
     xColorItem expanddefs[256];
     register int i;
     if (pPriv->installedMap != NULL && pPriv->installedMap != pmap)
 	return;
     if ((pmap->pVisual->class | DynamicClass) == DirectColor) {
 	ndef = fbExpandDirectColors(pmap, ndef, pdefs, expanddefs);
 	pdefs = expanddefs;
+    }
     while (ndef--) {
 	i = pdefs->pixel;
 	rmap[i] = pdefs->red >> 11;
 	gmap[i] = pdefs->green >> 11;
 	bmap[i] = pdefs->blue >> 11;
 	x68kUpdateColormap(pmap->pScreen, i, 1, rmap, gmap, bmap);
 	pdefs++;
+    }
+}
 /*-------------------------------------------------------------------------
  * function "x68kUpdateColormap"
+ *
  *  purpose:  update hardware colormap
  *  argument: (ScreenPtr)pScreen: screen
  *            (int)dex          : colormap index
  *            (int)count        : count for updating
  *            (uint8_t *)[rgb]map: each map
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
                                uint8_t *rmap, uint8_t *gmap, uint8_t *bmap)
+{
     X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
     volatile uint16_t *pal = pPriv->reg->gpal;
     for( ; count > 0; count--,dex++ ) {
         pal[dex] = (uint16_t)gmap[dex] << 11 |
                    (uint16_t)rmap[dex] << 6 |
                    (uint16_t)bmap[dex] << 1;
+    }
+}
 /* EOF x68kGraph.c */

 @@ -1,378 +1,378 @@
-/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08: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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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.
  *-----------------------------------------------------------------------*/
 /*-
  * Copyright (c) 1987 by the Regents of the University of California
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  The University of California
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
  */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
                     All Rights Reserved
 Permission  to  use,  copy,  modify,  and  distribute   this
 software  and  its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright no-
 tice  appear  in all copies and that both that copyright no-
 tice and this permission notice appear in  supporting  docu-
 mentation,  and  that the names of Sun or X Consortium
 not be used in advertising or publicity pertaining to
 distribution  of  the software  without specific prior
 written permission. Sun and X Consortium make no
 representations about the suitability of this software for
 any purpose. It is provided "as is" without any express or
 implied warranty.
 SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
 NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
 ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
 ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
 PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /*
  * Copyright 1991, 1992, 1993 Kaleb S. Keithley
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Kaleb S. Keithley makes no
  * representations about the suitability of this software for
  * any purpose.  It is provided "as is" without express or
  * implied warranty.
  */
 #include "x68k.h"
 #include "mi.h"
 #include "input.h"
 #include "inpututils.h"
 #include "exevents.h"
 #include "events.h"
 #include "eventstr.h"
 #include <X11/Xatom.h>
 #include "xserver-properties.h"
 static void x68kMouseHandlerNotify(int, int, void *);
 static Bool x68kCursorOffScreen(ScreenPtr *, int *, int *);
 static void x68kCrossScreen(ScreenPtr, int);
 static void x68kWarpCursor(DeviceIntPtr, ScreenPtr, int, int);
 static void x68kMouseCtrl(DeviceIntPtr, PtrCtrl*);
 miPointerScreenFuncRec x68kPointerScreenFuncs = {
     x68kCursorOffScreen,
     x68kCrossScreen,
     x68kWarpCursor,
 };
 DeviceIntPtr x68kPointerDevice = NULL;
 static X68kMousePriv x68kMousePriv;
 static void
 x68kMouseHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseProc --
  *	Handle the initialization, etc. of a mouse
+ *
  * Results:
  *	none.
+ *
  * Side Effects:
  *-----------------------------------------------------------------------
  */
 int
 x68kMouseProc(DeviceIntPtr device, int what)
+{
     DevicePtr   pMouse = &device->public;
     int		format;
     static int	oformat;
     BYTE	map[4];
     Atom btn_labels[3] = {0};
     Atom axes_labels[2] = { 0, 0 };
     MouseEmu3btnPtr pEmu3btn;
     Bool emu3enable;
     int emu3timeout;
     switch (what) {
 	case DEVICE_INIT:
             pMouse->devicePrivate = (void *) &x68kMousePriv;
             if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
-                ErrorF("Can't open mouse device");
+                ErrorF("Can't open mouse device\n");
                 return !Success;
+            }
 	    pMouse->on = FALSE;
 	    map[1] = 1;
 	    map[2] = 2;
 	    map[3] = 3;
 	    btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
 	    btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
 	    btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
 	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
 	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
 	    InitPointerDeviceStruct(pMouse, map, 3, btn_labels,
 		x68kMouseCtrl, GetMotionHistorySize(),
 , axes_labels);
 	    /* Initialize emulation 3 buttons settings */
 	    emu3enable = TRUE;			/* XXX should be configurable */
 	    emu3timeout = EMU3B_DEF_TIMEOUT;	/* XXX should be configurable */
 	    if (emu3enable) {
 		pEmu3btn = &x68kMousePriv.emu3btn;
 		Emulate3ButtonsEnable(pEmu3btn, device, emu3timeout);
+	    }
 	    break;
 	case DEVICE_ON:
 	    if (ioctl (x68kMousePriv.fd, VUIDGFORMAT, &oformat) == -1) {
-		ErrorF("x68kMouseProc ioctl VUIDGFORMAT");
+		ErrorF("x68kMouseProc ioctl VUIDGFORMAT\n");
 		return !Success;
+	    }
 	    format = VUID_FIRM_EVENT;
 	    if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &format) == -1) {
-		ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
+		ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
 		return !Success;
+	    }
             if ( fcntl(x68kMousePriv.fd, F_SETOWN, getpid()) == -1 ||
                  fcntl(x68kMousePriv.fd, F_SETFL, O_NONBLOCK | O_ASYNC) == -1
                  ) {
-                ErrorF("Async mouse I/O failed");
+                ErrorF("Async mouse I/O failed\n");
                 return !Success;
+            }
 	    x68kMousePriv.bmask = 0;
 	    SetNotifyFd(x68kMousePriv.fd, x68kMouseHandlerNotify,
 		X_NOTIFY_READ, NULL);
 	    pMouse->on = TRUE;
 	    break;
 	case DEVICE_OFF:
 	    pMouse->on = FALSE;
 	    RemoveNotifyFd(x68kMousePriv.fd);
 	    break;
 	case DEVICE_CLOSE:
 	    if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &oformat) == -1)
-		ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
+		ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
 	    break;
+    }
     return Success;
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseCtrl --
  *	Alter the control parameters for the mouse. Since acceleration
  *	etc. is done from the PtrCtrl record in the mouse's device record,
  *	there's nothing to do here.
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 /*ARGSUSED*/
 static void
 x68kMouseCtrl(DeviceIntPtr device, PtrCtrl* ctrl)
+{
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseGetEvents --
  *	Return the events waiting in the wings for the given mouse.
+ *
  * Results:
  *	A pointer to an array of Firm_events or (Firm_event *)0 if no events
  *	The number of events contained in the array.
  *	A boolean as to whether more events might be available.
+ *
  * Side Effects:
  *	None.
  *-----------------------------------------------------------------------
  */
 Firm_event *
 x68kMouseGetEvents(int fd, int *pNumEvents, Bool *pAgain)
+{
     int nBytes;               /* number of bytes of events available. */
     static Firm_event evBuf[X68K_MAXEVENTS];     /* Buffer for Firm_events */
     if ((nBytes = read (fd, (char *)evBuf, sizeof(evBuf))) == -1) {
 	if (errno == EWOULDBLOCK) {
 	    *pNumEvents = 0;
 	    *pAgain = FALSE;
 	} else {
-	    ErrorF("x68kMouseGetEvents read");
+	    ErrorF("x68kMouseGetEvents read\n");
 	    FatalError ("Could not read from mouse");
+	}
     } else {
 	*pNumEvents = nBytes / sizeof (Firm_event);
 	*pAgain = (nBytes == sizeof (evBuf));
+    }
     return evBuf;
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseEnqueueEvent --
  *	Given a Firm_event for a mouse, pass it off the the dix layer
  *	properly converted...
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The cursor may be redrawn...? devPrivate/x/y will be altered.
+ *
  *-----------------------------------------------------------------------
  */
 void
 x68kMouseEnqueueEvent(DeviceIntPtr device, Firm_event *fe)
+{
     X68kMousePrivPtr	pPriv;	/* Private data for pointer */
     int			bmask;	/* Temporary button mask */
     int			type, buttons, flag;
     int			valuators[2];
     ValuatorMask	mask;
     pPriv = (X68kMousePrivPtr)device->public.devicePrivate;
     switch (fe->id) {
     case MS_LEFT:
     case MS_MIDDLE:
     case MS_RIGHT:
 	/*
 	 * A button changed state. Sometimes we will get two events
 	 * for a single state change. Should we get a button event which
 	 * reflects the current state of affairs, that event is discarded.
+	 *
 	 * Mouse buttons start at 1 as defined in <X11/X.h>.
+	 *
 	 * The bmask stores which buttons are currently pressed.
 	 * This bmask is also used for Emulate3Buttons functions that
 	 * assume the left button is LSB as defined in mouseEmu3btn.c.
 	 */
 	buttons = (fe->id - MS_LEFT) + 1;
 	bmask = 1 << (buttons - 1);
 	if (fe->value == VKEY_UP) {
 	    if (pPriv->bmask & bmask) {
 		type = ButtonRelease;
 		pPriv->bmask &= ~bmask;
 	    } else {
 		return;
+	    }
 	} else {
 	    if ((pPriv->bmask & bmask) == 0) {
 		type = ButtonPress;
 		pPriv->bmask |= bmask;
 	    } else {
 		return;
+	    }
+	}
 	if (buttons == Button1 || buttons == Button3) {
 	    /* Handle middle button emulation */
 	    Emulate3ButtonsQueueEvent(&pPriv->emu3btn, type, buttons, pPriv->bmask);
 	} else {
 	    flag = POINTER_RELATIVE;
 	    valuator_mask_zero(&mask);
 	    QueuePointerEvents(device, type, buttons, flag, &mask);
+	}
 	break;
     case LOC_X_DELTA:
 	valuators[0] = fe->value;
 	valuators[1] = 0;
 	valuator_mask_set_range(&mask, 0, 2, valuators);
         flag = POINTER_RELATIVE | POINTER_ACCELERATE;
 	QueuePointerEvents(device, MotionNotify, 0, flag, &mask);
 	break;
     case LOC_Y_DELTA:
 	/*
 	 * For some reason, motion up generates a positive y delta
 	 * and motion down a negative delta, so we must subtract
 	 * here instead of add...
 	 */
 	valuators[0] = 0;
 	valuators[1] = -fe->value;
 	valuator_mask_set_range(&mask, 0, 2, valuators);
         flag = POINTER_RELATIVE | POINTER_ACCELERATE;
 	QueuePointerEvents(device, MotionNotify, 0, flag, &mask);
 	break;
     case LOC_X_ABSOLUTE:
     case LOC_Y_ABSOLUTE:
 	/* XXX not sure how to get current X and Y position */
     default:
 	FatalError ("%s: unrecognized id\n", __func__);
 	break;
+    }
+}
 /*ARGSUSED*/
 static Bool
 x68kCursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
+{
     return FALSE;
+}
 static void
 x68kCrossScreen(ScreenPtr pScreen, int entering)
+{
+}
 static void
 x68kWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
     sigset_t newsigmask;
     (void) sigemptyset (&newsigmask);
     (void) sigaddset (&newsigmask, SIGIO);
     (void) sigprocmask (SIG_BLOCK, &newsigmask, (sigset_t *)NULL);
     miPointerWarpCursor (pDev, pScreen, x, y);
     (void) sigprocmask (SIG_UNBLOCK, &newsigmask, (sigset_t *)NULL);
+}
 /* EOF x68kMouse.c */

 @@ -1,411 +1,411 @@
-/* $NetBSD: x68kKbd.c,v 1.10 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.11 2021/03/11 12:08: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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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.
  *-----------------------------------------------------------------------*/
 /*-
  * Copyright (c) 1987 by the Regents of the University of California
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  The University of California
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
  */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
                     All Rights Reserved
 Permission  to  use,  copy,  modify,  and  distribute   this
 software  and  its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright no-
 tice  appear  in all copies and that both that copyright no-
 tice and this permission notice appear in  supporting  docu-
 mentation,  and  that the names of Sun or X Consortium
 not be used in advertising or publicity pertaining to
 distribution  of  the software  without specific prior
 written permission. Sun and X Consortium make no
 representations about the suitability of this software for
 any purpose. It is provided "as is" without any express or
 implied warranty.
 SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
 NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
 ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
 ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
 PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 #include "x68k.h"
 #include "mi.h"
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include "screenint.h"
 #include "inputstr.h"
 #include "eventstr.h"
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 #include <X11/extensions/XKB.h>
 #include "xkbsrv.h"
 #define MIN_KEYCODE     7       /* necessary to avoid the mouse buttons */
 #define MAX_KEYCODE     255     /* limited by the protocol */
 X68kKbdPriv x68kKbdPriv;
 DeviceIntPtr x68kKeyboardDevice = NULL;
 static void x68kKbdHandlerNotify(int, int, void *);
 static void x68kInitModMap(KeySymsRec *, CARD8 *);
 static void x68kInitKbdNames(XkbRMLVOSet *, X68kKbdPrivPtr);
 static void x68kKbdRingBell(DeviceIntPtr, int, int);
 static void x68kKbdBell(int, DeviceIntPtr, void *, int);
 static void x68kKbdCtrl(DeviceIntPtr, KeybdCtrl *);
 static void x68kSetLeds(X68kKbdPrivPtr, uint8_t);
 static void
 x68kKbdHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
 /*------------------------------------------------------------------------
  * x68kKbdProc --
  *	Handle the initialization, etc. of a keyboard.
+ *
  * Results:
  *	None.
+ *
  *----------------------------------------------------------------------*/
 int
 x68kKbdProc(DeviceIntPtr pDev,	/* Keyboard to manipulate */
             int what)		/* What to do to it */
+{
     DevicePtr pKeyboard = &pDev->public;
     CARD8 x68kModMap[MAP_LENGTH];
     int mode;
     XkbRMLVOSet rmlvo;
     switch (what) {
         case DEVICE_INIT:
             pKeyboard->devicePrivate = (void *)&x68kKbdPriv;
             if( (x68kKbdPriv.fd = open("/dev/kbd", O_RDONLY)) == -1 ) {
-                ErrorF("Can't open keyboard device");
+                ErrorF("Can't open keyboard device\n");
                 return !Success;
+            }
             pKeyboard->on = FALSE;
             x68kInitModMap(x68kKeySyms, x68kModMap);
             x68kInitKbdNames(&rmlvo, pKeyboard->devicePrivate);
 #if 0 /* XXX How should we setup XKB maps for non PS/2 keyboard!? */
             InitKeyboardDeviceStruct(pDev, &rmlvo,
                                      x68kKbdBell, x68kKbdCtrl);
 #else
             InitKeyboardDeviceStruct(pDev, NULL,
                                      x68kKbdBell, x68kKbdCtrl);
 	    XkbApplyMappingChange(pDev, x68kKeySyms,
 		x68kKeySyms->minKeyCode,
 		x68kKeySyms->maxKeyCode - x68kKeySyms->minKeyCode + 1,
 		x68kModMap, serverClient);
 #endif
             break;
         case DEVICE_ON:
             mode = 1;
             if ( fcntl(x68kKbdPriv.fd, F_SETOWN, getpid()) == -1 ||
                  fcntl(x68kKbdPriv.fd, F_SETFL, O_NONBLOCK|O_ASYNC) == -1 ||
                  ioctl(x68kKbdPriv.fd, KIOCSDIRECT, &mode) == -1 ) {
-                ErrorF("Async keyboard I/O failed");
+                ErrorF("Async keyboard I/O failed\n");
                 return !Success;
+            }
 	    x68kSetLeds(&x68kKbdPriv, (uint8_t)x68kKbdPriv.leds);
             SetNotifyFd(x68kKbdPriv.fd, x68kKbdHandlerNotify,
 		X_NOTIFY_READ, NULL);
             pKeyboard->on = TRUE;
             break;
         case DEVICE_CLOSE:
         case DEVICE_OFF:
             RemoveNotifyFd(x68kKbdPriv.fd);
             pKeyboard->on = FALSE;
             break;
         default:
             FatalError("Unknown keyboard operation\n");
+    }
     return Success;
+}
 /*-------------------------------------------------------------------------
  * function "x68kInitModMap"
+ *
  *  purpose:  initialize modmap with keysym table
  *  argument: (KeySymsRec *)x68kKeySyms : keysym table
  *            (CARD8 *)x68kModMap       : result
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kInitModMap(KeySymsRec *KeySyms, CARD8 *x68kModMap)
+{
     int i;
     for (i = 0; i < MAP_LENGTH; i++)
         x68kModMap[i] = NoSymbol;
     if (KeySyms->minKeyCode < MIN_KEYCODE) {
         KeySyms->minKeyCode += MIN_KEYCODE;
         KeySyms->maxKeyCode += MIN_KEYCODE;
+    }
     if (KeySyms->maxKeyCode > MAX_KEYCODE)
         KeySyms->maxKeyCode = MAX_KEYCODE;
     for (i = KeySyms->minKeyCode;
          i < KeySyms->maxKeyCode; i++) {
         switch (KeySyms->map[(i-KeySyms->minKeyCode)*4]) {
             case XK_Shift_L:
             case XK_Shift_R:
                 x68kModMap[i] = ShiftMask;
                 break;
             case XK_Control_L:
             case XK_Control_R:
                 x68kModMap[i] = ControlMask;
                 break;
             case XK_Alt_L:
             case XK_Alt_R:
                 x68kModMap[i] = Mod1Mask;
                 break;
             case XK_Meta_L:
             case XK_Meta_R:
                 x68kModMap[i] = Mod2Mask;
                 break;
             case XK_Caps_Lock:
                 x68kModMap[i] = LockMask;
                 break;
+        }
+    }
+}
 /*-------------------------------------------------------------------------
  * function "x68kInitKbdNames"
+ *
  *  purpose:  store xkb database names
  *  argument: (XkbRMLVOSet *)rmlvo
  *            (X68kKbdPrivPtr)pKbd
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kInitKbdNames(XkbRMLVOSet *rmlvo, X68kKbdPrivPtr pKbd)
+{
 #if 0 /* XXX How should we setup XKB maps for non PS/2 keyboard!? */
     rmlvo->rules = "base";
     rmlvo->model = "x68k";
     switch (pKbd->type) {
     case X68K_KB_STANDARD:
         rmlvo->layout = "jp(standard)";
         break;
     case X68K_KB_ASCII:
         rmlvo->layout = "jp(ascii)";
         break;
+    }
     rmlvo->variant = "basic";
     rmlvo->options = "";
 #else
     rmlvo->rules = "base";
     rmlvo->model = NULL;
     rmlvo->layout = NULL;
     rmlvo->variant = NULL;
     rmlvo->options = NULL;
 #endif
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kKbdGetEvents --
  *	Return the events waiting in the wings for the given keyboard.
+ *
  * Results:
  *	A pointer to an array of Firm_events or (Firm_event *)0 if no events
  *	The number of events contained in the array.
  *	A boolean as to whether more events might be available.
+ *
  * Side Effects:
  *	None.
  *-----------------------------------------------------------------------
  */
 Firm_event *
 x68kKbdGetEvents(int fd, int *pNumEvents, Bool *pAgain)
+{
     int nBytes;		/* number of bytes of events available. */
     static Firm_event evBuf[X68K_MAXEVENTS];	/* Buffer for Firm_events */
     if ((nBytes = read (fd, evBuf, sizeof(evBuf))) == -1) {
 	if (errno == EWOULDBLOCK) {
 	    *pNumEvents = 0;
 	    *pAgain = FALSE;
 	} else {
-	    ErrorF("Reading keyboard");
+	    ErrorF("Reading keyboard\n");
 	    FatalError ("Could not read the keyboard");
+	}
     } else {
 	*pNumEvents = nBytes / sizeof (Firm_event);
 	*pAgain = (nBytes == sizeof (evBuf));
+    }
     return evBuf;
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kKbdEnqueueEvent --
+ *
  *-----------------------------------------------------------------------
  */
 void
 x68kKbdEnqueueEvent(DeviceIntPtr pDev, Firm_event *fe)
+{
     BYTE		keycode;
     int			type;
     type = ((fe->value == VKEY_UP) ? KeyRelease : KeyPress);
     keycode = (fe->id & 0x7f) + MIN_KEYCODE;
     QueueKeyboardEvents(pDev, type, keycode);
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kKbdBell --
  *	Ring the terminal/keyboard bell
+ *
  * Results:
  *	Ring the keyboard bell for an amount of time proportional to
  *	"loudness."
+ *
  * Side Effects:
  *	None, really...
+ *
  *-----------------------------------------------------------------------
  */
 static void
 x68kKbdRingBell(DeviceIntPtr pDev, int volume, int duration)
+{
     int		    kbdCmd;	/* Command to give keyboard */
     X68kKbdPrivPtr  pPriv = (X68kKbdPrivPtr)pDev->public.devicePrivate;
     if (volume == 0)
 	return;
     kbdCmd = KBD_CMD_BELL;
     if (ioctl (pPriv->fd, KIOCCMD, &kbdCmd) == -1) {
-	ErrorF("Failed to activate bell");
+	ErrorF("Failed to activate bell\n");
 	return;
+    }
     usleep (duration * 1000);
     kbdCmd = KBD_CMD_NOBELL;
     if (ioctl (pPriv->fd, KIOCCMD, &kbdCmd) == -1)
-	ErrorF("Failed to deactivate bell");
+	ErrorF("Failed to deactivate bell\n");
+}
 static void
 x68kKbdBell(int volume, DeviceIntPtr pDev, void *ctrl, int unused)
+{
     KeybdCtrl*      kctrl = (KeybdCtrl*) ctrl;
     if (kctrl->bell == 0)
 	return;
     x68kKbdRingBell(pDev, volume, kctrl->bell_duration);
+}
 void
 DDXRingBell(int volume, int pitch, int duration)
+{
     DeviceIntPtr	pKeyboard;
     pKeyboard = x68kKeyboardDevice;
     if (pKeyboard != NULL)
 	x68kKbdRingBell(pKeyboard, volume, duration);
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kKbdCtrl --
  *	Alter some of the keyboard control parameters
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	Some...
+ *
  *-----------------------------------------------------------------------
  */
 #define	XKB_LED_ZENKAKU		0x40
 #define	XKB_LED_HIRAGANA	0x20
 #define	XKB_LED_INSERT		0x10
 #define	XKB_LED_CAPS_LOCK	0x08
 #define	XKB_LED_CODE_INPUT	0x04
 #define	XKB_LED_ROMAJI		0x02
 #define	XKB_LED_KANA_LOCK	0x01
 static void
 x68kKbdCtrl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+{
     X68kKbdPrivPtr pPriv = (X68kKbdPrivPtr)pDev->public.devicePrivate;
     if (pPriv->leds != ctrl->leds) {
         x68kSetLeds(pPriv, (uint8_t)ctrl->leds);
 	pPriv->leds = ctrl->leds;
+    }
+}
 /*-------------------------------------------------------------------------
  * function "x68kSetLeds"
+ *
  *  purpose:  set keyboard leds to specified state
  *  argument: (X68kKbdPrivPtr)pPriv
  *            (uint8_t)data;
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 static void
 x68kSetLeds(X68kKbdPrivPtr pPriv, uint8_t data)
+{
     /* bit sequence of led indicator in xkb and hardware are same */
     if (ioctl(pPriv->fd, KIOCSLED, &data) == -1)
-        ErrorF("Failed to set keyboard lights");
+        ErrorF("Failed to set keyboard lights\n");
+}
 Bool
 LegalModifier(unsigned int key, DeviceIntPtr pDev)
+{
     return TRUE;
+}
 /* EOF x68kKbd.c */

 @@ -1,122 +1,122 @@
-/* $NetBSD: x68kText.c,v 1.5 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kText.c,v 1.6 2021/03/11 12:08: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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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.
  *-----------------------------------------------------------------------*/
 #include "x68k.h"
 #include "mi.h"
 #include "micmap.h"
 #include "fb.h"
 #include "os.h"
 /*-------------------------------------------------------------------------
  * function "x68kTextOpen"                          [ X68kFBProc function ]
+ *
  *  purpose:  call common frame buffer opening procedure
  *            and enable TVRAM simultaneous access mode
  *  argument: (X68kScreenRec *)pPriv : X68k private screen record
  *  returns:  (Bool): TRUE  if succeeded
  *                    FALSE otherwise
  *-----------------------------------------------------------------------*/
 static uint16_t r21;
 static uint16_t tpal0;
 static uint16_t tpal15;
 Bool
 x68kTextOpen(X68kScreenRec *pPriv)
+{
     if( !x68kFbCommonOpen(pPriv, "/dev/grf0") )
         return FALSE;
     /* enable TVRAM simultaneous access mode */
     r21 = pPriv->reg->crtc.r21;
     pPriv->reg->crtc.r21 = 0x01f0;
     /* initialize scroll registers */
     pPriv->reg->crtc.r10 = pPriv->reg->crtc.r11 = 0;
     tpal0 = pPriv->reg->tpal[0];
     tpal15 = pPriv->reg->tpal[15];
     pPriv->reg->tpal[0] = 0;
     pPriv->reg->tpal[15] = 0xFFFE;
     return TRUE;
+}
 /*-------------------------------------------------------------------------
  * function "x68kTextClose"                        [ X68kFBProc function ]
+ *
  *  purpose:  close text frame buffer
  *  argument: nothing
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
 void
 x68kTextClose(X68kScreenRec *pPriv)
+{
     pPriv->reg->crtc.r21 = r21;  /* recover TVRAM mode */
     pPriv->reg->tpal[0] = tpal0;
     pPriv->reg->tpal[15] = tpal15;
     x68kFbCommonClose(pPriv);
+}
 /*-------------------------------------------------------------------------
  * function "x68kTextInit"                     [ called by DIX AddScreen ]
+ *
  *  purpose:  initialize text frame buffer
  *  argument: (ScreenPtr)pScreen       : DIX screen record
  *            (int)argc, (char **)argv : standard C arguments
  *  returns:  (Bool) TRUE  if succeeded
  *                   FALSE otherwise
  *-----------------------------------------------------------------------*/
 Bool
 x68kTextInit(ScreenPtr pScreen, int argc, char *argv[])
+{
     X68kScreenRec *pPriv;
     /* get private screen record set by X68KConfig */
     pPriv = x68kGetScreenRecByType(X68K_FB_TEXT);
     if ( !dixRegisterPrivateKey(&x68kScreenPrivateKeyRec, PRIVATE_SCREEN, 0) ) {
-            ErrorF("dixRegisterPrivateKey failed");
+            ErrorF("dixRegisterPrivateKey failed\n");
             return FALSE;
+    }
     x68kSetScreenPrivate(pScreen, pPriv);
     if ( !fbScreenInit(pScreen, pPriv->fb,
                         pPriv->scr_width, pPriv->scr_height,
                         pPriv->dpi, pPriv->dpi, pPriv->fb_width, 1) )
         return FALSE;
     pScreen->whitePixel = 1;
     pScreen->blackPixel = 0;
     if ( !miDCInitialize(pScreen, &x68kPointerScreenFuncs) )
         return FALSE;
     if ( !miCreateDefColormap(pScreen) )
         return FALSE;
     pScreen->SaveScreen = x68kSaveScreen;
     return TRUE;
+}
 /* EOF x68kText.c */