From nobody Fri Jul 28 19:09:33 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 4RCHJ01tb5z4pbkc; Fri, 28 Jul 2023 19:09:36 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4RCHJ018kCz3NLp; Fri, 28 Jul 2023 19:09:36 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690571376; 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=N6OKMAm1Ovykzs9OUX9Z8DlJkRxg57LKMtTulQgI8/8=; b=BRXGAh0ZbprVM6EBoO3fLV8g9qIztRgHjmLJiivTAHfo2PLzB2jquerM3aUKM0ynzs1gLF CoUmZMihI4ZTOggxt7C5croeKtoBztRFS9f3zmNkYYI2OUpzwRrrehnnrPBtIz3K8ifxNb Jio5LgN/RxhADgmGwCpMPyGaqyQgaqp6W1VI/PSMIskhKyGiGALxdpb9nG7LTuPGWOnSiQ MwRXDGPF5kkHKcFCcfQxk4/CCKDWt0KK01OFrfLDzP9nxkjdrhhl6PQBDYyv7qKoMB7VcJ eK2dEqpJuvL6mlsrLGGa7jZkv17MUNZqybDzBixqHOWlx6FPysTo0Yoosn4kmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690571376; 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=N6OKMAm1Ovykzs9OUX9Z8DlJkRxg57LKMtTulQgI8/8=; b=ZeV1G3PhVDwBoQLzduuingrRnSwCLjWoNrZU/YRTQDDZ1n6a2BLh/dRzPW6IDl1LAsWwvq fOVLN1QRM0JF9Ik60waddkiFpEudjpHV7rcA8RjFxZHQn6KkLJHTEGeOjAEDleOX+oCOCN 3EXjK3O1GdAyiL6ZGhd9xKJPdzfdNR015b5viKxNADGh/82EotmijZ6k/L+U2PFOKknABc 30kPsJgaGzkl0ibQetoDtsY3haH00mc9duTF3m6KNE81V2GoMnAG/8mio9K+30wo44Msld A9oqEOf6A2oF26FwBM9KBZI1fxPHp2bDng1jeuMbWHfaOgbl8DDPWsZaHG2T9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690571376; a=rsa-sha256; cv=none; b=Czxj0FUiVYEDj/m9VNt95yHxv+G4i9Ze4cZKhRWRaHu8XF4Z5QbrRo3ftd1JIR2YoSmrvy FtyDjJ0FsQP44lOPe9YGkoQBFNKSxsM/HBSaneqOcnQDy5Torb22wZMMyHn4k0UkY1a7XM O5YsCGXFLz5UVWoDDkak4+DnGNtV55USDfMZc4ykukzWJDvgFRJ8uco12azuJ0nKeQ6yDA 2w+gKAka/yQKgjzoVeMNtDnFMbPWeetdOY4PfMgM+KULoyxJCZh+EMYjzcfknyoSll5fFH beY/RSgROuelW3ohuMS9g8QHlIgYsV7lXu7UpBup8F7odbJ6Uq428vidBKQy6g== Received: from [172.21.4.170] (dynamic-177-53-82-16.telecominternet.net.br [177.53.82.16]) (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) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RCHHy6YFQz1BBx; Fri, 28 Jul 2023 19:09:34 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <079cf9ae-3476-1269-4092-587c1c983597@FreeBSD.org> Date: Fri, 28 Jul 2023 16:09:33 -0300 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 971bac5ace7a - main - kbd: consolidate kb interfaces (phase one) Content-Language: en-US To: Jessica Clarke Cc: Warner Losh , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202307070510.3675AWZS051152@gitrepo.freebsd.org> <65b0e348-b27d-f641-1004-6f76ff3ebfbd@FreeBSD.org> <0504b648-df5e-4125-c4bc-01d4ecd5374d@FreeBSD.org> <40ECF84B-ECF1-4700-9059-F971BBD3668B__22149.6855768905$1690571077$gmane$org@jrtc27.com> From: Renato Botelho In-Reply-To: <40ECF84B-ECF1-4700-9059-F971BBD3668B__22149.6855768905$1690571077$gmane$org@jrtc27.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 28/07/23 16:04, Jessica Clarke wrote: > On 28 Jul 2023, at 20:01, Renato Botelho wrote: >> >> On 28/07/23 00:04, Warner Losh wrote: >>> On Thu, Jul 27, 2023 at 5:48 AM Renato Botelho > wrote: >>> On 07/07/23 02:10, Warner Losh wrote: >>> > The branch main has been updated by imp: >>> > >>> > URL: >>> https://cgit.FreeBSD.org/src/commit/?id=971bac5ace7a3c2262349fa2808188a11a5ffeed >>> > >>> > commit 971bac5ace7a3c2262349fa2808188a11a5ffeed >>> > Author: Michael > >>> > AuthorDate: 2023-07-07 02:32:45 +0000 >>> > Commit: Warner Losh >>> > CommitDate: 2023-07-07 05:10:18 +0000 >>> > >>> > kbd: consolidate kb interfaces (phase one) >>> > >>> > Refactor to eliminate duplicated rate and delay tables, with >>> minor style >>> > tweaks for changed lines. Remove an obsolete comment about >>> needing to >>> > convert from microseconds to ticks (that's done elsewhere). >>> Remove >>> > traiing whitespace in kbdcontrol.c. >>> > >>> > Except for the new warning, no change in behavior >>> > >>> > Sponsored by: DSS GmbH >>> > Reviewed by: imp [minor style tweaks as well] >>> > Pull Request: https://github.com/freebsd/pull/683 >>> >>> > Differential Revision: https://reviews.freebsd.org/D38818 >>> >>> > --- >>> > sys/dev/adb/adb_kbd.c | 12 ++------- >>> > sys/dev/atkbdc/atkbd.c | 18 +++++--------- >>> > sys/dev/gpio/gpiokeys.c | 10 ++------ >>> > sys/dev/hid/hkbd.c | 10 ++------ >>> > sys/dev/kbdmux/kbdmux.c | 23 +++++------------ >>> > sys/dev/usb/input/ukbd.c | 10 ++------ >>> > sys/dev/vkbd/vkbd.c | 18 +++++--------- >>> > sys/sys/kbio.h | 7 ++++++ >>> > usr.sbin/kbdcontrol/kbdcontrol.c | 53 >>> +++++++++++++++++++++------------------- >>> > 9 files changed, 61 insertions(+), 100 deletions(-) >>> After this change I started seeing following error building kbdcontrol: >>> Building /usr/obj/usr/src/amd64.amd64/usr.sbin/kbdcontrol/kbdcontrol.o >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:35: error: use of >>> undeclared identifier 'kbdelays'; did you mean 'ndelays'? >>> static const int ndelays = nitems(kbdelays); >>> ^~~~~~~~ >>> ndelays >>> /usr/include/sys/param.h:324:28: note: expanded from macro 'nitems' >>> #define nitems(x) (sizeof((x)) / sizeof((x)[0])) >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:18: note: 'ndelays' >>> declared here >>> static const int ndelays = nitems(kbdelays); >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:35: error: use of >>> undeclared identifier 'kbdelays'; did you mean 'ndelays'? >>> static const int ndelays = nitems(kbdelays); >>> ^~~~~~~~ >>> ndelays >>> /usr/include/sys/param.h:324:42: note: expanded from macro 'nitems' >>> #define nitems(x) (sizeof((x)) / sizeof((x)[0])) >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:18: note: 'ndelays' >>> declared here >>> static const int ndelays = nitems(kbdelays); >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:28: error: subscripted >>> value is not an array, pointer, or vector >>> static const int ndelays = nitems(kbdelays); >>> ^~~~~~~~~~~~~~~~ >>> /usr/include/sys/param.h:324:44: note: expanded from macro 'nitems' >>> #define nitems(x) (sizeof((x)) / sizeof((x)[0])) >>> ~~~^~ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:98:36: error: use of >>> undeclared identifier 'kbrates' >>> static const int nrepeats = nitems(kbrates); >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:98:36: error: use of >>> undeclared identifier 'kbrates' >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:1072:17: error: use of >>> undeclared identifier 'kbdelays'; did you mean 'ndelays'? >>> if (delay <= kbdelays[n]) >>> ^~~~~~~~ >>> ndelays >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:97:18: note: 'ndelays' >>> declared here >>> static const int ndelays = nitems(kbdelays); >>> ^ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:1072:25: error: subscripted >>> value is not an array, pointer, or vector >>> if (delay <= kbdelays[n]) >>> ~~~~~~~~^~ >>> /usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:1076:18: error: use of >>> undeclared identifier 'kbrates' >>> if (repeat <= kbrates[n]) >>> ^ >>> 8 errors generated. >>> *** Error code 1 >>> I haven't seen this. How do I recreate this? Does this happen on a clean build? >> >> After I upgrade system to recent CURRENT the error is gone. > > kbdcontrol requires an updated sys/kbio.h, so if you try and do a make > of just it outside of make buildenv and without having first installed > updated headers to worldtmp then you won’t get the updated sys/kbio.h. > I don’t think that’s something we support in general, only when it > happens to work? It failed during an attempt of make buildworld. After that I tried to build only it, just to check. I ran make depend first too. -- Renato Botelho