[src/trunk]: src Fix some awkward language in manpage and code comments.

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

details:   https://anonhg.NetBSD.org/src/rev/f2b536e109fd
branches:  trunk
changeset: 813629:f2b536e109fd
user:      jandberg <jandberg%NetBSD.org@localhost>
date:      Sat Feb 06 20:20:18 2016 +0000

description:
Fix some awkward language in manpage and code comments.

diffstat:

 share/man/man4/man4.amiga/amidisplaycc.4 |   9 ++---
 sys/arch/amiga/dev/amidisplaycc.c        |  44 ++++++++++++-------------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diffs (172 lines):

diff -r ad02a68e083f -r f2b536e109fd share/man/man4/man4.amiga/amidisplaycc.4
--- a/share/man/man4/man4.amiga/amidisplaycc.4  Sat Feb 06 20:19:28 2016 +0000
+++ b/share/man/man4/man4.amiga/amidisplaycc.4  Sat Feb 06 20:20:18 2016 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: amidisplaycc.4,v 1.10 2009/03/11 13:41:25 joerg Exp $
+.\" $NetBSD: amidisplaycc.4,v 1.11 2016/02/06 20:20:18 jandberg Exp $
 .Dd November 12, 2003
 .Dt AMIDISPLAYCC 4 amiga
 .Os
@@ -23,11 +23,10 @@
 It can however coexist well enough with grf0 to make possible running
 X the old way, but be warned, you cannot switch screens while
 in X and when quitting it, it seems to hang. Switching a screen
-then will bring up the text console. As always, we apologise for
-the inconvenience.
+then will bring up the text console.
 .Pp
-What it does support is hilite (bold), underline, reverse and
-foreground/background colors.
+It supports foreground and background color, and the hilite (bold),
+underline, and reverse text attributes.
 .Ss Virtual terminals and screen types
 The number of virtual screens is limited only by
 the available chip memory.
diff -r ad02a68e083f -r f2b536e109fd sys/arch/amiga/dev/amidisplaycc.c
--- a/sys/arch/amiga/dev/amidisplaycc.c Sat Feb 06 20:19:28 2016 +0000
+++ b/sys/arch/amiga/dev/amidisplaycc.c Sat Feb 06 20:20:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $ */
+/*     $NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,15 +28,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
  * to render text on bitmapped screens. Uses the functions defined in
  * grfabs_reg.h for display creation/destruction and low level setup.
  *
- * For each virtual terminal a new screen ('view') is allocated.
- * Also one more is allocated for the mapped screen on demand.
+ * For each virtual terminal a new screen (a grfabs view) is allocated.
+ * Also one more view is allocated for the mapped screen on demand.
  */
 
 #include "amidisplaycc.h"
@@ -65,7 +65,7 @@
 #include <dev/cons.h>
 #include <dev/wsfont/wsfont.h>
 
-/* These can be lowered if you are sure you dont need that much colors. */
+/* These can be lowered if you are sure you don't need that much colors. */
 #define MAXDEPTH 8
 #define MAXROWS 128
 
@@ -175,16 +175,12 @@
        amidisplaycc_allocattr
 };
 
-/* add some of our own data to the wsscreen_descr */
+/* Add some of our own data to the wsscreen_descr */
 struct amidisplaycc_screen_descr {
        struct wsscreen_descr  wsdescr;
        int                    depth;
 };
 
-/*
- * List of supported screenmodes. Almost anything can be given here.
- */
-
 #define ADCC_SCREEN(name, width, height, depth, fontwidth, fontheight) \
     /* CONSTCOND */ \
     {{ \
@@ -197,10 +193,10 @@
     depth }
 
 /*
- * Screen types.
+ * List of supported screen types.
  *
- * The first in list is used for the console screen.
- * A suitable screen mode is guessed for it by looking
+ * The first item in list is used for the console screen.
+ * A suitable screen size is guessed for it by looking
  * at the GRF_* options.
  */
 struct amidisplaycc_screen_descr amidisplaycc_screentab[] = {
@@ -252,7 +248,7 @@
 #define NELEMS(arr) (sizeof(arr)/sizeof((arr)[0]))
 
 /*
- * This structure also is passed to wscons. It contains pointers
+ * This structure is passed to wscons. It contains pointers
  * to the available display modes.
  */
 
@@ -343,7 +339,7 @@
  * This gets called at console init to determine the priority of
  * this console device.
  *
- * Of course pointers to this and other functions must present
+ * Pointers to this and other functions must present
  * in constab[] in conf.c for this to work.
  */
 void
@@ -409,7 +405,7 @@
        if (matchname("amidisplaycc", name) == 0)
                return (0);
 
-       /* Allow only one of us now. Not sure about that. */
+       /* Allow only one of us. */
        if (amidisplaycc_attached)
                return (0);
 
@@ -481,10 +477,9 @@
        }
 }
 
-
 /*
- * Color, bgcolor and style are packed into one long attribute.
- * These macros are used to create/split the attribute
+ * Foreground color, background color, and style are packed into one
+ * long attribute. These macros are used to create/split the attribute.
  */
 
 #define MAKEATTR(fg, bg, mode) (((fg)<<16) | ((bg)<<8) | (mode))
@@ -541,9 +536,6 @@
 }
 
 
-/*
- * This obviously does something important, don't ask me what.
- */
 int
 amidisplaycc_mapchar(void *screen, int ch, unsigned int *chp)
 {
@@ -778,8 +770,6 @@
 
 /*
  * Copy a number of rows to another location on the screen.
- * Combined with eraserows it can be used to perform operation
- * also known as 'scrolling'.
  */
 
 void
@@ -1167,9 +1157,8 @@
        }
 
        /*
-        * As we all know by now, we are mapping our special
-        * screen here so our pretty text consoles are left
-        * untouched.
+        * Screen reserved for graphics is used to avoid writing
+        * over the text screens.
         */
 
        bm = adp->gfxview->bitmap;
@@ -1189,6 +1178,7 @@
 
 /*
  * Create a new screen.
+ *
  * NULL dp signifies console and then memory is allocated statically
  * and the screen is automatically displayed.
  *