Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Dec 2019 16:04:12 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r356007 - in stable: 11/sys/dev/adb 11/sys/dev/atkbdc 11/sys/dev/hyperv/input 11/sys/dev/uart 12/sys/dev/adb 12/sys/dev/atkbdc 12/sys/dev/hyperv/input 12/sys/dev/uart
Message-ID:  <201912221604.xBMG4CAU012404@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Sun Dec 22 16:04:12 2019
New Revision: 356007
URL: https://svnweb.freebsd.org/changeset/base/356007

Log:
  MFC r355794: keyboard switch definitions: standardize on c99 initializers

Modified:
  stable/11/sys/dev/adb/adb_kbd.c
  stable/11/sys/dev/atkbdc/atkbd.c
  stable/11/sys/dev/hyperv/input/hv_kbd.c
  stable/11/sys/dev/uart/uart_kbd_sun.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/dev/adb/adb_kbd.c
  stable/12/sys/dev/atkbdc/atkbd.c
  stable/12/sys/dev/hyperv/input/hv_kbd.c
  stable/12/sys/dev/uart/uart_kbd_sun.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/dev/adb/adb_kbd.c
==============================================================================
--- stable/11/sys/dev/adb/adb_kbd.c	Sun Dec 22 15:55:52 2019	(r356006)
+++ stable/11/sys/dev/adb/adb_kbd.c	Sun Dec 22 16:04:12 2019	(r356007)
@@ -194,25 +194,25 @@ static kbd_set_state_t  akbd_set_state;
 static kbd_poll_mode_t  akbd_poll;
 
 keyboard_switch_t akbdsw = {
-        akbd_probe,
-        akbd_init,
-        akbd_term,
-        akbd_interrupt,
-        akbd_test_if,
-        akbd_enable,
-        akbd_disable,
-        akbd_read,
-        akbd_check,
-        akbd_read_char,
-        akbd_check_char,
-        akbd_ioctl,
-        akbd_lock,
-        akbd_clear_state,
-        akbd_get_state,
-        akbd_set_state,
-        genkbd_get_fkeystr,
-        akbd_poll,
-        genkbd_diag,
+        .probe =	akbd_probe,
+        .init =		akbd_init,
+        .term =		akbd_term,
+        .intr =		akbd_interrupt,
+        .test_if =	akbd_test_if,
+        .enable =	akbd_enable,
+        .disable =	akbd_disable,
+        .read =		akbd_read,
+        .check =	akbd_check,
+        .read_char =	akbd_read_char,
+        .check_char =	akbd_check_char,
+        .ioctl =	akbd_ioctl,
+        .lock =		akbd_lock,
+        .clear_state =	akbd_clear_state,
+        .get_state =	akbd_get_state,
+        .set_state =	akbd_set_state,
+        .get_fkeystr =	genkbd_get_fkeystr,
+        .poll =		akbd_poll,
+        .diag =		genkbd_diag,
 };
 
 KEYBOARD_DRIVER(akbd, akbdsw, akbd_configure);

Modified: stable/11/sys/dev/atkbdc/atkbd.c
==============================================================================
--- stable/11/sys/dev/atkbdc/atkbd.c	Sun Dec 22 15:55:52 2019	(r356006)
+++ stable/11/sys/dev/atkbdc/atkbd.c	Sun Dec 22 16:04:12 2019	(r356007)
@@ -230,25 +230,25 @@ static kbd_set_state_t	atkbd_set_state;
 static kbd_poll_mode_t	atkbd_poll;
 
 static keyboard_switch_t atkbdsw = {
-	atkbd_probe,
-	atkbd_init,
-	atkbd_term,
-	atkbd_intr,
-	atkbd_test_if,
-	atkbd_enable,
-	atkbd_disable,
-	atkbd_read,
-	atkbd_check,
-	atkbd_read_char,
-	atkbd_check_char,
-	atkbd_ioctl,
-	atkbd_lock,
-	atkbd_clear_state,
-	atkbd_get_state,
-	atkbd_set_state,
-	genkbd_get_fkeystr,
-	atkbd_poll,
-	genkbd_diag,
+	.probe =	atkbd_probe,
+	.init =		atkbd_init,
+	.term =		atkbd_term,
+	.intr =		atkbd_intr,
+	.test_if =	atkbd_test_if,
+	.enable =	atkbd_enable,
+	.disable =	atkbd_disable,
+	.read =		atkbd_read,
+	.check =	atkbd_check,
+	.read_char =	atkbd_read_char,
+	.check_char =	atkbd_check_char,
+	.ioctl =	atkbd_ioctl,
+	.lock =		atkbd_lock,
+	.clear_state =	atkbd_clear_state,
+	.get_state =	atkbd_get_state,
+	.set_state =	atkbd_set_state,
+	.get_fkeystr =	genkbd_get_fkeystr,
+	.poll =		atkbd_poll,
+	.diag =		genkbd_diag,
 };
 
 KEYBOARD_DRIVER(atkbd, atkbdsw, atkbd_configure);

Modified: stable/11/sys/dev/hyperv/input/hv_kbd.c
==============================================================================
--- stable/11/sys/dev/hyperv/input/hv_kbd.c	Sun Dec 22 15:55:52 2019	(r356006)
+++ stable/11/sys/dev/hyperv/input/hv_kbd.c	Sun Dec 22 16:04:12 2019	(r356007)
@@ -446,25 +446,25 @@ hvkbd_read(keyboard_t *kbd, int wait)
 }
 
 static keyboard_switch_t hvkbdsw = {
-	hvkbd_probe,		/* not used */
-	hvkbd_init,
-	hvkbd_term,		/* not used */
-	hvkbd_intr,		/* not used */
-	hvkbd_test_if,		/* not used */
-	hvkbd_enable,
-	hvkbd_disable,
-	hvkbd_read,
-	hvkbd_check,
-	hvkbd_read_char,
-	hvkbd_check_char,
-	hvkbd_ioctl,
-	hvkbd_lock,		/* not used */
-	hvkbd_clear_state,
-	hvkbd_get_state,	/* not used */
-	hvkbd_set_state,	/* not used */
-	genkbd_get_fkeystr,
-	hvkbd_poll,
-	genkbd_diag,
+	.probe =	hvkbd_probe,		/* not used */
+	.init =		hvkbd_init,
+	.term =		hvkbd_term,		/* not used */
+	.intr =		hvkbd_intr,		/* not used */
+	.test_if =	hvkbd_test_if,		/* not used */
+	.enable =	hvkbd_enable,
+	.disable =	hvkbd_disable,
+	.read =		hvkbd_read,
+	.check =	hvkbd_check,
+	.read_char =	hvkbd_read_char,
+	.check_char =	hvkbd_check_char,
+	.ioctl =	hvkbd_ioctl,
+	.lock =		hvkbd_lock,		/* not used */
+	.clear_state =	hvkbd_clear_state,
+	.get_state =	hvkbd_get_state,	/* not used */
+	.set_state =	hvkbd_set_state,	/* not used */
+	.get_fkeystr =	genkbd_get_fkeystr,
+	.poll =		hvkbd_poll,
+	.diag =		genkbd_diag,
 };
 
 KEYBOARD_DRIVER(hvkbd, hvkbdsw, hvkbd_configure);

Modified: stable/11/sys/dev/uart/uart_kbd_sun.c
==============================================================================
--- stable/11/sys/dev/uart/uart_kbd_sun.c	Sun Dec 22 15:55:52 2019	(r356006)
+++ stable/11/sys/dev/uart/uart_kbd_sun.c	Sun Dec 22 16:04:12 2019	(r356007)
@@ -117,25 +117,25 @@ static int keycode2scancode(int keycode, int shift, in
 #endif
 
 static keyboard_switch_t sunkbdsw = {
-	sunkbd_probe,
-	sunkbd_init,
-	sunkbd_term,
-	sunkbd_intr,
-	sunkbd_test_if,
-	sunkbd_enable,
-	sunkbd_disable,
-	sunkbd_read,
-	sunkbd_check,
-	sunkbd_read_char,
-	sunkbd_check_char,
-	sunkbd_ioctl,
-	sunkbd_lock,
-	sunkbd_clear_state,
-	sunkbd_get_state,
-	sunkbd_set_state,
-	genkbd_get_fkeystr,
-	sunkbd_poll_mode,
-	sunkbd_diag
+	.probe =	sunkbd_probe,
+	.init =		sunkbd_init,
+	.term =		sunkbd_term,
+	.intr =		sunkbd_intr,
+	.test_if =	sunkbd_test_if,
+	.enable =	sunkbd_enable,
+	.disable =	sunkbd_disable,
+	.read =		sunkbd_read,
+	.check =	sunkbd_check,
+	.read_char =	sunkbd_read_char,
+	.check_char =	sunkbd_check_char,
+	.ioctl =	sunkbd_ioctl,
+	.lock =		sunkbd_lock,
+	.clear_state =	sunkbd_clear_state,
+	.get_state =	sunkbd_get_state,
+	.set_state =	sunkbd_set_state,
+	.get_fkeystr =	genkbd_get_fkeystr,
+	.poll =		sunkbd_poll_mode,
+	.diag =		sunkbd_diag
 };
 
 KEYBOARD_DRIVER(sunkbd, sunkbdsw, sunkbd_configure);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912221604.xBMG4CAU012404>