rtl8188eu: Flatten hal directory

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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	\
+_OUTSRC_FILES := hal/phydm_debug.o	\
-		hal/phydm/phydm_antdiv.o\
+		hal/phydm_antdiv.o\
-		hal/phydm/phydm_antdect.o\
+		hal/phydm_antdect.o\
-		hal/phydm/phydm_interface.o\
+		hal/phydm_interface.o\
-		hal/phydm/phydm_hwconfig.o\
+		hal/phydm_hwconfig.o\
-		hal/phydm/phydm.o\
+		hal/phydm.o\
-		hal/phydm/halphyrf_ce.o\
+		hal/halphyrf_ce.o\
-		hal/phydm/phydm_edcaturbocheck.o\
+		hal/phydm_edcaturbocheck.o\
-		hal/phydm/phydm_dig.o\
+		hal/phydm_dig.o\
-		hal/phydm/phydm_pathdiv.o\
+		hal/phydm_pathdiv.o\
-		hal/phydm/phydm_rainfo.o\
+		hal/phydm_rainfo.o\
-		hal/phydm/phydm_dynamicbbpowersaving.o\
+		hal/phydm_dynamicbbpowersaving.o\
-		hal/phydm/phydm_powertracking_ce.o\
+		hal/phydm_powertracking_ce.o\
-		hal/phydm/phydm_dynamictxpower.o\
+		hal/phydm_dynamictxpower.o\
-		hal/phydm/phydm_adaptivity.o\
+		hal/phydm_adaptivity.o\
-		hal/phydm/phydm_cfotracking.o\
+		hal/phydm_cfotracking.o\
-		hal/phydm/phydm_noisemonitor.o\
+		hal/phydm_noisemonitor.o\
-		hal/phydm/phydm_acs.o\
+		hal/phydm_acs.o\
-		hal/phydm/phydm_dfs.o\
+		hal/phydm_dfs.o\
-		hal/phydm/txbf/phydm_hal_txbf_api.o\
+		hal/phydm_hal_txbf_api.o\
-		hal/phydm/phydm_adc_sampling.o\
+		hal/phydm_adc_sampling.o\
-		hal/phydm/phydm_kfree.o\
+		hal/phydm_kfree.o\
-		hal/phydm/phydm_ccx.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\
+_OUTSRC_FILES += hal/halhwimg8188e_mac.o\
-		hal/phydm/halhwimg8188e_bb.o\
+		hal/halhwimg8188e_bb.o\
-		hal/phydm/halhwimg8188e_rf.o\
+		hal/halhwimg8188e_rf.o\
-		hal/phydm/halphyrf_8188e_ce.o\
+		hal/halphyrf_8188e_ce.o\
-		hal/phydm/phydm_regconfig8188e.o\
+		hal/phydm_regconfig8188e.o\
-		hal/phydm/hal8188erateadaptive.o\
+		hal/hal8188erateadaptive.o\
-		hal/phydm/phydm_rtl8188e.o
+		hal/phydm_rtl8188e.o
 
 ########### AUTO_CFG  #################################
 

core/rtw_mp.c

@@ -4,7 +4,7 @@
 #define _RTW_MP_C_
 #include <drv_types.h>
 
-#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))

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"

hal/phydm_beamforming.h

@@ -6,9 +6,9 @@
 #endif
 
 /*Beamforming Related*/
-#include "txbf/halcomtxbf.h"
+#include "halcomtxbf.h"
-#include "txbf/haltxbfjaguar.h"
+#include "haltxbfjaguar.h"
-#include "txbf/haltxbfinterface.h"
+#include "haltxbfinterface.h"
 
 #define beamforming_gid_paid(adapter, p_tcb)
 #define	phydm_acting_determine(p_dm_odm, type)	false

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 <hal_btcoex.h>
 #endif

include/rtw_odm.h

@@ -5,7 +5,7 @@
 #define __RTW_ODM_H__
 
 #include <drv_types.h>
-#include "../hal/phydm/phydm_types.h"
+#include "../hal/phydm_types.h"
 /*
 * This file provides utilities/wrappers for rtw driver to use ODM
 */

os_dep/ioctl_linux.c

@@ -7,7 +7,7 @@
 #include <rtw_mp.h>
 #include <rtw_mp_ioctl.h>
 #include <rtw_mlme.h>
-#include "../../hal/phydm/phydm_precomp.h"
+#include "../../hal/phydm_precomp.h"
 #ifdef RTW_HALMAC
 #include "../../hal/hal_halmac.h"
 #endif

os_dep/ioctl_mp.c

@@ -6,7 +6,7 @@
 #include <drv_types.h>
 #include <rtw_mp.h>
 #include <rtw_mp_ioctl.h>
-#include "../../hal/phydm/phydm_precomp.h"
+#include "../../hal/phydm_precomp.h"
 
 /*
  * Input Format: %s,%d,%d