summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2021-09-19 04:55:58 +0000
committertsutsui <tsutsui@NetBSD.org>2021-09-19 04:55:58 +0000
commitda800c38aebd397ef2bab5c2e0416bccd47020f9 (patch)
treed765aba243c56bd346294fa5491a8ba06149183e /sys/dev
parent1fe4d70aa87a7803bd5936c3906b56346f040298 (diff)
Use C99 designated initializer for wscons ops.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hil/hilkbd.c28
-rw-r--r--sys/dev/hil/hilms.c8
2 files changed, 19 insertions, 17 deletions
diff --git a/sys/dev/hil/hilkbd.c b/sys/dev/hil/hilkbd.c
index d946289ff12..8ded24a3366 100644
--- a/sys/dev/hil/hilkbd.c
+++ b/sys/dev/hil/hilkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hilkbd.c,v 1.6 2021/08/07 16:19:11 thorpej Exp $ */
+/* $NetBSD: hilkbd.c,v 1.7 2021/09/19 04:55:58 tsutsui Exp $ */
/* $OpenBSD: hilkbd.c,v 1.14 2009/01/21 21:53:59 grange Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
@@ -79,9 +79,9 @@ static void hilkbd_set_leds(void *, int);
static int hilkbd_ioctl(void *, u_long, void *, int, struct lwp *);
static const struct wskbd_accessops hilkbd_accessops = {
- hilkbd_enable,
- hilkbd_set_leds,
- hilkbd_ioctl,
+ .enable = hilkbd_enable,
+ .set_leds = hilkbd_set_leds,
+ .ioctl = hilkbd_ioctl,
};
static void hilkbd_cngetc(void *, u_int *, int *);
@@ -89,26 +89,28 @@ static void hilkbd_cnpollc(void *, int);
static void hilkbd_cnbell(void *, u_int, u_int, u_int);
static const struct wskbd_consops hilkbd_consops = {
- hilkbd_cngetc,
- hilkbd_cnpollc,
- hilkbd_cnbell,
+ .getc = hilkbd_cngetc,
+ .pollc = hilkbd_cnpollc,
+ .bell = hilkbd_cnbell,
};
static struct wskbd_mapdata hilkbd_keymapdata = {
- hilkbd_keydesctab,
+ .keydesc = hilkbd_keydesctab,
+ .layout =
#ifdef HILKBD_LAYOUT
- HILKBD_LAYOUT,
+ HILKBD_LAYOUT,
#else
- KB_US,
+ KB_US,
#endif
};
static struct wskbd_mapdata hilkbd_keymapdata_ps2 = {
- hilkbd_keydesctab_ps2,
+ .keydesc = hilkbd_keydesctab_ps2,
+ .layout =
#ifdef HILKBD_LAYOUT
- HILKBD_LAYOUT,
+ HILKBD_LAYOUT,
#else
- KB_US,
+ KB_US,
#endif
};
diff --git a/sys/dev/hil/hilms.c b/sys/dev/hil/hilms.c
index c8de6d5b917..23073f60213 100644
--- a/sys/dev/hil/hilms.c
+++ b/sys/dev/hil/hilms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hilms.c,v 1.4 2021/08/07 16:19:11 thorpej Exp $ */
+/* $NetBSD: hilms.c,v 1.5 2021/09/19 04:55:58 tsutsui Exp $ */
/* $OpenBSD: hilms.c,v 1.5 2007/04/10 22:37:17 miod Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
@@ -67,9 +67,9 @@ static int hilms_ioctl(void *, u_long, void *, int, struct lwp *);
static void hilms_disable(void *);
static const struct wsmouse_accessops hilms_accessops = {
- hilms_enable,
- hilms_ioctl,
- hilms_disable,
+ .enable = hilms_enable,
+ .ioctl = hilms_ioctl,
+ .disable = hilms_disable,
};
static void hilms_callback(struct hildev_softc *, u_int, uint8_t *);