Mon Jul 6 20:19:14 2020 UTC ()
Use C99 initializers in wsdisplay_font struct definitions for
Spleen kernel fonts.


(fcambus)
diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen12x24.h
diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen32x64.h
diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen5x8.h
diff -r1.4 -r1.5 src/sys/dev/wsfont/spleen16x32.h
diff -r1.3 -r1.4 src/sys/dev/wsfont/spleen8x16.h
cvs diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen12x24.h (expand / switch to unified diff)

--- src/sys/dev/wsfont/spleen12x24.h 2020/06/21 15:48:17 1.5
+++ src/sys/dev/wsfont/spleen12x24.h 2020/07/06 20:19:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spleen12x24.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */ 1/* $NetBSD: spleen12x24.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
2/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */ 2/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org> 5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,36 +20,36 @@ @@ -20,36 +20,36 @@
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30static u_char spleen12x24_data[]; 30static u_char spleen12x24_data[];
31 31
32struct wsdisplay_font spleen12x24 = { 32struct wsdisplay_font spleen12x24 = {
33 "Spleen 12x24", /* typeface name */ 33 .name = "Spleen 12x24",
34 ' ', /* firstchar */ 34 .firstchar = ' ',
35 256 - ' ', /* numchars */ 35 .numchars = 256 - ' ',
36 WSDISPLAY_FONTENC_ISO, /* encoding */ 36 .encoding = WSDISPLAY_FONTENC_ISO,
37 12, /* width */ 37 .fontwidth = 12,
38 24, /* height */ 38 .fontheight = 24,
39 2, /* stride */ 39 .stride = 2,
40 WSDISPLAY_FONTORDER_L2R, /* bit order */ 40 .bitorder = WSDISPLAY_FONTORDER_L2R,
41 WSDISPLAY_FONTORDER_L2R, /* byte order */ 41 .byteorder = WSDISPLAY_FONTORDER_L2R,
42 spleen12x24_data /* data */ 42 .data = spleen12x24_data
43}; 43};
44 44
45static u_char spleen12x24_data[] = { 45static u_char spleen12x24_data[] = {
46 0x00, 0x00, /* ................ */ 46 0x00, 0x00, /* ................ */
47 0x00, 0x00, /* ................ */ 47 0x00, 0x00, /* ................ */
48 0x00, 0x00, /* ................ */ 48 0x00, 0x00, /* ................ */
49 0x00, 0x00, /* ................ */ 49 0x00, 0x00, /* ................ */
50 0x00, 0x00, /* ................ */ 50 0x00, 0x00, /* ................ */
51 0x00, 0x00, /* ................ */ 51 0x00, 0x00, /* ................ */
52 0x00, 0x00, /* ................ */ 52 0x00, 0x00, /* ................ */
53 0x00, 0x00, /* ................ */ 53 0x00, 0x00, /* ................ */
54 0x00, 0x00, /* ................ */ 54 0x00, 0x00, /* ................ */
55 0x00, 0x00, /* ................ */ 55 0x00, 0x00, /* ................ */
cvs diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen32x64.h (expand / switch to unified diff)

--- src/sys/dev/wsfont/spleen32x64.h 2020/06/21 15:48:17 1.5
+++ src/sys/dev/wsfont/spleen32x64.h 2020/07/06 20:19:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spleen32x64.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */ 1/* $NetBSD: spleen32x64.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
2/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */ 2/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org> 5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,36 +20,36 @@ @@ -20,36 +20,36 @@
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30static u_char spleen32x64_data[]; 30static u_char spleen32x64_data[];
31 31
32struct wsdisplay_font spleen32x64 = { 32struct wsdisplay_font spleen32x64 = {
33 "Spleen 32x64", /* typeface name */ 33 .name = "Spleen 32x64",
34 ' ', /* firstchar */ 34 .firstchar = ' ',
35 256 - ' ', /* numchars */ 35 .numchars = 256 - ' ',
36 WSDISPLAY_FONTENC_ISO, /* encoding */ 36 .encoding = WSDISPLAY_FONTENC_ISO,
37 32, /* width */ 37 .fontwidth = 32,
38 64, /* height */ 38 .fontheight = 64,
39 4, /* stride */ 39 .stride = 4,
40 WSDISPLAY_FONTORDER_L2R, /* bit order */ 40 .bitorder = WSDISPLAY_FONTORDER_L2R,
41 WSDISPLAY_FONTORDER_L2R, /* byte order */ 41 .byteorder = WSDISPLAY_FONTORDER_L2R,
42 spleen32x64_data /* data */ 42 .data = spleen32x64_data
43}; 43};
44 44
45static u_char spleen32x64_data[] = { 45static u_char spleen32x64_data[] = {
46 0x00, 0x00, 0x00, 0x00, /* ................................ */ 46 0x00, 0x00, 0x00, 0x00, /* ................................ */
47 0x00, 0x00, 0x00, 0x00, /* ................................ */ 47 0x00, 0x00, 0x00, 0x00, /* ................................ */
48 0x00, 0x00, 0x00, 0x00, /* ................................ */ 48 0x00, 0x00, 0x00, 0x00, /* ................................ */
49 0x00, 0x00, 0x00, 0x00, /* ................................ */ 49 0x00, 0x00, 0x00, 0x00, /* ................................ */
50 0x00, 0x00, 0x00, 0x00, /* ................................ */ 50 0x00, 0x00, 0x00, 0x00, /* ................................ */
51 0x00, 0x00, 0x00, 0x00, /* ................................ */ 51 0x00, 0x00, 0x00, 0x00, /* ................................ */
52 0x00, 0x00, 0x00, 0x00, /* ................................ */ 52 0x00, 0x00, 0x00, 0x00, /* ................................ */
53 0x00, 0x00, 0x00, 0x00, /* ................................ */ 53 0x00, 0x00, 0x00, 0x00, /* ................................ */
54 0x00, 0x00, 0x00, 0x00, /* ................................ */ 54 0x00, 0x00, 0x00, 0x00, /* ................................ */
55 0x00, 0x00, 0x00, 0x00, /* ................................ */ 55 0x00, 0x00, 0x00, 0x00, /* ................................ */
cvs diff -r1.5 -r1.6 src/sys/dev/wsfont/spleen5x8.h (expand / switch to unified diff)

--- src/sys/dev/wsfont/spleen5x8.h 2020/06/29 09:45:35 1.5
+++ src/sys/dev/wsfont/spleen5x8.h 2020/07/06 20:19:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spleen5x8.h,v 1.5 2020/06/29 09:45:35 fcambus Exp $ */ 1/* $NetBSD: spleen5x8.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
2/* $OpenBSD: spleen5x8.h,v 1.2 2018/12/02 14:47:23 fcambus Exp $ */ 2/* $OpenBSD: spleen5x8.h,v 1.2 2018/12/02 14:47:23 fcambus Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2018-2020 Frederic Cambus <fcambus@openbsd.org> 5 * Copyright (c) 2018-2020 Frederic Cambus <fcambus@openbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,36 +20,36 @@ @@ -20,36 +20,36 @@
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30static u_char spleen5x8_data[]; 30static u_char spleen5x8_data[];
31 31
32struct wsdisplay_font spleen5x8 = { 32struct wsdisplay_font spleen5x8 = {
33 "Spleen 5x8", /* typeface name */ 33 .name = "Spleen 5x8",
34 ' ', /* firstchar */ 34 .firstchar = ' ',
35 128 - ' ', /* numchars */ 35 .numchars = 128 - ' ',
36 WSDISPLAY_FONTENC_ISO, /* encoding */ 36 .encoding = WSDISPLAY_FONTENC_ISO,
37 5, /* width */ 37 .fontwidth = 5,
38 8, /* height */ 38 .fontheight = 8,
39 1, /* stride */ 39 .stride = 1,
40 WSDISPLAY_FONTORDER_L2R, /* bit order */ 40 .bitorder = WSDISPLAY_FONTORDER_L2R,
41 WSDISPLAY_FONTORDER_L2R, /* byte order */ 41 .byteorder = WSDISPLAY_FONTORDER_L2R,
42 spleen5x8_data /* data */ 42 .data = spleen5x8_data
43}; 43};
44 44
45static u_char spleen5x8_data[] = { 45static u_char spleen5x8_data[] = {
46 0x00, /* ........ */ 46 0x00, /* ........ */
47 0x00, /* ........ */ 47 0x00, /* ........ */
48 0x00, /* ........ */ 48 0x00, /* ........ */
49 0x00, /* ........ */ 49 0x00, /* ........ */
50 0x00, /* ........ */ 50 0x00, /* ........ */
51 0x00, /* ........ */ 51 0x00, /* ........ */
52 0x00, /* ........ */ 52 0x00, /* ........ */
53 0x00, /* ........ */ 53 0x00, /* ........ */
54 54
55 0x20, /* ..*..... */ 55 0x20, /* ..*..... */
cvs diff -r1.4 -r1.5 src/sys/dev/wsfont/spleen16x32.h (expand / switch to unified diff)

--- src/sys/dev/wsfont/spleen16x32.h 2020/06/21 15:48:17 1.4
+++ src/sys/dev/wsfont/spleen16x32.h 2020/07/06 20:19:14 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spleen16x32.h,v 1.4 2020/06/21 15:48:17 fcambus Exp $ */ 1/* $NetBSD: spleen16x32.h,v 1.5 2020/07/06 20:19:14 fcambus Exp $ */
2/* $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */ 2/* $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org> 5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,36 +20,36 @@ @@ -20,36 +20,36 @@
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30static u_char spleen16x32_data[]; 30static u_char spleen16x32_data[];
31 31
32struct wsdisplay_font spleen16x32 = { 32struct wsdisplay_font spleen16x32 = {
33 "Spleen 16x32", /* typeface name */ 33 .name = "Spleen 16x32",
34 ' ', /* firstchar */ 34 .firstchar = ' ',
35 256 - ' ', /* numchars */ 35 .numchars = 256 - ' ',
36 WSDISPLAY_FONTENC_ISO, /* encoding */ 36 .encoding = WSDISPLAY_FONTENC_ISO,
37 16, /* width */ 37 .fontwidth = 16,
38 32, /* height */ 38 .fontheight = 32,
39 2, /* stride */ 39 .stride = 2,
40 WSDISPLAY_FONTORDER_L2R, /* bit order */ 40 .bitorder = WSDISPLAY_FONTORDER_L2R,
41 WSDISPLAY_FONTORDER_L2R, /* byte order */ 41 .byteorder = WSDISPLAY_FONTORDER_L2R,
42 spleen16x32_data /* data */ 42 .data = spleen16x32_data
43}; 43};
44 44
45static u_char spleen16x32_data[] = { 45static u_char spleen16x32_data[] = {
46 0x00, 0x00, /* ................ */ 46 0x00, 0x00, /* ................ */
47 0x00, 0x00, /* ................ */ 47 0x00, 0x00, /* ................ */
48 0x00, 0x00, /* ................ */ 48 0x00, 0x00, /* ................ */
49 0x00, 0x00, /* ................ */ 49 0x00, 0x00, /* ................ */
50 0x00, 0x00, /* ................ */ 50 0x00, 0x00, /* ................ */
51 0x00, 0x00, /* ................ */ 51 0x00, 0x00, /* ................ */
52 0x00, 0x00, /* ................ */ 52 0x00, 0x00, /* ................ */
53 0x00, 0x00, /* ................ */ 53 0x00, 0x00, /* ................ */
54 0x00, 0x00, /* ................ */ 54 0x00, 0x00, /* ................ */
55 0x00, 0x00, /* ................ */ 55 0x00, 0x00, /* ................ */
cvs diff -r1.3 -r1.4 src/sys/dev/wsfont/spleen8x16.h (expand / switch to unified diff)

--- src/sys/dev/wsfont/spleen8x16.h 2020/06/21 15:48:17 1.3
+++ src/sys/dev/wsfont/spleen8x16.h 2020/07/06 20:19:14 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spleen8x16.h,v 1.3 2020/06/21 15:48:17 fcambus Exp $ */ 1/* $NetBSD: spleen8x16.h,v 1.4 2020/07/06 20:19:14 fcambus Exp $ */
2/* $OpenBSD: spleen8x16.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */ 2/* $OpenBSD: spleen8x16.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org> 5 * Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,36 +20,36 @@ @@ -20,36 +20,36 @@
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30static u_char spleen8x16_data[]; 30static u_char spleen8x16_data[];
31 31
32struct wsdisplay_font spleen8x16 = { 32struct wsdisplay_font spleen8x16 = {
33 "Spleen 8x16", /* typeface name */ 33 .name = "Spleen 8x16",
34 ' ', /* firstchar */ 34 .firstchar = ' ',
35 256 - ' ', /* numchars */ 35 .numchars = 256 - ' ',
36 WSDISPLAY_FONTENC_ISO, /* encoding */ 36 .encoding = WSDISPLAY_FONTENC_ISO,
37 8, /* width */ 37 .fontwidth = 8,
38 16, /* height */ 38 .fontheight = 16,
39 1, /* stride */ 39 .stride = 1,
40 WSDISPLAY_FONTORDER_L2R, /* bit order */ 40 .bitorder = WSDISPLAY_FONTORDER_L2R,
41 WSDISPLAY_FONTORDER_L2R, /* byte order */ 41 .byteorder = WSDISPLAY_FONTORDER_L2R,
42 spleen8x16_data /* data */ 42 .data = spleen8x16_data
43}; 43};
44 44
45static u_char spleen8x16_data[] = { 45static u_char spleen8x16_data[] = {
46 0x00, /* ........ */ 46 0x00, /* ........ */
47 0x00, /* ........ */ 47 0x00, /* ........ */
48 0x00, /* ........ */ 48 0x00, /* ........ */
49 0x00, /* ........ */ 49 0x00, /* ........ */
50 0x00, /* ........ */ 50 0x00, /* ........ */
51 0x00, /* ........ */ 51 0x00, /* ........ */
52 0x00, /* ........ */ 52 0x00, /* ........ */
53 0x00, /* ........ */ 53 0x00, /* ........ */
54 0x00, /* ........ */ 54 0x00, /* ........ */
55 0x00, /* ........ */ 55 0x00, /* ........ */