diff options
Diffstat (limited to 'IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c')
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c | 139 |
1 files changed, 56 insertions, 83 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c index a02e3683d3..624f725ab2 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c @@ -1,6 +1,7 @@ -/**@file
+/** @file
+ UEFI Component Name(2) protocol implementation for Isa Floppy driver.
-Copyright (c) 2006 - 2007, Intel Corporation.<BR>
+Copyright (c) 2006 - 2009, Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -53,10 +54,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIsaFloppyDriverNameTable by This does not support the language specified by Language,
then EFI_UNSUPPORTED is returned.
- @param This[in] A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+ @param[in] This A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
EFI_COMPONENT_NAME_PROTOCOL instance.
-
- @param Language[in] A pointer to a Null-terminated ASCII string
+ @param[in] Language A pointer to a Null-terminated ASCII string
array indicating the language. This is the
language of the driver name that the caller is
requesting, and it must match one of the
@@ -64,23 +64,18 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIsaFloppyDriverNameTable number of languages supported by a driver is up
to the driver writer. Language is specified
in RFC 4646 or ISO 639-2 language code format.
-
- @param DriverName[out] A pointer to the Unicode string to return.
+ @param[out] DriverName A pointer to the Unicode string to return.
This Unicode string is the name of the
driver specified by This in the language
specified by Language.
-
@retval EFI_SUCCESS The Unicode string for the Driver specified by
This and the language specified by Language was
returned in DriverName.
@retval EFI_INVALID_PARAMETER Language is NULL.
-
@retval EFI_INVALID_PARAMETER DriverName is NULL.
-
@retval EFI_UNSUPPORTED The driver specified by This does not support
the language specified by Language.
-
**/
EFI_STATUS
EFIAPI
@@ -112,15 +107,13 @@ IsaFloppyComponentNameGetDriverName ( then EFI_UNSUPPORTED is returned. If the driver specified by This does not
support the language specified by Language, then EFI_UNSUPPORTED is returned.
- @param This[in] A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+ @param[in] This A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
EFI_COMPONENT_NAME_PROTOCOL instance.
-
- @param ControllerHandle[in] The handle of a controller that the driver
+ @param[in] ControllerHandle The handle of a controller that the driver
specified by This is managing. This handle
specifies the controller whose name is to be
returned.
-
- @param ChildHandle[in] The handle of the child controller to retrieve
+ @param[in] ChildHandle The handle of the child controller to retrieve
the name of. This is an optional parameter that
may be NULL. It will be NULL for device
drivers. It will also be NULL for a bus drivers
@@ -128,8 +121,7 @@ IsaFloppyComponentNameGetDriverName ( controller. It will not be NULL for a bus
driver that wishes to retrieve the name of a
child controller.
-
- @param Language[in] A pointer to a Null-terminated ASCII string
+ @param[in] Language A pointer to a Null-terminated ASCII string
array indicating the language. This is the
language of the driver name that the caller is
requesting, and it must match one of the
@@ -137,8 +129,7 @@ IsaFloppyComponentNameGetDriverName ( number of languages supported by a driver is up
to the driver writer. Language is specified in
RFC 4646 or ISO 639-2 language code format.
-
- @param ControllerName[out] A pointer to the Unicode string to return.
+ @param[out] ControllerName A pointer to the Unicode string to return.
This Unicode string is the name of the
controller specified by ControllerHandle and
ChildHandle in the language specified by
@@ -149,72 +140,55 @@ IsaFloppyComponentNameGetDriverName ( the language specified by Language for the
driver specified by This was returned in
DriverName.
-
@retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.
-
@retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid
EFI_HANDLE.
-
@retval EFI_INVALID_PARAMETER Language is NULL.
-
@retval EFI_INVALID_PARAMETER ControllerName is NULL.
-
@retval EFI_UNSUPPORTED The driver specified by This is not currently
managing the controller specified by
ControllerHandle and ChildHandle.
-
@retval EFI_UNSUPPORTED The driver specified by This does not support
the language specified by Language.
-
**/
EFI_STATUS
EFIAPI
IsaFloppyComponentNameGetControllerName (
- IN EFI_COMPONENT_NAME_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN EFI_HANDLE ChildHandle OPTIONAL,
- IN CHAR8 *Language,
- OUT CHAR16 **ControllerName
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN EFI_HANDLE ChildHandle OPTIONAL,
+ IN CHAR8 *Language,
+ OUT CHAR16 **ControllerName
)
{
- EFI_STATUS Status;
- EFI_BLOCK_IO_PROTOCOL *BlkIo;
- FDC_BLK_IO_DEV *FdcDev;
- EFI_ISA_IO_PROTOCOL *IsaIoProtocol;
+ EFI_STATUS Status;
+ EFI_BLOCK_IO_PROTOCOL *BlkIo;
+ FDC_BLK_IO_DEV *FdcDev;
+ if (Language == NULL || ControllerName == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
//
// This is a device driver, so ChildHandle must be NULL.
//
if (ChildHandle != NULL) {
return EFI_UNSUPPORTED;
}
+
//
- // Check Controller's handle
+ // Check if this driver is currently managing ControllerHandle
//
- Status = gBS->OpenProtocol (
- ControllerHandle,
- &gEfiIsaIoProtocolGuid,
- (VOID **) &IsaIoProtocol,
- gFdcControllerDriver.DriverBindingHandle,
- ControllerHandle,
- EFI_OPEN_PROTOCOL_BY_DRIVER
- );
- if (!EFI_ERROR (Status)) {
- gBS->CloseProtocol (
- ControllerHandle,
- &gEfiIsaIoProtocolGuid,
- gFdcControllerDriver.DriverBindingHandle,
- ControllerHandle
- );
-
- return EFI_UNSUPPORTED;
+ Status = EfiTestManagedDevice (
+ ControllerHandle,
+ gFdcControllerDriver.DriverBindingHandle,
+ &gEfiIsaIoProtocolGuid
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
}
- if (Status != EFI_ALREADY_STARTED) {
- return EFI_UNSUPPORTED;
- }
//
- // Get the Block I/O Protocol on Controller
+ // Get the device context
//
Status = gBS->OpenProtocol (
ControllerHandle,
@@ -227,9 +201,7 @@ IsaFloppyComponentNameGetControllerName ( if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Get the Floppy Disk Controller's Device structure
- //
+
FdcDev = FDD_BLK_IO_FROM_THIS (BlkIo);
return LookupUnicodeString2 (
@@ -244,33 +216,34 @@ IsaFloppyComponentNameGetControllerName ( /**
Add the component name for the floppy device
- @param FdcDev - A pointer to the FDC_BLK_IO_DEV instance.
+ @param[in] FdcDev A pointer to the FDC_BLK_IO_DEV instance.
**/
VOID
AddName (
- IN FDC_BLK_IO_DEV *FdcDev
+ IN FDC_BLK_IO_DEV *FdcDev
)
-
{
- CHAR16 FloppyDriveName[FLOPPY_DRIVE_NAME_ASCII_LEN + 1];
-
- StrCpy (FloppyDriveName, FLOPPY_DRIVE_NAME);
- FloppyDriveName[FLOPPY_DRIVE_NAME_ASCII_LEN - 1] = (CHAR16) (L'0' + FdcDev->Disk);
- AddUnicodeString2 (
- "eng",
- gIsaFloppyComponentName.SupportedLanguages,
- &FdcDev->ControllerNameTable,
- FloppyDriveName,
- TRUE
- );
- AddUnicodeString2 (
- "en",
- gIsaFloppyComponentName2.SupportedLanguages,
- &FdcDev->ControllerNameTable,
- FloppyDriveName,
- FALSE
- );
-
+ CHAR16 FloppyDriveName[FLOPPY_DRIVE_NAME_LEN + 1];
+
+ if (!(FeaturePcdGet(PcdComponentNameDisable) && FeaturePcdGet(PcdComponentName2Disable))) {
+ StrCpy (FloppyDriveName, FLOPPY_DRIVE_NAME);
+ FloppyDriveName[FLOPPY_DRIVE_NAME_LEN - 1] = (CHAR16) (L'0' + FdcDev->Disk);
+
+ AddUnicodeString2 (
+ "eng",
+ gIsaFloppyComponentName.SupportedLanguages,
+ &FdcDev->ControllerNameTable,
+ FloppyDriveName,
+ TRUE
+ );
+ AddUnicodeString2 (
+ "en",
+ gIsaFloppyComponentName2.SupportedLanguages,
+ &FdcDev->ControllerNameTable,
+ FloppyDriveName,
+ FALSE
+ );
+ }
}
|