From 4ba61e5e2a1b3cec7faaad36c252738f6f57f8a6 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Thu, 22 Jun 2006 06:08:00 +0000 Subject: =?UTF-8?q?1.=20UINTN=20&=20INTN=20issue=20for=20EBC=20architectur?= =?UTF-8?q?e:=20=09The=20MAX=5FBIT=20of=20EBC=20will=20no=20longer=20be=20?= =?UTF-8?q?fixed=20to=20bit=2063.=20It=20is=20defined=20as=20(1ULL=20<<=20?= =?UTF-8?q?(sizeof=20(INTN)=20*=208=20-=201)).=20=09Make=20EdkModulePkg=20?= =?UTF-8?q?&=20MdePkg=20EBC=20compiler=20clean:=20treat=20all=20EFI=5FSTAT?= =?UTF-8?q?US=20error=20code=20as=20variable.=202.=20PrintLib=20=09Complet?= =?UTF-8?q?e=20all=20missing=20ASSERT()s.=20=09Fix=20=E2=80=9C\n=E2=80=9D?= =?UTF-8?q?=20&=20=E2=80=9C%\n=E2=80=9D=20issue=20thanks=20to=20the=20clar?= =?UTF-8?q?ification=20of=20MWG=200.56d.=20=09Adjust=20StatusString=20arra?= =?UTF-8?q?y=20to=20support=20EBC=20build.=203.=20BaseMemoryLib=20=09Adjus?= =?UTF-8?q?t=20ASSERT=20()=20&=20function=20header=20of=20ComparaMem,=20Se?= =?UTF-8?q?tMemXX,=20ScanMemXX=20to=20synchronize=20with=20MWG=200.56d.=20?= =?UTF-8?q?4.SmbusLib=20=09Change=20Pec=20bit=20to=20bit=2022=20SmBusAddre?= =?UTF-8?q?ss=20to=20synchronize=20MWG=200.56d.=20=09Add=20ASSERT()s=20to?= =?UTF-8?q?=20check=20if=20length=20is=20illegal=20for=20SmBusBlockWrite()?= =?UTF-8?q?=20&=20SmBusProcessBlock()=20since=20it=20is=206=20bit=20now.?= =?UTF-8?q?=205.=20PerformanceLib=20=09Rename=20=E2=80=9CEdkDxePerformance?= =?UTF-8?q?Lib=E2=80=9D=20&=20=E2=80=9CEdkPeiPerformanceLib=E2=80=9D=20to?= =?UTF-8?q?=20=E2=80=9CDxePerformanceLib=E2=80=9D=20&=20=E2=80=9CPeiPerfor?= =?UTF-8?q?manceLib=E2=80=9D=20respectively.=20=09Synchronize=20the=20func?= =?UTF-8?q?tion=20header=20of=20GetPerformanceMeasurement()=20with=20MWG?= =?UTF-8?q?=200.56d.=206.=20BasePeCoffLoaderLib.=20=09Make=20PeCoffLoaderL?= =?UTF-8?q?oadImage=20()=20Assert()=20if=20ImageContext=20is=20NULL>=20=09?= =?UTF-8?q?Make=20PeCoffLoaderLoadImage=20()=20return=20RETURN=5FINVALID?= =?UTF-8?q?=5FPARAMETER=20if=20the=20ImageAddress=20in=20ImageContext=20is?= =?UTF-8?q?=200.=20=09Adjust=20some=20coding=20style.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@593 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Network/PxeBc/Dxe/pxe_bc_udp.c | 7 +- .../Universal/Network/PxeBc/Dxe/pxe_loadfile.c | 137 ++++++++------------- .../Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c | 11 +- 3 files changed, 58 insertions(+), 97 deletions(-) (limited to 'EdkModulePkg/Universal') diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c index 7d782955c8..32768c05c6 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c @@ -463,12 +463,7 @@ Returns: } } - switch (StatCode) { - case EFI_SUCCESS: - case EFI_TIMEOUT: - break; - - default: + if ((StatCode != EFI_SUCCESS) && (StatCode != EFI_TIMEOUT)) { DEBUG ( (EFI_D_INFO, "\nUdpRead() Exit #3 %Xh %r", diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c index 315c95a9f5..182462c02f 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c @@ -1456,15 +1456,12 @@ Returns: (VOID *) &LoadfilePtr->Private->CallbackProtocolPtr ); - switch (Status) { - case EFI_SUCCESS: + if (Status == EFI_SUCCESS) { // // There is already a callback routine. Do nothing. // DEBUG ((EFI_D_WARN, "\nLoadFile() BC callback exists.")); - break; - - case EFI_UNSUPPORTED: + } else if (Status == EFI_UNSUPPORTED) { // // No BaseCode Callback protocol found. Add our own. // @@ -1490,10 +1487,7 @@ Returns: &NewMakeCallback ); } - - break; - - default: + } else { DEBUG ((EFI_D_WARN, "\nLoadFile() Callback check status == %xh", Status)); } // @@ -1578,11 +1572,11 @@ Returns: DEBUG ((EFI_D_WARN, "\nBC.Loadfile() Status == %xh\n", Status)); - switch (Status) { - case EFI_SUCCESS: /* 0 */ + if (Status == EFI_SUCCESS) { + /* 0 */ return EFI_SUCCESS; - - case EFI_BUFFER_TOO_SMALL: /* 5 */ + } else if (Status == EFI_BUFFER_TOO_SMALL) { + /* 5 */ // // Error is only displayed when we are actually trying to // download the boot image. @@ -1590,104 +1584,81 @@ Returns: if (Buffer == NULL) { return EFI_BUFFER_TOO_SMALL; } - AsciiPrint ("\nPXE-E05: Download buffer is smaller than requested file.\n"); - break; - - case EFI_DEVICE_ERROR: /* 7 */ + } else if (Status == EFI_DEVICE_ERROR) { + /* 7 */ AsciiPrint ("\nPXE-E07: Network device error. Check network connection.\n"); - break; - - case EFI_OUT_OF_RESOURCES: /* 9 */ + } else if (Status == EFI_OUT_OF_RESOURCES) { + /* 9 */ AsciiPrint ("\nPXE-E09: Could not allocate I/O buffers.\n"); - break; - - case EFI_NO_MEDIA: /* 12 */ + } else if (Status == EFI_NO_MEDIA) { + /* 12 */ AsciiPrint ("\nPXE-E12: Could not detect network connection. Check cable.\n"); - break; - - case EFI_NO_RESPONSE: /* 16 */ + } else if (Status == EFI_NO_RESPONSE) { + /* 16 */ AsciiPrint ("\nPXE-E16: Valid PXE offer not received.\n"); - break; - - case EFI_TIMEOUT: /* 18 */ + } else if (Status == EFI_TIMEOUT) { + /* 18 */ AsciiPrint ("\nPXE-E18: Timeout. Server did not respond.\n"); - break; - - case EFI_ABORTED: /* 21 */ + } else if (Status == EFI_ABORTED) { + /* 21 */ AsciiPrint ("\nPXE-E21: Remote boot cancelled.\n"); - break; - - case EFI_ICMP_ERROR: /* 22 */ + } else if (Status == EFI_ICMP_ERROR) { + /* 22 */ AsciiPrint ("\nPXE-E22: Client received ICMP error from server.\n"); - if (LoadfilePtr->Private->EfiBc.Mode == NULL) { - break; - } - - if (!LoadfilePtr->Private->EfiBc.Mode->IcmpErrorReceived) { - break; - } + if ((LoadfilePtr->Private->EfiBc.Mode != NULL) && LoadfilePtr->Private->EfiBc.Mode->IcmpErrorReceived) { + AsciiPrint ( + "PXE-E98: Type: %xh Code: %xh ", + LoadfilePtr->Private->EfiBc.Mode->IcmpError.Type, + LoadfilePtr->Private->EfiBc.Mode->IcmpError.Code + ); - AsciiPrint ( - "PXE-E98: Type: %xh Code: %xh ", - LoadfilePtr->Private->EfiBc.Mode->IcmpError.Type, - LoadfilePtr->Private->EfiBc.Mode->IcmpError.Code - ); + switch (LoadfilePtr->Private->EfiBc.Mode->IcmpError.Type) { + case 0x03: + switch (LoadfilePtr->Private->EfiBc.Mode->IcmpError.Code) { + case 0x00: /* net unreachable */ + AsciiPrint ("Net unreachable"); + break; - switch (LoadfilePtr->Private->EfiBc.Mode->IcmpError.Type) { - case 0x03: - switch (LoadfilePtr->Private->EfiBc.Mode->IcmpError.Code) { - case 0x00: /* net unreachable */ - AsciiPrint ("Net unreachable"); - break; + case 0x01: /* host unreachable */ + AsciiPrint ("Host unreachable"); + break; - case 0x01: /* host unreachable */ - AsciiPrint ("Host unreachable"); - break; + case 0x02: /* protocol unreachable */ + AsciiPrint ("Protocol unreachable"); + break; - case 0x02: /* protocol unreachable */ - AsciiPrint ("Protocol unreachable"); - break; + case 0x03: /* port unreachable */ + AsciiPrint ("Port unreachable"); + break; - case 0x03: /* port unreachable */ - AsciiPrint ("Port unreachable"); - break; + case 0x04: /* Fragmentation needed */ + AsciiPrint ("Fragmentation needed"); + break; - case 0x04: /* Fragmentation needed */ - AsciiPrint ("Fragmentation needed"); - break; + case 0x05: /* Source route failed */ + AsciiPrint ("Source route failed"); + break; + } - case 0x05: /* Source route failed */ - AsciiPrint ("Source route failed"); break; } - break; + AsciiPrint ("\n"); } - - AsciiPrint ("\n"); - - break; - - case EFI_TFTP_ERROR: /* 23 */ + } else if (Status == EFI_TFTP_ERROR) { + /* 23 */ AsciiPrint ("\nPXE-E23: Client received TFTP error from server.\n"); - if (LoadfilePtr->Private->EfiBc.Mode == NULL) { - break; - } - - if (LoadfilePtr->Private->EfiBc.Mode->TftpErrorReceived) { + if ((LoadfilePtr->Private->EfiBc.Mode != NULL) && (LoadfilePtr->Private->EfiBc.Mode->TftpErrorReceived)) { AsciiPrint ( "PXE-E98: Code: %xh %a\n", LoadfilePtr->Private->EfiBc.Mode->TftpError.ErrorCode, LoadfilePtr->Private->EfiBc.Mode->TftpError.ErrorString ); } - - break; - - default: + } else { AsciiPrint ("\nPXE-E99: Unexpected network error: %xh\n", Status); } diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c index 50f97a8915..8e015b2a3d 100644 --- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c +++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4Run.c @@ -126,14 +126,9 @@ PxeDhcp4Run ( // efi_status = PxeDhcp4Init (This, timeout, &offers, &offer_list); - switch (efi_status) { - case EFI_NO_RESPONSE: - case EFI_TIMEOUT: - case EFI_SUCCESS: - break; - - case EFI_ABORTED: - default: + if ((efi_status != EFI_NO_RESPONSE) && + (efi_status != EFI_TIMEOUT) && + (efi_status != EFI_SUCCESS)) { return efi_status; } // -- cgit v1.2.3