diff options
| -rw-r--r-- | DuetPkg/IsaAcpiDxe/PcatIsaAcpi.c | 8 | ||||
| -rw-r--r-- | DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c | 6 | ||||
| -rw-r--r-- | DuetPkg/PciBusNoEnumerationDxe/PciIo.c | 8 | ||||
| -rw-r--r-- | DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c | 4 | ||||
| -rw-r--r-- | DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.c b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.c index 674c6dfc00..a0f4cdfd40 100644 --- a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.c +++ b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.c @@ -92,7 +92,7 @@ Returns: Status = gBS->OpenProtocol (
Controller,
&gEfiPciIoProtocolGuid,
- &PciIo,
+ (VOID**)&PciIo,
This->DriverBindingHandle,
Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
@@ -171,7 +171,7 @@ Returns: Status = gBS->OpenProtocol (
Controller,
&gEfiPciIoProtocolGuid,
- &PciIo,
+ (VOID**)&PciIo,
This->DriverBindingHandle,
Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
@@ -197,7 +197,7 @@ Returns: Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(PCAT_ISA_ACPI_DEV),
- &PcatIsaAcpiDev
+ (VOID**)&PcatIsaAcpiDev
);
if (EFI_ERROR (Status)) {
goto Done;
@@ -284,7 +284,7 @@ PcatIsaAcpiDriverBindingStop ( Status = gBS->OpenProtocol (
Controller,
&gEfiIsaAcpiProtocolGuid,
- &IsaAcpi,
+ (VOID**)&IsaAcpi,
This->DriverBindingHandle,
Controller,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c index 2f0a1757c0..b763c6cce6 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c @@ -864,7 +864,7 @@ Returns: --*/
{
UINT32 Value;
- UINT64 BarValue64;
+ //UINT64 BarValue64;
UINT32 OriginalValue;
UINT32 Mask;
UINT32 Data;
@@ -873,7 +873,7 @@ Returns: OriginalValue = 0;
Value = 0;
- BarValue64 = 0;
+ //BarValue64 = 0;
Status = BarExisted (
PciIoDevice,
@@ -923,7 +923,7 @@ Returns: // Need to treat it as no-bar
//
if (PciIoDevice->PciBar[BarIndex].Length == 0) {
- PciIoDevice->PciBar[BarIndex].BarType = 0;
+ PciIoDevice->PciBar[BarIndex].BarType = PciBarTypeUnknown;
}
PciIoDevice->PciBar[BarIndex].Prefetchable = FALSE;
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c index 55d16b64cb..759c61a83c 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c @@ -370,7 +370,7 @@ Returns: Count = 1;
}
- Width &= 0x03;
+ Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & 0x03);
if ((*Offset + Count * ((UINTN)1 << Width)) - 1 >= PciIoDevice->PciBar[BarIndex].Length) {
return EFI_INVALID_PARAMETER;
@@ -412,7 +412,7 @@ Returns: // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX
// If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX
//
- Width &= 0x03;
+ Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & 0x03);
if (PciIoDevice->IsPciExp) {
if ((*Offset + Count * ((UINTN)1 << Width)) - 1 >= PCI_EXP_MAX_CONFIG_OFFSET) {
@@ -951,7 +951,7 @@ Returns: }
if (PciIoDevice->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) {
- Operation = Operation + EfiPciOperationBusMasterRead64;
+ Operation = (EFI_PCI_IO_PROTOCOL_OPERATION) (Operation + EfiPciOperationBusMasterRead64);
}
Status = PciIoDevice->PciRootBridgeIo->Map (
@@ -1865,5 +1865,5 @@ Returns: return TRUE;
}
- return (PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1));
+ return (BOOLEAN) ((PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1)));
}
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c index 8525b4b94e..67a46b9759 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c @@ -137,7 +137,7 @@ Returns: return EFI_INVALID_PARAMETER;
}
if (Width >= MMIO_COPY_UINT8) {
- Width = Width - MMIO_COPY_UINT8;
+ Width = (EFI_IO_WIDTH) (Width - MMIO_COPY_UINT8);
Status = Private->PciRootBridgeIo->CopyMem (
Private->PciRootBridgeIo,
(EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,
@@ -201,7 +201,7 @@ Returns: return EFI_INVALID_PARAMETER;
}
if (Width >= MMIO_COPY_UINT8) {
- Width = Width - MMIO_COPY_UINT8;
+ Width = (EFI_IO_WIDTH) (Width - MMIO_COPY_UINT8);
Status = Private->PciRootBridgeIo->CopyMem (
Private->PciRootBridgeIo,
(EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c index 9c5ae3c400..d1b83ba19e 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c @@ -1013,7 +1013,7 @@ Returns: UINTN OutStride;
- Width = Width & 0x03;
+ Width = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) (Width & 0x03);
Stride = (UINTN)1 << Width;
InStride = InStrideFlag ? Stride : 0;
OutStride = OutStrideFlag ? Stride : 0;
|