Update to FreeBSD head 2018-09-17

Git mirror commit 6c2192b1ef8c50788c751f878552526800b1e319.

Update #3472.

7 files changed, 62 insertions, 57 deletions

diff --git a/freebsd/sys/dev/evdev/cdev.c b/freebsd/sys/dev/evdev/cdev.c
index 10f4e77e..5ae14fed 100644
--- a/freebsd/sys/dev/evdev/cdev.c
+++ b/freebsd/sys/dev/evdev/cdev.c
@@ -421,7 +421,7 @@ evdev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 			return (ENOTSUP);
 
 		ke = (struct input_keymap_entry *)data;
-		evdev->ev_methods->ev_get_keycode(evdev, evdev->ev_softc, ke);
+		evdev->ev_methods->ev_get_keycode(evdev, ke);
 		return (0);
 
 	case EVIOCSKEYCODE:
@@ -434,7 +434,7 @@ evdev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 			return (ENOTSUP);
 
 		ke = (struct input_keymap_entry *)data;
-		evdev->ev_methods->ev_set_keycode(evdev, evdev->ev_softc, ke);
+		evdev->ev_methods->ev_set_keycode(evdev, ke);
 		return (0);
 
 	case EVIOCGABS(0) ... EVIOCGABS(ABS_MAX):
diff --git a/freebsd/sys/dev/evdev/evdev.c b/freebsd/sys/dev/evdev/evdev.c
index 6c2976d7..a355ec50 100644
--- a/freebsd/sys/dev/evdev/evdev.c
+++ b/freebsd/sys/dev/evdev/evdev.c
@@ -343,6 +343,13 @@ evdev_set_methods(struct evdev_dev *evdev, void *softc,
 	evdev->ev_softc = softc;
 }
 
+inline void *
+evdev_get_softc(struct evdev_dev *evdev)
+{
+
+	return (evdev->ev_softc);
+}
+
 inline void
 evdev_support_prop(struct evdev_dev *evdev, uint16_t prop)
 {
@@ -804,8 +811,7 @@ evdev_inject_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 	case EV_FF:
 		if (evdev->ev_methods != NULL &&
 		    evdev->ev_methods->ev_event != NULL)
-			evdev->ev_methods->ev_event(evdev, evdev->ev_softc,
-			    type, code, value);
+			evdev->ev_methods->ev_event(evdev, type, code, value);
 		/*
 		 * Leds and driver repeats should be reported in ev_event
 		 * method body to interoperate with kbdmux states and rates
@@ -848,7 +854,7 @@ evdev_register_client(struct evdev_dev *evdev, struct evdev_client *client)
 	    evdev->ev_methods->ev_open != NULL) {
 		debugf(evdev, "calling ev_open() on device %s",
 		    evdev->ev_shortname);
-		ret = evdev->ev_methods->ev_open(evdev, evdev->ev_softc);
+		ret = evdev->ev_methods->ev_open(evdev);
 	}
 	if (ret == 0)
 		LIST_INSERT_HEAD(&evdev->ev_clients, client, ec_link);
@@ -866,7 +872,7 @@ evdev_dispose_client(struct evdev_dev *evdev, struct evdev_client *client)
 	if (LIST_EMPTY(&evdev->ev_clients)) {
 		if (evdev->ev_methods != NULL &&
 		    evdev->ev_methods->ev_close != NULL)
-			evdev->ev_methods->ev_close(evdev, evdev->ev_softc);
+			(void)evdev->ev_methods->ev_close(evdev);
 		if (evdev_event_supported(evdev, EV_REP) &&
 		    bit_test(evdev->ev_flags, EVDEV_FLAG_SOFTREPEAT))
 			evdev_stop_repeat(evdev);
diff --git a/freebsd/sys/dev/evdev/evdev.h b/freebsd/sys/dev/evdev/evdev.h
index 31f0c2c3..b897a465 100644
--- a/freebsd/sys/dev/evdev/evdev.h
+++ b/freebsd/sys/dev/evdev/evdev.h
@@ -38,11 +38,10 @@
 
 struct evdev_dev;
 
-typedef int (evdev_open_t)(struct evdev_dev *, void *);
-typedef void (evdev_close_t)(struct evdev_dev *, void *);
-typedef void (evdev_event_t)(struct evdev_dev *, void *, uint16_t,
-    uint16_t, int32_t);
-typedef void (evdev_keycode_t)(struct evdev_dev *, void *,
+typedef int (evdev_open_t)(struct evdev_dev *);
+typedef int (evdev_close_t)(struct evdev_dev *);
+typedef void (evdev_event_t)(struct evdev_dev *, uint16_t, uint16_t, int32_t);
+typedef void (evdev_keycode_t)(struct evdev_dev *,
     struct input_keymap_entry *);
 
 /*
@@ -126,6 +125,7 @@ void evdev_support_sw(struct evdev_dev *, uint16_t);
 void evdev_set_repeat_params(struct evdev_dev *, uint16_t, int);
 int evdev_set_report_size(struct evdev_dev *, size_t);
 void evdev_set_flag(struct evdev_dev *, uint16_t);
+void *evdev_get_softc(struct evdev_dev *);
 
 /* Multitouch related functions: */
 int32_t evdev_get_mt_slot_by_tracking_id(struct evdev_dev *, int32_t);
@@ -141,7 +141,6 @@ uint16_t evdev_scancode2key(int *, int);
 void evdev_push_mouse_btn(struct evdev_dev *, int);
 void evdev_push_leds(struct evdev_dev *, int);
 void evdev_push_repeats(struct evdev_dev *, keyboard_t *);
-evdev_event_t evdev_ev_kbd_event;
 
 /* Event reporting shortcuts: */
 static __inline int
diff --git a/freebsd/sys/dev/evdev/evdev_utils.c b/freebsd/sys/dev/evdev/evdev_utils.c
index 9814ffeb..17a815fb 100644
--- a/freebsd/sys/dev/evdev/evdev_utils.c
+++ b/freebsd/sys/dev/evdev/evdev_utils.c
@@ -42,8 +42,6 @@
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/input.h>
 
-#include <dev/kbd/kbdreg.h>
-
 #define	NONE	KEY_RESERVED
 
 static uint16_t evdev_usb_scancodes[256] = {
@@ -301,43 +299,3 @@ evdev_push_repeats(struct evdev_dev *evdev, keyboard_t *kbd)
 	evdev_push_event(evdev, EV_REP, REP_DELAY, kbd->kb_delay1);
 	evdev_push_event(evdev, EV_REP, REP_PERIOD, kbd->kb_delay2);
 }
-
-void
-evdev_ev_kbd_event(struct evdev_dev *evdev, void *softc, uint16_t type,
-    uint16_t code, int32_t value)
-{
-	keyboard_t *kbd = (keyboard_t *)softc;
-	int delay[2], leds, oleds;
-	size_t i;
-
-	if (type == EV_LED) {
-		leds = oleds = KBD_LED_VAL(kbd);
-		for (i = 0; i < nitems(evdev_led_codes); i++) {
-			if (evdev_led_codes[i] == code) {
-				if (value)
-					leds |= 1 << i;
-				else
-					leds &= ~(1 << i);
-				if (leds != oleds) {
-					mtx_lock(&Giant);
-					kbdd_ioctl(kbd, KDSETLED,
-					    (caddr_t)&leds);
-					mtx_unlock(&Giant);
-				}
-				break;
-			}
-		}
-	} else if (type == EV_REP && code == REP_DELAY) {
-		delay[0] = value;
-		delay[1] = kbd->kb_delay2;
-		mtx_lock(&Giant);
-		kbdd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
-		mtx_unlock(&Giant);
-	} else if (type == EV_REP && code == REP_PERIOD) {
-		delay[0] = kbd->kb_delay1;
-		delay[1] = value;
-		mtx_lock(&Giant);
-		kbdd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
-		mtx_unlock(&Giant);
-	}
-}
diff --git a/freebsd/sys/dev/evdev/input-event-codes.h b/freebsd/sys/dev/evdev/input-event-codes.h
index cc1528f6..61c9000b 100644
--- a/freebsd/sys/dev/evdev/input-event-codes.h
+++ b/freebsd/sys/dev/evdev/input-event-codes.h
@@ -421,6 +421,7 @@
 #define	BTN_TOOL_MOUSE		0x146
 #define	BTN_TOOL_LENS		0x147
 #define	BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
+#define	BTN_STYLUS3		0x149
 #define	BTN_TOUCH		0x14a
 #define	BTN_STYLUS		0x14b
 #define	BTN_STYLUS2		0x14c
@@ -607,6 +608,7 @@
 #define	BTN_DPAD_RIGHT		0x223
 
 #define	KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
+#define	KEY_ROTATE_LOCK_TOGGLE	0x231	/* Display rotation lock */
 
 #define	KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
 #define	KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
@@ -615,6 +617,7 @@
 #define	KEY_APPSELECT		0x244	/* AL Select Task/Application */
 #define	KEY_SCREENSAVER		0x245	/* AL Screen Saver */
 #define	KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
+#define	KEY_ASSISTANT		0x247	/* AL Context-aware desktop assistant */
 
 #define	KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
 #define	KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
@@ -626,6 +629,38 @@
 #define	KEY_KBDINPUTASSIST_ACCEPT		0x264
 #define	KEY_KBDINPUTASSIST_CANCEL		0x265
 
+/* Diagonal movement keys */
+#define	KEY_RIGHT_UP			0x266
+#define	KEY_RIGHT_DOWN			0x267
+#define	KEY_LEFT_UP			0x268
+#define	KEY_LEFT_DOWN			0x269
+
+#define	KEY_ROOT_MENU			0x26a	/* Show Device's Root Menu */
+/* Show Top Menu of the Media (e.g. DVD) */
+#define	KEY_MEDIA_TOP_MENU		0x26b
+#define	KEY_NUMERIC_11			0x26c
+#define	KEY_NUMERIC_12			0x26d
+/*
+ * Toggle Audio Description: refers to an audio service that helps blind and
+ * visually impaired consumers understand the action in a program. Note: in
+ * some countries this is referred to as "Video Description".
+ */
+#define	KEY_AUDIO_DESC			0x26e
+#define	KEY_3D_MODE			0x26f
+#define	KEY_NEXT_FAVORITE		0x270
+#define	KEY_STOP_RECORD			0x271
+#define	KEY_PAUSE_RECORD		0x272
+#define	KEY_VOD				0x273 /* Video on Demand */
+#define	KEY_UNMUTE			0x274
+#define	KEY_FASTREVERSE			0x275
+#define	KEY_SLOWREVERSE			0x276
+/*
+ * Control a data application associated with the currently viewed channel,
+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
+ */
+#define	KEY_DATA			0x277
+#define	KEY_ONSCREEN_KEYBOARD		0x278
+
 #define	BTN_TRIGGER_HAPPY		0x2c0
 #define	BTN_TRIGGER_HAPPY1		0x2c0
 #define	BTN_TRIGGER_HAPPY2		0x2c1
@@ -763,6 +798,7 @@
 #define	SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
 #define	SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define	SW_MUTE_DEVICE		0x0e  /* set = device disabled */
+#define	SW_PEN_INSERTED		0x0f  /* set = pen inserted */
 #define	SW_MAX			0x0f
 #define	SW_CNT			(SW_MAX+1)
 
diff --git a/freebsd/sys/dev/evdev/input.h b/freebsd/sys/dev/evdev/input.h
index 7639e0d6..947f4643 100644
--- a/freebsd/sys/dev/evdev/input.h
+++ b/freebsd/sys/dev/evdev/input.h
@@ -38,6 +38,9 @@
 
 #include "input-event-codes.h"
 
+#define	input_event_sec		time.tv_sec
+#define	input_event_usec	time.tv_usec
+
 struct input_event {
 	struct timeval	time;
 	uint16_t	type;
@@ -138,6 +141,9 @@ struct input_keymap_entry {
 #define	BUS_GSC			0x1A
 #define	BUS_ATARI		0x1B
 #define	BUS_SPI			0x1C
+#define	BUS_RMI			0x1D
+#define	BUS_CEC			0x1E
+#define	BUS_INTEL_ISHTP		0x1F
 
 /*
  * MT_TOOL types
diff --git a/freebsd/sys/dev/evdev/uinput.c b/freebsd/sys/dev/evdev/uinput.c
index 3b332d1f..28d740cc 100644
--- a/freebsd/sys/dev/evdev/uinput.c
+++ b/freebsd/sys/dev/evdev/uinput.c
@@ -161,10 +161,10 @@ uinput_knl_assert_unlocked(void *arg)
 }
 
 static void
-uinput_ev_event(struct evdev_dev *evdev, void *softc, uint16_t type,
-    uint16_t code, int32_t value)
+uinput_ev_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
+    int32_t value)
 {
-	struct uinput_cdev_state *state = softc;
+	struct uinput_cdev_state *state = evdev_get_softc(evdev);
 
 	if (type == EV_LED)
 		evdev_push_event(evdev, type, code, value);