Fixed EBC build issues.
Fixed ICC build issues. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3431 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -523,12 +523,12 @@ MnpInitializeInstanceData (
|
||||
//
|
||||
// Copy the MNP Protocol interfaces from the template.
|
||||
//
|
||||
Instance->ManagedNetwork = mMnpProtocolTemplate;
|
||||
CopyMem (&Instance->ManagedNetwork, &mMnpProtocolTemplate, sizeof (EFI_MANAGED_NETWORK_PROTOCOL));
|
||||
|
||||
//
|
||||
// Copy the default config data.
|
||||
//
|
||||
Instance->ConfigData = mMnpDefaultConfigData;
|
||||
CopyMem (&Instance->ConfigData, &mMnpDefaultConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));
|
||||
|
||||
//
|
||||
// Initialize the lists.
|
||||
@@ -1024,7 +1024,7 @@ MnpConfigureInstance (
|
||||
//
|
||||
// Save the new configuration data.
|
||||
//
|
||||
*OldConfigData = *NewConfigData;
|
||||
CopyMem (OldConfigData, NewConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));
|
||||
|
||||
Instance->Configured = (BOOLEAN) (ConfigData != NULL);
|
||||
|
||||
@@ -1035,7 +1035,7 @@ MnpConfigureInstance (
|
||||
Status = MnpStart (
|
||||
MnpServiceData,
|
||||
IsConfigUpdate,
|
||||
!NewConfigData->DisableBackgroundPolling
|
||||
(BOOLEAN) !NewConfigData->DisableBackgroundPolling
|
||||
);
|
||||
} else {
|
||||
//
|
||||
@@ -1138,7 +1138,7 @@ MnpConfigReceiveFilters (
|
||||
NET_LIST_FOR_EACH (Entry, &MnpServiceData->GroupAddressList) {
|
||||
|
||||
GroupAddress = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);
|
||||
*(MCastFilter + Index) = GroupAddress->Address;
|
||||
CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (EFI_MAC_ADDRESS));
|
||||
Index++;
|
||||
|
||||
ASSERT (Index <= MCastFilterCnt);
|
||||
@@ -1252,7 +1252,7 @@ MnpGroupOpAddCtrlBlk (
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
GroupAddress->Address = *MacAddress;
|
||||
CopyMem (&GroupAddress->Address, MacAddress, sizeof (EFI_MAC_ADDRESS));
|
||||
GroupAddress->RefCnt = 0;
|
||||
NetListInsertTail (
|
||||
&MnpServiceData->GroupAddressList,
|
||||
|
@@ -43,7 +43,6 @@ MnpIsValidTxToken (
|
||||
)
|
||||
{
|
||||
MNP_SERVICE_DATA *MnpServiceData;
|
||||
EFI_SIMPLE_NETWORK_MODE *SnpMode;
|
||||
EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;
|
||||
UINT32 Index;
|
||||
UINT32 TotalLength;
|
||||
@@ -52,7 +51,6 @@ MnpIsValidTxToken (
|
||||
MnpServiceData = Instance->MnpServiceData;
|
||||
NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);
|
||||
|
||||
SnpMode = MnpServiceData->Snp->Mode;
|
||||
TxData = Token->Packet.TxData;
|
||||
|
||||
if ((Token->Event == NULL) || (TxData == NULL) || (TxData->FragmentCount == 0)) {
|
||||
@@ -262,7 +260,7 @@ MnpSyncSendPacket (
|
||||
//
|
||||
// Get the recycled transmit buffer status.
|
||||
//
|
||||
Snp->GetStatus (Snp, NULL, &TxBuf);
|
||||
Snp->GetStatus (Snp, NULL, (VOID **) &TxBuf);
|
||||
|
||||
if (!EFI_ERROR (gBS->CheckEvent (MnpServiceData->TxTimeoutEvent))) {
|
||||
|
||||
@@ -749,7 +747,7 @@ MnpWrapRxData (
|
||||
//
|
||||
// Fill the RxData in RxDataWrap,
|
||||
//
|
||||
RxDataWrap->RxData = *RxData;
|
||||
CopyMem (&RxDataWrap->RxData, RxData, sizeof (EFI_MANAGED_NETWORK_RECEIVE_DATA));
|
||||
|
||||
//
|
||||
// Create the recycle event.
|
||||
@@ -829,7 +827,7 @@ MnpEnqueuePacket (
|
||||
//
|
||||
// Wrap the RxData.
|
||||
//
|
||||
RxDataWrap = MnpWrapRxData (Instance, &RxData);
|
||||
CopyMem (&RxDataWrap, MnpWrapRxData (Instance, &RxData), sizeof (MNP_RXDATA_WRAP));
|
||||
if (RxDataWrap == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ MnpGetModeData (
|
||||
//
|
||||
// Copy the instance configuration data.
|
||||
//
|
||||
*MnpConfigData = Instance->ConfigData;
|
||||
CopyMem (MnpConfigData, &Instance->ConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));
|
||||
}
|
||||
|
||||
if (SnpModeData != NULL) {
|
||||
@@ -76,7 +76,7 @@ MnpGetModeData (
|
||||
// Copy the underlayer Snp mode data.
|
||||
//
|
||||
Snp = Instance->MnpServiceData->Snp;
|
||||
*SnpModeData = *(Snp->Mode);
|
||||
CopyMem (SnpModeData, Snp->Mode, sizeof (EFI_SIMPLE_NETWORK_MODE));
|
||||
}
|
||||
|
||||
if (!Instance->Configured) {
|
||||
@@ -229,7 +229,7 @@ MnpMcastIpToMac (
|
||||
MacAddress->Addr[0] = 0x01;
|
||||
MacAddress->Addr[1] = 0x00;
|
||||
MacAddress->Addr[2] = 0x5E;
|
||||
MacAddress->Addr[3] = IpAddress->v4.Addr[1] & 0x7F;
|
||||
MacAddress->Addr[3] = (UINT8) (IpAddress->v4.Addr[1] & 0x7F);
|
||||
MacAddress->Addr[4] = IpAddress->v4.Addr[2];
|
||||
MacAddress->Addr[5] = IpAddress->v4.Addr[3];
|
||||
|
||||
|
Reference in New Issue
Block a user