\r
--*/\r
{\r
- NetZeroMem (Header, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER));\r
+ ZeroMem (Header, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER));\r
\r
Header->Signature = EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE;\r
Header->Length = IBFT_HEAP_OFFSET;\r
\r
Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *) (Table + 1);\r
\r
- NetZeroMem (Control, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE));\r
+ ZeroMem (Control, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE));\r
\r
Control->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_ID;\r
Control->Header.Version = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION;\r
//\r
*Heap -= Len + 1;\r
\r
- NetCopyMem (*Heap, Data, Len);\r
+ CopyMem (*Heap, Data, Len);\r
*(*Heap + Len) = 0;\r
}\r
\r
\r
Control->InitiatorOffset = (UINT16) ((UINTN) Initiator - (UINTN) Table);\r
\r
- NetZeroMem (Initiator, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE));\r
+ ZeroMem (Initiator, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE));\r
\r
Initiator->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_ID;\r
Initiator->Header.Version = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION;\r
{\r
UINTN Index;\r
\r
- NetZeroMem (V6, sizeof (EFI_IPv6_ADDRESS));\r
+ ZeroMem (V6, sizeof (EFI_IPv6_ADDRESS));\r
\r
V6->Addr[10] = 0xff;\r
V6->Addr[11] = 0xff;\r
//\r
// Fill the Nic section.\r
//\r
- NetZeroMem (Nic, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE));\r
+ ZeroMem (Nic, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE));\r
\r
Nic->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_ID;\r
Nic->Header.Version = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION;\r
IScsiMapV4ToV6Addr (&SessionConfigData->DhcpServer, &Nic->DhcpServer);\r
\r
Mac = IScsiGetMacAddress (DriverData->Controller);\r
- NetCopyMem (Nic->Mac, Mac, sizeof (Nic->Mac));\r
+ CopyMem (Nic->Mac, Mac, sizeof (Nic->Mac));\r
\r
//\r
// Get the PCI location of the Nic.\r
//\r
// Fill the Target section.\r
//\r
- NetZeroMem (Target, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE));\r
+ ZeroMem (Target, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE));\r
\r
Target->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_ID;\r
Target->Header.Version = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION;\r
Target->NicIndex = (UINT8) Index;\r
\r
IScsiMapV4ToV6Addr (&SessionConfigData->NvData.TargetIp, &Target->Ip);\r
- NetCopyMem (Target->BootLun, SessionConfigData->NvData.BootLun, sizeof (Target->BootLun));\r
+ CopyMem (Target->BootLun, SessionConfigData->NvData.BootLun, sizeof (Target->BootLun));\r
\r
//\r
// Target iSCSI Name, CHAP name/secret, reverse CHAP name/secret.\r
}\r
\r
Signature = Table->Signature;\r
- NetFreePool (Table);\r
+ gBS->FreePool (Table);\r
\r
if (Signature == EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE) {\r
//\r
//\r
// Allocate 4k bytes to hold the ACPI table.\r
//\r
- Table = NetAllocatePool (IBFT_MAX_SIZE);\r
+ Table = AllocatePool (IBFT_MAX_SIZE);\r
if (Table == NULL) {\r
return ;\r
}\r
IScsiFillInitiatorSection (Table, &Heap, HandleBuffer[0]);\r
IScsiFillNICAndTargetSections (Table, &Heap, HandleCount, HandleBuffer);\r
\r
- NetFreePool (HandleBuffer);\r
+ gBS->FreePool (HandleBuffer);\r
\r
TableHandle = 0;\r
\r
AcpiSupport->PublishTables (AcpiSupport, EFI_ACPI_TABLE_VERSION_3_0);\r
}\r
\r
- NetFreePool (Table);\r
+ gBS->FreePool (Table);\r
}\r