Module Name: src
Committed By: drochner
Date: Thu Feb 25 11:20:10 UTC 2010
Modified Files:
src/sys/dev/ic: pcdisplay_chars.c vga.c
src/sys/dev/wscons: unicode.h wsemul_vt100_chars.c
Log Message:
retire our private definitions for the scan1/3/5/7/9 DEC graphics
symbols, use the unicode definitions instead (which apparently didn't
exist when I wrote that)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/pcdisplay_chars.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wscons/unicode.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/wscons/wsemul_vt100_chars.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/pcdisplay_chars.c
diff -u src/sys/dev/ic/pcdisplay_chars.c:1.15 src/sys/dev/ic/pcdisplay_chars.c:1.16
--- src/sys/dev/ic/pcdisplay_chars.c:1.15 Wed Feb 24 18:33:45 2010
+++ src/sys/dev/ic/pcdisplay_chars.c Thu Feb 25 11:20:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_chars.c,v 1.15 2010/02/24 18:33:45 drochner Exp $ */
+/* $NetBSD: pcdisplay_chars.c,v 1.16 2010/02/25 11:20:10 drochner Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.15 2010/02/24 18:33:45 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.16 2010/02/25 11:20:10 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,8 +284,7 @@
{0x230b, 0xd9, 3}, /* RIGHT FLOOR -> light up and left */
{0x2329, 0x3c, 3}, /* LEFT-POINTING ANGLE BRACKET -> < */
{0x232a, 0x3e, 3}, /* RIGHT-POINTING ANGLE BRACKET -> > */
- {_e003U, 0x2d, 3}, /* scan 5 -> - */
- {_e005U, 0x5f, 3}, /* scan 9 -> _ */
+ {0x23bd, 0x5f, 3}, /* scan 9 -> _ */
{_e00bU, 0x7b, 3}, /* braceleftmid -> { */
{_e00cU, 0x7d, 3}, /* bracerightmid -> } */
{_e00fU, 0xd9, 3}, /* mirrored not sign? -> light up and left */
@@ -299,9 +298,9 @@
{0x03bd, 0x76, 2}, /* GREEK SMALL LETTER NU -> v */
{0x03c9, 0x77, 2}, /* GREEK SMALL LETTER OMEGA -> w */
{0x20ac, 0x45, 2}, /* EURO SIGN -> E */
+ {0x23bb, 0x2d, 2}, /* scan 3 -> - */
+ {0x23bc, 0x2d, 2}, /* scan 7 -> - */
{0x25cf, 0xf9, 2}, /* BLACK CIRCLE */
- {_e002U, 0x2d, 2}, /* scan 3 -> - */
- {_e004U, 0x2d, 2}, /* scan 7 -> - */
{_e007U, 0xda, 2}, /* bracelefttp -> light down and right */
{_e008U, 0xc0, 2}, /* braceleftbt -> light up and right */
{_e009U, 0xbf, 2}, /* bracerighttp -> light down and left */
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.101 src/sys/dev/ic/vga.c:1.102
--- src/sys/dev/ic/vga.c:1.101 Thu Feb 19 00:39:25 2009
+++ src/sys/dev/ic/vga.c Thu Feb 25 11:20:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.101 2009/02/19 00:39:25 jmcneill Exp $ */
+/* $NetBSD: vga.c,v 1.102 2010/02/25 11:20:10 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.101 2009/02/19 00:39:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.102 2010/02/25 11:20:10 drochner Exp $");
/* for WSCONS_SUPPORT_PCVTFONTS */
#include "opt_wsdisplay_compat.h"
@@ -1246,11 +1246,11 @@
0x00ac, /* NOT SIGN */
0x00a8, /* DIAERESIS */
0x2260, /* NOT EQUAL TO */
- _e005U, /* scan 9 */
- _e004U, /* scan 7 */
- _e003U, /* scan 5 */
- _e002U, /* scan 3 */
- _e001U, /* scan 1 */
+ 0x23bd, /* scan 9 */
+ 0x23bc, /* scan 7 */
+ 0x2500, /* scan 5 */
+ 0x23bb, /* scan 3 */
+ 0x23ba, /* scan 1 */
0x03c5, /* GREEK SMALL LETTER UPSILON */
0x00f8, /* LATIN SMALL LETTER O WITH STROKE */
/* 8 */ 0x0153, /* LATIN SMALL LIGATURE OE */
Index: src/sys/dev/wscons/unicode.h
diff -u src/sys/dev/wscons/unicode.h:1.3 src/sys/dev/wscons/unicode.h:1.4
--- src/sys/dev/wscons/unicode.h:1.3 Sun Dec 2 01:04:26 2001
+++ src/sys/dev/wscons/unicode.h Thu Feb 25 11:20:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unicode.h,v 1.3 2001/12/02 01:04:26 ross Exp $ */
+/* $NetBSD: unicode.h,v 1.4 2010/02/25 11:20:09 drochner Exp $ */
/*
* some private character definitions for stuff not found
@@ -7,11 +7,6 @@
*/
#define _e000U 0xe000 /* mirrored question mark? */
-#define _e001U 0xe001 /* scan 1 */
-#define _e002U 0xe002 /* scan 3 */
-#define _e003U 0xe003 /* scan 5 */
-#define _e004U 0xe004 /* scan 7 */
-#define _e005U 0xe005 /* scan 9 */
#define _e006U 0xe006 /* N/L control */
#define _e007U 0xe007 /* bracelefttp */
#define _e008U 0xe008 /* braceleftbt */
Index: src/sys/dev/wscons/wsemul_vt100_chars.c
diff -u src/sys/dev/wscons/wsemul_vt100_chars.c:1.13 src/sys/dev/wscons/wsemul_vt100_chars.c:1.14
--- src/sys/dev/wscons/wsemul_vt100_chars.c:1.13 Wed Feb 10 19:39:39 2010
+++ src/sys/dev/wscons/wsemul_vt100_chars.c Thu Feb 25 11:20:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_chars.c,v 1.13 2010/02/10 19:39:39 drochner Exp $ */
+/* $NetBSD: wsemul_vt100_chars.c,v 1.14 2010/02/25 11:20:09 drochner Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.13 2010/02/10 19:39:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.14 2010/02/25 11:20:09 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@
0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x00a0,
/* 6 */ 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
- _e006U, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, _e001U,
- _e002U, 0x2500, _e004U, _e005U, 0x251c, 0x2524, 0x2534, 0x252c,
+ _e006U, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
+ 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x007f,
};
