Hi tech@,
We do not support iso7 nor pcvt encoding, so remove macro definitions
and commented entries.
Comments? OK?
Index: sys/dev/wscons/wsconsio.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsconsio.h,v
retrieving revision 1.82
diff -u -p -r1.82 wsconsio.h
--- sys/dev/wscons/wsconsio.h 13 Jun 2017 08:00:24 -0000 1.82
+++ sys/dev/wscons/wsconsio.h 13 Jun 2017 08:41:20 -0000
@@ -506,8 +506,6 @@ struct wsdisplay_font {
int encoding;
#define WSDISPLAY_FONTENC_ISO 0
#define WSDISPLAY_FONTENC_IBM 1
-#define WSDISPLAY_FONTENC_PCVT 2
-#define WSDISPLAY_FONTENC_ISO7 3 /* greek */
u_int fontwidth, fontheight, stride;
#define WSDISPLAY_MAXFONTSZ (512*1024)
int bitorder, byteorder;
Index: usr.sbin/wsfontload/wsfontload.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsfontload/wsfontload.c,v
retrieving revision 1.16
diff -u -p -r1.16 wsfontload.c
--- usr.sbin/wsfontload/wsfontload.c 6 Sep 2015 20:07:46 -0000 1.16
+++ usr.sbin/wsfontload/wsfontload.c 13 Jun 2017 08:41:21 -0000
@@ -75,10 +75,6 @@ static const struct {
} encodings[] = {
{"iso", WSDISPLAY_FONTENC_ISO},
{"ibm", WSDISPLAY_FONTENC_IBM},
-#if 0
- {"pcvt", WSDISPLAY_FONTENC_PCVT},
- {"iso7", WSDISPLAY_FONTENC_ISO7},
-#endif
};
int
