staging: r8188eu: move firmware related macros to rtw_fw.h

Move firmware related macros from rtl8188e_hal.h to rtw_fw.h.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220107143617.2214-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index dad2aa473a1c91ebbd77cf7de71a82c6170a1a58..d9e944a839403365e1097f4fb93b76db09d631e0 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -34,17 +34,6 @@
 #define DRVINFO_SZ     4 /*  unit is 8bytes */
 #define PageNum_128(_Len)      (u32)(((_Len)>>7) + ((_Len) & 0x7F ? 1 : 0))
 
-/*  download firmware related data structure */
-#define FW_8188E_START_ADDRESS         0x1000
-
-#define MAX_PAGE_SIZE                  4096    /*  @ page : 4k bytes */
-
-#define IS_FW_HEADER_EXIST(_fwhdr)                             \
-       ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x92C0 || \
-       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88C0 ||  \
-       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x2300 ||  \
-       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88E0)
-
 /*  This structure must be careful with byte-ordering */
 
 struct rt_firmware_hdr {

diff --git a/drivers/staging/r8188eu/include/rtw_fw.h b/drivers/staging/r8188eu/include/rtw_fw.h
index 7491577042511012af9db43a671a8f960852d678..9b7492ef01992cc6d471d74b75ac56175d79bcb2 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_fw.h
+++ b/drivers/staging/r8188eu/include/rtw_fw.h
@@ -6,7 +6,15 @@
 
 #include "drv_types.h"
 
-#define MAX_REG_BOLCK_SIZE 196
+#define MAX_REG_BOLCK_SIZE     196
+#define FW_8188E_START_ADDRESS 0x1000
+#define MAX_PAGE_SIZE          4096
+
+#define IS_FW_HEADER_EXIST(_fwhdr)                             \
+       ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x92C0 || \
+       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88C0 ||  \
+       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x2300 ||  \
+       (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88E0)
 
 int rtl8188e_firmware_download(struct adapter *padapter);
 void rtw_reset_8051(struct adapter *padapter);