NetworkPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the NetworkPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
This commit is contained in:
Michael Kubacki
committed by
mergify[bot]
mergify[bot]
parent
2f88bd3a12
commit
d1050b9dff
@@ -73,31 +73,31 @@
|
||||
//
|
||||
#define WIFI_MGR_DXE_VERSION 0xb
|
||||
|
||||
#define OUI_IEEE_80211I 0xAC0F00
|
||||
#define OUI_IEEE_80211I 0xAC0F00
|
||||
|
||||
typedef enum {
|
||||
Ieee80211PairwiseCipherSuiteUseGroupCipherSuite = 0,
|
||||
Ieee80211PairwiseCipherSuiteWEP40 = 1,
|
||||
Ieee80211PairwiseCipherSuiteTKIP = 2,
|
||||
Ieee80211PairwiseCipherSuiteCCMP = 4,
|
||||
Ieee80211PairwiseCipherSuiteWEP104 = 5,
|
||||
Ieee80211PairwiseCipherSuiteBIP = 6,
|
||||
//...
|
||||
Ieee80211PairwiseCipherSuiteWEP40 = 1,
|
||||
Ieee80211PairwiseCipherSuiteTKIP = 2,
|
||||
Ieee80211PairwiseCipherSuiteCCMP = 4,
|
||||
Ieee80211PairwiseCipherSuiteWEP104 = 5,
|
||||
Ieee80211PairwiseCipherSuiteBIP = 6,
|
||||
// ...
|
||||
} IEEE_80211_PAIRWISE_CIPHER_SUITE;
|
||||
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_USE_GROUP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteUseGroupCipherSuite << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40 (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP40 << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_TKIP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteTKIP << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_CCMP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteCCMP << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104 (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP104 << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_BIP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteBIP << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_USE_GROUP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteUseGroupCipherSuite << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40 (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP40 << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_TKIP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteTKIP << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_CCMP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteCCMP << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104 (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP104 << 24))
|
||||
#define IEEE_80211_PAIRWISE_CIPHER_SUITE_BIP (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteBIP << 24))
|
||||
|
||||
typedef enum {
|
||||
Ieee80211AkmSuite8021XOrPMKSA = 1,
|
||||
Ieee80211AkmSuitePSK = 2,
|
||||
Ieee80211AkmSuite8021XOrPMKSASHA256 = 5,
|
||||
Ieee80211AkmSuitePSKSHA256 = 6
|
||||
//...
|
||||
// ...
|
||||
} IEEE_80211_AKM_SUITE;
|
||||
|
||||
#define IEEE_80211_AKM_SUITE_8021X_OR_PMKSA (OUI_IEEE_80211I | (Ieee80211AkmSuite8021XOrPMKSA << 24))
|
||||
@@ -108,10 +108,10 @@ typedef enum {
|
||||
//
|
||||
// Protocol instances
|
||||
//
|
||||
extern EFI_DRIVER_BINDING_PROTOCOL gWifiMgrDxeDriverBinding;
|
||||
extern EFI_COMPONENT_NAME2_PROTOCOL gWifiMgrDxeComponentName2;
|
||||
extern EFI_COMPONENT_NAME_PROTOCOL gWifiMgrDxeComponentName;
|
||||
extern EFI_HII_CONFIG_ACCESS_PROTOCOL gWifiMgrDxeHiiConfigAccess;
|
||||
extern EFI_DRIVER_BINDING_PROTOCOL gWifiMgrDxeDriverBinding;
|
||||
extern EFI_COMPONENT_NAME2_PROTOCOL gWifiMgrDxeComponentName2;
|
||||
extern EFI_COMPONENT_NAME_PROTOCOL gWifiMgrDxeComponentName;
|
||||
extern EFI_HII_CONFIG_ACCESS_PROTOCOL gWifiMgrDxeHiiConfigAccess;
|
||||
|
||||
//
|
||||
// Private Context Data Structure
|
||||
@@ -130,12 +130,12 @@ typedef enum {
|
||||
WifiMgrScanStateMaximum
|
||||
} WIFI_MGR_SCAN_STATE;
|
||||
|
||||
#define WIFI_SCAN_FREQUENCY 30
|
||||
#define WIFI_SCAN_FREQUENCY 30
|
||||
|
||||
typedef struct _WIFI_MGR_SUPPORTED_SUITES {
|
||||
EFI_80211_AKM_SUITE_SELECTOR *SupportedAKMSuites;
|
||||
EFI_80211_CIPHER_SUITE_SELECTOR *SupportedSwCipherSuites;
|
||||
EFI_80211_CIPHER_SUITE_SELECTOR *SupportedHwCipherSuites;
|
||||
EFI_80211_AKM_SUITE_SELECTOR *SupportedAKMSuites;
|
||||
EFI_80211_CIPHER_SUITE_SELECTOR *SupportedSwCipherSuites;
|
||||
EFI_80211_CIPHER_SUITE_SELECTOR *SupportedHwCipherSuites;
|
||||
} WIFI_MGR_SUPPORTED_SUITES;
|
||||
|
||||
#define EFI_WIFIMGR_PRIVATE_GUID \
|
||||
@@ -143,15 +143,15 @@ typedef struct _WIFI_MGR_SUPPORTED_SUITES {
|
||||
0x99b7c019, 0x4789, 0x4829, { 0xa7, 0xbd, 0x0d, 0x4b, 0xaa, 0x62, 0x28, 0x72 } \
|
||||
}
|
||||
|
||||
typedef struct _WIFI_MGR_PRIVATE_DATA WIFI_MGR_PRIVATE_DATA;
|
||||
typedef struct _WIFI_MGR_PRIVATE_DATA WIFI_MGR_PRIVATE_DATA;
|
||||
|
||||
typedef struct _WIFI_MGR_PRIVATE_PROTOCOL {
|
||||
UINT32 Reserved;
|
||||
UINT32 Reserved;
|
||||
} WIFI_MGR_PRIVATE_PROTOCOL;
|
||||
|
||||
typedef struct _WIFI_MGR_FILE_CONTEXT {
|
||||
EFI_FILE_HANDLE FHandle;
|
||||
UINT16 *FileName;
|
||||
EFI_FILE_HANDLE FHandle;
|
||||
UINT16 *FileName;
|
||||
} WIFI_MGR_FILE_CONTEXT;
|
||||
|
||||
typedef enum {
|
||||
@@ -177,43 +177,43 @@ typedef struct {
|
||||
//
|
||||
// Produced protocols
|
||||
//
|
||||
WIFI_MGR_PRIVATE_PROTOCOL WifiMgrIdentifier;
|
||||
WIFI_MGR_PRIVATE_PROTOCOL WifiMgrIdentifier;
|
||||
|
||||
//
|
||||
// Private functions and data fields
|
||||
//
|
||||
LIST_ENTRY Link; // Link to the NicList in global private data structure.
|
||||
UINT32 NicIndex;
|
||||
EFI_80211_MAC_ADDRESS MacAddress;
|
||||
WIFI_MGR_SUPPORTED_SUITES SupportedSuites;
|
||||
EFI_ADAPTER_INFO_MEDIA_STATE LastLinkState;
|
||||
LIST_ENTRY Link; // Link to the NicList in global private data structure.
|
||||
UINT32 NicIndex;
|
||||
EFI_80211_MAC_ADDRESS MacAddress;
|
||||
WIFI_MGR_SUPPORTED_SUITES SupportedSuites;
|
||||
EFI_ADAPTER_INFO_MEDIA_STATE LastLinkState;
|
||||
|
||||
//
|
||||
// The network is currently connected, connecting or disconnecting.
|
||||
// Only one network can be operated at one time.
|
||||
//
|
||||
WIFI_MGR_NETWORK_PROFILE *CurrentOperateNetwork;
|
||||
WIFI_MGR_NETWORK_PROFILE *ConnectPendingNetwork;
|
||||
BOOLEAN HasDisconnectPendingNetwork;
|
||||
WIFI_MGR_NETWORK_PROFILE *CurrentOperateNetwork;
|
||||
WIFI_MGR_NETWORK_PROFILE *ConnectPendingNetwork;
|
||||
BOOLEAN HasDisconnectPendingNetwork;
|
||||
|
||||
//
|
||||
//Profile related data fields
|
||||
// Profile related data fields
|
||||
//
|
||||
LIST_ENTRY ProfileList; // List of WIFI_MGR_NETWORK_PROFILE
|
||||
UINT32 AvailableCount;
|
||||
UINT32 MaxProfileIndex;
|
||||
WIFI_MGR_NETWORK_PROFILE *UserSelectedProfile;
|
||||
LIST_ENTRY ProfileList; // List of WIFI_MGR_NETWORK_PROFILE
|
||||
UINT32 AvailableCount;
|
||||
UINT32 MaxProfileIndex;
|
||||
WIFI_MGR_NETWORK_PROFILE *UserSelectedProfile;
|
||||
|
||||
//
|
||||
// Data fields for Hii functionlity
|
||||
//
|
||||
BOOLEAN OneTimeScanRequest;
|
||||
BOOLEAN OneTimeConnectRequest;
|
||||
BOOLEAN OneTimeDisconnectRequest;
|
||||
WIFI_MGR_SCAN_STATE ScanState;
|
||||
UINTN ScanTickTime;
|
||||
WIFI_MGR_CONNECT_STATE ConnectState;
|
||||
BOOLEAN ConnectStateChanged;
|
||||
BOOLEAN OneTimeScanRequest;
|
||||
BOOLEAN OneTimeConnectRequest;
|
||||
BOOLEAN OneTimeDisconnectRequest;
|
||||
WIFI_MGR_SCAN_STATE ScanState;
|
||||
UINTN ScanTickTime;
|
||||
WIFI_MGR_CONNECT_STATE ConnectState;
|
||||
BOOLEAN ConnectStateChanged;
|
||||
} WIFI_MGR_DEVICE_DATA;
|
||||
|
||||
#define WIFI_MGR_DEVICE_DATA_SIGNATURE SIGNATURE_32 ('W','M','D','D')
|
||||
@@ -227,9 +227,9 @@ typedef struct {
|
||||
)
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
CHAR16 SSId[SSID_STORAGE_SIZE];
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
CHAR16 SSId[SSID_STORAGE_SIZE];
|
||||
} WIFI_HIDDEN_NETWORK_DATA;
|
||||
|
||||
#define WIFI_MGR_HIDDEN_NETWORK_SIGNATURE SIGNATURE_32 ('W','M','H','N')
|
||||
@@ -246,7 +246,6 @@ typedef struct {
|
||||
// Global private data struct
|
||||
//
|
||||
struct _WIFI_MGR_PRIVATE_DATA {
|
||||
|
||||
UINT32 Signature;
|
||||
EFI_HANDLE DriverHandle;
|
||||
EFI_HII_HANDLE RegisteredHandle;
|
||||
@@ -264,7 +263,7 @@ struct _WIFI_MGR_PRIVATE_DATA {
|
||||
EFI_EVENT MainPageRefreshEvent; // Event to refresh the main page
|
||||
|
||||
//
|
||||
//User Input Record
|
||||
// User Input Record
|
||||
//
|
||||
UINT8 SecurityType;
|
||||
UINT8 EapAuthMethod;
|
||||
@@ -287,7 +286,7 @@ struct _WIFI_MGR_PRIVATE_DATA {
|
||||
ConfigAccess, \
|
||||
WIFI_MGR_PRIVATE_DATA_SIGNATURE \
|
||||
)
|
||||
extern WIFI_MGR_PRIVATE_DATA *mPrivate;
|
||||
extern WIFI_MGR_PRIVATE_DATA *mPrivate;
|
||||
|
||||
typedef enum {
|
||||
TokenTypeGetNetworksToken,
|
||||
@@ -297,15 +296,15 @@ typedef enum {
|
||||
} WIFI_MGR_MAC_CONFIG_TOKEN_TYPE;
|
||||
|
||||
typedef union {
|
||||
EFI_80211_GET_NETWORKS_TOKEN *GetNetworksToken;
|
||||
EFI_80211_CONNECT_NETWORK_TOKEN *ConnectNetworkToken;
|
||||
EFI_80211_DISCONNECT_NETWORK_TOKEN *DisconnectNetworkToken;
|
||||
EFI_80211_GET_NETWORKS_TOKEN *GetNetworksToken;
|
||||
EFI_80211_CONNECT_NETWORK_TOKEN *ConnectNetworkToken;
|
||||
EFI_80211_DISCONNECT_NETWORK_TOKEN *DisconnectNetworkToken;
|
||||
} MAC_CONNECTION2_ADAPTER_TOKEN;
|
||||
|
||||
typedef struct {
|
||||
WIFI_MGR_DEVICE_DATA *Nic;
|
||||
WIFI_MGR_MAC_CONFIG_TOKEN_TYPE Type;
|
||||
MAC_CONNECTION2_ADAPTER_TOKEN Token;
|
||||
WIFI_MGR_DEVICE_DATA *Nic;
|
||||
WIFI_MGR_MAC_CONFIG_TOKEN_TYPE Type;
|
||||
MAC_CONNECTION2_ADAPTER_TOKEN Token;
|
||||
} WIFI_MGR_MAC_CONFIG_TOKEN;
|
||||
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user