Revert "rtw88: split driver up into a core and pci part"

After some discussion, for now, simply revert the change to split
the driver up into if_rtw88_core.ko and if_rtw88_pci.ko as we do
not have an if_rtw88.ko anymore.  We do have code trying to
auto-load modules, e.g. ifconfig, based on if_xxx.ko.

We could, based on Makefile magic or further code, generate a
if_rtw88.ko module with proper dependencies and keep this but for
simplicity stay with the one slightly larger module for now.
Should code appear to do this "properly" we can revisit this once
USB support has landed.

Slightly update the module Makefile to keep the separation of files
between core and pci bits visible and maintainable for the future.

This reverts commit 0f7b9777f8f39fbc230b3e1de2f844d9f839adea.

7 files changed, 48 insertions, 71 deletions

diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4
index 43a51405d1d5..0ace002e4bde 100644
--- a/share/man/man4/rtw88.4
+++ b/share/man/man4/rtw88.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 12, 2022
+.Dd May 5, 2022
 .Dt rtw88 4
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@ lines in
 .Xr rc.conf 5
 to manually load the driver as a module at boot time:
 .Bd -literal -offset indent
-kld_list="${kld_list} if_rtw88_pci"
+kld_list="${kld_list} if_rtw88"
 .Ed
 .Pp
 The driver should automatically load any
diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c
index 8c720ab1a10f..35381a35f5d9 100644
--- a/sys/contrib/dev/rtw88/main.c
+++ b/sys/contrib/dev/rtw88/main.c
@@ -2203,11 +2203,3 @@ EXPORT_SYMBOL(rtw_unregister_hw);
 MODULE_AUTHOR("Realtek Corporation");
 MODULE_DESCRIPTION("Realtek 802.11ac wireless core module");
 MODULE_LICENSE("Dual BSD/GPL");
-#if defined(__FreeBSD__)
-MODULE_VERSION(rtw88_core, 1);
-MODULE_DEPEND(rtw88_core, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(rtw88_core, linuxkpi_wlan, 1, 1, 1);
-#ifdef CONFIG_RTW88_DEBUGFS
-MODULE_DEPEND(rtw88_core, debugfs, 1, 1, 1);
-#endif
-#endif
diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c
index dd553c87ea59..6c836be771bc 100644
--- a/sys/contrib/dev/rtw88/pci.c
+++ b/sys/contrib/dev/rtw88/pci.c
@@ -1951,8 +1951,10 @@ MODULE_AUTHOR("Realtek Corporation");
 MODULE_DESCRIPTION("Realtek 802.11ac wireless PCI driver");
 MODULE_LICENSE("Dual BSD/GPL");
 #if defined(__FreeBSD__)
-MODULE_VERSION(rtw88_pci, 1);
-MODULE_DEPEND(rtw88_pci, rtw88_core, 1, 1, 1);
-MODULE_DEPEND(rtw88_pci, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(rtw88_pci, linuxkpi_wlan, 1, 1, 1);
+MODULE_VERSION(rtw_pci, 1);
+MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1);
+#ifdef CONFIG_RTW88_DEBUGFS
+MODULE_DEPEND(rtw_pci, debugfs, 1, 1, 1);
+#endif
 #endif
diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile
index 972065e7f208..aaaadfdca2d7 100644
--- a/sys/modules/rtw88/Makefile
+++ b/sys/modules/rtw88/Makefile
@@ -1,7 +1,43 @@
 # $FreeBSD$
 
-SUBDIR=		core
-SUBDIR+=	pci
-#SUBDIR+=	usb
+DEVRTW88DIR=	${SRCTOP}/sys/contrib/dev/rtw88
 
-.include <bsd.subdir.mk>
+.PATH: ${DEVRTW88DIR}
+
+WITH_CONFIG_PM=	0
+
+KMOD=	if_rtw88
+
+# Core parts.
+SRCS=	main.c
+SRCS+=	bf.c coex.c debug.c efuse.c fw.c mac.c mac80211.c
+SRCS+=	phy.c ps.c regd.c
+SRCS+=	rx.c sar.c sec.c tx.c util.c
+
+.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0
+SRCR+=	wow.c
+CFLAGS+=	-DCONFIG_PM=${WITH_CONFIG_PM}
+.endif
+
+# PCI parts.
+SRCS+=	pci.c
+SRCS+=	rtw8723d.c rtw8723d_table.c rtw8723de.c		# 11n
+SRCS+=	rtw8821c.c rtw8821c_table.c rtw8821ce.c		# 11ac
+SRCS+=	rtw8822b.c rtw8822b_table.c rtw8822be.c		# 11ac
+SRCS+=	rtw8822c.c rtw8822c_table.c rtw8822ce.c		# 11ac
+
+# Other
+SRCS+=	${LINUXKPI_GENSRCS}
+SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h
+
+# Helpful after fresh imports.
+#CFLAGS+=	-ferror-limit=0
+
+CFLAGS+=	-DKBUILD_MODNAME='"rtw88"'
+
+CFLAGS+=	-I${DEVRTW88DIR}
+CFLAGS+=	-I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+=	-DCONFIG_RTW88_DEBUG
+#CFLAGS+=	-DCONFIG_RTW88_DEBUGFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/rtw88/Makefile.inc b/sys/modules/rtw88/Makefile.inc
deleted file mode 100644
index b4a682a35519..000000000000
--- a/sys/modules/rtw88/Makefile.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-# Common information shared by all submodule builds.
-
-DEVRTW88DIR=	${SRCTOP}/sys/contrib/dev/rtw88
-
-.PATH: ${DEVRTW88DIR}
-
-WITH_CONFIG_PM=	0
-
-# Other
-SRCS+=	${LINUXKPI_GENSRCS}
-SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h
-
-# Helpful after fresh imports.
-CFLAGS+=	-ferror-limit=0
-
-CFLAGS+=	-I${DEVRTW88DIR}
-CFLAGS+=	-I${SRCTOP}/sys/compat/linuxkpi/common/include
-CFLAGS+=	-DCONFIG_RTW88_DEBUG
-#CFLAGS+=	-DCONFIG_RTW88_DEBUGFS
-
-# end
diff --git a/sys/modules/rtw88/core/Makefile b/sys/modules/rtw88/core/Makefile
deleted file mode 100644
index e19103ce8417..000000000000
--- a/sys/modules/rtw88/core/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-KMOD=	rtw88_core
-
-SRCS=	main.c
-SRCS+=	bf.c coex.c debug.c efuse.c fw.c mac.c mac80211.c
-SRCS+=	phy.c ps.c regd.c
-SRCS+=	rx.c sar.c sec.c tx.c util.c
-
-.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0
-SRCR+=	wow.c
-CFLAGS+=	-DCONFIG_PM=${WITH_CONFIG_PM}
-.endif
-
-CFLAGS+=	-DKBUILD_MODNAME='"rtw88_core"'
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rtw88/pci/Makefile b/sys/modules/rtw88/pci/Makefile
deleted file mode 100644
index 070e6c8e2bc0..000000000000
--- a/sys/modules/rtw88/pci/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-KMOD=	if_rtw88_pci
-
-SRCS+=	pci.c
-SRCS+=	rtw8723d.c rtw8723d_table.c rtw8723de.c		# 11n
-SRCS+=	rtw8821c.c rtw8821c_table.c rtw8821ce.c		# 11ac
-SRCS+=	rtw8822b.c rtw8822b_table.c rtw8822be.c		# 11ac
-SRCS+=	rtw8822c.c rtw8822c_table.c rtw8822ce.c		# 11ac
-
-CFLAGS+=	-DKBUILD_MODNAME='"rtw88"'
-
-.include <bsd.kmod.mk>