From nobody Wed Aug 03 22:49:39 2022 X-Original-To: dev-commits-ports-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 4Lyn9b3Z7lz4Y24D; Wed, 3 Aug 2022 22:49:39 +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 4Lyn9b2z37z3ZHn; Wed, 3 Aug 2022 22:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566979; 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=v9K1ibsd1qqpRxMwPzBMVtGu3r1xDFVtQ8PLlEKfrCo=; b=q5Qul+bVCD4wVzHd5ySan6Jpf7nD5UaeeVbRJkeB0mxe0GAquXA/mYPTh/OceXMLQ+MW2e GO6N1PKml2gxcCKvWIaiS/rJjmvDwr3I5VY9v7NOI3Dwhn6auwRXy1KRQHSksaX0LmSHx5 ep7IGHm2bYHswX/bq0ntufmAMY3x4SuGR+QnDwukEVoj39es0wzm0dMWmmXsnDIBFqP7sL dQlOiv0dZw1Nuq1O7QiEkrKUZHKb1ynTectPZDItYtY3JUCSQEFuL85G2jHwoWot5FmLWi G0hRgR1bjC6k1Re5o4LYPGrxzAFE3AvQQov4ayF/Vhw3QYXyrOmIcVadhqBJUQ== 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 4Lyn9b21RNz16l6; Wed, 3 Aug 2022 22:49:39 +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 273Mnd5f021391; Wed, 3 Aug 2022 22:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273Mndm4021390; Wed, 3 Aug 2022 22:49:39 GMT (envelope-from git) Date: Wed, 3 Aug 2022 22:49:39 GMT Message-Id: <202208032249.273Mndm4021390@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: b2590422fe56 - main - multimedia/cx88: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b2590422fe56b7d7f906dc0b02b2128fc04ef1fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566979; 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=v9K1ibsd1qqpRxMwPzBMVtGu3r1xDFVtQ8PLlEKfrCo=; b=FLNJGSJgfhmRDvZrk+Dc88KZKW1uRqF3JQvESp7iMOHlz6CDKtasJisKAtKRQTJrRQYNUv cZGThrtLMM6gdBTQcGwFKrAHRuw1kJrpXH7uDEBX6q85yB08pkj9NXF/TBf9UgC9CUy7x1 XnATQPOjmykksN2Sn6fPTkwhtKAvKIZO20cXsZ2dPbJQ12K3JKu7cDnxGt9z4+9oEL3CQs 4KcI7ywZs5V1KReMf2eH2QGc7qLSsawNQiphDK3yfU6Y4coNedt/e2e/XwROGPT6/QS+cW jXy3qjOfotOXwDqnzORtBa5/OwbtGCj0LTvJHYUf2RELBwEs34zOPH3DHhnjfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659566979; a=rsa-sha256; cv=none; b=fpr9aHojXIblDNvudBEGT7WuDHc6SKluLimWZosF+pebNu47SGoNEjfKiGAeIsZu9fpfge aRi+yaqTOb8I5QZuTGZra6odUfS7v0T+dU1EL1JvCpX0N1TMEybAVePGkjB5RA1kPH1Fbq 7ICtht3HeN70d/vge6NbIVMdvNlxDeoFr+V83CrGgK6y/CrBx6OViKisVKr2QZL/ilCBJN PnIdC2uAyBk0ljtRPwHKfPnWkO24D5kb5vIP4q/dPvyO1qxkNXPgI65KzyqMshgoXQtjJq dsDbdIqNFz3nnZnwDpkSIuz5xmswcLyqg3nyhCCwaxRBCDf23IYxZTgKYipAQA== 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=b2590422fe56b7d7f906dc0b02b2128fc04ef1fb commit b2590422fe56b7d7f906dc0b02b2128fc04ef1fb Author: John Baldwin AuthorDate: 2022-08-03 22:44:20 +0000 Commit: John Baldwin CommitDate: 2022-08-03 22:45:00 +0000 multimedia/cx88: Remove devclass from DRIVER_MODULE on recent main. While here, remove DRIVER_MODULE lines for the cardbus driver. These are not necessary since the cardbus bus driver inherits from the pci bus driver, so all PCI drivers are already candidates for cardbus devices. Reviewed by: jah (maintainer) Differential Revision: https://reviews.freebsd.org/D35946 --- multimedia/cx88/files/patch-audio_cx88__audio.h | 18 ++++++++ .../files/patch-cx23880_audio_cx23880__audio.c | 26 ++++++++++++ .../cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c | 26 ++++++++++++ .../files/patch-cx23880_video_cx23880__video.c | 26 ++++++++++++ .../files/patch-cx23885_avcore_cx23885__avcore.c | 39 +++++++++++++++++ multimedia/cx88/files/patch-cx23885_cx23885.c | 49 ++++++++++++++++++++++ multimedia/cx88/files/patch-iicdev_iicdev.c | 25 +++++++++++ multimedia/cx88/files/patch-ir_cx88__ir.c | 25 +++++++++++ 8 files changed, 234 insertions(+) diff --git a/multimedia/cx88/files/patch-audio_cx88__audio.h b/multimedia/cx88/files/patch-audio_cx88__audio.h new file mode 100644 index 000000000000..238e17ecd2ad --- /dev/null +++ b/multimedia/cx88/files/patch-audio_cx88__audio.h @@ -0,0 +1,18 @@ +--- audio/cx88_audio.h.orig 2022-07-26 16:13:09 UTC ++++ audio/cx88_audio.h +@@ -127,9 +127,15 @@ extern driver_t cx88_pcm_driver; + + extern driver_t cx88_pcm_driver; + ++#if __FreeBSD_version >= 1400058 + #define CX88_PCM_DRIVER_MODULE(host) \ ++ DRIVER_MODULE(cx88pcm, host, cx88_pcm_driver, NULL, NULL); \ ++ MODULE_DEPEND(host, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); ++#else ++#define CX88_PCM_DRIVER_MODULE(host) \ + DRIVER_MODULE(cx88pcm, host, cx88_pcm_driver, pcm_devclass, NULL, NULL); \ + MODULE_DEPEND(host, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); ++#endif + + int cx88_audio_setup( + cx88_audio_softc *sc, diff --git a/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c b/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c new file mode 100644 index 000000000000..1cf621328235 --- /dev/null +++ b/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c @@ -0,0 +1,26 @@ +--- cx23880/audio/cx23880_audio.c.orig 2022-07-26 16:22:44 UTC ++++ cx23880/audio/cx23880_audio.c +@@ -1018,8 +1018,6 @@ static int cx23880_audio_shutdown(device_t dev) + return 0; + } + +-static devclass_t cx23880_audio_devclass; +- + static device_method_t cx23880_audio_methods[] = + { + /* Device interface */ +@@ -1058,8 +1056,13 @@ static driver_t cx23880_audio_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE_ORDERED(cx23880audio, pci, cx23880_audio_driver, NULL, NULL, SI_ORDER_ANY); ++#else ++static devclass_t cx23880_audio_devclass; ++ + DRIVER_MODULE_ORDERED(cx23880audio, pci, cx23880_audio_driver, cx23880_audio_devclass, NULL, NULL, SI_ORDER_ANY); +-DRIVER_MODULE_ORDERED(cx23880audio, cardbus, cx23880_audio_driver, cx23880_audio_devclass, NULL, NULL, SI_ORDER_ANY); ++#endif + + CX88_DRIVER_MODULE(cx23880audio); + CX88_I2C_DRIVER_MODULE(cx23880audio); diff --git a/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c b/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c new file mode 100644 index 000000000000..e1a2f5d5ecde --- /dev/null +++ b/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c @@ -0,0 +1,26 @@ +--- cx23880/mpeg/cx23880_mpeg.c.orig 2022-07-26 16:16:15 UTC ++++ cx23880/mpeg/cx23880_mpeg.c +@@ -173,8 +173,6 @@ static int cx23880_mpeg_request_reconfig(device_t dev) + return cx88_mpeg_request_reconfig(&(sc->mpeg)); + } + +-static devclass_t cx23880_mpeg_devclass; +- + /* DEVMETHODs */ + static device_method_t cx23880_mpeg_methods[] = + { +@@ -203,8 +201,13 @@ static driver_t cx23880_mpeg_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE_ORDERED(cx23880mpeg, pci, cx23880_mpeg_driver, NULL, NULL, SI_ORDER_ANY); ++#else ++static devclass_t cx23880_mpeg_devclass; ++ + DRIVER_MODULE_ORDERED(cx23880mpeg, pci, cx23880_mpeg_driver, cx23880_mpeg_devclass, NULL, NULL, SI_ORDER_ANY); +-DRIVER_MODULE_ORDERED(cx23880mpeg, cardbus, cx23880_mpeg_driver, cx23880_mpeg_devclass, NULL, NULL, SI_ORDER_ANY); ++#endif + + CX88_DRIVER_MODULE(cx23880mpeg); + CX88_I2C_DRIVER_MODULE(cx23880mpeg); diff --git a/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c b/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c new file mode 100644 index 000000000000..2a19b778079b --- /dev/null +++ b/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c @@ -0,0 +1,26 @@ +--- cx23880/video/cx23880_video.c.orig 2022-07-26 16:17:40 UTC ++++ cx23880/video/cx23880_video.c +@@ -519,8 +519,6 @@ static int cx23880_video_request_reconfig(device_t dev + return cx88_video_request_reconfig(&(sc->video)); + } + +-static devclass_t cx23880_video_devclass; +- + /* DEVMETHODs */ + static device_method_t cx23880_video_methods[] = + { +@@ -561,8 +559,13 @@ static driver_t cx23880_video_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE_ORDERED(cx23880video, pci, cx23880_video_driver, NULL, NULL, SI_ORDER_ANY); ++#else ++static devclass_t cx23880_video_devclass; ++ + DRIVER_MODULE_ORDERED(cx23880video, pci, cx23880_video_driver, cx23880_video_devclass, NULL, NULL, SI_ORDER_ANY); +-DRIVER_MODULE_ORDERED(cx23880video, cardbus, cx23880_video_driver, cx23880_video_devclass, NULL, NULL, SI_ORDER_ANY); ++#endif + + CX88_DRIVER_MODULE(cx23880video); + CX88_I2C_DRIVER_MODULE(cx23880video); diff --git a/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c b/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c new file mode 100644 index 000000000000..f0667fc3a47a --- /dev/null +++ b/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c @@ -0,0 +1,39 @@ +--- cx23885/avcore/cx23885_avcore.c.orig 2022-07-26 16:27:33 UTC ++++ cx23885/avcore/cx23885_avcore.c +@@ -45,9 +45,6 @@ + + #define CX23885AV_I2C_TIMEOUT (hz / 8) + +-static devclass_t cx23885av_devclass; +-static devclass_t cx23885adc_devclass; +- + typedef struct + { + uint32_t hactive; +@@ -1260,7 +1257,13 @@ static driver_t cx23885av_driver = + sizeof(cx23885av_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cx23885av, iicbus, cx23885av_driver, NULL, NULL); ++#else ++static devclass_t cx23885av_devclass; ++ + DRIVER_MODULE(cx23885av, iicbus, cx23885av_driver, cx23885av_devclass, NULL, NULL); ++#endif + MODULE_DEPEND(cx23885av, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); + MODULE_DEPEND(cx23885av, firmware, 1, 1, 1); + MODULE_DEPEND(cx23885av, cx88audiocore, CX88_AUDIO_MINVER, CX88_AUDIO_MODVER, CX88_AUDIO_MAXVER); +@@ -1318,6 +1321,12 @@ static driver_t cx23885adc_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cx23885adc, iicbus, cx23885adc_driver, NULL, NULL); ++#else ++static devclass_t cx23885adc_devclass; ++ + DRIVER_MODULE(cx23885adc, iicbus, cx23885adc_driver, cx23885adc_devclass, NULL, NULL); ++#endif + MODULE_DEPEND(cx23885adc, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); + MODULE_VERSION(cx23885adc, CX23885ADC_MODVER); diff --git a/multimedia/cx88/files/patch-cx23885_cx23885.c b/multimedia/cx88/files/patch-cx23885_cx23885.c new file mode 100644 index 000000000000..a19941930822 --- /dev/null +++ b/multimedia/cx88/files/patch-cx23885_cx23885.c @@ -0,0 +1,49 @@ +--- cx23885/cx23885.c.orig 2022-07-26 16:24:23 UTC ++++ cx23885/cx23885.c +@@ -508,8 +508,6 @@ static int cx23885_suspend(device_t dev) + return error; + } + +-static devclass_t cx23885_devclass; +- + /* DEVMETHODs */ + static device_method_t cx23885_methods[] = + { +@@ -532,8 +530,13 @@ static driver_t cx23885_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE_ORDERED(cx23885b, pci, cx23885_driver, NULL, NULL, SI_ORDER_ANY); ++#else ++static devclass_t cx23885_devclass; ++ + DRIVER_MODULE_ORDERED(cx23885b, pci, cx23885_driver, cx23885_devclass, NULL, NULL, SI_ORDER_ANY); +-DRIVER_MODULE_ORDERED(cx23885b, cardbus, cx23885_driver, cx23885_devclass, NULL, NULL, SI_ORDER_ANY); ++#endif + + CX88_DRIVER_MODULE(cx23885b); + CX88_PCM_DRIVER_MODULE(cx23885b); +@@ -544,8 +547,6 @@ MODULE_VERSION(cx23885b, CX23885_MODVER); + MODULE_DEPEND(cx23885b, cx23885adc, CX23885ADC_MINVER, CX23885ADC_MODVER, CX23885ADC_MAXVER); + MODULE_VERSION(cx23885b, CX23885_MODVER); + +-static devclass_t cx23885_i2c_devclass; +- + static int cx23885_i2c_probe(device_t dev) + { + device_set_desc(dev, "CX23885/7/8 I2C master"); +@@ -596,7 +597,13 @@ static driver_t cx23885_i2c_driver = + sizeof(cx88_i2c_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cx23885i2c, cx23885b, cx23885_i2c_driver, NULL, NULL); ++#else ++static devclass_t cx23885_i2c_devclass; ++ + DRIVER_MODULE(cx23885i2c, cx23885b, cx23885_i2c_driver, cx23885_i2c_devclass, NULL, NULL); ++#endif + MODULE_DEPEND(cx23885i2c, cx23885b, CX23885_MINVER, CX23885_MODVER, CX23885_MAXVER); + CX88_I2C_DRIVER_MODULE(cx23885i2c); + MODULE_VERSION(cx23885i2c, 1); diff --git a/multimedia/cx88/files/patch-iicdev_iicdev.c b/multimedia/cx88/files/patch-iicdev_iicdev.c new file mode 100644 index 000000000000..a6efeed0cf00 --- /dev/null +++ b/multimedia/cx88/files/patch-iicdev_iicdev.c @@ -0,0 +1,25 @@ +--- iicdev/iicdev.c.orig 2022-07-26 16:18:50 UTC ++++ iicdev/iicdev.c +@@ -59,8 +59,6 @@ typedef struct + struct sx lock; + } iicdev_softc; + +-static devclass_t iicdev_devclass; +- + static int iicdev_probe(device_t dev); + static int iicdev_attach(device_t dev); + static int iicdev_detach(device_t dev); +@@ -233,7 +231,13 @@ static driver_t iicdev_driver = + sizeof(iicdev_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(iicdev, iicbus, iicdev_driver, NULL, NULL); ++#else ++static devclass_t iicdev_devclass; ++ + DRIVER_MODULE(iicdev, iicbus, iicdev_driver, iicdev_devclass, NULL, NULL); ++#endif + MODULE_DEPEND(iicdev, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); + MODULE_VERSION(iicdev, IICDEV_MODVER); + diff --git a/multimedia/cx88/files/patch-ir_cx88__ir.c b/multimedia/cx88/files/patch-ir_cx88__ir.c new file mode 100644 index 000000000000..df2170707764 --- /dev/null +++ b/multimedia/cx88/files/patch-ir_cx88__ir.c @@ -0,0 +1,25 @@ +--- ir/cx88_ir.c.orig 2022-07-26 16:20:13 UTC ++++ ir/cx88_ir.c +@@ -70,8 +70,6 @@ static unsigned int cx88_ir_biphase_decode(uint32_t *s + static int cx88_ir_request_reconfig(device_t dev); + static unsigned int cx88_ir_biphase_decode(uint32_t *samples, unsigned int num_samples); + +-static devclass_t cx88_ir_devclass; +- + static d_open_t cx88_ir_open; + static d_close_t cx88_ir_close; + static d_read_t cx88_ir_read; +@@ -401,7 +399,12 @@ static driver_t cx88_ir_driver = + 0 + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cx88ir, pci, cx88_ir_driver, NULL, NULL); ++#else ++static devclass_t cx88_ir_devclass; ++ + DRIVER_MODULE(cx88ir, pci, cx88_ir_driver, cx88_ir_devclass, NULL, NULL); +-DRIVER_MODULE(cx88ir, cardbus, cx88_ir_driver, cx88_ir_devclass, NULL, NULL); ++#endif + CX88_DRIVER_MODULE(cx88ir); + MODULE_VERSION(cx88ir, 1);