summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/wsfont/spleen12x24.h26
-rw-r--r--sys/dev/wsfont/spleen16x32.h26
-rw-r--r--sys/dev/wsfont/spleen32x64.h26
-rw-r--r--sys/dev/wsfont/spleen5x8.h26
-rw-r--r--sys/dev/wsfont/spleen8x16.h26
5 files changed, 65 insertions, 65 deletions
diff --git a/sys/dev/wsfont/spleen12x24.h b/sys/dev/wsfont/spleen12x24.h
index 09b76e2e35d..4e4e8beca67 100644
--- a/sys/dev/wsfont/spleen12x24.h
+++ b/sys/dev/wsfont/spleen12x24.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spleen12x24.h,v 1.6 2020/06/21 19:03:29 fcambus Exp $ */
+/* $OpenBSD: spleen12x24.h,v 1.7 2020/06/23 13:58:34 fcambus Exp $ */
/*
* Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
@@ -29,18 +29,18 @@
static u_char spleen12x24_data[];
struct wsdisplay_font spleen12x24 = {
- "Spleen 12x24", /* typeface name */
- 0, /* index */
- ' ', /* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 12, /* width */
- 24, /* height */
- 2, /* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- NULL, /* cookie */
- spleen12x24_data /* data */
+ .name = "Spleen 12x24",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 12,
+ .fontheight = 24,
+ .stride = 2,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen12x24_data
};
static u_char spleen12x24_data[] = {
diff --git a/sys/dev/wsfont/spleen16x32.h b/sys/dev/wsfont/spleen16x32.h
index 567b18b4fc2..a8e9e194781 100644
--- a/sys/dev/wsfont/spleen16x32.h
+++ b/sys/dev/wsfont/spleen16x32.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spleen16x32.h,v 1.5 2020/06/21 19:03:29 fcambus Exp $ */
+/* $OpenBSD: spleen16x32.h,v 1.6 2020/06/23 13:58:34 fcambus Exp $ */
/*
* Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
@@ -29,18 +29,18 @@
static u_char spleen16x32_data[];
struct wsdisplay_font spleen16x32 = {
- "Spleen 16x32", /* typeface name */
- 0, /* index */
- ' ', /* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 16, /* width */
- 32, /* height */
- 2, /* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- NULL, /* cookie */
- spleen16x32_data /* data */
+ .name = "Spleen 16x32",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 16,
+ .fontheight = 32,
+ .stride = 2,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen16x32_data
};
static u_char spleen16x32_data[] = {
diff --git a/sys/dev/wsfont/spleen32x64.h b/sys/dev/wsfont/spleen32x64.h
index 2205e762494..ec6c5638f7a 100644
--- a/sys/dev/wsfont/spleen32x64.h
+++ b/sys/dev/wsfont/spleen32x64.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spleen32x64.h,v 1.6 2020/06/21 19:03:29 fcambus Exp $ */
+/* $OpenBSD: spleen32x64.h,v 1.7 2020/06/23 13:58:34 fcambus Exp $ */
/*
* Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
@@ -29,18 +29,18 @@
static u_char spleen32x64_data[];
struct wsdisplay_font spleen32x64 = {
- "Spleen 32x64", /* typeface name */
- 0, /* index */
- ' ', /* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 32, /* width */
- 64, /* height */
- 4, /* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- NULL, /* cookie */
- spleen32x64_data /* data */
+ .name = "Spleen 32x64",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 32,
+ .fontheight = 64,
+ .stride = 4,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen32x64_data
};
static u_char spleen32x64_data[] = {
diff --git a/sys/dev/wsfont/spleen5x8.h b/sys/dev/wsfont/spleen5x8.h
index 0bf8c79c0ae..4acb1f699aa 100644
--- a/sys/dev/wsfont/spleen5x8.h
+++ b/sys/dev/wsfont/spleen5x8.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spleen5x8.h,v 1.5 2020/06/21 19:03:29 fcambus Exp $ */
+/* $OpenBSD: spleen5x8.h,v 1.6 2020/06/23 13:58:34 fcambus Exp $ */
/*
* Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
@@ -29,18 +29,18 @@
static u_char spleen5x8_data[];
struct wsdisplay_font spleen5x8 = {
- "Spleen 5x8", /* typeface name */
- 0, /* index */
- ' ', /* firstchar */
- 128 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 5, /* width */
- 8, /* height */
- 1, /* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- NULL, /* cookie */
- spleen5x8_data /* data */
+ .name = "Spleen 5x8",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 128 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 5,
+ .fontheight = 8,
+ .stride = 1,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen5x8_data
};
static u_char spleen5x8_data[] = {
diff --git a/sys/dev/wsfont/spleen8x16.h b/sys/dev/wsfont/spleen8x16.h
index 0bec18012b7..058a250ce76 100644
--- a/sys/dev/wsfont/spleen8x16.h
+++ b/sys/dev/wsfont/spleen8x16.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spleen8x16.h,v 1.4 2020/06/21 19:03:29 fcambus Exp $ */
+/* $OpenBSD: spleen8x16.h,v 1.5 2020/06/23 13:58:34 fcambus Exp $ */
/*
* Copyright (c) 2018-2019 Frederic Cambus <fcambus@openbsd.org>
@@ -29,18 +29,18 @@
static u_char spleen8x16_data[];
struct wsdisplay_font spleen8x16 = {
- "Spleen 8x16", /* typeface name */
- 0, /* index */
- ' ', /* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 8, /* width */
- 16, /* height */
- 1, /* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- NULL, /* cookie */
- spleen8x16_data /* data */
+ .name = "Spleen 8x16",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 8,
+ .fontheight = 16,
+ .stride = 1,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen8x16_data
};
static u_char spleen8x16_data[] = {