Use REPORT_STATUS_CODExxx() macros directly.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11224 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2011-01-03 19:25:00 +00:00
parent 250057b56a
commit ee686203fd
2 changed files with 38 additions and 41 deletions

View File

@ -1,7 +1,7 @@
/** @file /** @file
The header file for EFI_ISA_IO protocol implementation. The header file for EFI_ISA_IO protocol implementation.
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -165,18 +165,6 @@ IsaIoFlush (
IN EFI_ISA_IO_PROTOCOL *This IN EFI_ISA_IO_PROTOCOL *This
); );
/**
report a error Status code
@param Code The error status code.
@return EFI_SUCCESS Success to report status code.
**/
EFI_STATUS
ReportErrorStatusCode (
EFI_STATUS_CODE_VALUE Code
);
/** /**
Writes I/O operation base address and count number to a 8 bit I/O Port. Writes I/O operation base address and count number to a 8 bit I/O Port.

View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation for EFI_ISA_IO_PROTOCOL. The implementation for EFI_ISA_IO_PROTOCOL.
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -80,24 +80,6 @@ EFI_ISA_DMA_REGISTERS mDmaRegisters[8] = {
}, },
}; };
/**
report a error Status code
@param Code The error status code.
@return EFI_SUCCESS Success to report status code.
**/
EFI_STATUS
ReportErrorStatusCode (
EFI_STATUS_CODE_VALUE Code
)
{
return REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
Code
);
}
/** /**
Initializes an ISA I/O Instance Initializes an ISA I/O Instance
@ -176,7 +158,10 @@ IsaIoIoRead (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -235,7 +220,10 @@ IsaIoIoWrite (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -274,7 +262,10 @@ WritePort (
&Value &Value
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
return Status; return Status;
} }
@ -414,7 +405,10 @@ IsaIoFlush (
Status = IsaIoDevice->PciIo->Flush (IsaIoDevice->PciIo); Status = IsaIoDevice->PciIo->Flush (IsaIoDevice->PciIo);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -544,7 +538,10 @@ IsaIoMemRead (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -610,7 +607,10 @@ IsaIoMemWrite (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -688,7 +688,10 @@ IsaIoCopyMem (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;
@ -1404,7 +1407,10 @@ IsaIoAllocateBuffer (
Status = gBS->AllocatePages (Type, MemoryType, Pages, &PhysicalAddress); Status = gBS->AllocatePages (Type, MemoryType, Pages, &PhysicalAddress);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
return Status; return Status;
} }
@ -1447,7 +1453,10 @@ IsaIoFreeBuffer (
Pages Pages
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR); REPORT_STATUS_CODE (
EFI_ERROR_CODE | EFI_ERROR_MINOR,
EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR
);
} }
return Status; return Status;