Module Name: src
Committed By: riastradh
Date: Fri Oct 28 23:40:37 UTC 2022
Modified Files:
src/sys/dev/ic: pckbc.c
src/sys/dev/pckbport: pckbd.c pms.c
Log Message:
pckbport(4): C99 initializers
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/ic/pckbc.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pckbport/pckbd.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pckbport/pms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/pckbc.c
diff -u src/sys/dev/ic/pckbc.c:1.62 src/sys/dev/ic/pckbc.c:1.63
--- src/sys/dev/ic/pckbc.c:1.62 Fri May 1 01:34:57 2020
+++ src/sys/dev/ic/pckbc.c Fri Oct 28 23:40:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.62 2020/05/01 01:34:57 riastradh Exp $ */
+/* $NetBSD: pckbc.c,v 1.63 2022/10/28 23:40:37 riastradh Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.62 2020/05/01 01:34:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.63 2022/10/28 23:40:37 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,13 +85,13 @@ void pckbc_start(struct pckbc_internal *
const char * const pckbc_slot_names[] = { "kbd", "aux" };
-static struct pckbport_accessops const pckbc_ops = {
- pckbc_xt_translation,
- pckbc_send_devcmd,
- pckbc_poll_data1,
- pckbc_slot_enable,
- pckbc_intr_establish,
- pckbc_set_poll
+static const struct pckbport_accessops pckbc_ops = {
+ .t_xt_translation = pckbc_xt_translation,
+ .t_send_devcmd = pckbc_send_devcmd,
+ .t_poll_data1 = pckbc_poll_data1,
+ .t_slot_enable = pckbc_slot_enable,
+ .t_intr_establish = pckbc_intr_establish,
+ .t_set_poll = pckbc_set_poll,
};
#define KBD_DELAY DELAY(8)
Index: src/sys/dev/pckbport/pckbd.c
diff -u src/sys/dev/pckbport/pckbd.c:1.36 src/sys/dev/pckbport/pckbd.c:1.37
--- src/sys/dev/pckbport/pckbd.c:1.36 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/pckbport/pckbd.c Fri Oct 28 23:40:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.36 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: pckbd.c,v 1.37 2022/10/28 23:40:37 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.36 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.37 2022/10/28 23:40:37 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,9 +137,9 @@ void pckbd_set_leds(void *, int);
int pckbd_ioctl(void *, u_long, void *, int, struct lwp *);
const struct wskbd_accessops pckbd_accessops = {
- pckbd_enable,
- pckbd_set_leds,
- pckbd_ioctl,
+ .enable = pckbd_enable,
+ .set_leds = pckbd_set_leds,
+ .ioctl = pckbd_ioctl,
};
void pckbd_cngetc(void *, u_int *, int *);
@@ -147,17 +147,17 @@ void pckbd_cnpollc(void *, int);
void pckbd_cnbell(void *, u_int, u_int, u_int);
const struct wskbd_consops pckbd_consops = {
- pckbd_cngetc,
- pckbd_cnpollc,
- pckbd_cnbell,
+ .getc = pckbd_cngetc,
+ .pollc = pckbd_cnpollc,
+ .bell = pckbd_cnbell,
};
const struct wskbd_mapdata pckbd_keymapdata = {
- pckbd_keydesctab,
+ .keydesc = pckbd_keydesctab,
#ifdef PCKBD_LAYOUT
- PCKBD_LAYOUT,
+ .layout = PCKBD_LAYOUT,
#else
- KB_US,
+ .layout = KB_US,
#endif
};
Index: src/sys/dev/pckbport/pms.c
diff -u src/sys/dev/pckbport/pms.c:1.39 src/sys/dev/pckbport/pms.c:1.40
--- src/sys/dev/pckbport/pms.c:1.39 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/pckbport/pms.c Fri Oct 28 23:40:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.39 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.39 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $");
#include "opt_pms.h"
@@ -97,9 +97,9 @@ static bool pms_suspend(device_t, const
static bool pms_resume(device_t, const pmf_qual_t *);
static const struct wsmouse_accessops pms_accessops = {
- pms_enable,
- pms_ioctl,
- pms_disable,
+ .enable = pms_enable,
+ .ioctl = pms_ioctl,
+ .disable = pms_disable,
};
static int
