On 7/19/21 5:46 PM, Phillip Potter wrote:
Move all C source files from the core subdirectory to the root
folder of the driver, and adjust Makefile accordingly. The ultmate
goal is to remove hal layer and fold its functionalty into the main
sources. At this point, the distinction between hal and core will be
meaningless, so this is the first step towards simplifying the file
layout.
Signed-off-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
---
drivers/staging/rtl8188eu/Makefile | 34 +++++++++----------
drivers/staging/rtl8188eu/{core => }/rtw_ap.c | 0
.../staging/rtl8188eu/{core => }/rtw_cmd.c | 0
.../staging/rtl8188eu/{core => }/rtw_efuse.c | 0
.../rtl8188eu/{core => }/rtw_ieee80211.c | 0
.../rtl8188eu/{core => }/rtw_ioctl_set.c | 0
.../staging/rtl8188eu/{core => }/rtw_iol.c | 0
.../staging/rtl8188eu/{core => }/rtw_led.c | 0
.../staging/rtl8188eu/{core => }/rtw_mlme.c | 0
.../rtl8188eu/{core => }/rtw_mlme_ext.c | 0
.../rtl8188eu/{core => }/rtw_pwrctrl.c | 0
.../staging/rtl8188eu/{core => }/rtw_recv.c | 0
drivers/staging/rtl8188eu/{core => }/rtw_rf.c | 0
.../rtl8188eu/{core => }/rtw_security.c | 0
.../staging/rtl8188eu/{core => }/rtw_sreset.c | 0
.../rtl8188eu/{core => }/rtw_sta_mgt.c | 0
.../rtl8188eu/{core => }/rtw_wlan_util.c | 0
.../staging/rtl8188eu/{core => }/rtw_xmit.c | 0
18 files changed, 17 insertions(+), 17 deletions(-)
rename drivers/staging/rtl8188eu/{core => }/rtw_ap.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_cmd.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_efuse.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_ieee80211.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_ioctl_set.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_iol.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_led.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_mlme.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_mlme_ext.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_pwrctrl.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_recv.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_rf.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_security.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_sreset.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_sta_mgt.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_wlan_util.c (100%)
rename drivers/staging/rtl8188eu/{core => }/rtw_xmit.c (100%)
diff --git a/drivers/staging/rtl8188eu/Makefile b/drivers/staging/rtl8188eu/Makefile
index 28b936e8be0a..2dad13bdbdeb 100644
--- a/drivers/staging/rtl8188eu/Makefile
+++ b/drivers/staging/rtl8188eu/Makefile
@@ -1,22 +1,22 @@
# SPDX-License-Identifier: GPL-2.0
r8188eu-y := \
- core/rtw_ap.o \
- core/rtw_cmd.o \
- core/rtw_efuse.o \
- core/rtw_ieee80211.o \
- core/rtw_ioctl_set.o \
- core/rtw_iol.o \
- core/rtw_led.o \
- core/rtw_mlme.o \
- core/rtw_mlme_ext.o \
- core/rtw_pwrctrl.o \
- core/rtw_recv.o \
- core/rtw_rf.o \
- core/rtw_security.o \
- core/rtw_sreset.o \
- core/rtw_sta_mgt.o \
- core/rtw_wlan_util.o \
- core/rtw_xmit.o \
+ rtw_ap.o \
+ rtw_cmd.o \
+ rtw_efuse.o \
+ rtw_ieee80211.o \
+ rtw_ioctl_set.o \
+ rtw_iol.o \
+ rtw_led.o \
+ rtw_mlme.o \
+ rtw_mlme_ext.o \
+ rtw_pwrctrl.o \
+ rtw_recv.o \
+ rtw_rf.o \
+ rtw_security.o \
+ rtw_sreset.o \
+ rtw_sta_mgt.o \
+ rtw_wlan_util.o \
+ rtw_xmit.o \
hal/fw.o \
hal/mac_cfg.o \
hal/bb_cfg.o \
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/rtw_ap.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_ap.c
rename to drivers/staging/rtl8188eu/rtw_ap.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/rtw_cmd.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_cmd.c
rename to drivers/staging/rtl8188eu/rtw_cmd.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/rtw_efuse.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_efuse.c
rename to drivers/staging/rtl8188eu/rtw_efuse.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/rtw_ieee80211.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_ieee80211.c
rename to drivers/staging/rtl8188eu/rtw_ieee80211.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c b/drivers/staging/rtl8188eu/rtw_ioctl_set.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
rename to drivers/staging/rtl8188eu/rtw_ioctl_set.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_iol.c b/drivers/staging/rtl8188eu/rtw_iol.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_iol.c
rename to drivers/staging/rtl8188eu/rtw_iol.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/rtw_led.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_led.c
rename to drivers/staging/rtl8188eu/rtw_led.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/rtw_mlme.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_mlme.c
rename to drivers/staging/rtl8188eu/rtw_mlme.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/rtw_mlme_ext.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
rename to drivers/staging/rtl8188eu/rtw_mlme_ext.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/rtw_pwrctrl.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
rename to drivers/staging/rtl8188eu/rtw_pwrctrl.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/rtw_recv.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_recv.c
rename to drivers/staging/rtl8188eu/rtw_recv.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_rf.c b/drivers/staging/rtl8188eu/rtw_rf.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_rf.c
rename to drivers/staging/rtl8188eu/rtw_rf.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/rtw_security.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_security.c
rename to drivers/staging/rtl8188eu/rtw_security.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/rtw_sreset.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_sreset.c
rename to drivers/staging/rtl8188eu/rtw_sreset.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/rtw_sta_mgt.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
rename to drivers/staging/rtl8188eu/rtw_sta_mgt.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/rtw_wlan_util.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_wlan_util.c
rename to drivers/staging/rtl8188eu/rtw_wlan_util.c
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/rtw_xmit.c
similarity index 100%
rename from drivers/staging/rtl8188eu/core/rtw_xmit.c
rename to drivers/staging/rtl8188eu/rtw_xmit.c
I think this is just source churning. The current setup with include. core. hal
and os_dep subdirectories are not opressive.
Larry
