diff options
Diffstat (limited to 'MdeModulePkg/Bus/Usb/UsbBusDxe')
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 17 | ||||
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h | 5 |
2 files changed, 8 insertions, 14 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c index 63480f62a9..30bf43cb36 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c @@ -15,11 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "UsbBus.h"
-//
-// USB_BUS_PROTOCOL is only used to locate USB_BUS
-//
-EFI_GUID mUsbBusProtocolGuid = EFI_USB_BUS_PROTOCOL_GUID;
-
EFI_USB_IO_PROTOCOL mUsbIoProtocol = {
UsbIoControlTransfer,
UsbIoBulkTransfer,
@@ -982,7 +977,7 @@ UsbBusBuildProtocol ( //
Status = gBS->InstallProtocolInterface (
&Controller,
- &mUsbBusProtocolGuid,
+ &gEfiCallerIdGuid,
EFI_NATIVE_INTERFACE,
&UsbBus->BusId
);
@@ -1045,7 +1040,7 @@ FREE_ROOTHUB: }
UNINSTALL_USBBUS:
- gBS->UninstallProtocolInterface (Controller, &mUsbBusProtocolGuid, &UsbBus->BusId);
+ gBS->UninstallProtocolInterface (Controller, &gEfiCallerIdGuid, &UsbBus->BusId);
CLOSE_HC:
if (UsbBus->Usb2Hc != NULL) {
@@ -1277,7 +1272,7 @@ UsbBusControllerDriverStart ( //
Status = gBS->OpenProtocol (
Controller,
- &mUsbBusProtocolGuid,
+ &gEfiCallerIdGuid,
(VOID **) &UsbBusId,
This->DriverBindingHandle,
Controller,
@@ -1298,7 +1293,7 @@ UsbBusControllerDriverStart ( //
Status = gBS->OpenProtocol (
Controller,
- &mUsbBusProtocolGuid,
+ &gEfiCallerIdGuid,
(VOID **) &UsbBusId,
This->DriverBindingHandle,
Controller,
@@ -1417,7 +1412,7 @@ UsbBusControllerDriverStop ( //
Status = gBS->OpenProtocol (
Controller,
- &mUsbBusProtocolGuid,
+ &gEfiCallerIdGuid,
(VOID **) &BusId,
This->DriverBindingHandle,
Controller,
@@ -1460,7 +1455,7 @@ UsbBusControllerDriverStop ( //
// Uninstall the bus identifier and close USB_HC/USB2_HC protocols
//
- gBS->UninstallProtocolInterface (Controller, &mUsbBusProtocolGuid, &Bus->BusId);
+ gBS->UninstallProtocolInterface (Controller, &gEfiCallerIdGuid, &Bus->BusId);
if (Bus->Usb2Hc != NULL) {
gBS->CloseProtocol (
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h index 14454da28a..f6e323239a 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h @@ -138,9 +138,6 @@ typedef struct _USB_HUB_API USB_HUB_API; #define USB_BIT(a) ((UINTN)(1 << (a)))
#define USB_BIT_IS_SET(Data, Bit) ((BOOLEAN)(((Data) & (Bit)) == (Bit)))
-#define EFI_USB_BUS_PROTOCOL_GUID \
- {0x2B2F68CC, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}}
-
#define USB_INTERFACE_FROM_USBIO(a) \
CR(a, USB_INTERFACE, UsbIo, USB_INTERFACE_SIGNATURE)
@@ -149,6 +146,8 @@ typedef struct _USB_HUB_API USB_HUB_API; //
// Used to locate USB_BUS
+// UsbBusProtocol is the private protocol.
+// gEfiCallerIdGuid will be used as its protocol guid.
//
typedef struct _EFI_USB_BUS_PROTOCOL {
UINT64 Reserved;
|