diff options
| author | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-08-14 09:52:25 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-08-14 09:52:25 +0000 |
| commit | 33efdf51b0f123259dec0bfcff49af189b46c411 (patch) | |
| tree | ca64b594e5609249f17a720ab2758342c68cbb89 /MdeModulePkg/Universal/SetupBrowserDxe/Ui.c | |
| parent | d0bf562330e5309a92e55e44063a8ea37ead4d1d (diff) | |
| download | edk2-platforms-33efdf51b0f123259dec0bfcff49af189b46c411.tar.xz | |
Refine the logic to handle the device path info get from string token.
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13632 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/SetupBrowserDxe/Ui.c')
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Ui.c | 87 |
1 files changed, 52 insertions, 35 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c index a2f336c2a4..e16b2e424a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c @@ -1949,6 +1949,55 @@ FormSetGuidToHiiHandle ( }
/**
+ Transfer the device path string to binary format.
+
+ @param StringPtr The device path string info.
+
+ @retval Device path binary info.
+
+**/
+EFI_DEVICE_PATH_PROTOCOL *
+ConvertDevicePathFromText (
+ IN CHAR16 *StringPtr
+ )
+{
+ UINTN BufferSize;
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;
+ CHAR16 TemStr[2];
+ UINT8 *DevicePathBuffer;
+ UINTN Index;
+ UINT8 DigitUint8;
+
+ ASSERT (StringPtr != NULL);
+
+ BufferSize = StrLen (StringPtr) / 2;
+ DevicePath = AllocatePool (BufferSize);
+ ASSERT (DevicePath != NULL);
+
+ //
+ // Convert from Device Path String to DevicePath Buffer in the reverse order.
+ //
+ DevicePathBuffer = (UINT8 *) DevicePath;
+ for (Index = 0; StringPtr[Index] != L'\0'; Index ++) {
+ TemStr[0] = StringPtr[Index];
+ DigitUint8 = (UINT8) StrHexToUint64 (TemStr);
+ if (DigitUint8 == 0 && TemStr[0] != L'0') {
+ //
+ // Invalid Hex Char as the tail.
+ //
+ break;
+ }
+ if ((Index & 1) == 0) {
+ DevicePathBuffer [Index/2] = DigitUint8;
+ } else {
+ DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);
+ }
+ }
+
+ return DevicePath;
+}
+
+/**
Process the goto op code, update the info in the selection structure.
@param Statement The statement belong to goto op code.
@@ -1968,13 +2017,7 @@ ProcessGotoOpCode ( )
{
CHAR16 *StringPtr;
- UINTN StringLen;
- UINTN BufferSize;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- CHAR16 TemStr[2];
- UINT8 *DevicePathBuffer;
- UINTN Index;
- UINT8 DigitUint8;
FORM_BROWSER_FORM *RefForm;
EFI_INPUT_KEY Key;
EFI_STATUS Status;
@@ -1984,22 +2027,18 @@ ProcessGotoOpCode ( Status = EFI_SUCCESS;
UpdateFormInfo = TRUE;
StringPtr = NULL;
- StringLen = 0;
//
// Prepare the device path check, get the device path info first.
//
if (Statement->HiiValue.Value.ref.DevicePath != 0) {
StringPtr = GetToken (Statement->HiiValue.Value.ref.DevicePath, Selection->FormSet->HiiHandle);
- if (StringPtr != NULL) {
- StringLen = StrLen (StringPtr);
- }
}
//
// Check whether the device path string is a valid string.
//
- if (Statement->HiiValue.Value.ref.DevicePath != 0 && StringPtr != NULL && StringLen != 0) {
+ if (Statement->HiiValue.Value.ref.DevicePath != 0 && StringPtr != NULL) {
if (Selection->Form->ModalForm) {
return Status;
}
@@ -2007,33 +2046,11 @@ ProcessGotoOpCode ( // Goto another Hii Package list
//
Selection->Action = UI_ACTION_REFRESH_FORMSET;
- BufferSize = StrLen (StringPtr) / 2;
- DevicePath = AllocatePool (BufferSize);
- ASSERT (DevicePath != NULL);
-
- //
- // Convert from Device Path String to DevicePath Buffer in the reverse order.
- //
- DevicePathBuffer = (UINT8 *) DevicePath;
- for (Index = 0; StringPtr[Index] != L'\0'; Index ++) {
- TemStr[0] = StringPtr[Index];
- DigitUint8 = (UINT8) StrHexToUint64 (TemStr);
- if (DigitUint8 == 0 && TemStr[0] != L'0') {
- //
- // Invalid Hex Char as the tail.
- //
- break;
- }
- if ((Index & 1) == 0) {
- DevicePathBuffer [Index/2] = DigitUint8;
- } else {
- DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);
- }
- }
- FreePool (StringPtr);
+ DevicePath = ConvertDevicePathFromText (StringPtr);
Selection->Handle = DevicePathToHiiHandle (DevicePath);
FreePool (DevicePath);
+ FreePool (StringPtr);
if (Selection->Handle == NULL) {
//
|