sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Add optional extended decode for Vendor Device Nodes for consistent map names

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: jaben carsey <jaben.carsey@intel.com>
Reviewed-by: Joe Peterson <joe.peterson@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hp.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16420 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jaben carsey 2014-11-24 14:50:14 +00:00 committed by jcarsey
parent 7475d13829
commit cc4c331207
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
View File

@ -14,6 +14,7 @@
#include "UefiShellCommandLib.h" #include "UefiShellCommandLib.h"
#include <Library/DevicePathLib.h> #include <Library/DevicePathLib.h>
#include <Library/SortLib.h> #include <Library/SortLib.h>
#include <Library/UefiLib.h>
typedef enum { typedef enum {
MTDTypeUnknown, MTDTypeUnknown,
@ -575,6 +576,9 @@ DevPathSerialVendor (
{ {
VENDOR_DEVICE_PATH *Vendor; VENDOR_DEVICE_PATH *Vendor;
SAS_DEVICE_PATH *Sas; SAS_DEVICE_PATH *Sas;
UINTN TargetNameLength;
UINTN Index;
CHAR16 *Buffer;
if (DevicePathNode == NULL || MappingItem == NULL) { if (DevicePathNode == NULL || MappingItem == NULL) {
return; return;
@ -589,6 +593,32 @@ DevPathSerialVendor (
AppendCSDNum (MappingItem, Sas->Lun); AppendCSDNum (MappingItem, Sas->Lun);
AppendCSDNum (MappingItem, Sas->DeviceTopology); AppendCSDNum (MappingItem, Sas->DeviceTopology);
AppendCSDNum (MappingItem, Sas->RelativeTargetPort); AppendCSDNum (MappingItem, Sas->RelativeTargetPort);
} else {
TargetNameLength = MIN(DevicePathNodeLength (DevicePathNode) - sizeof (VENDOR_DEVICE_PATH), PcdGet32(PcdShellVendorExtendedDecode));
if (TargetNameLength != 0) {
//
// String is 2 chars per data byte, plus NULL terminator
//
Buffer = AllocateZeroPool (((TargetNameLength * 2) + 1) * sizeof(CHAR16));
ASSERT(Buffer != NULL);
if (Buffer == NULL) {
return;
}
//
// Build the string data
//
for (Index = 0; Index < TargetNameLength; Index++) {
Buffer = CatSPrint (Buffer, L"%02x", *((UINT8*)Vendor + sizeof (VENDOR_DEVICE_PATH) + Index));
}
//
// Append the new data block
//
AppendCSDStr (MappingItem, Buffer);
FreePool(Buffer);
}
} }
} }

1
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
View File

@ -61,6 +61,7 @@
gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## ALWAYS_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## ALWAYS_CONSUMED
gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## ALWAYS_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## ALWAYS_CONSUMED
gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames ## SOMETIMES_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames ## SOMETIMES_CONSUMED
gEfiShellPkgTokenSpaceGuid.PcdShellVendorExtendedDecode ## SOMETIMES_CONSUMED
[Depex] [Depex]
gEfiUnicodeCollation2ProtocolGuid gEfiUnicodeCollation2ProtocolGuid

5
ShellPkg/ShellPkg.dec
View File

@ -132,3 +132,8 @@
## Do iSCSI decode for map names. ## Do iSCSI decode for map names.
# This is disabled by default due to the length of generated strings # This is disabled by default due to the length of generated strings
gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames|FALSE|BOOLEAN|0x00000012 gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames|FALSE|BOOLEAN|0x00000012
## Controls Extended decode for Vendor device path nodes for map names.
# Up to this many bytes of vendor specific data will be used. Default is 0
# (disabled).
gEfiShellPkgTokenSpaceGuid.PcdShellVendorExtendedDecode|0|UINT32|0x00000013