Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/wsfont Use C99 initializers in wsdisplay_font struct...



details:   https://anonhg.NetBSD.org/src/rev/70dc88606914
branches:  trunk
changeset: 973664:70dc88606914
user:      fcambus <fcambus%NetBSD.org@localhost>
date:      Mon Jul 06 20:19:14 2020 +0000

description:
Use C99 initializers in wsdisplay_font struct definitions for
Spleen kernel fonts.

diffstat:

 sys/dev/wsfont/spleen12x24.h |  22 +++++++++++-----------
 sys/dev/wsfont/spleen16x32.h |  22 +++++++++++-----------
 sys/dev/wsfont/spleen32x64.h |  22 +++++++++++-----------
 sys/dev/wsfont/spleen5x8.h   |  22 +++++++++++-----------
 sys/dev/wsfont/spleen8x16.h  |  22 +++++++++++-----------
 5 files changed, 55 insertions(+), 55 deletions(-)

diffs (180 lines):

diff -r 75e71bcaebbb -r 70dc88606914 sys/dev/wsfont/spleen12x24.h
--- a/sys/dev/wsfont/spleen12x24.h      Mon Jul 06 18:49:12 2020 +0000
+++ b/sys/dev/wsfont/spleen12x24.h      Mon Jul 06 20:19:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spleen12x24.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */
+/*     $NetBSD: spleen12x24.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
 /*     $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
 
 /*
@@ -30,16 +30,16 @@
 static u_char spleen12x24_data[];
 
 struct wsdisplay_font spleen12x24 = {
-       "Spleen 12x24",                 /* typeface name */
-       ' ',                            /* firstchar */
-       256 - ' ',                      /* numchars */
-       WSDISPLAY_FONTENC_ISO,          /* encoding */
-       12,                             /* width */
-       24,                             /* height */
-       2,                              /* stride */
-       WSDISPLAY_FONTORDER_L2R,        /* bit order */
-       WSDISPLAY_FONTORDER_L2R,        /* byte order */
-       spleen12x24_data                /* data */
+       .name           = "Spleen 12x24",
+       .firstchar      = ' ',
+       .numchars       = 256 - ' ',
+       .encoding       = WSDISPLAY_FONTENC_ISO,
+       .fontwidth      = 12,
+       .fontheight     = 24,
+       .stride         = 2,
+       .bitorder       = WSDISPLAY_FONTORDER_L2R,
+       .byteorder      = WSDISPLAY_FONTORDER_L2R,
+       .data           = spleen12x24_data
 };
 
 static u_char spleen12x24_data[] = {
diff -r 75e71bcaebbb -r 70dc88606914 sys/dev/wsfont/spleen16x32.h
--- a/sys/dev/wsfont/spleen16x32.h      Mon Jul 06 18:49:12 2020 +0000
+++ b/sys/dev/wsfont/spleen16x32.h      Mon Jul 06 20:19:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spleen16x32.h,v 1.4 2020/06/21 15:48:17 fcambus Exp $ */
+/*     $NetBSD: spleen16x32.h,v 1.5 2020/07/06 20:19:14 fcambus Exp $ */
 /*     $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
 
 /*
@@ -30,16 +30,16 @@
 static u_char spleen16x32_data[];
 
 struct wsdisplay_font spleen16x32 = {
-       "Spleen 16x32",                 /* typeface name */
-       ' ',                            /* firstchar */
-       256 - ' ',                      /* numchars */
-       WSDISPLAY_FONTENC_ISO,          /* encoding */
-       16,                             /* width */
-       32,                             /* height */
-       2,                              /* stride */
-       WSDISPLAY_FONTORDER_L2R,        /* bit order */
-       WSDISPLAY_FONTORDER_L2R,        /* byte order */
-       spleen16x32_data                /* data */
+       .name           = "Spleen 16x32",
+       .firstchar      = ' ',
+       .numchars       = 256 - ' ',
+       .encoding       = WSDISPLAY_FONTENC_ISO,
+       .fontwidth      = 16,
+       .fontheight     = 32,
+       .stride         = 2,
+       .bitorder       = WSDISPLAY_FONTORDER_L2R,
+       .byteorder      = WSDISPLAY_FONTORDER_L2R,
+       .data           = spleen16x32_data
 };
 
 static u_char spleen16x32_data[] = {
diff -r 75e71bcaebbb -r 70dc88606914 sys/dev/wsfont/spleen32x64.h
--- a/sys/dev/wsfont/spleen32x64.h      Mon Jul 06 18:49:12 2020 +0000
+++ b/sys/dev/wsfont/spleen32x64.h      Mon Jul 06 20:19:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spleen32x64.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */
+/*     $NetBSD: spleen32x64.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
 /*     $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
 
 /*
@@ -30,16 +30,16 @@
 static u_char spleen32x64_data[];
 
 struct wsdisplay_font spleen32x64 = {
-       "Spleen 32x64",                 /* typeface name */
-       ' ',                            /* firstchar */
-       256 - ' ',                      /* numchars */
-       WSDISPLAY_FONTENC_ISO,          /* encoding */
-       32,                             /* width */
-       64,                             /* height */
-       4,                              /* stride */
-       WSDISPLAY_FONTORDER_L2R,        /* bit order */
-       WSDISPLAY_FONTORDER_L2R,        /* byte order */
-       spleen32x64_data                /* data */
+       .name           = "Spleen 32x64",
+       .firstchar      = ' ',
+       .numchars       = 256 - ' ',
+       .encoding       = WSDISPLAY_FONTENC_ISO,
+       .fontwidth      = 32,
+       .fontheight     = 64,
+       .stride         = 4,
+       .bitorder       = WSDISPLAY_FONTORDER_L2R,
+       .byteorder      = WSDISPLAY_FONTORDER_L2R,
+       .data           = spleen32x64_data
 };
 
 static u_char spleen32x64_data[] = {
diff -r 75e71bcaebbb -r 70dc88606914 sys/dev/wsfont/spleen5x8.h
--- a/sys/dev/wsfont/spleen5x8.h        Mon Jul 06 18:49:12 2020 +0000
+++ b/sys/dev/wsfont/spleen5x8.h        Mon Jul 06 20:19:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spleen5x8.h,v 1.5 2020/06/29 09:45:35 fcambus Exp $ */
+/*     $NetBSD: spleen5x8.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
 /*     $OpenBSD: spleen5x8.h,v 1.2 2018/12/02 14:47:23 fcambus Exp $ */
 
 /*
@@ -30,16 +30,16 @@
 static u_char spleen5x8_data[];
 
 struct wsdisplay_font spleen5x8 = {
-       "Spleen 5x8",                   /* typeface name */
-       ' ',                            /* firstchar */
-       128 - ' ',                      /* numchars */
-       WSDISPLAY_FONTENC_ISO,          /* encoding */
-       5,                              /* width */
-       8,                              /* height */
-       1,                              /* stride */
-       WSDISPLAY_FONTORDER_L2R,        /* bit order */
-       WSDISPLAY_FONTORDER_L2R,        /* byte order */
-       spleen5x8_data                  /* data */
+       .name           = "Spleen 5x8",
+       .firstchar      = ' ',
+       .numchars       = 128 - ' ',
+       .encoding       = WSDISPLAY_FONTENC_ISO,
+       .fontwidth      = 5,
+       .fontheight     = 8,
+       .stride         = 1,
+       .bitorder       = WSDISPLAY_FONTORDER_L2R,
+       .byteorder      = WSDISPLAY_FONTORDER_L2R,
+       .data           = spleen5x8_data
 };
 
 static u_char spleen5x8_data[] = {
diff -r 75e71bcaebbb -r 70dc88606914 sys/dev/wsfont/spleen8x16.h
--- a/sys/dev/wsfont/spleen8x16.h       Mon Jul 06 18:49:12 2020 +0000
+++ b/sys/dev/wsfont/spleen8x16.h       Mon Jul 06 20:19:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spleen8x16.h,v 1.3 2020/06/21 15:48:17 fcambus Exp $ */
+/*     $NetBSD: spleen8x16.h,v 1.4 2020/07/06 20:19:14 fcambus Exp $ */
 /*     $OpenBSD: spleen8x16.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
 
 /*
@@ -30,16 +30,16 @@
 static u_char spleen8x16_data[];
 
 struct wsdisplay_font spleen8x16 = {
-       "Spleen 8x16",                  /* typeface name */
-       ' ',                            /* firstchar */
-       256 - ' ',                      /* numchars */
-       WSDISPLAY_FONTENC_ISO,          /* encoding */
-       8,                              /* width */
-       16,                             /* height */
-       1,                              /* stride */
-       WSDISPLAY_FONTORDER_L2R,        /* bit order */
-       WSDISPLAY_FONTORDER_L2R,        /* byte order */
-       spleen8x16_data                 /* data */
+       .name           = "Spleen 8x16",
+       .firstchar      = ' ',
+       .numchars       = 256 - ' ',
+       .encoding       = WSDISPLAY_FONTENC_ISO,
+       .fontwidth      = 8,
+       .fontheight     = 16,
+       .stride         = 1,
+       .bitorder       = WSDISPLAY_FONTORDER_L2R,
+       .byteorder      = WSDISPLAY_FONTORDER_L2R,
+       .data           = spleen8x16_data
 };
 
 static u_char spleen8x16_data[] = {



Home | Main Index | Thread Index | Old Index