diff options
author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-03-15 02:33:16 +0000 |
---|---|---|
committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-03-15 02:33:16 +0000 |
commit | e5f461a8507ffcc89cd99ca43a09b76dca136ab5 (patch) | |
tree | 940e8e77690b58fe33b5d962ed599fcd36e6bc85 /EdkModulePkg | |
parent | aa156393bf28ce3c44d84b773e398070d1f4fe79 (diff) | |
download | edk2-e5f461a8507ffcc89cd99ca43a09b76dca136ab5.tar.gz edk2-e5f461a8507ffcc89cd99ca43a09b76dca136ab5.tar.bz2 edk2-e5f461a8507ffcc89cd99ca43a09b76dca136ab5.zip |
1. Remove #ifdef _MSC_EXTENSION_ from all source files
2. Remove #ifdef _GCC_ from all resource files
3. Remove #if 0 from all resource files
4. Remove #ifdef MDE_CPU_IPF and #ifdef MDE_CPU_EBC
5. Remove #progam from Decode.c
6. Remove #ifdef TIANO_EXTENSION_FLAG from source files
7. Remove #ifdef SUPPORT_IPV6, since code base doesn't support IPV6 at all.
8. Remove #ifdef SpecialNowaitVersion from pxe_bc_mtftp.c, since it's only used for test.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2470 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg')
14 files changed, 309 insertions, 489 deletions
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c index 3b49595130..cbbc00b183 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c @@ -338,14 +338,10 @@ Returns: //
// Force Interrupt line to "Unknown" or "No Connection"
- // based on the PCI spec, the Interrupt line for x86 should be set as 0xFF for unknown.
//
PciIo = &(PciIoDevice->PciIo);
-#ifndef MDE_CPU_IPF
Data8 = PCI_INT_LINE_UNKNOWN;
-#else
- Data8 = 0;
-#endif
+
PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);
//
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c index c42865612a..cb7fa89749 100644 --- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c +++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module name:
decode.c
@@ -21,16 +21,6 @@ Revision history: // TODO: fix comment to add: Module Name: DECODE.C
#include "Undi32.h"
-
-//
-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.
-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"
-// does not recognize this pragma.
-//
-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)
-#pragma data_seg("rtdata")
-#endif
-
//
// Global variables defined in this file
//
@@ -1339,7 +1329,7 @@ Returns: }
AdapterInfo = &(UNDI32DeviceList[CdbPtr->IFnum]->NicInfo);
-
+
//
// entering from older entry point
//
@@ -1655,11 +1645,3 @@ Returns: PxePtr->Fudge = (UINT8) (PxePtr->Fudge - ChkSum ((VOID *) PxePtr, PxePtr->Len));
}
-//
-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.
-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"
-// does not recognize this pragma.
-//
-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)
-#pragma data_seg()
-#endif
diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c index 1bb7d70b10..f0debd5662 100644 --- a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c +++ b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -20,11 +20,6 @@ Abstract: --*/
-
-#ifdef TIANO_EXTENSION_FLAG
-EFI_GUID UnknownDeviceGuid = UNKNOWN_DEVICE_GUID;
-#endif
-
EFI_GUID mEfiUnixThunkProtocolGuid = EFI_UNIX_THUNK_PROTOCOL_GUID;
EFI_GUID mEfiUnixUgaGuid = EFI_UNIX_UGA_GUID;
EFI_GUID mEfiMsgPcAnsiGuid = DEVICE_PATH_MESSAGING_PC_ANSI;
@@ -90,19 +85,19 @@ CatPrint ( Routine Description:
- Concatenates a formatted unicode string to allocated pool.
+ Concatenates a formatted unicode string to allocated pool.
The caller must free the resulting buffer.
Arguments:
- Str - Tracks the allocated pool, size in use, and
+ Str - Tracks the allocated pool, size in use, and
amount of pool allocated.
fmt - The format string
Returns:
- Allocated buffer with the formatted string printed in it.
+ Allocated buffer with the formatted string printed in it.
The caller must free the allocated buffer. The buffer
allocation is not packed.
@@ -161,7 +156,7 @@ Arguments: Returns:
- If the memory for the device path is successfully allocated, then a
+ If the memory for the device path is successfully allocated, then a
pointer to the new device path is returned. Otherwise, NULL is returned.
--*/
@@ -998,7 +993,7 @@ LibDuplicateDevicePathInstance ( Routine Description:
- Function creates a device path data structure that identically matches the
+ Function creates a device path data structure that identically matches the
device path passed in.
Arguments:
@@ -1007,7 +1002,7 @@ Arguments: Returns:
- The new copy of DevPath is created to identically match the input.
+ The new copy of DevPath is created to identically match the input.
Otherwise, NULL is returned.
--*/
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa index e4d527b084..85298640bf 100644 --- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa +++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa @@ -41,6 +41,9 @@ <Keyword>BaseMemoryLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
+ <Keyword>MemoryAllocationLib</Keyword>
+ </LibraryClass>
+ <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiBootServicesTableLib</Keyword>
</LibraryClass>
</LibraryClassDefinitions>
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c index 9f4fe3c061..50de4c6c9d 100644 --- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c +++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -43,7 +43,7 @@ Arguments: CapsuleHeaderArray A array of pointers to capsule headers passed in
CapsuleCount The number of capsule
ScatterGatherList Physical address of datablock list points to capsule
-
+
Returns:
EFI STATUS
@@ -51,8 +51,8 @@ Returns: not set, the capsule has been successfully processed by the firmware.
If it set, the ScattlerGatherList is successfully to be set.
EFI_INVALID_PARAMETER CapsuleCount is less than 1,CapsuleGuid is not supported.
- EFI_DEVICE_ERROR Failed to SetVariable or AllocatePool or ProcessFirmwareVolume.
-
+ EFI_DEVICE_ERROR Failed to SetVariable or AllocatePool or ProcessFirmwareVolume.
+
--*/
{
UINTN CapsuleSize;
@@ -76,17 +76,17 @@ Returns: for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {
CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
- return EFI_INVALID_PARAMETER;
+ return EFI_INVALID_PARAMETER;
}
if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
return EFI_UNSUPPORTED;
- }
- }
+ }
+ }
}
//
- //Assume that capsules have the same flags on reseting or not.
+ //Assume that capsules have the same flags on reseting or not.
//
CapsuleHeader = CapsuleHeaderArray[0];
@@ -97,28 +97,28 @@ Returns: if (!FeaturePcdGet(PcdSupportUpdateCapsuleRest)) {
return EFI_UNSUPPORTED;
}
-
+
if (ScatterGatherList == 0) {
return EFI_INVALID_PARAMETER;
} else {
Status = EfiSetVariable (
- EFI_CAPSULE_VARIABLE_NAME,
- &gEfiCapsuleVendorGuid,
- EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
- sizeof (UINTN),
- (VOID *) &ScatterGatherList
+ EFI_CAPSULE_VARIABLE_NAME,
+ &gEfiCapsuleVendorGuid,
+ EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+ sizeof (UINTN),
+ (VOID *) &ScatterGatherList
);
- if (Status != EFI_SUCCESS) {
+ if (Status != EFI_SUCCESS) {
return EFI_DEVICE_ERROR;
}
}
return EFI_SUCCESS;
}
-
+
//
//The rest occurs in the condition of non-reset mode
//
- if (EfiAtRuntime ()) {
+ if (EfiAtRuntime ()) {
return EFI_INVALID_PARAMETER;
}
@@ -128,34 +128,31 @@ Returns: for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {
CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
CapsuleSize = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize;
- Status = gBS->AllocatePool (EfiBootServicesData, CapsuleSize, &BufferPtr);
- if (Status != EFI_SUCCESS) {
- goto Done;
+
+ BufferPtr = AllocatePool (CapsuleSize);
+ if (BufferPtr == NULL) {
+ return EFI_DEVICE_ERROR;
}
- gBS->CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);
+
+ CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);
//
- //Call DXE service ProcessFirmwareVolume to process immediatelly
+ //Call DXE service ProcessFirmwareVolume to process immediatelly
//
Status = gDS->ProcessFirmwareVolume (BufferPtr, CapsuleSize, &FvHandle);
if (Status != EFI_SUCCESS) {
- gBS->FreePool (BufferPtr);
+ FreePool (BufferPtr);
return EFI_DEVICE_ERROR;
}
gDS->Dispatch ();
- gBS->FreePool (BufferPtr);
+ FreePool (BufferPtr);
}
- return EFI_SUCCESS;
-Done:
- if (BufferPtr != NULL) {
- gBS->FreePool (BufferPtr);
- }
- return EFI_DEVICE_ERROR;
+ return EFI_SUCCESS;
}
-
+
EFI_STATUS
EFIAPI
QueryCapsuleCapabilities (
@@ -196,10 +193,10 @@ Returns: if ((MaxiumCapsuleSize == NULL) ||(ResetType == NULL)) {
return EFI_INVALID_PARAMETER;
- }
+ }
CapsuleHeader = NULL;
-
+
//
//Compare GUIDs with EFI_CAPSULE_GUID, if capsule header contains CAPSULE_FLAGS_PERSIST_ACROSS_RESET
//and CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE flags,whatever the GUID is ,the service supports.
@@ -207,19 +204,19 @@ Returns: for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {
CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
- return EFI_INVALID_PARAMETER;
+ return EFI_INVALID_PARAMETER;
}
if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
return EFI_UNSUPPORTED;
}
- }
+ }
}
//
- //Assume that capsules have the same flags on reseting or not.
+ //Assume that capsules have the same flags on reseting or not.
//
- CapsuleHeader = CapsuleHeaderArray[0];
+ CapsuleHeader = CapsuleHeaderArray[0];
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) != 0) {
//
//Check if the platform supports update capsule across a system reset
@@ -228,11 +225,11 @@ Returns: return EFI_UNSUPPORTED;
}
*ResetType = EfiResetWarm;
- *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);
+ *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);
} else {
*ResetType = EfiResetCold;
*MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizeNonPopulateCapsule);
- }
+ }
return EFI_SUCCESS;
-}
+}
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h index 26df291a29..ba32dee45b 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
bc.h
@@ -39,9 +39,9 @@ Abstract: //
// Determine the classes of IPv4 address
//
-#define IS_CLASSA_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0x80) == 0x00)
-#define IS_CLASSB_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xc0) == 0x80)
-#define IS_CLASSC_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xe0) == 0xc0)
+#define IS_CLASSA_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0x80) == 0x00)
+#define IS_CLASSB_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xc0) == 0x80)
+#define IS_CLASSC_IPADDR(x) ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xe0) == 0xc0)
#define IS_INADDR_UNICAST(x) ((IS_CLASSA_IPADDR(x) || IS_CLASSB_IPADDR(x) || IS_CLASSC_IPADDR(x)) && (((EFI_IP_ADDRESS*)x)->Addr[0] != 0) )
//
@@ -92,14 +92,7 @@ typedef struct { EFI_EVENT IgmpGroupEvent[MAX_MCAST_GROUPS];
UINT16 RandomPort;
-#if SUPPORT_IPV6
- //
- // TBD
- //
-#else
UINT32 MCastGroup[MAX_MCAST_GROUPS];
-#endif
-
BOOLEAN GoodStationIp;
BOOLEAN DidTransmit;
UINTN IpLength;
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c index 44f7cf22c6..4444b20d00 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c @@ -1,12 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
bc.c
@@ -162,7 +163,7 @@ SeedRandom ( Arguments:
Returns:
- none -
+ none -
--*/
{
@@ -216,7 +217,7 @@ IpChecksum ( Length - Length to be checksummed
Returns:
- Checksum - Returns the 16 bit ones complement of
+ Checksum - Returns the 16 bit ones complement of
ones complement sum of 16 bit words
--*/
@@ -264,7 +265,7 @@ IpChecksum2 ( MessageLen - Length to be checksummed
Returns:
- Checksum - Returns the 16 bit ones complement of
+ Checksum - Returns the 16 bit ones complement of
ones complement sum of 16 bit words
--*/
@@ -298,7 +299,7 @@ UpdateChecksum ( NewWord - New Value
Returns:
- Checksum - Returns the 16 bit ones complement of
+ Checksum - Returns the 16 bit ones complement of
ones complement sum of 16 bit words
--*/
@@ -328,7 +329,7 @@ SetMakeCallback ( Returns:
0 - Callbacks are active on the handle
- 1 - Callbacks are not active on the handle
+ 1 - Callbacks are not active on the handle
--*/
{
@@ -385,7 +386,7 @@ WaitForReceive ( Arguments:
Private - Pointer to Pxe BaseCode Protocol
Function - What PXE function to callback
- TimeoutEvent - Timer event that will trigger when we have waited too
+ TimeoutEvent - Timer event that will trigger when we have waited too
long for an incoming packet
HeaderSizePtr - Pointer to the size of the Header size
BufferSizePtr - Pointer to the size of the Buffer size
@@ -446,52 +447,6 @@ WaitForReceive ( //
for (;;)
{
-#if 0
- //
- // Check for received packet event.
- //
- if (!EFI_ERROR (gBS->CheckEvent (SnpPtr->WaitForPacket))) {
- //
- // Packet should be available. Attempt to read it.
- //
- *BufferSizePtr = BUFFER_ALLOCATE_SIZE;
-
- StatCode = SnpPtr->Receive (
- SnpPtr,
- HeaderSizePtr,
- BufferSizePtr,
- Private->ReceiveBufferPtr,
- 0,
- 0,
- ProtocolPtr
- );
-
- if (EFI_ERROR (StatCode)) {
- break;
- }
- //
- // Packet was received. Make received callback then return.
- //
- if (CallbackPtr != NULL) {
- StatCode = CallbackPtr (
- Private->CallbackProtocolPtr,
- Function,
- TRUE,
- (UINT32) *BufferSizePtr,
- (EFI_PXE_BASE_CODE_PACKET *) Private->ReceiveBufferPtr
- );
-
- if (StatCode != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {
- StatCode = EFI_ABORTED;
- } else {
- StatCode = EFI_SUCCESS;
- }
- }
-
- break;
- }
-
-#else
//
// Poll for received packet.
//
@@ -533,7 +488,7 @@ WaitForReceive ( if (StatCode != EFI_NOT_READY) {
break;
}
-#endif
+
//
// Check for callback event.
//
@@ -599,7 +554,7 @@ SendPacket ( Arguments:
Private - Pointer to Pxe BaseCode Protocol
- HeaderPtr - Pointer to the buffer
+ HeaderPtr - Pointer to the buffer
PacketPtr - Pointer to the packet to send
PacketLen - The length of the entire packet to send
HardwareAddr - Pointer to the MAC address of the destination
@@ -1263,7 +1218,6 @@ BcStart ( return EFI_ALREADY_STARTED;
}
-#if !SUPPORT_IPV6
//
// Fail if IPv6 is requested and not supported.
//
@@ -1272,7 +1226,7 @@ BcStart ( EfiReleaseLock (&Private->Lock);
return EFI_UNSUPPORTED;
}
-#endif
+
//
// Setup shortcuts to SNP protocol and data structure.
//
@@ -1505,12 +1459,8 @@ BcStart ( // supports IPv6.
//
Private->EfiBc.Mode->Ipv6Supported = SUPPORT_IPV6;
-
-#if SUPPORT_IPV6
- Private->EfiBc.Mode->Ipv6Available = Private->NiiPtr->Ipv6Supported;
-#else
Private->EfiBc.Mode->Ipv6Available = FALSE;
-#endif
+
//
// Set to TRUE by the BC constructor if this BC implementation
// supports BIS.
@@ -1756,14 +1706,7 @@ IpFilter ( //
if (!Index2)
{
-#if SUPPORT_IPV6
- if (PxebcMode->UsingIpv6) {
- //
- // TBD
- //
- } else
-#endif
- TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;
+ TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;
--Index;
} else {
TmpIp = (EFI_IP_ADDRESS *) &Filter->IpList[Index];
@@ -2309,12 +2252,8 @@ PxeBcDriverStart ( // implementation supports IPv6.
//
Private->EfiBc.Mode->Ipv6Supported = SUPPORT_IPV6;
-
-#if SUPPORT_IPV6
- Private->EfiBc.Mode->Ipv6Available = Private->NiiPtr->Ipv6Supported;
-#else
Private->EfiBc.Mode->Ipv6Available = FALSE;
-#endif
+
//
// Set to TRUE by the BC constructor if this BC
// implementation supports BIS.
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h index 69bfe6d6de..5cabf2e050 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--*/
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
// Client architecture types
//
-#if defined MDE_CPU_IA32
+#if defined MDE_CPU_IA32
#define SYS_ARCH 0x6
#elif defined MDE_CPU_X64
#define SYS_ARCH 0x7
@@ -332,7 +332,7 @@ typedef struct { // zero transmitted means checksum not computed
// data follows
//
- UINT16 Checksum;
+ UINT16 Checksum;
} UDPV4_HEADER;
typedef struct {
@@ -370,7 +370,7 @@ typedef struct { // zero checksum is transmitted as -0 (ones comp)
// zero transmitted means checksum not computed
//
- UINT16 Checksum;
+ UINT16 Checksum;
UINT16 UrgentPointer; // pointer to urgent data (allows sender to specify urgent data)
} TCPV4_HEADER;
@@ -435,7 +435,7 @@ typedef struct { } IPV4_STRUCT;
#pragma pack() // reset to default
-
+
////////////////////////////////////////////////////////////
//
// BC IP Filter Routine
@@ -723,13 +723,6 @@ IpReceive ( )
;
-#if 0
-VOID
-WaitForTxComplete (
- IN PXE_BASECODE_DEVICE *Private
- )
-;
-#endif
//
// routine to cycle waiting for a receive or timeout
//
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c index f4935b26b3..83ca20b292 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--*/
@@ -272,13 +272,6 @@ Returns: Grp = *(UINT32 *) GroupPtr;
-#if SUPPORT_IPV6
- if (Private->EfiBc.Mode->UsingIpv6) {
- //
- // TBD
- //
- }
-#endif
//
// see if we already have it or if we can't take anymore
//
@@ -324,13 +317,6 @@ Returns: Grp = *(UINT32 *) GroupPtr;
-#if SUPPORT_IPV6
- if (Private->EfiBc.Mode->UsingIpv6) {
- //
- // TBD
- //
- }
-#endif
//
// if not in group, ignore
//
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c index e0e12ece81..bf60d51a66 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
pxe_bc_ip.c
@@ -609,14 +609,6 @@ IpReceive ( continue;
}
-#if SUPPORT_IPV6
- if (PxeBcMode->UsingIpv6) {
- //
- // TBD
- //
- }
-#endif
-
#define IpRxHeader ((IPV4_HEADER *) PacketPtr)
//
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c index b99f2d303d..a937958468 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c @@ -1,16 +1,16 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
-
+
pxe_bc_mtftp.c
Abstract:
@@ -91,21 +91,21 @@ Routine description: information in Mode structure and return TFTP_ERROR status.
Parameters:
- Private :=
- Operation :=
- HeaderPtr :=
- BufferSizePtr :=
- BufferPtr :=
- ServerIpPtr :=
- ServerPortPtr :=
- OurIpPtr :=
- OurPortPtr :=
- Timeout :=
+ Private :=
+ Operation :=
+ HeaderPtr :=
+ BufferSizePtr :=
+ BufferPtr :=
+ ServerIpPtr :=
+ ServerPortPtr :=
+ OurIpPtr :=
+ OurPortPtr :=
+ Timeout :=
Returns:
- EFI_SUCCESS :=
- EFI_TFTP_ERROR :=
- other :=
+ EFI_SUCCESS :=
+ EFI_TFTP_ERROR :=
+ other :=
--*/
{
EFI_PXE_BASE_CODE_MODE *PxeBcMode;
@@ -191,10 +191,10 @@ Routine description: Send TFTP ERROR message to TFTP server
Parameters:
- Private :=
- ServerIpPtr :=
- ServerPortPtr :=
- OurPortPtr :=
+ Private :=
+ ServerIpPtr :=
+ ServerPortPtr :=
+ OurPortPtr :=
Returns:
--*/
@@ -249,7 +249,7 @@ Parameters: ServerPortPtr := Pointer to TFTP server UDP port
ReplyIpPtr := Pointer to TFTP DATA packet destination IP address
OurPortPtr := Pointer to TFTP client UDP port
- Timeout :=
+ Timeout :=
ReplyLenPtr := Pointer to packet length
PxeBcMode := Pointer to packet buffer
BlockNumPtr := Pointer to block number
@@ -398,7 +398,7 @@ Parameters: ReplyIpPtr := Pointer to TFTP DATA packet destination IP address
OurPortPtr := Pointer to TFTP client UDP port
LastBlock := Last block number received
- Timeout :=
+ Timeout :=
DontUseBuffer := TRUE == throw away data, just count # of bytes
Returns:
@@ -605,7 +605,7 @@ Parameters: OurPortPtr := Pointer to TFTP client UDP port
FilenamePtr := Pointer to TFTP file or directory name
PacketSizePtr := Pointer to block size
- Buffer :=
+ Buffer :=
Returns:
--*/
@@ -713,16 +713,16 @@ Parameters: Req := TFTP request type
Options := TFTP option bits
Private := Pointer to PxeBc interface
- HeaderPtr :=
+ HeaderPtr :=
PacketSizePtr := Pointer to block size
- ReplyLenPtr :=
- BufferPtr :=
+ ReplyLenPtr :=
+ BufferPtr :=
ServerIpPtr := Pointer to TFTP server IP address
ServerPortPtr := Pointer to TFTP server UDP port
- ServerReplyPortPtr :=
+ ServerReplyPortPtr :=
OurPortPtr := Pointer to TFTP client UDP Port
FilenamePtr := Pointer to file or directory name
- Timeout :=
+ Timeout :=
Returns:
--*/
@@ -847,15 +847,15 @@ Routine description: Parameters:
Private := Pointer to PxeBc interface
- BufferSizePtr :=
- BufferPtr :=
+ BufferSizePtr :=
+ BufferPtr :=
ServerIpPtr := Pointer to TFTP server IP address
MtftpInfoPtr := Pointer to MTFTP session information
StartBlockPtr := IN=first block we are looking for OUT=first block received
NumMissedPtr := Number of blocks missed
- TransTimeout :=
- ListenTimeout :=
- FinalBlock :=
+ TransTimeout :=
+ ListenTimeout :=
+ FinalBlock :=
DontUseBuffer := TRUE == throw packets away, just count bytes
Returns:
@@ -991,17 +991,17 @@ Routine description: Parameters:
Private := Pointer to PxeBc interface
BufferSizePtr := IN=buffer size OUT=transfer size
- BufferPtr :=
- PacketSizePtr :=
- ServerIpPtr :=
- FilenamePtr :=
- MtftpInfoPtr :=
- CompletionStatusPtr :=
- DontUseBuffer :=
+ BufferPtr :=
+ PacketSizePtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ MtftpInfoPtr :=
+ CompletionStatusPtr :=
+ DontUseBuffer :=
Returns:
// mtftp open session
-// return code EFI_SUCCESS
+// return code EFI_SUCCESS
// and *CompletionStatusPtr = GOTUNI | GOTMULTI means done
// and *CompletionStatusPtr = GOTMULTI means got first two multicast packets, use listen for rest
// and *CompletionStatusPtr = 0 means did not get first two multicast packets, use listen for all
@@ -1205,12 +1205,12 @@ Routine description: Parameters:
Private := Pointer to PxeBc interface
- BufferSizePtr :=
- BufferPtr :=
- ServerIpPtr :=
- FilenamePtr :=
- MtftpInfoPtr :=
- DontUseBuffer :=
+ BufferSizePtr :=
+ BufferPtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ MtftpInfoPtr :=
+ DontUseBuffer :=
Returns:
--*/
@@ -1255,17 +1255,8 @@ Returns: BufferPtrLocal = BufferPtr + Offset;
}
- //
- // special !!! do not leave enabled in saved version on Source Safe
- // Following code put in in order to create a special version for regression
- // test of MTFTP server to make sure it handles mulitple opens correctly.
- // This code should NOT be enabled normally.
- //
-#ifdef SpecialNowaitVersion
-#pragma message ("This is special version for MTFTP regression test")
- if (StartBlock || !LastBlock)
-#endif
- if (((Status = MtftpListen (
+
+ if (((Status = MtftpListen (
Private,
&BufferSize,
BufferPtrLocal,
@@ -1278,11 +1269,11 @@ Returns: LastBlock,
DontUseBuffer
)) != EFI_SUCCESS) && (Status != EFI_TIMEOUT)) {
- return Status;
- //
- // failed
- //
- }
+ return Status;
+ //
+ // failed
+ //
+ }
//
// if none were received, start block is not reset
//
@@ -1399,12 +1390,12 @@ Routine description: // if OACK received, set info
Parameters:
- Private :=
- BufferSizePtr :=
- ServerIpPtr :=
- SrvPort :=
- FilenamePtr :=
- PacketSizePtr :=
+ Private :=
+ BufferSizePtr :=
+ ServerIpPtr :=
+ SrvPort :=
+ FilenamePtr :=
+ PacketSizePtr :=
Returns:
--*/
@@ -1581,15 +1572,15 @@ Routine description: // while data size is max
Parameters:
- Private :=
- BufferSizePtr :=
- BufferPtr :=
- ServerIpPtr :=
- FilenamePtr :=
- PacketSizePtr :=
- SrvPort :=
- Req :=
- DontUseBuffer :=
+ Private :=
+ BufferSizePtr :=
+ BufferPtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ PacketSizePtr :=
+ SrvPort :=
+ Req :=
+ DontUseBuffer :=
Returns:
--*/
@@ -1765,13 +1756,13 @@ Routine description: // while data size is max
Parameters:
- Private :=
- BufferSizePtr :=
- BufferPtr :=
- ServerIpPtr :=
- FilenamePtr :=
- PacketSizePtr :=
- Overwrite :=
+ Private :=
+ BufferSizePtr :=
+ BufferPtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ PacketSizePtr :=
+ Overwrite :=
Returns:
--*/
@@ -1951,16 +1942,16 @@ Routine description: MTFTP API entry point
Parameters:
- Private :=
- Operation :=
- BufferSizePtr :=
- BufferPtr :=
- ServerIpPtr :=
- FilenamePtr :=
- PacketSizePtr :=
- MtftpInfoPtr :=
- Overwrite :=
- DontUseBuffer :=
+ Private :=
+ Operation :=
+ BufferSizePtr :=
+ BufferPtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ PacketSizePtr :=
+ MtftpInfoPtr :=
+ Overwrite :=
+ DontUseBuffer :=
Returns:
* EFI_INVALID_PARAMETER
@@ -2313,16 +2304,16 @@ Routine description: MTFTP API entry point.
Parameters:
- This :=
- Operation :=
- BufferPtr :=
- Overwrite :=
- BufferSizePtr :=
- BlockSizePtr :=
- ServerIpPtr :=
- FilenamePtr :=
- MtftpInfoPtr :=
- DontUseBuffer :=
+ This :=
+ Operation :=
+ BufferPtr :=
+ Overwrite :=
+ BufferSizePtr :=
+ BlockSizePtr :=
+ ServerIpPtr :=
+ FilenamePtr :=
+ MtftpInfoPtr :=
+ DontUseBuffer :=
Returns:
* EFI_INVALID_PARAMETER
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c index 32768c05c6..a8b9ed089b 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
pxe_bc_udp.c
@@ -44,21 +44,21 @@ Routine description: Parameters:
Private := Pointer to PxeBc interface
- OpFlags :=
- DestIpPtr :=
- DestPortPtr :=
- GatewayIpPtr :=
- SrcIpPtr :=
- SrcPortPtr :=
- HeaderSizePtr :=
- HeaderPtr :=
- BufferSizeptr :=
- BufferPtr :=
+ OpFlags :=
+ DestIpPtr :=
+ DestPortPtr :=
+ GatewayIpPtr :=
+ SrcIpPtr :=
+ SrcPortPtr :=
+ HeaderSizePtr :=
+ HeaderPtr :=
+ BufferSizeptr :=
+ BufferPtr :=
Returns:
- EFI_SUCCESS :=
- EFI_INVALID_PARAMETER :=
- other :=
+ EFI_SUCCESS :=
+ EFI_INVALID_PARAMETER :=
+ other :=
--*/
{
UINTN TotalLength;
@@ -197,20 +197,20 @@ Routine description: Parameters:
This := Pointer to PxeBc interface.
- OpFlags :=
- DestIpPtr :=
- DestPortPtr :=
- GatewayIpPtr :=
- SrcIpPtr :=
- SrcPortPtr :=
- HeaderSizePtr :=
- HeaderPtr :=
- BufferSizeptr :=
- BufferPtr :=
+ OpFlags :=
+ DestIpPtr :=
+ DestPortPtr :=
+ GatewayIpPtr :=
+ SrcIpPtr :=
+ SrcPortPtr :=
+ HeaderSizePtr :=
+ HeaderPtr :=
+ BufferSizeptr :=
+ BufferPtr :=
Returns:
- EFI_SUCCESS :=
- other :=
+ EFI_SUCCESS :=
+ other :=
--*/
{
EFI_STATUS StatCode;
@@ -291,21 +291,21 @@ Routine description: Parameters:
Private := Pointer to PxeBc interface
- OpFlags :=
- DestIpPtr :=
- DestPortPtr :=
- SrcIpPtr :=
- SrcPortPtr :=
- HeaderSizePtr :=
- HeaderPtr :=
- BufferSizeptr :=
- BufferPtr :=
+ OpFlags :=
+ DestIpPtr :=
+ DestPortPtr :=
+ SrcIpPtr :=
+ SrcPortPtr :=
+ HeaderSizePtr :=
+ HeaderPtr :=
+ BufferSizeptr :=
+ BufferPtr :=
TimeoutEvent :=
Returns:
- EFI_SUCCESS :=
- EFI_INVALID_PARAMETER :=
- other :=
+ EFI_SUCCESS :=
+ EFI_INVALID_PARAMETER :=
+ other :=
--*/
{
EFI_STATUS StatCode;
@@ -362,14 +362,6 @@ Returns: CopyMem (&TmpDestIp, &Private->EfiBc.Mode->StationIp, sizeof (TmpDestIp));
}
-#if SUPPORT_IPV6
- if (Private->EfiBc.Mode->UsingIpv6) {
- //
- // %%TBD
- //
- }
-#endif
-
for (;;) {
*BufferSizeptr = BufferSize;
@@ -500,19 +492,19 @@ Routine description: Parameters:
This := Pointer to PxeBc interface.
- OpFlags :=
- DestIpPtr :=
- DestPortPtr :=
- SrcIpPtr :=
- SrcPortPtr :=
- HeaderSizePtr :=
- HeaderPtr :=
- BufferSizeptr :=
- BufferPtr :=
+ OpFlags :=
+ DestIpPtr :=
+ DestPortPtr :=
+ SrcIpPtr :=
+ SrcPortPtr :=
+ HeaderSizePtr :=
+ HeaderPtr :=
+ BufferSizeptr :=
+ BufferPtr :=
Returns:
- EFI_SUCCESS :=
- other :=
+ EFI_SUCCESS :=
+ other :=
--*/
{
EFI_STATUS StatCode;
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c index 8b7cd28810..3cb7f3f4be 100644 --- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c +++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c @@ -1,17 +1,17 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
PxeDhcp4InitSelect.c
-
+
Abstract:
--*/
@@ -332,13 +332,6 @@ PxeDhcp4Init ( return EFI_NOT_READY;
}
-#if 0
- if (!is_good_discover (&This->Data->Discover)) {
- //
- // %%TBD - check discover packet fields
- //
- }
-#endif
//
// Get pointer to our instance data.
//
@@ -477,13 +470,6 @@ PxeDhcp4Select ( return EFI_DEVICE_ERROR;
}
-#if 0
- if (!is_good_discover (&This->Data->Discover)) {
- //
- // %%TBD - check discover packet fields
- //
- }
-#endif
//
// Setup useful variables...
//
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c index 50c991372d..503d5a6038 100644 --- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c +++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c @@ -1,17 +1,17 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
support.c
-
+
Abstract:
Miscellaneous support routines for PxeDhcp4 protocol.
@@ -746,7 +746,7 @@ Parameters: op_flags := UDP receive operation flags
Returns:
- EFI_INVALID_PARAMETER :=
+ EFI_INVALID_PARAMETER :=
EFI_SUCCESS := Packet received
other := Return from PxeBc->UdpRead()
--*/
@@ -827,7 +827,7 @@ Parameters: SecondsTimeout := Number of seconds until timeout
Returns:
- EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL ||
+ EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL ||
tx_pkt == NULL || rx_pkt == NULL || rx_vfy == NULL || Private->PxeBc == NULL
EFI_ABORTED := Receive aborted
EFI_TIMEOUT := No packets received
@@ -923,31 +923,6 @@ Returns: //
// Wait for packet(s)...
//
-#if 0
- if (!client_ip) {
- Aprint ("client_ip == NULL ");
- } else {
- Aprint (
- "client_ip == %d.%d.%d.%d ",
- client_ip->v4.Addr[0],
- client_ip->v4.Addr[1],
- client_ip->v4.Addr[2],
- client_ip->v4.Addr[3]
- );
- }
-
- if (!ServerIp) {
- Aprint ("ServerIp == NULL\n");
- } else {
- Aprint (
- "ServerIp == %d.%d.%d.%d\n",
- ServerIp->v4.Addr[0],
- ServerIp->v4.Addr[1],
- ServerIp->v4.Addr[2],
- ServerIp->v4.Addr[3]
- );
- }
-#endif
done_flag = FALSE;
got_packet = FALSE;
|