From nobody Mon Feb 27 04:12:36 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 4PQ6Y51PLHz3tHph for ; Mon, 27 Feb 2023 04:12:57 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic309-22.consmr.mail.gq1.yahoo.com (sonic309-22.consmr.mail.gq1.yahoo.com [98.137.65.148]) (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 4PQ6Y45mhgz3hGR for ; Mon, 27 Feb 2023 04:12:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677471174; bh=r1jUaI93SovfoSQJ5etBqcCtghA+v5xHDX+LrcxiHb4=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=TFguXvF8FdtqHQMTHXz10aSHRiwqE0ZB3GdBCPlNpZom2g5DAm74yzoVR9Y6Vi0cR3YlAGT49xwtKStw8mwY0QppqLxGngko4gYYc/jYSpxiZt/5vQq3WDrNfr0eeuaDEAx2zThT3EFSoFaLlG4vfMm/VGCVJyIElnAQp75oTrO3Gap4wGtyzGjBtT/rO9j0C8fGTBTAxndX4Og8m0u7pbLlsK8hywZH+0UtJ1gwXfT3zDcZxp8cEmNBgjgOuGf8p3qTwLMK+4+cw7En6UKEUDkhfz/1VEgho93xbgzZhbUD4BBGHUQkKR9qk/x008WsYyj7h8eSWzgdJkgpwAFOrA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677471174; bh=zTCT7JdClfY2Jw2Y0udAHKINXvwoAfJ36w2A0FXiM1G=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=SK/siJAvWFVvyldb/Pwc7rRfigTvduGLKA25SMYe3FohdRV+gd3MryFqe4aMXJCDQhSZgvUhcDSj7wl9cxo4yBzxhR8B/PLMrvNDXqNL7JNB8NIgf0QJPs53YCd2H/edulf+N85oozxYHpypkhpepXfJ2BDFwsC9qXcrHW/GDuDicRg22YBZnoeQYE6b4Mrk1bZ4JiEJrxeIA+8+xhDfjm2OG0nA5fWMR0SFi0u0UmOdyvWxDxwH6pampbE590wnzySsHOjfp9XoJs1UAuT1kWT09txrKCxQUW5FSg7SFzV7i4SmAjBnox02HOBCEwqGfsDfijq2s98ntmiR+ldO7Q== X-YMail-OSG: pYzs79kVM1k_LkTMXh4yZuKgQ1h0_iGSbaYNmB1QZglAogezbTzKDid675vnh3A QxaV281y7rcO0raEOrZhQzeG63Zt1E_tCypVAKsRBzaIK.lhtvRm31re1.PM86GqjjeWG0Jz_2k8 1DayJPBs19M1Lcb8tzbcKiwNl4zDAKdNBO5qZYEXUlsT5mC80JVDmLhO4xAJZ2.wm.VoQSW54LTX Hw0NKzx52ZnA1AXc9pKYenzzK1GqqaLNcyG4pMPPuWskn5m4xONv9uDohNZ08uQJTZ1kT4da_uBT U0T.nhh6Yh_HnpH8Ff4JmYEGBBP7pp7oJvibP_f0bwyykpjx252ymB5Z6OcPBq1yoR3tK6LxD.cl 6Yhc_qihNGw_SdInaTsWlKr4v8ovMoS2ddwlPJUFRxpbPW9248B8TuICNlnM_GIotxsg5.ZO8i0p UtHqkD_svoSvXoU5F6yb4kuDOVzdb7BL.RKunLdr7UT2aoCDcdCBdFTni7ee5eS.NbgIzi6UgAsK 9CDy7s2Bhe_VJ3slWT5YbFfL5xOjMDzSmZRFj1Q5kVC0_fYMxiY8POMX08RvAajSBWu055l7VFU4 G2F4S_cFLyJRItiTAaotpG0RyWWR1FicfFVHMef33CVTUBQaz638uAGL1nWVE4BX5C_lVj13CQXE xM0Njpu9ViKohPIb9JIwHigUAje1bulvLQPDEh.o.E4q743q_7hDiF92RBJTtMoOUsW4iTkuZcYo JxDxkz5gDyrQDhoNxeMtW0bSu7wxtGYlFreSGN.P..Db6KiUJOFF8GdT4XWrw8fesm7RsYZWZ7Wr 8QtyCNrL.Pk5pevHzdTMSDqkEYHK3NCsjx.YOB9B3N8OJ7MTIaPIekyy8n0YCDr0ZbuOb8b0YhFx eeOVlvIs5NBEPQbyRb.RNTmQ_8BWRS.3y52LZBDshnw4SCFkXiGvS2jtxtLbnPtno43J.5G3eDLq aFnd3ERuBqpPLUGCAgzSnoiInkcKoP86qHjcTz__R38iCWpaQO_YXaRSBMQmusOmTcUnKFhy3eKM YAR0R_kxCAh6ZJUCDV1PWU8ZfJevZY6cCLJRuT_wbL3hipK0pJrvzxkM1GJTfNy.Zf8Re_gq4fXk r3qdzt5FG20W.aXQtehnRclPsUTkbs.y2R.8kAEmAbQUcVnRCNpaFVUaQCUWyfTxunXaYDAom6HM gsQ.RaYjNGEvl4YMbf5dRy8gG12Gtli4znLjwIFrXJLYZfdo9MPRCnTQAwRjtxv99Zn_7vHwzX7m tEriLpJToEnnFDYfGiKMAYjE0aWPuhfeEnIW6qyvEpQRCQFafSXsjIPVeEKbQUZcn68pEnRx52Vt n39kksmWCQdt9Flc3susTbcXJdAEaCy5PoeyZ0Gud_m2afST1SIuXOTc_bn4Vi2WM3qMra8fOOeu yPgAeIzIRD52Gv1HWkvLhd6sZkjOnPK46Ay_FM7WdPuzEzelDh_MmXX.OFPtYKrac3bSlLuTgdSt K9McILTWIMULPg2GR254BPHsf3KScnYrqrd.5hagwipDLduNgmsDFku2eNBbSAr1oXBeSQjlVsU0 fucuglVMd.aTbfhKyejDzinZk8UYC_Sew9lT5P31d2zDk6QUp4tvf_ifv3RO0N647XIrmgAqLmi. GMiIoBNGFUUs338Swb2FCUuTcv6uITzIRjlkbCCiF8YVaofm6XKGdwBp_b3JnA.jsqBpxcpz7Ocd lDS94EPC7b2CS6059dtCB6xRi42.6iXyFGdnbfchNJHTzJhvnX9z1PPpLfXiO9kXLk8MzaB1VOVu j5EzedVsjIztxH3HlP6D3WyIFq0PWlv3DM34uFh.fDS9nXi0qpcWa2kuaTPE8cIXYJD06n8DZ8HB 1tda4eXpsf0.xzUz0kjcmZBKXO.kOnhrCjgUTNmDN0NVAaiofq83aU56uSyEIDwNQ1U0eyOkilv. 2UieKK8wLU_V90ouIy7e8d1oKv8vfZbAhdsY6zUNVdri1b695wE_feGWgIh5QEOQZcpuVb4KYFjx WOAP9xJwZxJEhT9k.aBDDyyvOV69nlGzNcfBzkbaAew9bmvM3d0J7vKzbDbxD_j4S6i.KhyOVFDY zsvigq5J5S75HjP0dMuWauHlRvqqacypql1dwedIkaczmuwgTQOef8wboH6enwyswirM2ZS1kxlE HIAvKxc.Ev9EvZVya.catoC7_q6DCwx_sMjhu6i.YhQ.9gYvUikU_88hRRklk9GYEIOotQtOlqbQ Pme6CH3yLw3hWnoikGPNAhADaZfOIRTW0PW8RC48XzPWt4nUHs2GxvZ.foJSEXL5AN8FSjGQ0Cqu Vquo- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.gq1.yahoo.com with HTTP; Mon, 27 Feb 2023 04:12:54 +0000 Received: by hermes--production-bf1-57c96c66f6-97q92 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 45e13a01e5d1acfb5175c12ad474b365; Mon, 27 Feb 2023 04:12:48 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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 From: Mark Millard In-Reply-To: Date: Sun, 26 Feb 2023 20:12:36 -0800 Cc: imp@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5BEC0410-DBAA-4CBF-8BDB-5C317AD2A094@yahoo.com> References: <66452C86-02AA-4604-B65C-5E32EEBAFCC3.ref@yahoo.com> <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> To: Warner Losh X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PQ6Y45mhgz3hGR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Feb 26, 2023, at 19:33, Warner Losh wrote: > On Sat, Feb 25, 2023 at 10:03=E2=80=AFAM Mark Millard = wrote: > Warner Losh wrote on > Date: Sat, 25 Feb 2023 06:26:00 UTC : >=20 > > 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 >=20 > [Just reporting Ximalas's Discord note.] >=20 > So opt_kbd.h must be included before kbdreg.h in > order to avoid: macro redefined in opt_kbd.h ? >=20 > Should something force the right order? >=20 > If we include them in the wrong order, then the compiler will = complain, > and that's likely sufficient. I'll double check NOTES to make sure = that the > values there are different than the defaults. The report on Discord (Kernel) was that the attempted use resulted in: --- psm.o --- In file included from /usr/src/sys/dev/atkbdc/psm.c:100: In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: ./opt_kbd.h:1:9: error: 'KBD_DELAY1' macro redefined = [-Werror,-Wmacro-redefined] #define KBD_DELAY1 200 ^ /usr/src/sys/dev/kbd/kbdreg.h:155:9: note: previous definition is here #define KBD_DELAY1 500 ^ In file included from /usr/src/sys/dev/atkbdc/psm.c:100: In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: ./opt_kbd.h:3:9: error: 'KBD_DELAY2' macro redefined = [-Werror,-Wmacro-redefined] #define KBD_DELAY2 15 ^ /usr/src/sys/dev/kbd/kbdreg.h:158:9: note: previous definition is here #define KBD_DELAY2 100 ^ 2 errors generated. *** [psm.o] Error code 1 The reported workaround was: diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index a308cc81cd3a..86560f7bc2dd 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include "opt_isa.h" +#include "opt_kbd.h" #include "opt_psm.h" #include "opt_evdev.h" > Warner > > 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