Silicon/Rockchip: Rename gOhciDeviceProtocol to gOhciDeviceProtocolGuid

edk2-porting · Jul 7, 2023 · 175d90f · 175d90f
1 parent 37d0c71
commit 175d90f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/ComponentName.c b/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/ComponentName.c
@@ -186,7 +186,7 @@ OhciComponentNameGetControllerName (
   Status = EfiTestManagedDevice (
              ControllerHandle,
              gOhciDriverBinding.DriverBindingHandle,
-             &gOhciDeviceProtocol
+             &gOhciDeviceProtocolGuid
              );
   if (EFI_ERROR (Status)) {
     return Status;

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c b/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c
@@ -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 @@ OHCIDriverBindingStart (
          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
          );

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf b/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
@@ -62,7 +62,7 @@
   gEfiEndOfDxeEventGroupGuid
 
 [Protocols]
-  gOhciDeviceProtocol                           ## TO_START
+  gOhciDeviceProtocolGuid                           ## TO_START
   gEfiUsbHcProtocolGuid                         ## BY_START
 
 [Depex]

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.c b/edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.c
@@ -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;

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.inf b/edk2-rockchip/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.inf
@@ -44,7 +44,7 @@
   gRockchipTokenSpaceGuid.PcdDwc3Size
 
 [Protocols]
-  gOhciDeviceProtocol           ## PRODUCES
+  gOhciDeviceProtocolGuid           ## PRODUCES
 
 [Guids]
   gEfiEndOfDxeEventGroupGuid

diff --git a/edk2-rockchip/Silicon/Rockchip/Include/Protocol/OhciDeviceProtocol.h b/edk2-rockchip/Silicon/Rockchip/Include/Protocol/OhciDeviceProtocol.h
@@ -18,6 +18,6 @@ typedef struct {
   UINT32      BaseAddress;
 } OHCI_DEVICE_PROTOCOL;
 
-extern EFI_GUID gOhciDeviceProtocol;
+extern EFI_GUID gOhciDeviceProtocolGuid;
 
 #endif // _OHCI_DEVICE_PROTOCOL_H_
diff --git a/edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBm.c b/edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBm.c
@@ -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

diff --git a/edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -99,4 +99,4 @@
   gEfiBlockIoProtocolGuid
   gEsrtManagementProtocolGuid
   gPlatformBootManagerProtocolGuid
-  gOhciDeviceProtocol
+  gOhciDeviceProtocolGuid
diff --git a/edk2-rockchip/Silicon/Rockchip/RockchipPkg.dec b/edk2-rockchip/Silicon/Rockchip/RockchipPkg.dec
@@ -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 } }