\r
**/\r
\r
-#include <IndustryStandard/Pci.h>\r
-#include <IndustryStandard/Acpi.h>\r
#include <Library/DebugLib.h>\r
#include <Library/XenHypercallLib.h>\r
\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_PCI_IO_PROTOCOL *PciIo;\r
- PCI_TYPE00 Pci;\r
+ XENIO_PROTOCOL *XenIo;\r
\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &gEfiPciIoProtocolGuid,\r
- (VOID **)&PciIo,\r
+ &gXenIoProtocolGuid,\r
+ (VOID **)&XenIo,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
);\r
+\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
- Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0,\r
- sizeof Pci / sizeof (UINT32), &Pci);\r
-\r
- if (Status == EFI_SUCCESS) {\r
- if (Pci.Hdr.VendorId == PCI_VENDOR_ID_XEN &&\r
- Pci.Hdr.DeviceId == PCI_DEVICE_ID_XEN_PLATFORM) {\r
- Status = EFI_SUCCESS;\r
- } else {\r
- Status = EFI_UNSUPPORTED;\r
- }\r
- }\r
-\r
- gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+ gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
This->DriverBindingHandle, ControllerHandle);\r
\r
return Status;\r
{\r
EFI_STATUS Status;\r
XENBUS_DEVICE *Dev;\r
- EFI_PCI_IO_PROTOCOL *PciIo;\r
- EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *BarDesc;\r
- UINT64 MmioAddr;\r
+ XENIO_PROTOCOL *XenIo;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &gEfiPciIoProtocolGuid,\r
- (VOID **) &PciIo,\r
+ &gXenIoProtocolGuid,\r
+ (VOID**)&XenIo,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
);\r
+\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Dev->Signature = XENBUS_DEVICE_SIGNATURE;\r
Dev->This = This;\r
Dev->ControllerHandle = ControllerHandle;\r
- Dev->PciIo = PciIo;\r
+ Dev->XenIo = XenIo;\r
Dev->DevicePath = DevicePath;\r
InitializeListHead (&Dev->ChildList);\r
\r
mMyDevice = Dev;\r
EfiReleaseLock (&mMyDeviceLock);\r
\r
- //\r
- // The BAR1 of this PCI device is used for shared memory and is supposed to\r
- // look like MMIO. The address space of the BAR1 will be used to map the\r
- // Grant Table.\r
- //\r
- Status = PciIo->GetBarAttributes (PciIo, PCI_BAR_IDX1, NULL, (VOID**) &BarDesc);\r
- ASSERT_EFI_ERROR (Status);\r
- ASSERT (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);\r
-\r
- /* Get a Memory address for mapping the Grant Table. */\r
- DEBUG ((EFI_D_INFO, "XenBus: BAR at %LX\n", BarDesc->AddrRangeMin));\r
- MmioAddr = BarDesc->AddrRangeMin;\r
- FreePool (BarDesc);\r
-\r
Status = XenGetSharedInfoPage (Dev);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "XenBus: Unable to get the shared info page.\n"));\r
goto ErrorAllocated;\r
}\r
\r
- XenGrantTableInit (Dev, MmioAddr);\r
+ XenGrantTableInit (Dev);\r
\r
Status = XenStoreInit (Dev);\r
ASSERT_EFI_ERROR (Status);\r
gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
This->DriverBindingHandle, ControllerHandle);\r
ErrorOpenningProtocol:\r
- gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+ gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
This->DriverBindingHandle, ControllerHandle);\r
return Status;\r
}\r
\r
gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
This->DriverBindingHandle, ControllerHandle);\r
- gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+ gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
This->DriverBindingHandle, ControllerHandle);\r
\r
mMyDevice = NULL;\r