svn commit: r356012 - in stable: 11/sys/arm/versatile 11/sys/dev/gpio 11/sys/dev/hyperv/input 11/sys/dev/usb/input 12/sys/arm/versatile 12/sys/dev/gpio 12/sys/dev/hyperv/input 12/sys/dev/usb/input

[Kyle Evans]

Author: kevans
Date: Sun Dec 22 17:06:56 2019
New Revision: 356012
URL: https://svnweb.freebsd.org/changeset/base/356012

Log:
  MFC r355793: kbd drivers: use kbdd_* indirection for diag invocation

Modified:
  stable/12/sys/arm/versatile/pl050.c
  stable/12/sys/dev/gpio/gpiokeys.c
  stable/12/sys/dev/hyperv/input/hv_kbd.c
  stable/12/sys/dev/usb/input/ukbd.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/arm/versatile/pl050.c
  stable/11/sys/dev/gpio/gpiokeys.c
  stable/11/sys/dev/hyperv/input/hv_kbd.c
  stable/11/sys/dev/usb/input/ukbd.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/arm/versatile/pl050.c
==============================================================================
--- stable/12/sys/arm/versatile/pl050.c	Sun Dec 22 17:04:16 2019	(r356011)
+++ stable/12/sys/arm/versatile/pl050.c	Sun Dec 22 17:06:56 2019	(r356012)
@@ -716,7 +716,7 @@ pl050_kmi_attach(device_t dev)
 #endif
 
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 	kmi_attached = 1;
 	return (0);

Modified: stable/12/sys/dev/gpio/gpiokeys.c
==============================================================================
--- stable/12/sys/dev/gpio/gpiokeys.c	Sun Dec 22 17:04:16 2019	(r356011)
+++ stable/12/sys/dev/gpio/gpiokeys.c	Sun Dec 22 17:06:56 2019	(r356012)
@@ -433,7 +433,7 @@ gpiokeys_attach(device_t dev)
 #endif
 
 	if (bootverbose) {
-		genkbd_diag(kbd, 1);
+		kbdd_diag(kbd, 1);
 	}
 
 	total_keys = 0;

Modified: stable/12/sys/dev/hyperv/input/hv_kbd.c
==============================================================================
--- stable/12/sys/dev/hyperv/input/hv_kbd.c	Sun Dec 22 17:04:16 2019	(r356011)
+++ stable/12/sys/dev/hyperv/input/hv_kbd.c	Sun Dec 22 17:06:56 2019	(r356012)
@@ -535,7 +535,7 @@ hv_kbd_drv_attach(device_t dev)
 	}
 #endif
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 	return (0);
 detach:

Modified: stable/12/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/12/sys/dev/usb/input/ukbd.c	Sun Dec 22 17:04:16 2019	(r356011)
+++ stable/12/sys/dev/usb/input/ukbd.c	Sun Dec 22 17:06:56 2019	(r356012)
@@ -1370,7 +1370,7 @@ ukbd_attach(device_t dev)
 	sc->sc_flags |= UKBD_FLAG_ATTACHED;
 
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 
 #ifdef USB_DEBUG