From nobody Wed Aug 03 22:49:40 2022 X-Original-To: dev-commits-ports-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 4Lyn9c4PFJz4Y1yP; Wed, 3 Aug 2022 22:49:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lyn9c3ymXz3Zjj; Wed, 3 Aug 2022 22:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566980; 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=uirnmaiMeELSunJBlRR9llhappcPax/kj6wnmJeSnk0=; b=fNoNTkl3AHuxfAwCtUh3QKREbJNHWjLCsidb7ZL/+IGpAVTBhmFquEN9f71+RnFCG5FVmf ul2BNB9FzxS0ZRsrRLoeweA1BHgjLzSXLiz/j0CpjchXG7krmYJwP7Ula0dECxd32exTNr JMxIdBs21QhEuJl7JpUIw7fMNx/jAdonCWtymJXr274tqXOtHh2PjzzTEBxmVxy/55oQcC pnfHBqQOfWlvnDJ3/s0ybdtaTvEW4O0L9mMYrkIxzeE53LGi+58yRFPPe4SEOzsMacC3/h fyBoJ24bbp5U3cgaOlBmXZxxlEWf0l3arvDLJ0d1ZlZizLO9qcn08kMiQKxQDA== 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 4Lyn9c30trz17JT; Wed, 3 Aug 2022 22:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 273MneK8021415; Wed, 3 Aug 2022 22:49:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273MneNS021414; Wed, 3 Aug 2022 22:49:40 GMT (envelope-from git) Date: Wed, 3 Aug 2022 22:49:40 GMT Message-Id: <202208032249.273MneNS021414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: de3758e2e34c - main - comms/uarduno: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de3758e2e34c09c0b12343f1346aabf1834c8224 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566980; 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=uirnmaiMeELSunJBlRR9llhappcPax/kj6wnmJeSnk0=; b=HGZ12V8O2rIoXHSlIBq6l26nYZFl8qQ9zBHahL92L4vSD5bkZDAVpeXSMXVs2MLDD4XhP+ eZei4nH0ACBZuZ9KYvKDkcjp/qhCd+RHlhXcrludNob0wcHIx8kMPh9fAhUYfLpchvAEgT xBE7MgiMbHzy7pyNQTVLCSt/pDhxMViT2+cK2QZszT37JJd4siGW9z1YQRI+ubnYAiwXYj k/bFjhshlhQkRi9b1mnQuiddaQejDQp7256Fbi3IrH4zPzMz1K+TLZicmnBHWOSvAKYhFW 1bR27XmH/HTOYbIwL/NIIVT2le1y7N3mYVAAree6eQ6LOo68/sGG8WDHvnLVsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659566980; a=rsa-sha256; cv=none; b=a1nYxhrwdYLFosZ7LFCQmt+3vuESETk0P1Hq1xT7xc5f3rLW+ZoD8GbOJZPwbD7QxoEOys Ve+gbRbDjy49cESRbsKmxSmcI3L+NR/9giLV8y2eXMzNFYXhieF9EJP2UGJfgLg2ot0qOn MCpq+D0BxHAkrkxLBn7MNR4uGnv+MexZ8q4mtdzRCeoI9iO2Zsv1Vk2chcXOm8Z7ywy6hQ DT93A/HYtL6DOw5g4+pueNdbjnHFOfpyYYXYIu+oe93faQWmtCH00Fbqj6ZJ2O0+6Jwsl8 /UA89jkKxTsgdIyiGHP8erBWyK/BD0+O4tKNfkOfPAxOQRl4JT/xlGOlXljZHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=de3758e2e34c09c0b12343f1346aabf1834c8224 commit de3758e2e34c09c0b12343f1346aabf1834c8224 Author: John Baldwin AuthorDate: 2022-08-03 22:45:23 +0000 Commit: John Baldwin CommitDate: 2022-08-03 22:45:23 +0000 comms/uarduno: Remove devclass from DRIVER_MODULE on recent main. PR: 265458 Reviewed by: Bob Frazier (maintainer) Differential Revision: https://reviews.freebsd.org/D35947 --- comms/uarduno/files/patch-uarduno.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/comms/uarduno/files/patch-uarduno.c b/comms/uarduno/files/patch-uarduno.c new file mode 100644 index 000000000000..bde58343d767 --- /dev/null +++ b/comms/uarduno/files/patch-uarduno.c @@ -0,0 +1,37 @@ +--- uarduno.c.orig 2022-07-26 16:34:54 UTC ++++ uarduno.c +@@ -242,7 +242,11 @@ static driver_t uarduno_driver = + sizeof(struct uarduno_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(uarduno, uhub, uarduno_driver, usbd_driver_load, NULL); ++#else + DRIVER_MODULE(uarduno, uhub, uarduno_driver, ucom_devclass, usbd_driver_load, 0); ++#endif + MODULE_DEPEND(uarduno, usb, 1, 1, 1); + MODULE_DEPEND(uarduno, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); + MODULE_VERSION(uarduno, UARDUNO_MODVER); +@@ -1120,8 +1124,6 @@ static device_method_t uarduno_methods[] = + {0, 0} + }; + +-static devclass_t uarduno_devclass; +- + static driver_t uarduno_driver = + { + .name = "uarduno", +@@ -1129,7 +1131,13 @@ static driver_t uarduno_driver = + .size = sizeof(struct uarduno_softc), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(uarduno, uhub, uarduno_driver, NULL, NULL); ++#else ++static devclass_t uarduno_devclass; ++ + DRIVER_MODULE(uarduno, uhub, uarduno_driver, uarduno_devclass, NULL, 0); ++#endif + MODULE_DEPEND(uarduno, ucom, 1, 1, 1); + MODULE_DEPEND(uarduno, usb, 1, 1, 1); + MODULE_VERSION(uarduno, UARDUNO_MODVER);