From nobody Tue Aug 27 18:39:03 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 4Wtbt02Fn8z52cSv; Tue, 27 Aug 2024 18:39:04 +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 4Wtbt00v44z4gsT; Tue, 27 Aug 2024 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724783944; 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=Tv4vFF/mU4aaY/rixZlbRk8vy4MF8WXoFcOVa+gKJX8=; b=aqOINMS30fID801HrDn9UqvS5vUm1Y/W2sLSqoVlRY8rvGo7kotSJsmPHONFwyn2pdUTDJ +JJJzh13N/pkibuCk7jzVdShcagJ92/FbHDZsKytzzOBLE77rLNg7hWNL9/WLttfSJ+57I 3L+6NzO1nea2LSyuM7vTFmvKxJ85kylir174PVvLb3n0Fph5WBpz2GRCV1AQ+7tDu+rzxE y8e6tAW56ILjw8R7eszrQ9Tap2CsI6c4G0S3qJC8uooISSek6+59zv9cxLq1ycNG6Ifzo7 n46xbLxGU7K8d3shurrDBH9oI5VOGeWP2IeCD4lJfOc5UBciPTJoxw4vDquu5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724783944; a=rsa-sha256; cv=none; b=KcqJ1LOTUAMywvPJ89/BMISXI9ryARITj8k8vyN4WMgLQbhzCa89MTlevlS2krQTwoHLhE ISfaKnuqjcU0eqMI+u4msh8d9vsinlNQ8XBV+5ebd0H3XoQ1Tltzg855n0yNOofgyuTIGt Fh2WUShzPt/giVhlqtcZ2q5QVtdMLux+E1DPBLLRtpf51LsiXSgaUwlz/Kl09sYhc/kib8 OaaGfd8RSw5NKXX6cYeC5S7HrVdYBWFSc7PFzyIytDwoRcwGK4zwC0xeNLxer/HYVnsrk7 YMOopmsVysrxhsnSItMOrohRuCq+RBxNPpP1rptVig2sDHA8lSy4hJKadGilIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724783944; 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=Tv4vFF/mU4aaY/rixZlbRk8vy4MF8WXoFcOVa+gKJX8=; b=fxsd9yh8YuB/+ePKrhYyoWoUnBELJNppDIvt9QjLinGDoC5f8Nm/BXbupCjFQwsU3vJgKD 3HqvX3DGGrqkErgvlgEjpwsdqZezK2/bkUCE32HACEjXM+8wHcEp7q/R4ZnJ7dv59Fhlx5 m2icPfs6kYzE4x9T3vfvHpObc+BtadsHEBdI5SaroQBYANB23YBtgzJwGqJP06Roq/jzww QxNmM9hk+49DUAT3pLd9i69pqiSgYK16C1IzUyXz4qtMTRDt+B1O+qBVHDQOq8pWwwP9RU c6hRNK5NJyAway9zkZ4U2mEMFIx85gaxjLPdBLY19/Th6bPmsZyq6KylP5Tx3g== 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 4Wtbt00WdGz11bg; Tue, 27 Aug 2024 18:39:04 +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 47RId3j6044869; Tue, 27 Aug 2024 18:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RId3NV044866; Tue, 27 Aug 2024 18:39:03 GMT (envelope-from git) Date: Tue, 27 Aug 2024 18:39:03 GMT Message-Id: <202408271839.47RId3NV044866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 51cb6f524457 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 51cb6f5244575e1abc008598e90eb35452ffbcac Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=51cb6f5244575e1abc008598e90eb35452ffbcac commit 51cb6f5244575e1abc008598e90eb35452ffbcac Author: Bjoern A. Zeeb AuthorDate: 2024-08-27 18:35:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-08-27 18:37:55 +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 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D46300 --- 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;