diff options
Diffstat (limited to 'MdePkg/Library/UefiLib/UefiDriverModel.c')
| -rw-r--r-- | MdePkg/Library/UefiLib/UefiDriverModel.c | 2111 |
1 files changed, 1333 insertions, 778 deletions
diff --git a/MdePkg/Library/UefiLib/UefiDriverModel.c b/MdePkg/Library/UefiLib/UefiDriverModel.c index deaf9a74a9..fdcf4f9c4f 100644 --- a/MdePkg/Library/UefiLib/UefiDriverModel.c +++ b/MdePkg/Library/UefiLib/UefiDriverModel.c @@ -8,7 +8,6 @@ **/
-
#include "UefiLibInternal.h"
/**
@@ -54,7 +53,8 @@ EfiLibInstallDriverBinding ( Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
//
@@ -65,8 +65,6 @@ EfiLibInstallDriverBinding ( return Status;
}
-
-
/**
Uninstalls a Driver Binding Protocol instance.
@@ -91,7 +89,8 @@ EfiLibUninstallDriverBinding ( Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
//
@@ -102,8 +101,6 @@ EfiLibUninstallDriverBinding ( return Status;
}
-
-
/**
Installs and completes the initialization of a Driver Binding Protocol instance and
optionally installs the Component Name, Driver Configuration and Driver Diagnostics Protocols.
@@ -152,74 +149,94 @@ EfiLibInstallAllDriverProtocols ( DriverBinding->ImageHandle = ImageHandle;
DriverBinding->DriverBindingHandle = DriverBindingHandle;
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
if (DriverConfiguration == NULL) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
NULL
);
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
}
} else {
if (DriverConfiguration == NULL) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- Status = gBS->InstallMultipleProtocolInterfaces (
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
@@ -234,8 +251,6 @@ EfiLibInstallAllDriverProtocols ( return Status;
}
-
-
/**
Uninstalls a Driver Binding Protocol instance and optionally uninstalls the
Component Name, Driver Configuration and Driver Diagnostics Protocols.
@@ -265,74 +280,94 @@ EfiLibUninstallAllDriverProtocols ( ASSERT (DriverBinding != NULL);
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
if (DriverConfiguration == NULL) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
NULL
);
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
}
} else {
if (DriverConfiguration == NULL) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- Status = gBS->UninstallMultipleProtocolInterfaces (
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
@@ -347,8 +382,6 @@ EfiLibUninstallAllDriverProtocols ( return Status;
}
-
-
/**
Installs Driver Binding Protocol with optional Component Name and Component Name 2 Protocols.
@@ -375,12 +408,12 @@ EfiLibUninstallAllDriverProtocols ( EFI_STATUS
EFIAPI
EfiLibInstallDriverBindingComponentName2 (
- IN CONST EFI_HANDLE ImageHandle,
- IN CONST EFI_SYSTEM_TABLE *SystemTable,
- IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
- IN EFI_HANDLE DriverBindingHandle,
- IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
- IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL
+ IN CONST EFI_HANDLE ImageHandle,
+ IN CONST EFI_SYSTEM_TABLE *SystemTable,
+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
+ IN EFI_HANDLE DriverBindingHandle,
+ IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
+ IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL
)
{
EFI_STATUS Status;
@@ -393,37 +426,45 @@ EfiLibInstallDriverBindingComponentName2 ( DriverBinding->ImageHandle = ImageHandle;
DriverBinding->DriverBindingHandle = DriverBindingHandle;
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
- } else {
+ } else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
- }
+ }
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
- Status = gBS->InstallMultipleProtocolInterfaces (
- &DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- NULL
- );
- } else {
- Status = gBS->InstallMultipleProtocolInterfaces (
- &DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- NULL
- );
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ NULL
+ );
+ } else {
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ NULL
+ );
}
}
@@ -435,8 +476,6 @@ EfiLibInstallDriverBindingComponentName2 ( return Status;
}
-
-
/**
Uninstalls Driver Binding Protocol with optional Component Name and Component Name 2 Protocols.
@@ -454,46 +493,54 @@ EfiLibInstallDriverBindingComponentName2 ( EFI_STATUS
EFIAPI
EfiLibUninstallDriverBindingComponentName2 (
- IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
- IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
- IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL
+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
+ IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
+ IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL
)
{
EFI_STATUS Status;
ASSERT (DriverBinding != NULL);
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
- } else {
+ } else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
- }
+ }
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
- Status = gBS->UninstallMultipleProtocolInterfaces (
- DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- NULL
- );
- } else {
- Status = gBS->UninstallMultipleProtocolInterfaces (
- DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- NULL
- );
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
+ DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ NULL
+ );
+ } else {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
+ DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ NULL
+ );
}
}
@@ -505,8 +552,6 @@ EfiLibUninstallDriverBindingComponentName2 ( return Status;
}
-
-
/**
Installs Driver Binding Protocol with optional Component Name, Component Name 2, Driver
Configuration, Driver Configuration 2, Driver Diagnostics, and Driver Diagnostics 2 Protocols.
@@ -539,16 +584,16 @@ EfiLibUninstallDriverBindingComponentName2 ( EFI_STATUS
EFIAPI
EfiLibInstallAllDriverProtocols2 (
- IN CONST EFI_HANDLE ImageHandle,
- IN CONST EFI_SYSTEM_TABLE *SystemTable,
- IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
- IN EFI_HANDLE DriverBindingHandle,
- IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
- IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL,
- IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration OPTIONAL,
- IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2 OPTIONAL,
- IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics OPTIONAL,
- IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL
+ IN CONST EFI_HANDLE ImageHandle,
+ IN CONST EFI_SYSTEM_TABLE *SystemTable,
+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
+ IN EFI_HANDLE DriverBindingHandle,
+ IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
+ IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL,
+ IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration OPTIONAL,
+ IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2 OPTIONAL,
+ IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics OPTIONAL,
+ IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL
)
{
EFI_STATUS Status;
@@ -563,157 +608,205 @@ EfiLibInstallAllDriverProtocols2 ( if (DriverConfiguration2 == NULL) {
if (DriverConfiguration == NULL) {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -721,173 +814,237 @@ EfiLibInstallAllDriverProtocols2 ( }
}
} else {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -897,173 +1054,237 @@ EfiLibInstallAllDriverProtocols2 ( }
} else {
if (DriverConfiguration == NULL) {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -1071,189 +1292,269 @@ EfiLibInstallAllDriverProtocols2 ( }
}
} else {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->InstallMultipleProtocolInterfaces (
&DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -1271,8 +1572,6 @@ EfiLibInstallAllDriverProtocols2 ( return Status;
}
-
-
/**
Uninstalls Driver Binding Protocol with optional Component Name, Component Name 2, Driver
Configuration, Driver Configuration 2, Driver Diagnostics, and Driver Diagnostics 2 Protocols.
@@ -1296,13 +1595,13 @@ EfiLibInstallAllDriverProtocols2 ( EFI_STATUS
EFIAPI
EfiLibUninstallAllDriverProtocols2 (
- IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
- IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
- IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL,
- IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration OPTIONAL,
- IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2 OPTIONAL,
- IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics OPTIONAL,
- IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL
+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,
+ IN CONST EFI_COMPONENT_NAME_PROTOCOL *ComponentName OPTIONAL,
+ IN CONST EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2 OPTIONAL,
+ IN CONST EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration OPTIONAL,
+ IN CONST EFI_DRIVER_CONFIGURATION2_PROTOCOL *DriverConfiguration2 OPTIONAL,
+ IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics OPTIONAL,
+ IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL
)
{
EFI_STATUS Status;
@@ -1311,157 +1610,205 @@ EfiLibUninstallAllDriverProtocols2 ( if (DriverConfiguration2 == NULL) {
if (DriverConfiguration == NULL) {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -1469,173 +1816,237 @@ EfiLibUninstallAllDriverProtocols2 ( }
}
} else {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -1645,173 +2056,237 @@ EfiLibUninstallAllDriverProtocols2 ( }
} else {
if (DriverConfiguration == NULL) {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
@@ -1819,189 +2294,269 @@ EfiLibUninstallAllDriverProtocols2 ( }
}
} else {
- if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics == NULL) || FeaturePcdGet (PcdDriverDiagnosticsDisable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
}
}
} else {
- if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((DriverDiagnostics2 == NULL) || FeaturePcdGet (PcdDriverDiagnostics2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
NULL
);
}
}
} else {
- if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
+ if ((ComponentName == NULL) || FeaturePcdGet (PcdComponentNameDisable)) {
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
} else {
Status = gBS->UninstallMultipleProtocolInterfaces (
DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
} else {
- if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {
- Status = gBS->UninstallMultipleProtocolInterfaces (
- DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
- NULL
- );
- } else {
- Status = gBS->UninstallMultipleProtocolInterfaces (
- DriverBinding->DriverBindingHandle,
- &gEfiDriverBindingProtocolGuid, DriverBinding,
- &gEfiComponentNameProtocolGuid, ComponentName,
- &gEfiComponentName2ProtocolGuid, ComponentName2,
- &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,
- &gEfiDriverConfiguration2ProtocolGuid, DriverConfiguration2,
- &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,
- &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,
+ if ((ComponentName2 == NULL) || FeaturePcdGet (PcdComponentName2Disable)) {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
+ DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
+ NULL
+ );
+ } else {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
+ DriverBinding->DriverBindingHandle,
+ &gEfiDriverBindingProtocolGuid,
+ DriverBinding,
+ &gEfiComponentNameProtocolGuid,
+ ComponentName,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2,
+ &gEfiDriverConfigurationProtocolGuid,
+ DriverConfiguration,
+ &gEfiDriverConfiguration2ProtocolGuid,
+ DriverConfiguration2,
+ &gEfiDriverDiagnosticsProtocolGuid,
+ DriverDiagnostics,
+ &gEfiDriverDiagnostics2ProtocolGuid,
+ DriverDiagnostics2,
NULL
);
}
|