From nobody Sat Feb 25 17:03:06 2023 X-Original-To: dev-commits-src-main@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 4PPCl15YRdz3tdVH for ; Sat, 25 Feb 2023 17:03:25 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPCl03bvvz3nWj for ; Sat, 25 Feb 2023 17:03:24 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=JXxFES88; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677344602; bh=DiJE3YY55gWr5Ys8bMj/PTxh8284alKAmwvpTgFyx/c=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=JXxFES88UNCshtpz97uTgya3e/G/CflDF3ZQlSODB99eHb63Z1pcjwqexuZ/zoDYEia530D7nMBqEeKiVBrBgBXPTxwz5J41xxZTsi5WySJGvSv3vKqxG2M4DluZbTQKG26RAYdxhIw9A25zzmKcndM87fRLrIzb8xqEo6yMPZuBLvyPm7+1mkBRR2sU5FySympt9zBIHfkJC8aibEt5RW+5kmkpSngGiOc1B4VPF+xk6SrxprKxNhIf9SPkMW+UyZUdDrNk4CEONHyyAzgQtjYTqMZocQB/hcYKtjexh/DyJYsAl3Pn6JftkXqDc+lF4gKgrsUK8Q4Kd7DYJc+WMg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677344602; bh=9JHqi1979EuU2RZ2mgfoCJzusH6ezAXpFNIudHhnFUK=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=iGTQBdqYaAHztaJh3c9U6qLfZGArS41WTHc9Iw+HS/JxjcNHqKnEDWlxgsDS/Mi5/Uyt1BFlHTzBTXs9uw8ICXRNmnWohU5L/6AeyGTSi2HT9lcKMaQQNaoapFg5vmrXg9TMAQuJEzAVBPgHuUF4henB5VX6psCoQyS7qj0KPiZrXwF+BeVTGTVP7DuwUUWTHsyt7X5y93uyHUSfLF7K74lG/Bi3dr9E9aM+kqFsFyRqBesRa5nAhh6k0NF1Sip+oCI3tsEINjHFd07OWy8Xf+SuWcbr5HqW5lL4vAUBAWoR0Gtg6r9ZN/A0JpCjfBejgH4JkWN/QVoIheRhYvSMDg== X-YMail-OSG: T4G8KYQVM1ko9M63alYIfqhXknY1TYn9hzhqeatOznxduI6APahWgFOyWpgttk9 gl4q.s_2zmgD0E1BdMZi66jvLtd3b26SSXzvcf.pXd92vcbYIRIVY58Icz9AV3h45jRZJXFcc2fy kSZBXv.zDIm4egFQuku8Og3G5y0pOTmRPmZWy1UOw1uEPDxE37W3slTn_AEeHLWTu24c3mk2.VFz uxi9KBig7g1PoIkZ7CyJVxBwNeADrGTHnncOOGS2fYRfzU1WWOMFZPOjP2eKyddC9CM8DW2Y2hXb 3nt8t4wN7WMyKaXaceRckH9S6CdjxPspwPYNQ7YaOmSTp5bKzoL3JTPVS5D7I2BFxBNMzqUIbtpx I9m678DieO7bg82.tEogZpHiVtsRec0AnuKSzBQv_TFNS7_Ubt7NqTHExlMXRkq3WoW.YWSxOByw OC5_1dd9o2qMqqYcQyaf8KXsc9Mn44T7A3meHQjy_J6iuAnbz9j7wrH2Kx6aIW5bVs_Vr_8eR090 zZyGL3keZIjb5K_cK9VRkKsg3YusAhcBo1vGZG02CBXXFL6cQoLJlxFKM6DPkFQq0QD5Zl3zhDma .M1bWXPcAOQj_qHN8DKUzTFHEiSZ1hqbqYAUv8HVFUCMWm32GRO.aO2e6R2.VzyTYW7_lBmXlmQI Nmftu.t_izwRCXnNGygYpMp6puaJRDnYgWMctPllzeULPEmwJ6.2j50heGonpFwh4YsIjGrOL7Ah Ljp6vuPV8bE4BBG.tCQFI56uc2SG.8yGR6bVgpcpDJFVx7WV23DkzxAXUbr2hbfQuk6ffQTN56OH CiCG6KEX..tinbebOzjPO2R1xTkzhh4nozP20TgSj0ErVUGFMyuooWnIOTOiPKETdAwxmgD1Yndm RiVA2K9yR87FEbDUY9t7CHTG3Rb0poLfWX4NC23NvJzzg0tJEVobL3hywl9UvDvSIqsIEITF8Q_n ZzVg0wokTPJ.KkQw7Jv9haeCMYqSeQmO_hcz08kZ.7ukE1NtP5YYAgsoNaXmpxI2C6VPAaRxkYIJ 23WonfFRpKlPB1gfUjlYnVjpzlm2GkgLTxzPDHdtTbnbiwlvOBVCkSfvsMu8ySXyOrJvT9OW.TF1 Av4oUSioUi4dpGfxOH8Hnb97TXN5uwovOAQOjNSRWEKOiTSpWss6zvT6L2pyluEorsXFWDebSo1b yD.IYOpPu8U3dGa6is15MWqgp5AvAJ.Nl1saxQWcIhF_qCJMzIZvtAAeGIbXXP3YYRpOPwcIllta P7bMub.RqnlIBv9nNBoldGPX7pBkozPQkjJEmjNyFo7qL7bDqaEeyYkTnFhkXJA3DYgPIDgHzGRA cTXzOptNgRNYLNWGGA5GKWGo2q50BlH9Bl0BnsHFOZxT1RCp6pwgdLbE_TCdcLtcR_IrtYqlEgPH zUzuhWawmLKQsYggCtxJ.wAeKF8hUyPqWbZLooRIeT0FwwhHU9cqHZdANxpWvtHZJXXgpWkj8OIR yhxfcZUn1ytMl3d9Gl3caKeknE0XigvM8Xu97c.a6RoXDjK2S4xpLoSctm9KnLfV06teXTCq15H4 0hbOUO4hgM0ZtzZ8_wpj2z4VbabOqabl7mN1X9RDMWn5vpKC5j9pI5KfW.BZBKQ_PkNPCTUJqxng mjpZxCVfJ2gI_pqhOL1PdJVfHg4Beh3z0Dc6dd5OSCjmQbdfO6p9k.sgVS264asMXWX9b3iBCi7F AL2FLYAUjYrmQWsfgOVHZe6Nyj5_3Y9IU8C9RG78q0W8yvvpsrzICckib1XrrQlGiGroj2TEFqlv ubevxctfUT9Gxovk8bETX3l.VKhQI4DYbD9_EaqSdlMLYNID48oVWJNwxpPUGpDCrondT8A5Li8R 12ZdtcjCsolKv8XXqJYjK1lI5W0PAXZlIR_24dD5lC6CNzZi2x47CVaeZVpnJH55TI1ka.jTVyEl sOL50vLEMV6LMFzPx.tLopIJA2i7_wwLI1lwrRmk3K3TpAbcuJtHh4Ry24taiKGgkoMjE8_jnA30 Hb5woM_K2op8kjV.TCxMhvGqUrd6R1t4XD8uULz7JP.XSF5o7T_qGKM6StGBM0YiOKllMddRwA2t Cqs0rojMOqBVZwsLf4U7hmZYnOlT9kHquqxuW58yygutrLdKTitQ.HIBlTD9vxo5QwJ703j6KWCJ Ze2qY4hNdrVQLaPz8JgV.DE92ARIT9uCFu6uv4SsWEBshQxKllz2gG40A6Gx_qKkki87E3ImXZMK wpVQ0xXoHveKli1RVqhE17QiuiyJqZgnL3JuZC3Vi9V5D7oDH_4ftN2gPSDqDc3TdkU.TOaogrfe C X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Sat, 25 Feb 2023 17:03:22 +0000 Received: by hermes--production-ne1-746bc6c6c4-z5pmw (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID e38b5cdcdf9937895c1cb505586cdab2; Sat, 25 Feb 2023 17:03:17 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: RE: git: c51978f4b2f0 - main - kbd: add KBD_DELAY1 and KBD_DELAY2 Message-Id: <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> Date: Sat, 25 Feb 2023 09:03:06 -0800 To: imp@freebsd.org, dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.400.51.1.1) References: <66452C86-02AA-4604-B65C-5E32EEBAFCC3.ref@yahoo.com> X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; DKIM_TRACE(0.00)[yahoo.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4PPCl03bvvz3nWj X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N Warner Losh wrote on Date: Sat, 25 Feb 2023 06:26:00 UTC : > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d3= 5acb8ba4 >=20 > commit c51978f4b2f080c80ddc891c24b151d35acb8ba4 > Author: Michael Paepcke > AuthorDate: 2023-02-18 09:11:37 +0000 > Commit: Warner Losh > CommitDate: 2023-02-25 06:19:05 +0000 >=20 > kbd: add KBD_DELAY1 and KBD_DELAY2 > =20 > Allow to configure KBD_DELAY* via KERNCONF for user-land less = embedded > and security appliances > =20 > Reviewed by: imp (folded) > Pull Request: https://github.com/freebsd/freebsd-src/pull/649 > --- > sys/conf/options | 3 ++- > sys/dev/kbd/kbd.c | 4 ++-- > sys/dev/kbd/kbdreg.h | 8 ++++++-- > 3 files changed, 10 insertions(+), 5 deletions(-) >=20 > diff --git a/sys/conf/options b/sys/conf/options > index 7855a2f3f20e..42529a90a54e 100644 > --- a/sys/conf/options > +++ b/sys/conf/options > @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV opt_kbd.h > KBD_MAXRETRY opt_kbd.h > KBD_MAXWAIT opt_kbd.h > KBD_RESETDELAY opt_kbd.h > +KBD_DELAY1 opt_kbd.h > +KBD_DELAY2 opt_kbd.h > KBDIO_DEBUG opt_kbd.h > - > KBDMUX_DFLT_KEYMAP opt_kbdmux.h > =20 > # options for the Atheros driver > diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c > index 205d76639e0f..ebc779de4073 100644 > --- a/sys/dev/kbd/kbd.c > +++ b/sys/dev/kbd/kbd.c > @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, int = type, int unit, int config, > kbd->kb_accentmap =3D NULL; > kbd->kb_fkeytab =3D NULL; > kbd->kb_fkeytab_size =3D 0; > - kbd->kb_delay1 =3D KB_DELAY1; /* these values are advisory = only */ > - kbd->kb_delay2 =3D KB_DELAY2; > + kbd->kb_delay1 =3D KBD_DELAY1; /* these values are advisory = only */ > + kbd->kb_delay2 =3D KBD_DELAY2; > kbd->kb_count =3D 0L; > bzero(kbd->kb_lastact, sizeof(kbd->kb_lastact)); > } > diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h > index 15b7e5183f35..2839e259420d 100644 > --- a/sys/dev/kbd/kbdreg.h > +++ b/sys/dev/kbd/kbdreg.h > @@ -151,8 +151,12 @@ struct keyboard { > void *kb_data; /* the driver's private data */ > int kb_delay1; > int kb_delay2; > -#define KB_DELAY1 500 > -#define KB_DELAY2 100 > +#ifndef KBD_DELAY1 > +#define KBD_DELAY1 500 > +#endif > +#ifndef KBD_DELAY2 > +#define KBD_DELAY2 100 > +#endif [Just reporting Ximalas's Discord note.] So opt_kbd.h must be included before kbdreg.h in order to avoid: macro redefined in opt_kbd.h ? Should something force the right order? > unsigned long kb_count; /* # of processed key strokes */ > u_char kb_lastact[NUM_KEYS/2]; > struct cdev *kb_dev; =3D=3D=3D Mark Millard marklmi at yahoo.com