From 2e528309971136d18b342e35b575e4b45b5b83e3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 22 Jul 2021 12:55:23 -0500 Subject: [PATCH] rtl8188eu: Flatten hal directory Signed-off-by: Larry Finger --- Makefile | 62 ++++++++++---------- core/rtw_mp.c | 2 +- hal/{phydm => }/hal8188erateadaptive.c | 0 hal/{phydm => }/hal8188erateadaptive.h | 0 hal/{phydm => }/hal8188ereg.h | 0 hal/{phydm/txbf => }/halcomtxbf.h | 0 hal/{phydm => }/halhwimg.h | 0 hal/{phydm => }/halhwimg8188e_bb.c | 0 hal/{phydm => }/halhwimg8188e_bb.h | 0 hal/{phydm => }/halhwimg8188e_mac.c | 0 hal/{phydm => }/halhwimg8188e_mac.h | 0 hal/{phydm => }/halhwimg8188e_rf.c | 0 hal/{phydm => }/halhwimg8188e_rf.h | 0 hal/{phydm => }/halphyrf_8188e_ce.c | 0 hal/{phydm => }/halphyrf_8188e_ce.h | 0 hal/{phydm => }/halphyrf_ap.h | 0 hal/{phydm => }/halphyrf_ce.c | 0 hal/{phydm => }/halphyrf_ce.h | 0 hal/{phydm/txbf => }/haltxbfinterface.h | 0 hal/{phydm/txbf => }/haltxbfjaguar.h | 0 hal/{phydm => }/mp_precomp.h | 0 hal/{phydm => }/phydm.c | 0 hal/{phydm => }/phydm.h | 2 +- hal/{phydm => }/phydm_acs.c | 0 hal/{phydm => }/phydm_acs.h | 0 hal/{phydm => }/phydm_adaptivity.c | 0 hal/{phydm => }/phydm_adaptivity.h | 0 hal/{phydm => }/phydm_adc_sampling.c | 0 hal/{phydm => }/phydm_adc_sampling.h | 0 hal/{phydm => }/phydm_antdect.c | 0 hal/{phydm => }/phydm_antdect.h | 0 hal/{phydm => }/phydm_antdiv.c | 0 hal/{phydm => }/phydm_antdiv.h | 0 hal/{phydm => }/phydm_beamforming.h | 6 +- hal/{phydm => }/phydm_ccx.c | 0 hal/{phydm => }/phydm_ccx.h | 0 hal/{phydm => }/phydm_cfotracking.c | 0 hal/{phydm => }/phydm_cfotracking.h | 0 hal/{phydm => }/phydm_debug.c | 0 hal/{phydm => }/phydm_debug.h | 0 hal/{phydm => }/phydm_dfs.c | 0 hal/{phydm => }/phydm_dfs.h | 0 hal/{phydm => }/phydm_dig.c | 0 hal/{phydm => }/phydm_dig.h | 0 hal/{phydm => }/phydm_dynamic_rx_path.c | 0 hal/{phydm => }/phydm_dynamic_rx_path.h | 0 hal/{phydm => }/phydm_dynamicbbpowersaving.c | 0 hal/{phydm => }/phydm_dynamicbbpowersaving.h | 0 hal/{phydm => }/phydm_dynamictxpower.c | 0 hal/{phydm => }/phydm_dynamictxpower.h | 0 hal/{phydm => }/phydm_edcaturbocheck.c | 0 hal/{phydm => }/phydm_edcaturbocheck.h | 0 hal/{phydm => }/phydm_features.h | 0 hal/{phydm/txbf => }/phydm_hal_txbf_api.c | 0 hal/{phydm/txbf => }/phydm_hal_txbf_api.h | 0 hal/{phydm => }/phydm_hwconfig.c | 0 hal/{phydm => }/phydm_hwconfig.h | 0 hal/{phydm => }/phydm_interface.c | 0 hal/{phydm => }/phydm_interface.h | 0 hal/{phydm => }/phydm_iqk.h | 0 hal/{phydm => }/phydm_kfree.c | 0 hal/{phydm => }/phydm_kfree.h | 0 hal/{phydm => }/phydm_noisemonitor.c | 0 hal/{phydm => }/phydm_noisemonitor.h | 0 hal/{phydm => }/phydm_pathdiv.c | 0 hal/{phydm => }/phydm_pathdiv.h | 0 hal/{phydm => }/phydm_powertracking_ce.c | 0 hal/{phydm => }/phydm_powertracking_ce.h | 0 hal/{phydm => }/phydm_pre_define.h | 0 hal/{phydm => }/phydm_precomp.h | 0 hal/{phydm => }/phydm_rainfo.c | 0 hal/{phydm => }/phydm_rainfo.h | 0 hal/{phydm => }/phydm_reg.h | 0 hal/{phydm => }/phydm_regconfig8188e.c | 0 hal/{phydm => }/phydm_regconfig8188e.h | 0 hal/{phydm => }/phydm_regdefine11ac.h | 0 hal/{phydm => }/phydm_regdefine11n.h | 0 hal/{phydm => }/phydm_rtl8188e.c | 0 hal/{phydm => }/phydm_rtl8188e.h | 0 hal/{phydm => }/phydm_types.h | 0 hal/{phydm => }/rtchnlplan.c | 0 hal/{phydm => }/rtchnlplan.h | 0 hal/{phydm => }/version_rtl8188e.h | 0 include/hal_data.h | 2 +- include/rtw_odm.h | 2 +- os_dep/ioctl_linux.c | 2 +- os_dep/ioctl_mp.c | 2 +- 87 files changed, 40 insertions(+), 40 deletions(-) rename hal/{phydm => }/hal8188erateadaptive.c (100%) rename hal/{phydm => }/hal8188erateadaptive.h (100%) rename hal/{phydm => }/hal8188ereg.h (100%) rename hal/{phydm/txbf => }/halcomtxbf.h (100%) rename hal/{phydm => }/halhwimg.h (100%) rename hal/{phydm => }/halhwimg8188e_bb.c (100%) rename hal/{phydm => }/halhwimg8188e_bb.h (100%) rename hal/{phydm => }/halhwimg8188e_mac.c (100%) rename hal/{phydm => }/halhwimg8188e_mac.h (100%) rename hal/{phydm => }/halhwimg8188e_rf.c (100%) rename hal/{phydm => }/halhwimg8188e_rf.h (100%) rename hal/{phydm => }/halphyrf_8188e_ce.c (100%) rename hal/{phydm => }/halphyrf_8188e_ce.h (100%) rename hal/{phydm => }/halphyrf_ap.h (100%) rename hal/{phydm => }/halphyrf_ce.c (100%) rename hal/{phydm => }/halphyrf_ce.h (100%) rename hal/{phydm/txbf => }/haltxbfinterface.h (100%) rename hal/{phydm/txbf => }/haltxbfjaguar.h (100%) rename hal/{phydm => }/mp_precomp.h (100%) rename hal/{phydm => }/phydm.c (100%) rename hal/{phydm => }/phydm.h (99%) rename hal/{phydm => }/phydm_acs.c (100%) rename hal/{phydm => }/phydm_acs.h (100%) rename hal/{phydm => }/phydm_adaptivity.c (100%) rename hal/{phydm => }/phydm_adaptivity.h (100%) rename hal/{phydm => }/phydm_adc_sampling.c (100%) rename hal/{phydm => }/phydm_adc_sampling.h (100%) rename hal/{phydm => }/phydm_antdect.c (100%) rename hal/{phydm => }/phydm_antdect.h (100%) rename hal/{phydm => }/phydm_antdiv.c (100%) rename hal/{phydm => }/phydm_antdiv.h (100%) rename hal/{phydm => }/phydm_beamforming.h (89%) rename hal/{phydm => }/phydm_ccx.c (100%) rename hal/{phydm => }/phydm_ccx.h (100%) rename hal/{phydm => }/phydm_cfotracking.c (100%) rename hal/{phydm => }/phydm_cfotracking.h (100%) rename hal/{phydm => }/phydm_debug.c (100%) rename hal/{phydm => }/phydm_debug.h (100%) rename hal/{phydm => }/phydm_dfs.c (100%) rename hal/{phydm => }/phydm_dfs.h (100%) rename hal/{phydm => }/phydm_dig.c (100%) rename hal/{phydm => }/phydm_dig.h (100%) rename hal/{phydm => }/phydm_dynamic_rx_path.c (100%) rename hal/{phydm => }/phydm_dynamic_rx_path.h (100%) rename hal/{phydm => }/phydm_dynamicbbpowersaving.c (100%) rename hal/{phydm => }/phydm_dynamicbbpowersaving.h (100%) rename hal/{phydm => }/phydm_dynamictxpower.c (100%) rename hal/{phydm => }/phydm_dynamictxpower.h (100%) rename hal/{phydm => }/phydm_edcaturbocheck.c (100%) rename hal/{phydm => }/phydm_edcaturbocheck.h (100%) rename hal/{phydm => }/phydm_features.h (100%) rename hal/{phydm/txbf => }/phydm_hal_txbf_api.c (100%) rename hal/{phydm/txbf => }/phydm_hal_txbf_api.h (100%) rename hal/{phydm => }/phydm_hwconfig.c (100%) rename hal/{phydm => }/phydm_hwconfig.h (100%) rename hal/{phydm => }/phydm_interface.c (100%) rename hal/{phydm => }/phydm_interface.h (100%) rename hal/{phydm => }/phydm_iqk.h (100%) rename hal/{phydm => }/phydm_kfree.c (100%) rename hal/{phydm => }/phydm_kfree.h (100%) rename hal/{phydm => }/phydm_noisemonitor.c (100%) rename hal/{phydm => }/phydm_noisemonitor.h (100%) rename hal/{phydm => }/phydm_pathdiv.c (100%) rename hal/{phydm => }/phydm_pathdiv.h (100%) rename hal/{phydm => }/phydm_powertracking_ce.c (100%) rename hal/{phydm => }/phydm_powertracking_ce.h (100%) rename hal/{phydm => }/phydm_pre_define.h (100%) rename hal/{phydm => }/phydm_precomp.h (100%) rename hal/{phydm => }/phydm_rainfo.c (100%) rename hal/{phydm => }/phydm_rainfo.h (100%) rename hal/{phydm => }/phydm_reg.h (100%) rename hal/{phydm => }/phydm_regconfig8188e.c (100%) rename hal/{phydm => }/phydm_regconfig8188e.h (100%) rename hal/{phydm => }/phydm_regdefine11ac.h (100%) rename hal/{phydm => }/phydm_regdefine11n.h (100%) rename hal/{phydm => }/phydm_rtl8188e.c (100%) rename hal/{phydm => }/phydm_rtl8188e.h (100%) rename hal/{phydm => }/phydm_types.h (100%) rename hal/{phydm => }/rtchnlplan.c (100%) rename hal/{phydm => }/rtchnlplan.h (100%) rename hal/{phydm => }/version_rtl8188e.h (100%) diff --git a/Makefile b/Makefile index 7df9a6a..c372faa 100755 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and lat endif EXTRA_CFLAGS += -I$(src)/include -EXTRA_CFLAGS += -I$(src)/hal/phydm +EXTRA_CFLAGS += -I$(src)/hal #EXTRA_LDFLAGS += --strip-debug @@ -117,29 +117,29 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ hal/hal_$(HCI_NAME)_led.o -_OUTSRC_FILES := hal/phydm/phydm_debug.o \ - hal/phydm/phydm_antdiv.o\ - hal/phydm/phydm_antdect.o\ - hal/phydm/phydm_interface.o\ - hal/phydm/phydm_hwconfig.o\ - hal/phydm/phydm.o\ - hal/phydm/halphyrf_ce.o\ - hal/phydm/phydm_edcaturbocheck.o\ - hal/phydm/phydm_dig.o\ - hal/phydm/phydm_pathdiv.o\ - hal/phydm/phydm_rainfo.o\ - hal/phydm/phydm_dynamicbbpowersaving.o\ - hal/phydm/phydm_powertracking_ce.o\ - hal/phydm/phydm_dynamictxpower.o\ - hal/phydm/phydm_adaptivity.o\ - hal/phydm/phydm_cfotracking.o\ - hal/phydm/phydm_noisemonitor.o\ - hal/phydm/phydm_acs.o\ - hal/phydm/phydm_dfs.o\ - hal/phydm/txbf/phydm_hal_txbf_api.o\ - hal/phydm/phydm_adc_sampling.o\ - hal/phydm/phydm_kfree.o\ - hal/phydm/phydm_ccx.o +_OUTSRC_FILES := hal/phydm_debug.o \ + hal/phydm_antdiv.o\ + hal/phydm_antdect.o\ + hal/phydm_interface.o\ + hal/phydm_hwconfig.o\ + hal/phydm.o\ + hal/halphyrf_ce.o\ + hal/phydm_edcaturbocheck.o\ + hal/phydm_dig.o\ + hal/phydm_pathdiv.o\ + hal/phydm_rainfo.o\ + hal/phydm_dynamicbbpowersaving.o\ + hal/phydm_powertracking_ce.o\ + hal/phydm_dynamictxpower.o\ + hal/phydm_adaptivity.o\ + hal/phydm_cfotracking.o\ + hal/phydm_noisemonitor.o\ + hal/phydm_acs.o\ + hal/phydm_dfs.o\ + hal/phydm_hal_txbf_api.o\ + hal/phydm_adc_sampling.o\ + hal/phydm_kfree.o\ + hal/phydm_ccx.o EXTRA_CFLAGS += -I$(src)/platform @@ -171,13 +171,13 @@ _HAL_INTFS_FILES += hal/$(HCI_NAME)_ops_linux.o _HAL_INTFS_FILES +=hal/HalEfuseMask8188E_USB.o #hal/OUTSRC/Hal8188EFWImg_CE.o -_OUTSRC_FILES += hal/phydm/halhwimg8188e_mac.o\ - hal/phydm/halhwimg8188e_bb.o\ - hal/phydm/halhwimg8188e_rf.o\ - hal/phydm/halphyrf_8188e_ce.o\ - hal/phydm/phydm_regconfig8188e.o\ - hal/phydm/hal8188erateadaptive.o\ - hal/phydm/phydm_rtl8188e.o +_OUTSRC_FILES += hal/halhwimg8188e_mac.o\ + hal/halhwimg8188e_bb.o\ + hal/halhwimg8188e_rf.o\ + hal/halphyrf_8188e_ce.o\ + hal/phydm_regconfig8188e.o\ + hal/hal8188erateadaptive.o\ + hal/phydm_rtl8188e.o ########### AUTO_CFG ################################# diff --git a/core/rtw_mp.c b/core/rtw_mp.c index d39b14e..8697cd7 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -4,7 +4,7 @@ #define _RTW_MP_C_ #include -#include "../hal/phydm/phydm_precomp.h" +#include "../hal/phydm_precomp.h" #ifdef CONFIG_MP_VHT_HW_TX_MODE #define CEILING_POS(X) ((X - (int)(X)) > 0 ? (int)(X + 1) : (int)(X)) diff --git a/hal/phydm/hal8188erateadaptive.c b/hal/hal8188erateadaptive.c similarity index 100% rename from hal/phydm/hal8188erateadaptive.c rename to hal/hal8188erateadaptive.c diff --git a/hal/phydm/hal8188erateadaptive.h b/hal/hal8188erateadaptive.h similarity index 100% rename from hal/phydm/hal8188erateadaptive.h rename to hal/hal8188erateadaptive.h diff --git a/hal/phydm/hal8188ereg.h b/hal/hal8188ereg.h similarity index 100% rename from hal/phydm/hal8188ereg.h rename to hal/hal8188ereg.h diff --git a/hal/phydm/txbf/halcomtxbf.h b/hal/halcomtxbf.h similarity index 100% rename from hal/phydm/txbf/halcomtxbf.h rename to hal/halcomtxbf.h diff --git a/hal/phydm/halhwimg.h b/hal/halhwimg.h similarity index 100% rename from hal/phydm/halhwimg.h rename to hal/halhwimg.h diff --git a/hal/phydm/halhwimg8188e_bb.c b/hal/halhwimg8188e_bb.c similarity index 100% rename from hal/phydm/halhwimg8188e_bb.c rename to hal/halhwimg8188e_bb.c diff --git a/hal/phydm/halhwimg8188e_bb.h b/hal/halhwimg8188e_bb.h similarity index 100% rename from hal/phydm/halhwimg8188e_bb.h rename to hal/halhwimg8188e_bb.h diff --git a/hal/phydm/halhwimg8188e_mac.c b/hal/halhwimg8188e_mac.c similarity index 100% rename from hal/phydm/halhwimg8188e_mac.c rename to hal/halhwimg8188e_mac.c diff --git a/hal/phydm/halhwimg8188e_mac.h b/hal/halhwimg8188e_mac.h similarity index 100% rename from hal/phydm/halhwimg8188e_mac.h rename to hal/halhwimg8188e_mac.h diff --git a/hal/phydm/halhwimg8188e_rf.c b/hal/halhwimg8188e_rf.c similarity index 100% rename from hal/phydm/halhwimg8188e_rf.c rename to hal/halhwimg8188e_rf.c diff --git a/hal/phydm/halhwimg8188e_rf.h b/hal/halhwimg8188e_rf.h similarity index 100% rename from hal/phydm/halhwimg8188e_rf.h rename to hal/halhwimg8188e_rf.h diff --git a/hal/phydm/halphyrf_8188e_ce.c b/hal/halphyrf_8188e_ce.c similarity index 100% rename from hal/phydm/halphyrf_8188e_ce.c rename to hal/halphyrf_8188e_ce.c diff --git a/hal/phydm/halphyrf_8188e_ce.h b/hal/halphyrf_8188e_ce.h similarity index 100% rename from hal/phydm/halphyrf_8188e_ce.h rename to hal/halphyrf_8188e_ce.h diff --git a/hal/phydm/halphyrf_ap.h b/hal/halphyrf_ap.h similarity index 100% rename from hal/phydm/halphyrf_ap.h rename to hal/halphyrf_ap.h diff --git a/hal/phydm/halphyrf_ce.c b/hal/halphyrf_ce.c similarity index 100% rename from hal/phydm/halphyrf_ce.c rename to hal/halphyrf_ce.c diff --git a/hal/phydm/halphyrf_ce.h b/hal/halphyrf_ce.h similarity index 100% rename from hal/phydm/halphyrf_ce.h rename to hal/halphyrf_ce.h diff --git a/hal/phydm/txbf/haltxbfinterface.h b/hal/haltxbfinterface.h similarity index 100% rename from hal/phydm/txbf/haltxbfinterface.h rename to hal/haltxbfinterface.h diff --git a/hal/phydm/txbf/haltxbfjaguar.h b/hal/haltxbfjaguar.h similarity index 100% rename from hal/phydm/txbf/haltxbfjaguar.h rename to hal/haltxbfjaguar.h diff --git a/hal/phydm/mp_precomp.h b/hal/mp_precomp.h similarity index 100% rename from hal/phydm/mp_precomp.h rename to hal/mp_precomp.h diff --git a/hal/phydm/phydm.c b/hal/phydm.c similarity index 100% rename from hal/phydm/phydm.c rename to hal/phydm.c diff --git a/hal/phydm/phydm.h b/hal/phydm.h similarity index 99% rename from hal/phydm/phydm.h rename to hal/phydm.h index 35cde29..004354c 100644 --- a/hal/phydm/phydm.h +++ b/hal/phydm.h @@ -25,7 +25,7 @@ #include "phydm_iqk.h" #include "phydm_dfs.h" #include "phydm_ccx.h" -#include "txbf/phydm_hal_txbf_api.h" +#include "phydm_hal_txbf_api.h" #include "phydm_adc_sampling.h" #include "phydm_dynamic_rx_path.h" diff --git a/hal/phydm/phydm_acs.c b/hal/phydm_acs.c similarity index 100% rename from hal/phydm/phydm_acs.c rename to hal/phydm_acs.c diff --git a/hal/phydm/phydm_acs.h b/hal/phydm_acs.h similarity index 100% rename from hal/phydm/phydm_acs.h rename to hal/phydm_acs.h diff --git a/hal/phydm/phydm_adaptivity.c b/hal/phydm_adaptivity.c similarity index 100% rename from hal/phydm/phydm_adaptivity.c rename to hal/phydm_adaptivity.c diff --git a/hal/phydm/phydm_adaptivity.h b/hal/phydm_adaptivity.h similarity index 100% rename from hal/phydm/phydm_adaptivity.h rename to hal/phydm_adaptivity.h diff --git a/hal/phydm/phydm_adc_sampling.c b/hal/phydm_adc_sampling.c similarity index 100% rename from hal/phydm/phydm_adc_sampling.c rename to hal/phydm_adc_sampling.c diff --git a/hal/phydm/phydm_adc_sampling.h b/hal/phydm_adc_sampling.h similarity index 100% rename from hal/phydm/phydm_adc_sampling.h rename to hal/phydm_adc_sampling.h diff --git a/hal/phydm/phydm_antdect.c b/hal/phydm_antdect.c similarity index 100% rename from hal/phydm/phydm_antdect.c rename to hal/phydm_antdect.c diff --git a/hal/phydm/phydm_antdect.h b/hal/phydm_antdect.h similarity index 100% rename from hal/phydm/phydm_antdect.h rename to hal/phydm_antdect.h diff --git a/hal/phydm/phydm_antdiv.c b/hal/phydm_antdiv.c similarity index 100% rename from hal/phydm/phydm_antdiv.c rename to hal/phydm_antdiv.c diff --git a/hal/phydm/phydm_antdiv.h b/hal/phydm_antdiv.h similarity index 100% rename from hal/phydm/phydm_antdiv.h rename to hal/phydm_antdiv.h diff --git a/hal/phydm/phydm_beamforming.h b/hal/phydm_beamforming.h similarity index 89% rename from hal/phydm/phydm_beamforming.h rename to hal/phydm_beamforming.h index 14a8ae8..e3413f6 100644 --- a/hal/phydm/phydm_beamforming.h +++ b/hal/phydm_beamforming.h @@ -6,9 +6,9 @@ #endif /*Beamforming Related*/ -#include "txbf/halcomtxbf.h" -#include "txbf/haltxbfjaguar.h" -#include "txbf/haltxbfinterface.h" +#include "halcomtxbf.h" +#include "haltxbfjaguar.h" +#include "haltxbfinterface.h" #define beamforming_gid_paid(adapter, p_tcb) #define phydm_acting_determine(p_dm_odm, type) false diff --git a/hal/phydm/phydm_ccx.c b/hal/phydm_ccx.c similarity index 100% rename from hal/phydm/phydm_ccx.c rename to hal/phydm_ccx.c diff --git a/hal/phydm/phydm_ccx.h b/hal/phydm_ccx.h similarity index 100% rename from hal/phydm/phydm_ccx.h rename to hal/phydm_ccx.h diff --git a/hal/phydm/phydm_cfotracking.c b/hal/phydm_cfotracking.c similarity index 100% rename from hal/phydm/phydm_cfotracking.c rename to hal/phydm_cfotracking.c diff --git a/hal/phydm/phydm_cfotracking.h b/hal/phydm_cfotracking.h similarity index 100% rename from hal/phydm/phydm_cfotracking.h rename to hal/phydm_cfotracking.h diff --git a/hal/phydm/phydm_debug.c b/hal/phydm_debug.c similarity index 100% rename from hal/phydm/phydm_debug.c rename to hal/phydm_debug.c diff --git a/hal/phydm/phydm_debug.h b/hal/phydm_debug.h similarity index 100% rename from hal/phydm/phydm_debug.h rename to hal/phydm_debug.h diff --git a/hal/phydm/phydm_dfs.c b/hal/phydm_dfs.c similarity index 100% rename from hal/phydm/phydm_dfs.c rename to hal/phydm_dfs.c diff --git a/hal/phydm/phydm_dfs.h b/hal/phydm_dfs.h similarity index 100% rename from hal/phydm/phydm_dfs.h rename to hal/phydm_dfs.h diff --git a/hal/phydm/phydm_dig.c b/hal/phydm_dig.c similarity index 100% rename from hal/phydm/phydm_dig.c rename to hal/phydm_dig.c diff --git a/hal/phydm/phydm_dig.h b/hal/phydm_dig.h similarity index 100% rename from hal/phydm/phydm_dig.h rename to hal/phydm_dig.h diff --git a/hal/phydm/phydm_dynamic_rx_path.c b/hal/phydm_dynamic_rx_path.c similarity index 100% rename from hal/phydm/phydm_dynamic_rx_path.c rename to hal/phydm_dynamic_rx_path.c diff --git a/hal/phydm/phydm_dynamic_rx_path.h b/hal/phydm_dynamic_rx_path.h similarity index 100% rename from hal/phydm/phydm_dynamic_rx_path.h rename to hal/phydm_dynamic_rx_path.h diff --git a/hal/phydm/phydm_dynamicbbpowersaving.c b/hal/phydm_dynamicbbpowersaving.c similarity index 100% rename from hal/phydm/phydm_dynamicbbpowersaving.c rename to hal/phydm_dynamicbbpowersaving.c diff --git a/hal/phydm/phydm_dynamicbbpowersaving.h b/hal/phydm_dynamicbbpowersaving.h similarity index 100% rename from hal/phydm/phydm_dynamicbbpowersaving.h rename to hal/phydm_dynamicbbpowersaving.h diff --git a/hal/phydm/phydm_dynamictxpower.c b/hal/phydm_dynamictxpower.c similarity index 100% rename from hal/phydm/phydm_dynamictxpower.c rename to hal/phydm_dynamictxpower.c diff --git a/hal/phydm/phydm_dynamictxpower.h b/hal/phydm_dynamictxpower.h similarity index 100% rename from hal/phydm/phydm_dynamictxpower.h rename to hal/phydm_dynamictxpower.h diff --git a/hal/phydm/phydm_edcaturbocheck.c b/hal/phydm_edcaturbocheck.c similarity index 100% rename from hal/phydm/phydm_edcaturbocheck.c rename to hal/phydm_edcaturbocheck.c diff --git a/hal/phydm/phydm_edcaturbocheck.h b/hal/phydm_edcaturbocheck.h similarity index 100% rename from hal/phydm/phydm_edcaturbocheck.h rename to hal/phydm_edcaturbocheck.h diff --git a/hal/phydm/phydm_features.h b/hal/phydm_features.h similarity index 100% rename from hal/phydm/phydm_features.h rename to hal/phydm_features.h diff --git a/hal/phydm/txbf/phydm_hal_txbf_api.c b/hal/phydm_hal_txbf_api.c similarity index 100% rename from hal/phydm/txbf/phydm_hal_txbf_api.c rename to hal/phydm_hal_txbf_api.c diff --git a/hal/phydm/txbf/phydm_hal_txbf_api.h b/hal/phydm_hal_txbf_api.h similarity index 100% rename from hal/phydm/txbf/phydm_hal_txbf_api.h rename to hal/phydm_hal_txbf_api.h diff --git a/hal/phydm/phydm_hwconfig.c b/hal/phydm_hwconfig.c similarity index 100% rename from hal/phydm/phydm_hwconfig.c rename to hal/phydm_hwconfig.c diff --git a/hal/phydm/phydm_hwconfig.h b/hal/phydm_hwconfig.h similarity index 100% rename from hal/phydm/phydm_hwconfig.h rename to hal/phydm_hwconfig.h diff --git a/hal/phydm/phydm_interface.c b/hal/phydm_interface.c similarity index 100% rename from hal/phydm/phydm_interface.c rename to hal/phydm_interface.c diff --git a/hal/phydm/phydm_interface.h b/hal/phydm_interface.h similarity index 100% rename from hal/phydm/phydm_interface.h rename to hal/phydm_interface.h diff --git a/hal/phydm/phydm_iqk.h b/hal/phydm_iqk.h similarity index 100% rename from hal/phydm/phydm_iqk.h rename to hal/phydm_iqk.h diff --git a/hal/phydm/phydm_kfree.c b/hal/phydm_kfree.c similarity index 100% rename from hal/phydm/phydm_kfree.c rename to hal/phydm_kfree.c diff --git a/hal/phydm/phydm_kfree.h b/hal/phydm_kfree.h similarity index 100% rename from hal/phydm/phydm_kfree.h rename to hal/phydm_kfree.h diff --git a/hal/phydm/phydm_noisemonitor.c b/hal/phydm_noisemonitor.c similarity index 100% rename from hal/phydm/phydm_noisemonitor.c rename to hal/phydm_noisemonitor.c diff --git a/hal/phydm/phydm_noisemonitor.h b/hal/phydm_noisemonitor.h similarity index 100% rename from hal/phydm/phydm_noisemonitor.h rename to hal/phydm_noisemonitor.h diff --git a/hal/phydm/phydm_pathdiv.c b/hal/phydm_pathdiv.c similarity index 100% rename from hal/phydm/phydm_pathdiv.c rename to hal/phydm_pathdiv.c diff --git a/hal/phydm/phydm_pathdiv.h b/hal/phydm_pathdiv.h similarity index 100% rename from hal/phydm/phydm_pathdiv.h rename to hal/phydm_pathdiv.h diff --git a/hal/phydm/phydm_powertracking_ce.c b/hal/phydm_powertracking_ce.c similarity index 100% rename from hal/phydm/phydm_powertracking_ce.c rename to hal/phydm_powertracking_ce.c diff --git a/hal/phydm/phydm_powertracking_ce.h b/hal/phydm_powertracking_ce.h similarity index 100% rename from hal/phydm/phydm_powertracking_ce.h rename to hal/phydm_powertracking_ce.h diff --git a/hal/phydm/phydm_pre_define.h b/hal/phydm_pre_define.h similarity index 100% rename from hal/phydm/phydm_pre_define.h rename to hal/phydm_pre_define.h diff --git a/hal/phydm/phydm_precomp.h b/hal/phydm_precomp.h similarity index 100% rename from hal/phydm/phydm_precomp.h rename to hal/phydm_precomp.h diff --git a/hal/phydm/phydm_rainfo.c b/hal/phydm_rainfo.c similarity index 100% rename from hal/phydm/phydm_rainfo.c rename to hal/phydm_rainfo.c diff --git a/hal/phydm/phydm_rainfo.h b/hal/phydm_rainfo.h similarity index 100% rename from hal/phydm/phydm_rainfo.h rename to hal/phydm_rainfo.h diff --git a/hal/phydm/phydm_reg.h b/hal/phydm_reg.h similarity index 100% rename from hal/phydm/phydm_reg.h rename to hal/phydm_reg.h diff --git a/hal/phydm/phydm_regconfig8188e.c b/hal/phydm_regconfig8188e.c similarity index 100% rename from hal/phydm/phydm_regconfig8188e.c rename to hal/phydm_regconfig8188e.c diff --git a/hal/phydm/phydm_regconfig8188e.h b/hal/phydm_regconfig8188e.h similarity index 100% rename from hal/phydm/phydm_regconfig8188e.h rename to hal/phydm_regconfig8188e.h diff --git a/hal/phydm/phydm_regdefine11ac.h b/hal/phydm_regdefine11ac.h similarity index 100% rename from hal/phydm/phydm_regdefine11ac.h rename to hal/phydm_regdefine11ac.h diff --git a/hal/phydm/phydm_regdefine11n.h b/hal/phydm_regdefine11n.h similarity index 100% rename from hal/phydm/phydm_regdefine11n.h rename to hal/phydm_regdefine11n.h diff --git a/hal/phydm/phydm_rtl8188e.c b/hal/phydm_rtl8188e.c similarity index 100% rename from hal/phydm/phydm_rtl8188e.c rename to hal/phydm_rtl8188e.c diff --git a/hal/phydm/phydm_rtl8188e.h b/hal/phydm_rtl8188e.h similarity index 100% rename from hal/phydm/phydm_rtl8188e.h rename to hal/phydm_rtl8188e.h diff --git a/hal/phydm/phydm_types.h b/hal/phydm_types.h similarity index 100% rename from hal/phydm/phydm_types.h rename to hal/phydm_types.h diff --git a/hal/phydm/rtchnlplan.c b/hal/rtchnlplan.c similarity index 100% rename from hal/phydm/rtchnlplan.c rename to hal/rtchnlplan.c diff --git a/hal/phydm/rtchnlplan.h b/hal/rtchnlplan.h similarity index 100% rename from hal/phydm/rtchnlplan.h rename to hal/rtchnlplan.h diff --git a/hal/phydm/version_rtl8188e.h b/hal/version_rtl8188e.h similarity index 100% rename from hal/phydm/version_rtl8188e.h rename to hal/version_rtl8188e.h diff --git a/include/hal_data.h b/include/hal_data.h index ebfd243..b2a089d 100755 --- a/include/hal_data.h +++ b/include/hal_data.h @@ -4,7 +4,7 @@ #ifndef __HAL_DATA_H__ #define __HAL_DATA_H__ -#include "../hal/phydm/phydm_precomp.h" +#include "../hal/phydm_precomp.h" #ifdef CONFIG_BT_COEXIST #include #endif diff --git a/include/rtw_odm.h b/include/rtw_odm.h index 14cf059..7af30f3 100644 --- a/include/rtw_odm.h +++ b/include/rtw_odm.h @@ -5,7 +5,7 @@ #define __RTW_ODM_H__ #include -#include "../hal/phydm/phydm_types.h" +#include "../hal/phydm_types.h" /* * This file provides utilities/wrappers for rtw driver to use ODM */ diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index aafea62..654e2ba 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -7,7 +7,7 @@ #include #include #include -#include "../../hal/phydm/phydm_precomp.h" +#include "../../hal/phydm_precomp.h" #ifdef RTW_HALMAC #include "../../hal/hal_halmac.h" #endif diff --git a/os_dep/ioctl_mp.c b/os_dep/ioctl_mp.c index 289442b..d08bb3b 100644 --- a/os_dep/ioctl_mp.c +++ b/os_dep/ioctl_mp.c @@ -6,7 +6,7 @@ #include #include #include -#include "../../hal/phydm/phydm_precomp.h" +#include "../../hal/phydm_precomp.h" /* * Input Format: %s,%d,%d