From nobody Tue Feb 14 15:21:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGQ0Z2W3Nz3s4Jk; Tue, 14 Feb 2023 15:21:34 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGQ0Z250lz4Jts; Tue, 14 Feb 2023 15:21:34 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AET0b9l2fWyVObEZ22K8orUAaFZBd9a1FAyxfcXy3FQ=; b=qasyNLenxOwOTi3PriAwqwEkdEoV4LkNUMnRsdFMHMu3sjM3JMLqW9846/Ozz5ePbus2ls 4MRLk4pdXSvIsqFRS2/AWbC0Cq283ptJhD6pOotTG6FKhWvt+ri4gr13l4jF11WfKTNcw9 r3+pnBKHhTCiTBRLjGOZOlKz2p1658WMyqbTky8DS8PNyaiT6wJNc23q/HvnSeM0egrmtJ EVkfHLXG2UuizKgAFSikPaHB/CgRn9j3B7PF0U2Qrxlavou7Znpaz4W7OYQe5daDWEuUwD pyDVRyvECCyMoYYIaSYeuKGtndG2+zgYG4+BKyGCyK89U7o2rcNG7ldjsWNT7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AET0b9l2fWyVObEZ22K8orUAaFZBd9a1FAyxfcXy3FQ=; b=vilpFv/B3Zoj0W1jNEsSRrdKRcxA2fAQClX9/LYghIz+A4db1XtC6fXRqEDqPwfr8hJmFY S6g7dW7RCMQ2XOyu/F4i3utBh4qaA2RDTUIJmGVEtolIMpbC6X6bfW67udAFjvYXCA7Rl3 uG2HCLobqFwSNUtJHzbK1f7MebuhXjFaoeUaD3ARCuBk1n3twlmo4KTyVm0ojgH8lN4XRL anWVI4ZuCO0+5XHNxaKyTUnlQ1sJREES+cZWUVWkToDiuUd+trrS6z4Sw6w3g3eUvHm2bg vO94E6kJjdrS+kem8c1aHOPJeJ/M0IJU919GkoSAZVeWHtZ5fHnYhfyxd5UvlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676388094; a=rsa-sha256; cv=none; b=gLrMhBU90vJzwAqo7Beiq9jm0ORwrGh5E3UICzwpZXiXDr0s1iHKCGAXTSy4tc+xS6cxQT Hyp5h/4ETqoD/wub59MYqCFMGPJPqHNqDfrJcZq7K+QRFCE+JKm12BioVhsIv3fq6CqegX bQeZvPhTPE7rroyGPkjUyQiXFiFZxU76w3uX5/PvMqc5xzHFDHBJBALyrmfh7f+Gm+FAfa 7i8WPD06eiLURd9zJoNakl5o8JsjOxguRXIx7k0m9TmWBZOnfMM6Os+a6vx9o3hHDusk4R cP+ZljEkGLqIYg3TK2D/KxubXPoEBJgZ277lOzZAHNooEHKEwrp5Cex4zs8JSQ== Received: from gonegalt.net (ip-74-83-251-177.dynamic.fuse.net [74.83.251.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhibbits) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PGQ0Y6l9HzgBJ; Tue, 14 Feb 2023 15:21:33 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Date: Tue, 14 Feb 2023 10:21:32 -0500 From: Justin Hibbits To: Stefan =?UTF-8?B?RcOfZXI=?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f20058955c9d - main - sys/kbio.h: make pre-unicode keymap support optional Message-ID: <20230214102005.08621765@gonegalt.net> In-Reply-To: <202302141315.31EDFvN2044413@gitrepo.freebsd.org> References: <202302141315.31EDFvN2044413@gitrepo.freebsd.org> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; powerpc64le-unknown-linux-gnu) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Tue, 14 Feb 2023 13:15:57 GMT Stefan E=C3=9Fer wrote: > The branch main has been updated by se: >=20 > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Df20058955c9d1041a5a09cd02a27bab= da7e34dc8 >=20 > commit f20058955c9d1041a5a09cd02a27babda7e34dc8 > Author: Stefan E=C3=9Fer > AuthorDate: 2023-02-14 13:03:28 +0000 > Commit: Stefan E=C3=9Fer > CommitDate: 2023-02-14 13:03:28 +0000 >=20 > sys/kbio.h: make pre-unicode keymap support optional > =20 > FreeBSD-9 had introduced support for the full set of Unicode > characters to the parsing and processing of keymap character > tables.=20 > This support has been extended to cover the table for accented > characters that are reached via dead key combinations in > FreeBSD-13.2.=20 > New ioctls have been introduced to support both the pre-Unicode > and the Unicode formats and keyboard drivers have been extended to > support those ioctls. > =20 > This commit makes the ABI compatibility functions in the kernel > optional and dependent on COMPAT_FREEBSD13 in -CURRENT. > =20 > The kbdcontrol command in -CURRENT and 13-STABLE (before 13.2) has > been made ABI compatible with old kernels to allow a new world to > be run on an old kernel (that does not have full Unicode support for > keymaps). > =20 > This commit is not to merged back to 12-STABLE or 13-STABLE. It is > part of review D38465, which has been split into 3 separate > commits due to different MFC and life-time requirements of either > commit.=20 > Approved by: imp > Differential Revision: https://reviews.freebsd.org/D38465 > --- > sys/dev/adb/adb_kbd.c | 4 +++- > sys/dev/atkbdc/atkbd.c | 4 +++- > sys/dev/gpio/gpiokeys.c | 9 ++++++--- > sys/dev/hid/hkbd.c | 9 ++++++--- > sys/dev/hyperv/input/hv_kbd.c | 4 +++- > sys/dev/kbd/kbd.c | 27 ++++++++++++++++++++++----- > sys/dev/kbdmux/kbdmux.c | 6 ++++-- > sys/dev/syscons/syscons.c | 6 ++++-- > sys/dev/usb/input/ukbd.c | 9 ++++++--- > sys/dev/vkbd/vkbd.c | 4 +++- > sys/dev/vt/vt_core.c | 4 +++- > sys/sys/kbio.h | 16 ++++++++-------- > 12 files changed, 71 insertions(+), 31 deletions(-) >=20 > diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c > index 86d3865473bb..614d89c30447 100644 > --- a/sys/dev/adb/adb_kbd.c > +++ b/sys/dev/adb/adb_kbd.c > @@ -795,10 +795,12 @@ static int akbd_ioctl(keyboard_t *kbd, u_long > cmd, caddr_t data) break; > =20 > case PIO_KEYMAP: > - case OPIO_KEYMAP: > case PIO_KEYMAPENT: > case PIO_DEADKEYMAP: > +#ifdef COMPAT_FREEBSD13 > + case OPIO_KEYMAP: > case OPIO_DEADKEYMAP: > +#endif /* COMPAT_FREEBSD13 */ > default: > return (genkbd_commonioctl(kbd, cmd, data)); > } > diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c > index 08266cf4bf51..0c6dadca43aa 100644 > --- a/sys/dev/atkbdc/atkbd.c > +++ b/sys/dev/atkbdc/atkbd.c > @@ -1088,10 +1088,12 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, > caddr_t arg) return error; > =20 > case PIO_KEYMAP: /* set keyboard translation table */ > - case OPIO_KEYMAP: /* set keyboard translation table > (compat) */ case PIO_KEYMAPENT: /* set keyboard translation > table entry */ case PIO_DEADKEYMAP: /* set accent key > translation table */ +=C3=A4ifdef COMPAT_FREEBSD13 Looks like a unicode character slipped in here. - Justin