From nobody Tue Apr 30 05:59:23 2024 X-Original-To: dev-commits-src-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 4VT8fM2NLLz5JGrM; Tue, 30 Apr 2024 05:59:23 +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 4VT8fM1l4Tz53PJ; Tue, 30 Apr 2024 05:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714456763; 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=H8TyFBaGJ8YOEBJOjvg1u/PH7umU2X5s/Jo7DboPZ9c=; b=r2ExfY665o7H4WGPwIvqLNYXffuuSntcZt4S50BX5XOBtU0qfXcHHPJsh/UhAYj2QZ4acu AH9+VAfSPzrE5S4ysZ4lUpQnVmyByNmh6mdCOGt+2C7ouZ1VPio+E/PsImmrM3Q76pbwC1 zqfLNRZBJil4EgS/fhhx/WXz8cw3F0Xgy16W54Zw8nXFzxRZmXA30fOBMQ/svmbegTUfJd m9FoBmq7DvZuX6hpCR40xmD+jjEABHRJzgxP73wDag+AEq8HNOi5fYhk/e2NoiTbAb168D i+u9MtoYeg7BeEC/051povA+ijfvgTf3NZjC0OTon70YJM1E8SzX44vvh6zhnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714456763; a=rsa-sha256; cv=none; b=q8nPQx2zIsWTWoRL3eTdth/3L+iKsj9ZeW8B2wC+s68BBlHPeHHlKcQxrNes9wt+QWi9w6 jywUWYCoIBImx9lZVHq771rWF2/gOLH3Ex7xJW741/HJ0cRigqkO17f7+nSxcoEDjVtl6X M2iWUF7GCkIc7add0ChfCdqIfzERYnW3dqAa+7gN2zE+OvUCy6u3zc0hs1OpJ3j/c+rSRq aFdeJj5Y1v+u+NQO0eyGtAamEHqJA0Lum8pEovu9yM+vehgN1an59sJJ6lBCcSNS4kOcY+ iwuyVWRw3VmClNHdzy8Q8bekn7xwmaw5wbXZkNoBRgBx1nE3lOA1SxSf9cCsbQ== 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=1714456763; 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=H8TyFBaGJ8YOEBJOjvg1u/PH7umU2X5s/Jo7DboPZ9c=; b=jNLyFWM4CqND1mINFyT9lyxmfDF4YbfVYNijGsIwbsaud4/wG/iOv+i3f7421A9mQLFHPP lmlT3PIWuKqLPRzSqr8vXZejF0FrD0fbmNHz2sKr28yydEdX/vrBed2BcWUo/649MeXYfS sDGhP+GKjbbwHjV2vb2X5H9AhgoXdB23d0f4WVRxTt8wKx1TrHGV+9Q5m7u6YyZZSrPTIU 2LHBQjVOPsDsBY9Wy/wiMDtQ4m8k5ciMSRlr8LEmNi7W6TMBOYB1attb/9xKrpjRKrOwwt 2Q4kJ5p7jq2PzUkks8258qXR43jtUQBF9a0hN8wjfP8oPqbDYWAiUyQe2NYpcw== 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 4VT8fM1Lr5zNhd; Tue, 30 Apr 2024 05:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U5xNH3037886; Tue, 30 Apr 2024 05:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U5xNMm037883; Tue, 30 Apr 2024 05:59:23 GMT (envelope-from git) Date: Tue, 30 Apr 2024 05:59:23 GMT Message-Id: <202404300559.43U5xNMm037883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7f84bb34a1d1 - main - linuxkpi: hdmi: Split the module declaration to a new file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f84bb34a1d191949ec519a01c0c574f5e827c88 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7f84bb34a1d191949ec519a01c0c574f5e827c88 commit 7f84bb34a1d191949ec519a01c0c574f5e827c88 Author: Emmanuel Vadot AuthorDate: 2024-04-24 07:59:20 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-30 05:41:48 +0000 linuxkpi: hdmi: Split the module declaration to a new file In order to have a proper linuxkpi_video kmod, move the module declaration to a new file as linuxkpi_video will also include linux_hdmi.c Differential Revision: https://reviews.freebsd.org/D44926 Reviewed by: bz, emaste, wulf Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/compat/linuxkpi/common/src/linux_hdmi.c | 10 ---------- sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c | 7 +++++++ sys/modules/linuxkpi_hdmi/Makefile | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_hdmi.c b/sys/compat/linuxkpi/common/src/linux_hdmi.c index ec4ac7568c7c..947be761dfa4 100644 --- a/sys/compat/linuxkpi/common/src/linux_hdmi.c +++ b/sys/compat/linuxkpi/common/src/linux_hdmi.c @@ -21,12 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef __FreeBSD__ - -#include -#include -#endif - #include #include #include @@ -1915,7 +1909,3 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame, return ret; } EXPORT_SYMBOL(hdmi_infoframe_unpack); - - -MODULE_VERSION(linuxkpi_hdmi, 1); -MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); diff --git a/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c b/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c new file mode 100644 index 000000000000..b0d4c013a6f3 --- /dev/null +++ b/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c @@ -0,0 +1,7 @@ +/* Public domain. */ + +#include +#include + +MODULE_VERSION(linuxkpi_hdmi, 1); +MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); diff --git a/sys/modules/linuxkpi_hdmi/Makefile b/sys/modules/linuxkpi_hdmi/Makefile index ef843c726dac..dc19c0afeebc 100644 --- a/sys/modules/linuxkpi_hdmi/Makefile +++ b/sys/modules/linuxkpi_hdmi/Makefile @@ -2,6 +2,7 @@ KMOD= linuxkpi_hdmi SRCS= linux_hdmi.c \ + linuxkpi_hdmikmod.c SRCS+= ${LINUXKPI_GENSRCS}