These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / include / rtl8188e_hal.h

diff --git a/kernel/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/kernel/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index b8c42ee..cbad364 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/kernel/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -159,7 +159,7 @@ struct txpowerinfo24g {
 /*  | 1byte|----8bytes----|1byte|--5bytes--| */
 /*  |         |            Reserved(14bytes)         | */
 
-/*  PG data exclude header, dummy 6 bytes frome CP test and reserved 1byte. */
+/*  PG data exclude header, dummy 6 bytes from CP test and reserved 1byte. */
 #define EFUSE_OOB_PROTECT_BYTES                        15
 
 #define                HWSET_MAX_SIZE_88E              512
@@ -177,7 +177,7 @@ struct txpowerinfo24g {
 /*  9bytes + 1byt + 5bytes and pre 1byte. */
 /*  For worst case: */
 /*  | 2byte|----8bytes----|1byte|--7bytes--| 92D */
-/*  PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte. */
+/*  PG data exclude header, dummy 7 bytes from CP test and reserved 1byte. */
 #define                EFUSE_OOB_PROTECT_BYTES_88E     18
 #define                EFUSE_PROTECT_BYTES_BANK_88E    16
 
@@ -188,23 +188,8 @@ struct txpowerinfo24g {
 
 #define EFUSE_PROTECT_BYTES_BANK       16
 
-/*  For RTL8723 WiFi/BT/GPS multi-function configuration. */
-enum rt_multi_func {
-       RT_MULTI_FUNC_NONE = 0x00,
-       RT_MULTI_FUNC_WIFI = 0x01,
-       RT_MULTI_FUNC_BT = 0x02,
-       RT_MULTI_FUNC_GPS = 0x04,
-};
-
-/*  For RTL8723 regulator mode. */
-enum rt_regulator_mode {
-       RT_SWITCHING_REGULATOR = 0,
-       RT_LDO_REGULATOR = 1,
-};
-
 struct hal_data_8188e {
        struct HAL_VERSION      VersionID;
-       enum rt_regulator_mode RegulatorMode; /*  switching regulator or LDO */
        u16     CustomerID;
        u8 *pfirmware;
        u32 fwsize;
@@ -309,7 +294,6 @@ struct hal_data_8188e {
        /* for host message to fw */
        u8      LastHMEBoxNum;
 
-       u8      fw_ractrl;
        u8      RegTxPause;
        /*  Beacon function related global variable. */
        u32     RegBcnCtrlVal;
@@ -378,11 +362,6 @@ struct hal_data_8188e {
        ((struct hal_data_8188e *)((__pAdapter)->HalData))
 #define GET_RF_TYPE(priv)              (GET_HAL_DATA(priv)->rf_type)
 
-#define INCLUDE_MULTI_FUNC_BT(_Adapter)                                \
-       (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT)
-#define INCLUDE_MULTI_FUNC_GPS(_Adapter)                       \
-       (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS)
-
 /*  rtl8188e_hal_init.c */
 void _8051Reset88E(struct adapter *padapter);
 void rtl8188e_InitializeFirmwareVars(struct adapter *padapter);