From nobody Thu Jul 27 11:48:35 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 4RBTYh0THPz4p8bF; Thu, 27 Jul 2023 11:48:40 +0000 (UTC) (envelope-from garga@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 4RBTYg3YMQz3Lvm; Thu, 27 Jul 2023 11:48:39 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690458519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D1rQmYwkE1/mIOJInN4lgkWiwTrdCx5X9zzkr8i3QDM=; b=WPseQhchdSZArZZDuRLN4QA6kUMm5zqI2B8YH+jeTjc/gzjTgHGgkBdQc8XpGP1N/2bcG7 2rELDi7y8vbx+RlAd1ZXTEGbtoswB71rhFewdN7cNcHZE4Ih1KajAfefoO1uy9MltMaIkj QbN+TvZj9/T3OaNy+QiriG1/KkrOrvg/ykwzyp8A6i3hNSUT/bbSPeCbPq+Fv5TehS+UWu pyTug9dywMI1aCfbB7J1vZ+0UIDnGFpAH1nt4bOJzzQBCfzj/ag6oxb9wHvnGgvgGla0vQ n1ZiX524oqCpu3E3QtLFwwxpGAeVptMiY1pxNrSVOwGU1FiPGmYWIffvmKDfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690458519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D1rQmYwkE1/mIOJInN4lgkWiwTrdCx5X9zzkr8i3QDM=; b=mUgkZeSXT99JKOBKE7bO4JpaMjDrQn5X9etK8IYyLHhKOy+0+Dvjcd1g4pCnO49gMV9fwh ixSmORu6HsmKesgkihvQJLHjUduvQxx//fMhUTlcwCvSi+MrLdhHbDHNsxBvLwrbm/bUEI XbnD1bZ6wJ1r/lDlI0fx1xmxv5kKlqSy/DqPqTmvPhiTjdc6gGVVYKFtl0OIESQU0jAXJK ELGVeUSKSegQHNvgcghsC75xBOutwUOJMlUmTPWvch+fiejJWt0p+5PZo/1vCKDN6Yj57y s41ZIWOIA680oVDAG0NYI1f4gABYqiWh6Ks+9s2gGDkNO1YEpAoWp+cvRiWBbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690458519; a=rsa-sha256; cv=none; b=Eirwc6Nxnb8kpeB2fdPg2IcY4VQqtt+nAgp4l9bLtrvqVOPlsebzjD1AGzlj7k4gnEfnBe k/T+6+SCJKCi9Zv/THpyW9cUa/L/Vr/8Dz+vvlfKLoTNeuhcqgjVpY5gl8rH+ZF365pw9h 5nlrK14l1MzJbgTsBFhgjiygE/99spZk/DuP+aNK5a/n0aeLkXOmVDbE3gcukAVpN3K2yh iUM08d/oZfDd0zCL+4XqwUmbXNFmTzeJWKeFnqMt9PguzY/Rmsvjc4RwzV2UXRs74EJYdr fhyJhoyUiHEd7OmIHA15eyKj+0dpbLFtIeGCOhDsmNqyCsuQ+KwGlkbBd0r+8g== 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 4RBTYf4w3zzY6K; Thu, 27 Jul 2023 11:48:38 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <65b0e348-b27d-f641-1004-6f76ff3ebfbd@FreeBSD.org> Date: Thu, 27 Jul 2023 08:48:35 -0300 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 971bac5ace7a - main - kbd: consolidate kb interfaces (phase one) To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307070510.3675AWZS051152@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho In-Reply-To: <202307070510.3675AWZS051152@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 -- Renato Botelho