EDK2/edk2-rk3588
1
0
Fork 0
mirror of https://github.com/edk2-porting/edk2-rk3588.git synced 2025-12-18 11:39:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silicon/Rockchip: Rename gOhciDeviceProtocol to gOhciDeviceProtocolGuid

Browse Source
This commit is contained in:
Mario Bălănică
2023-07-07 22:00:07 +03:00
parent 37d0c718ff
commit 175d90f9d4
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/ComponentName.c
View File

@@ -186,7 +186,7 @@ OhciComponentNameGetControllerName (
Status = EfiTestManagedDevice (
ControllerHandle,
gOhciDriverBinding.DriverBindingHandle,
&gOhciDeviceProtocol
&gOhciDeviceProtocolGuid
);
if (EFI_ERROR (Status)) {
return Status;

10
edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c
View File

@@ -2135,7 +2135,7 @@ OHCIDriverBindingSupported (
// Connect to the non-discoverable device
//
Status = gBS->OpenProtocol (ControllerHandle,
&gOhciDeviceProtocol,
&gOhciDeviceProtocolGuid,
(VOID **)&Dev,
This->DriverBindingHandle,
ControllerHandle,
@@ -2148,7 +2148,7 @@ OHCIDriverBindingSupported (
// Clean up.
//
gBS->CloseProtocol (ControllerHandle,
&gOhciDeviceProtocol,
&gOhciDeviceProtocolGuid,
This->DriverBindingHandle,
ControllerHandle);
@@ -2187,7 +2187,7 @@ OHCIDriverBindingStart (
}
Status = gBS->OpenProtocol (ControllerHandle,
&gOhciDeviceProtocol,
&gOhciDeviceProtocolGuid,
(VOID **)&Ohc->Protocol,
This->DriverBindingHandle,
ControllerHandle,
@@ -2328,7 +2328,7 @@ UNINSTALL_USBHC:
NULL
);
gBS->CloseProtocol (ControllerHandle,
&gOhciDeviceProtocol,
&gOhciDeviceProtocolGuid,
This->DriverBindingHandle,
ControllerHandle);
FREE_MEM_PAGE:
@@ -2382,7 +2382,7 @@ OHCIDriverBindingStop (
gBS->CloseProtocol (
Controller,
&gOhciDeviceProtocol,
&gOhciDeviceProtocolGuid,
This->DriverBindingHandle,
Controller
);

2
edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
View File

@@ -62,7 +62,7 @@
gEfiEndOfDxeEventGroupGuid
[Protocols]
gOhciDeviceProtocol ## TO_START
gOhciDeviceProtocolGuid ## TO_START
gEfiUsbHcProtocolGuid ## BY_START
[Depex]

4
edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.c
View File

@@ -265,7 +265,7 @@ RegisterOhciController (
goto FreeOhciDevice;
}
CopyGuid (&OhciDevicePath->Vendor.Guid, &gOhciDeviceProtocol);
CopyGuid (&OhciDevicePath->Vendor.Guid, &gOhciDeviceProtocolGuid);
/* Device paths must be unique */
OhciDevicePath->BaseAddress = OhciDevice->BaseAddress;
@@ -277,7 +277,7 @@ RegisterOhciController (
Handle = NULL;
Status = gBS->InstallMultipleProtocolInterfaces (&Handle,
&gEfiDevicePathProtocolGuid, OhciDevicePath,
&gOhciDeviceProtocol, OhciDevice,
&gOhciDeviceProtocolGuid, OhciDevice,
NULL);
if (EFI_ERROR (Status)) {
goto FreeOhciDevicePath;

2
edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.inf
View File

@@ -44,7 +44,7 @@
gRockchipTokenSpaceGuid.PcdDwc3Size
[Protocols]
gOhciDeviceProtocol ## PRODUCES
gOhciDeviceProtocolGuid ## PRODUCES
[Guids]
gEfiEndOfDxeEventGroupGuid

2
edk2-rockchip/Silicon/Rockchip/Include/Protocol/OhciDeviceProtocol.h
View File

@@ -18,6 +18,6 @@ typedef struct {
UINT32 BaseAddress;
} OHCI_DEVICE_PROTOCOL;
extern EFI_GUID gOhciDeviceProtocol;
extern EFI_GUID gOhciDeviceProtocolGuid;
#endif // _OHCI_DEVICE_PROTOCOL_H_

2
edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBm.c
View File

@@ -899,7 +899,7 @@ PlatformBootManagerBeforeConsole (
//
// Connect USB OHCI controller(s)
//
FilterAndProcess (&gOhciDeviceProtocol, NULL, Connect);
FilterAndProcess (&gOhciDeviceProtocolGuid, NULL, Connect);
//
// Connect the Block I/O device produced by the SD/eMMC device that

2
edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@@ -99,4 +99,4 @@
gEfiBlockIoProtocolGuid
gEsrtManagementProtocolGuid
gPlatformBootManagerProtocolGuid
gOhciDeviceProtocol
gOhciDeviceProtocolGuid

2
edk2-rockchip/Silicon/Rockchip/RockchipPkg.dec
View File

@@ -23,7 +23,7 @@
gRk860xRegulatorProtocolGuid = { 0xb9ef9018, 0x2096, 0x4bf5, { 0x94, 0xb2, 0x70, 0x32, 0xb9, 0xa9, 0xa4, 0x29 } }
gRockchipCrtcProtocolGuid = { 0xC128406A, 0x99D9, 0x11EC, { 0x99, 0x27, 0xF4, 0x2A, 0x7D, 0xCB, 0x92, 0x5D } }
gRockchipConnectorProtocolGuid = { 0x50439CB6, 0x9B85, 0x11EC, { 0x95, 0x73, 0xF4, 0x2A, 0x7D, 0xCB, 0x92, 0x5D } }
gOhciDeviceProtocol = { 0x54bce5e6, 0xbaae, 0x488a, { 0x82, 0x67, 0xc0, 0x85, 0x7f, 0xb4, 0xe8, 0x05 } }
gOhciDeviceProtocolGuid = { 0x54bce5e6, 0xbaae, 0x488a, { 0x82, 0x67, 0xc0, 0x85, 0x7f, 0xb4, 0xe8, 0x05 } }
[Guids]
gRockchipTokenSpaceGuid = { 0xc620b83a, 0x3175, 0x11ec, { 0x95, 0xb4, 0xf4, 0x2a, 0x7d, 0xcb, 0x92, 0x5d } }