rtl8188eus: Flatten hal/efuse/rtl* into hal/

This change is part of the process of removing subdirectories of include/,
core/, hal/ and os_dep/.

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

Makefile

@@ -320,13 +320,13 @@ endif
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8188E_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8188E_PCIE.o
 endif
 ifeq ($(CONFIG_SDIO_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_SDIO.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8188E_SDIO.o
 endif
 
 #hal/OUTSRC/$(RTL871X)/Hal8188EFWImg_CE.o
@@ -384,10 +384,10 @@ endif
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8192E_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8192E_PCIE.o
 endif
 
 #hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o
@@ -444,18 +444,18 @@ endif
 
 ifeq ($(CONFIG_RTL8812A), y)
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8812A_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8812A_PCIE.o
 endif
 endif
 ifeq ($(CONFIG_RTL8821A), y)
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8821A_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8821A_PCIE.o
 endif
 endif
 
@@ -551,10 +551,10 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8723B_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8723B_PCIE.o
 endif
 
 _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8723b_bb.o\
@@ -617,10 +617,10 @@ endif
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8814A_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8814A_PCIE.o
 endif
 
 _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8814a_bb.o\
@@ -678,10 +678,10 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8703B_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8703B_PCIE.o
 endif
 
 _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8703b_bb.o\
@@ -737,10 +737,10 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8723D_USB.o
 endif
 ifeq ($(CONFIG_PCI_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_PCIE.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8723D_PCIE.o
 endif
 
 _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8723d_bb.o\
@@ -792,11 +792,11 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o
 endif
 
 ifeq ($(CONFIG_USB_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_USB.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8188F_USB.o
 endif
 
 ifeq ($(CONFIG_SDIO_HCI), y)
-_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_SDIO.o
+_HAL_INTFS_FILES +=hal/HalEfuseMask8188F_SDIO.o
 endif
 
 _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8188f_bb.o\

core/rtw_efuse.c

@@ -22,7 +22,7 @@
 #include <drv_types.h>
 #include <hal_data.h>
 
-#include "../hal/efuse/efuse_mask.h"
+#include "../hal/efuse_mask.h"
 
 /*------------------------Define local variable------------------------------*/
 u8	fakeEfuseBank = {0};

hal/efuse/efuse_mask.h

@@ -1,106 +0,0 @@
-
-#if DEV_BUS_TYPE == RT_USB_INTERFACE
-
-#if defined(CONFIG_RTL8188E)
-	#include "rtl8188e/HalEfuseMask8188E_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8812A)
-	#include "rtl8812a/HalEfuseMask8812A_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8821A)
-	#include "rtl8812a/HalEfuseMask8821A_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8192E)
-	#include "rtl8192e/HalEfuseMask8192E_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8723B)
-	#include "rtl8723b/HalEfuseMask8723B_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8814A)
-	#include "rtl8814a/HalEfuseMask8814A_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8703B)
-	#include "rtl8703b/HalEfuseMask8703B_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8723D)
-	#include "rtl8723d/HalEfuseMask8723D_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8188F)
-	#include "rtl8188f/HalEfuseMask8188F_USB.h"
-#endif
-
-#if defined(CONFIG_RTL8822B)
-	#include "rtl8822b/HalEfuseMask8822B_USB.h"
-#endif
-
-#elif DEV_BUS_TYPE == RT_PCI_INTERFACE
-
-#if defined(CONFIG_RTL8188E)
-	#include "rtl8188e/HalEfuseMask8188E_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8812A)
-	#include "rtl8812a/HalEfuseMask8812A_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8821A)
-	#include "rtl8812a/HalEfuseMask8821A_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8192E)
-	#include "rtl8192e/HalEfuseMask8192E_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8723B)
-	#include "rtl8723b/HalEfuseMask8723B_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8814A)
-	#include "rtl8814a/HalEfuseMask8814A_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8703B)
-	#include "rtl8703b/HalEfuseMask8703B_PCIE.h"
-#endif
-
-#if defined(CONFIG_RTL8822B)
-	#include "rtl8822b/HalEfuseMask8822B_PCIE.h"
-#endif
-#if defined(CONFIG_RTL8723D)
-	#include "rtl8723d/HalEfuseMask8723D_PCIE.h"
-#endif
-
-#elif DEV_BUS_TYPE == RT_SDIO_INTERFACE
-
-#if defined(CONFIG_RTL8188E)
-	#include "rtl8188e/HalEfuseMask8188E_SDIO.h"
-#endif
-
-#if defined(CONFIG_RTL8703B)
-	#include "rtl8703b/HalEfuseMask8703B_SDIO.h"
-#endif
-
-#if defined(CONFIG_RTL8188F)
-	#include "rtl8188f/HalEfuseMask8188F_SDIO.h"
-#endif
-
-#if defined(CONFIG_RTL8723D)
-	#include "rtl8723d/HalEfuseMask8723D_SDIO.h"
-#endif
-
-#if defined(CONFIG_RTL8821C)
-	#include "rtl8821c/HalEfuseMask8821C_SDIO.h"
-#endif
-
-#if defined(CONFIG_RTL8822B)
-	#include "rtl8822b/HalEfuseMask8822B_SDIO.h"
-#endif
-#endif

hal/efuse_mask.h

@@ -0,0 +1,106 @@
+
+#if DEV_BUS_TYPE == RT_USB_INTERFACE
+
+#if defined(CONFIG_RTL8188E)
+	#include "HalEfuseMask8188E_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8812A)
+	#include "HalEfuseMask8812A_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8821A)
+	#include "HalEfuseMask8821A_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8192E)
+	#include "HalEfuseMask8192E_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8723B)
+	#include "HalEfuseMask8723B_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8814A)
+	#include "HalEfuseMask8814A_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8703B)
+	#include "HalEfuseMask8703B_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8723D)
+	#include "HalEfuseMask8723D_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8188F)
+	#include "HalEfuseMask8188F_USB.h"
+#endif
+
+#if defined(CONFIG_RTL8822B)
+	#include "HalEfuseMask8822B_USB.h"
+#endif
+
+#elif DEV_BUS_TYPE == RT_PCI_INTERFACE
+
+#if defined(CONFIG_RTL8188E)
+	#include "HalEfuseMask8188E_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8812A)
+	#include "HalEfuseMask8812A_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8821A)
+	#include "HalEfuseMask8821A_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8192E)
+	#include "HalEfuseMask8192E_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8723B)
+	#include "HalEfuseMask8723B_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8814A)
+	#include "HalEfuseMask8814A_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8703B)
+	#include "HalEfuseMask8703B_PCIE.h"
+#endif
+
+#if defined(CONFIG_RTL8822B)
+	#include "HalEfuseMask8822B_PCIE.h"
+#endif
+#if defined(CONFIG_RTL8723D)
+	#include "HalEfuseMask8723D_PCIE.h"
+#endif
+
+#elif DEV_BUS_TYPE == RT_SDIO_INTERFACE
+
+#if defined(CONFIG_RTL8188E)
+	#include "HalEfuseMask8188E_SDIO.h"
+#endif
+
+#if defined(CONFIG_RTL8703B)
+	#include "HalEfuseMask8703B_SDIO.h"
+#endif
+
+#if defined(CONFIG_RTL8188F)
+	#include "HalEfuseMask8188F_SDIO.h"
+#endif
+
+#if defined(CONFIG_RTL8723D)
+	#include "HalEfuseMask8723D_SDIO.h"
+#endif
+
+#if defined(CONFIG_RTL8821C)
+	#include "HalEfuseMask8821C_SDIO.h"
+#endif
+
+#if defined(CONFIG_RTL8822B)
+	#include "HalEfuseMask8822B_SDIO.h"
+#endif
+#endif