From nobody Wed Oct 09 23:13:44 2024 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 4XP7x45NC3z5Z6QL; Wed, 09 Oct 2024 23:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP7x44rdwz4jvZ; Wed, 9 Oct 2024 23:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728515624; 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; bh=/v0fNZ0fnouTJeCpKXwrvAcSk32+H6m+qUU/pWCUiyY=; b=SCeevW225yQjRTiezNFMfxM/SrHKMCxvj5IkHSifIEgBs7EoBUQKi2N8uh6w1wltmhXlxs HIKgteEwm97yO3Pgho49WOXLTNcrQjbChvX9ubLfK5NTiWdgx0bkY7k23P5U9R0Luobl47 bWDeTrT3zRR8IpDxDFo/Owp4+SJEz9WDkmmtB1rZNTk3hvBNCfwq1ZniMItNEbnrdjjfCB PmuiId3lTFROxzitJie0Jtngm1/WipYJZCUgyfSVPJc2Uuu1lMxvrjNnoCr4GoZ+L/kOrX Gz+HQ7BYLTDLHhVlxdMqrwbxH0+pnOur+Bl4R/gkSQjaDddEMamErJvVk7ooKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728515624; 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; bh=/v0fNZ0fnouTJeCpKXwrvAcSk32+H6m+qUU/pWCUiyY=; b=fg2N3Rsofvd94YDR/HHkySYMWyDJGnja0rkWOPlXiCg4wJP9Bd7vekHxaFeyxVFjqz2mc9 1rGOOp/Cr7NjoiePysgtlbjtZFbOAN30Kq7SWxvJffALbJILIzVxYJ+Va+VqQveLtLYovt POPec0wcnYMttyy8vJaxFbnyrvBKq8tZ7MSaQCNuXkiXy98ElUeV97tIDwsNGBOOVcaSgK 1n48D7lU7BD4DLTCEAbv0vCEkgrwxG0EGkvehzLVofKJUb5cshB/z3SxdZZtZHQkUWzPNz hPIqEhKCmS70bz4YcaX/c3Kni0JYepW7zBU6QQT/xbVf6Xte8Qg04xE5pqXE8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728515624; a=rsa-sha256; cv=none; b=no5F5t3n0/aaKGyVFn4bz0N8+slZHxwjl5rSt0qR4prj3/1Du8Bactq0UPxPRND049keVD 71qG2dfCr9p4iuxMrLrffWUwFJLwiFlYmxELJEhQfwSc/rVbXU56mJvJXqQrHbxoyc3eFP VoQtbKQSo1gvzogJ7piHxPiNKynE7Y0HaT3EVD+o9lFCodrrUh+Qo2qk0MdwZGtPnsQnx5 bIfMkiUI8U3G5inXlv+Z1/KgGQt78BmBMEijm2JLflqnhO/vCMhWUl/ZpcdFDZPmHFlSEF JwSKC0g6b/migZIWZisEVZGp9uAm0XBtsfVLjA+Bukt7h6uAkxTQuut7Pvz76w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XP7x44SdjzYZq; Wed, 9 Oct 2024 23:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499NDiHn044711; Wed, 9 Oct 2024 23:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499NDill044708; Wed, 9 Oct 2024 23:13:44 GMT (envelope-from git) Date: Wed, 9 Oct 2024 23:13:44 GMT Message-Id: <202410092313.499NDill044708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 794e20f8071e - stable/14 - tools/sdiodevs2h.awk: adjust defined named for vendor and device IDs 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 794e20f8071e434ac4f72033264ab493bf1ea94e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=794e20f8071e434ac4f72033264ab493bf1ea94e commit 794e20f8071e434ac4f72033264ab493bf1ea94e Author: Bjoern A. Zeeb AuthorDate: 2024-08-27 18:35:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-09 19:18:28 +0000 tools/sdiodevs2h.awk: adjust defined named for vendor and device IDs Generate defined names which match the ones in the Linux drivers (a lot more); given we are likely to have drivers only based on those one way or another there is absolutely no reason to fight over differently generated names for device and vendor IDs. Sponsored by: The FreeBSD Foundation Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D46300 (cherry picked from commit 51cb6f5244575e1abc008598e90eb35452ffbcac) --- sys/tools/sdiodevs2h.awk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/tools/sdiodevs2h.awk b/sys/tools/sdiodevs2h.awk index 818bdef58762..596d09531ab1 100644 --- a/sys/tools/sdiodevs2h.awk +++ b/sys/tools/sdiodevs2h.awk @@ -55,7 +55,7 @@ function vendor(hfile) vendors[nvendors, 1] = $2; # name vendors[nvendors, 2] = $3; # id if (hfile) - printf("#define\tSDIO_VENDOR_%s\t%s\t", vendors[nvendors, 1], + printf("#define\tSDIO_VENDOR_ID_%s\t%s\t", vendors[nvendors, 1], vendors[nvendors, 2]) > hfile i = 3; f = 4; @@ -105,7 +105,7 @@ function product(hfile) products[nproducts, 2] = $3; # product id products[nproducts, 3] = $4; # id if (hfile) - printf("#define\tSDIO_PRODUCT_%s_%s\t%s\t", \ + printf("#define\tSDIO_DEVICE_ID_%s_%s\t%s\t", \ products[nproducts, 1], products[nproducts, 2], \ products[nproducts, 3]) > hfile @@ -155,7 +155,7 @@ function dump_dfile(dfile) printf("const struct sdio_knowndev sdio_knowndevs[] = {\n") > dfile for (i = 1; i <= nproducts; i++) { printf("\t{\n") > dfile - printf("\t SDIO_VENDOR_%s, SDIO_PRODUCT_%s_%s,\n", + printf("\t SDIO_VENDOR_ID_%s, SDIO_DEVICE_ID_%s_%s,\n", products[i, 1], products[i, 1], products[i, 2]) > dfile printf("\t ") > dfile printf("0") > dfile @@ -189,7 +189,7 @@ function dump_dfile(dfile) } for (i = 1; i <= nvendors; i++) { printf("\t{\n") > dfile - printf("\t SDIO_VENDOR_%s, 0,\n", vendors[i, 1]) > dfile + printf("\t SDIO_VENDOR_ID_%s, 0,\n", vendors[i, 1]) > dfile printf("\t SDIO_KNOWNDEV_NOPROD,\n") > dfile printf("\t \"") > dfile j = 3;