sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the following module msa files, they are three networt and two PCD modules.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2551 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2007-04-09 07:37:43 +00:00
parent 5101d837ed
commit 26aa0c2ff5
21 changed files with 161 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
View File

@@ -7,7 +7,7 @@
<Version>1.0</Version>
<Abstract>Component description file for Dhcp4 module.</Abstract>
<Description>This module can produce PxeDhcp4 protocol on ControllerHandle.</Description>
<Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
<Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
<License>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
@@ -22,8 +22,9 @@
<OutputFileBasename>Dhcp4</OutputFileBasename>
</ModuleDefinitions>
<LibraryClassDefinitions>
<LibraryClass Usage="ALWAYS_CONSUMED">
<LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
<Keyword>DebugLib</Keyword>
<HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverModelLib</Keyword>
@@ -60,18 +61,18 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies>
<Protocols>
<Protocol Usage="ALWAYS_CONSUMED">
<ProtocolCName>gEfiPxeDhcp4CallbackProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="BY_START">
<ProtocolCName>gEfiPxeDhcp4ProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="ALWAYS_CONSUMED">
<ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="TO_START">
<ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="TO_START">
<ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiPxeDhcp4CallbackProtocolGuid</ProtocolCName>
</Protocol>
</Protocols>
<Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

20
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2006, Intel Corporation
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
@@ -155,19 +155,11 @@ PxeDhcp4DriverBindingStart (
//
// Initialize the PXE DHCP device instance.
//
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (PXE_DHCP4_PRIVATE_DATA),
(VOID **) &Private
);
if (EFI_ERROR (Status)) {
Private = AllocateZeroPool (sizeof (PXE_DHCP4_PRIVATE_DATA));
if (Private == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto error_exit;
}
//
//
//
ZeroMem (Private, sizeof (PXE_DHCP4_PRIVATE_DATA));
Private->Signature = PXE_DHCP4_PRIVATE_DATA_SIGNATURE;
Private->PxeBc = PxeBc;
@@ -263,7 +255,7 @@ PxeDhcp4DriverBindingStop (
// Release allocated resources
//
if (Private->PxeDhcp4.Data) {
gBS->FreePool (Private->PxeDhcp4.Data);
FreePool (Private->PxeDhcp4.Data);
Private->PxeDhcp4.Data = NULL;
}
//
@@ -294,7 +286,7 @@ PxeDhcp4DriverBindingStop (
//
// Release our private data
//
gBS->FreePool (Private);
FreePool (Private);
return Status;
}

13
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
View File

@@ -107,13 +107,8 @@ offer_verify (
//
// Good DHCP (or BOOTP) packet. Cache it!
//
EfiStatus = gBS->AllocatePool (
EfiBootServicesData,
(Private->offers + 1) * sizeof (DHCP4_PACKET),
(VOID **) &tmp
);
if (EFI_ERROR (EfiStatus)) {
tmp = AllocatePool ((Private->offers + 1) * sizeof (DHCP4_PACKET));
if (tmp == NULL) {
return -2;
}
@@ -126,7 +121,7 @@ offer_verify (
Private->offers * sizeof (DHCP4_PACKET)
);
gBS->FreePool (Private->offer_list);
FreePool (Private->offer_list);
}
CopyMem (&tmp[Private->offers++], rx_pkt, sizeof (DHCP4_PACKET));
@@ -388,7 +383,7 @@ PxeDhcp4Init (
if (EFI_ERROR (EfiStatus)) {
if (Private->offer_list) {
gBS->FreePool (Private->offer_list);
FreePool (Private->offer_list);
}
Private->offers = 0;

16
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Release.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2006, Intel Corporation
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
@@ -65,7 +65,7 @@ PxeDhcp4Release (
// packet, just release storage and return.
//
if (This->Data->IsBootp || !This->Data->IsAck) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -96,7 +96,7 @@ PxeDhcp4Release (
);
if (EFI_ERROR (efi_status)) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -107,7 +107,7 @@ PxeDhcp4Release (
}
if (op->len != 4) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -139,7 +139,7 @@ PxeDhcp4Release (
);
if (EFI_ERROR (efi_status)) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -150,7 +150,7 @@ PxeDhcp4Release (
}
if (op->len != 4) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -181,7 +181,7 @@ PxeDhcp4Release (
efi_status = start_udp (Private, &client_ip, &subnet_mask);
if (EFI_ERROR (efi_status)) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {
@@ -233,7 +233,7 @@ PxeDhcp4Release (
//
stop_udp (Private);
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
if (Private->StopPxeBc) {

4
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2006, Intel Corporation
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
@@ -164,7 +164,7 @@ PxeDhcp4Run (
// No DHCP Acks. Release DHCP Offer list storage.
//
if (offer_list != NULL) {
gBS->FreePool (offer_list);
FreePool (offer_list);
offer_list = NULL;
}
//

16
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Setup.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2006, Intel Corporation
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
@@ -117,17 +117,7 @@ PxeDhcp4Setup (
// Allocate data structure. Return error
// if there is not enough available memory.
//
EfiStatus = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_PXE_DHCP4_DATA),
(VOID **) &This->Data
);
if (EFI_ERROR (EfiStatus)) {
This->Data = NULL;
return EfiStatus;
}
This->Data = AllocatePool (sizeof (EFI_PXE_DHCP4_DATA));
if (This->Data == NULL) {
return EFI_OUT_OF_RESOURCES;
}
@@ -139,7 +129,7 @@ PxeDhcp4Setup (
if (EFI_ERROR (EfiStatus)) {
if (EfiStatus != EFI_ALREADY_STARTED) {
gBS->FreePool (This->Data);
FreePool (This->Data);
This->Data = NULL;
Private->PxeBc->Stop (Private->PxeBc);
return EfiStatus;