Date: Wed, 3 Aug 2022 22:49:40 GMT From: John Baldwin <jhb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: de3758e2e34c - main - comms/uarduno: Remove devclass from DRIVER_MODULE on recent main. Message-ID: <202208032249.273MneNS021414@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <jhb@FreeBSD.org> AuthorDate: 2022-08-03 22:45:23 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-08-03 22:45:23 +0000 comms/uarduno: Remove devclass from DRIVER_MODULE on recent main. PR: 265458 Reviewed by: Bob Frazier <bobf@mrp3.com> (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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208032249.273MneNS021414>