ShellPkg: Move UpdateMapping() out of Map command and added to UefiShellCommandLib library.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15580 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 124 insertions, 110 deletions

diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index 13d526edf7..aed947c1a9 100644
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -4,7 +4,8 @@
   This library is for use ONLY by shell commands linked into the shell application.

   This library will not funciton if it is used for UEFI Shell 2.0 Applications.

 

-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>

+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.

+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

   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

@@ -584,6 +585,17 @@ ShellCommandCreateInitialMappingsAndPaths(
   );

 

 /**

+  Add mappings for any devices without one.  Do not change any existing maps.

+

+  @retval EFI_SUCCESS   The operation was successful.

+**/

+EFI_STATUS

+EFIAPI

+ShellCommandUpdateMapping (

+  VOID

+  );

+

+/**

   Converts a SHELL_FILE_HANDLE to an EFI_FILE_PROTOCOL*.

 

   @param[in] Handle     The SHELL_FILE_HANDLE to convert.

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index 48be39f832..18ae9f3384 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -1,6 +1,7 @@
 /** @file

   Provides interface to shell internal functions for shell commands.

 

+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.

   Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -1198,12 +1199,114 @@ ShellCommandCreateInitialMappingsAndPaths(
   }

 

   return (EFI_SUCCESS);

-}

-

-/**

-  Converts a SHELL_FILE_HANDLE to an EFI_FILE_PROTOCOL*.

-

-  @param[in] Handle     The SHELL_FILE_HANDLE to convert.

+}
+
+/**
+  Add mappings for any devices without one.  Do not change any existing maps.
+
+  @retval EFI_SUCCESS   The operation was successful.
+**/
+EFI_STATUS
+EFIAPI
+ShellCommandUpdateMapping (
+  VOID
+  )
+{
+  EFI_STATUS                Status;
+  EFI_HANDLE                *HandleList;
+  UINTN                     Count;
+  EFI_DEVICE_PATH_PROTOCOL  **DevicePathList;
+  CHAR16                    *NewDefaultName;
+  CHAR16                    *NewConsistName;
+  EFI_DEVICE_PATH_PROTOCOL  **ConsistMappingTable;
+
+  HandleList  = NULL;
+  Status      = EFI_SUCCESS;
+
+  //
+  // remove mappings that represent removed devices.
+  //
+
+  //
+  // Find each handle with Simple File System
+  //
+  HandleList = GetHandleListByProtocol(&gEfiSimpleFileSystemProtocolGuid);
+  if (HandleList != NULL) {
+    //
+    // Do a count of the handles
+    //
+    for (Count = 0 ; HandleList[Count] != NULL ; Count++);
+
+    //
+    // Get all Device Paths
+    //
+    DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);
+    ASSERT(DevicePathList != NULL);
+
+    for (Count = 0 ; HandleList[Count] != NULL ; Count++) {
+      DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);
+    }
+
+    //
+    // Sort all DevicePaths
+    //
+    PerformQuickSort(DevicePathList, Count, sizeof(EFI_DEVICE_PATH_PROTOCOL*), DevicePathCompare);
+
+    ShellCommandConsistMappingInitialize(&ConsistMappingTable);
+
+    //
+    // Assign new Mappings to remainders
+    //
+    for (Count = 0 ; HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) {
+      //
+      // Skip ones that already have
+      //
+      if (gEfiShellProtocol->GetMapFromDevicePath(&DevicePathList[Count]) != NULL) {
+        continue;
+      }
+      //
+      // Get default name
+      //
+      NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem);
+      ASSERT(NewDefaultName != NULL);
+
+      //
+      // Call shell protocol SetMap function now...
+      //
+      Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewDefaultName);
+
+      if (!EFI_ERROR(Status)) {
+        //
+        // Now do consistent name
+        //
+        NewConsistName = ShellCommandConsistMappingGenMappingName(DevicePathList[Count], ConsistMappingTable);
+        if (NewConsistName != NULL) {
+          Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewConsistName);
+          FreePool(NewConsistName);
+        }
+      }
+
+      FreePool(NewDefaultName);
+    }
+    ShellCommandConsistMappingUnInitialize(ConsistMappingTable);
+    SHELL_FREE_NON_NULL(HandleList);
+    SHELL_FREE_NON_NULL(DevicePathList);
+
+    HandleList = NULL;
+  } else {
+    Count = (UINTN)-1;
+  }
+  //
+  // Do it all over again for gEfiBlockIoProtocolGuid
+  //
+
+  return (Status);
+}
+
+/**
+  Converts a SHELL_FILE_HANDLE to an EFI_FILE_PROTOCOL*.
+
+  @param[in] Handle     The SHELL_FILE_HANDLE to convert.
 

   @return a EFI_FILE_PROTOCOL* representing the same file.

 **/

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 4763cfccca..5329be4192 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for map shell level 2 command.

 

+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.

   Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -118,108 +119,6 @@ SearchList(
 }

 

 /**

-  Add mappings for any devices without one.  Do not change any existing maps.

-

-  @retval EFI_SUCCESS   The operation was successful.

-**/

-EFI_STATUS

-EFIAPI

-UpdateMapping (

-  VOID

-  )

-{

-  EFI_STATUS                Status;

-  EFI_HANDLE                *HandleList;

-  UINTN                     Count;

-  EFI_DEVICE_PATH_PROTOCOL  **DevicePathList;

-  CHAR16                    *NewDefaultName;

-  CHAR16                    *NewConsistName;

-  EFI_DEVICE_PATH_PROTOCOL  **ConsistMappingTable;

-

-  HandleList  = NULL;

-  Status      = EFI_SUCCESS;

-

-  //

-  // remove mappings that represent removed devices.

-  //

-

-  //

-  // Find each handle with Simple File System

-  //

-  HandleList = GetHandleListByProtocol(&gEfiSimpleFileSystemProtocolGuid);

-  if (HandleList != NULL) {

-    //

-    // Do a count of the handles

-    //

-    for (Count = 0 ; HandleList[Count] != NULL ; Count++);

-

-    //

-    // Get all Device Paths

-    //

-    DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);

-    ASSERT(DevicePathList != NULL);

-

-    for (Count = 0 ; HandleList[Count] != NULL ; Count++) {

-      DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);

-    }

-

-    //

-    // Sort all DevicePaths

-    //

-    PerformQuickSort(DevicePathList, Count, sizeof(EFI_DEVICE_PATH_PROTOCOL*), DevicePathCompare);

-

-    ShellCommandConsistMappingInitialize(&ConsistMappingTable);

-

-    //

-    // Assign new Mappings to remainders

-    //

-    for (Count = 0 ; HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) {

-      //

-      // Skip ones that already have

-      //

-      if (gEfiShellProtocol->GetMapFromDevicePath(&DevicePathList[Count]) != NULL) {

-        continue;

-      }

-      //

-      // Get default name

-      //

-      NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem);

-      ASSERT(NewDefaultName != NULL);

-

-      //

-      // Call shell protocol SetMap function now...

-      //

-      Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewDefaultName);

-

-      if (!EFI_ERROR(Status)) {

-        //

-        // Now do consistent name

-        //

-        NewConsistName = ShellCommandConsistMappingGenMappingName(DevicePathList[Count], ConsistMappingTable);

-        if (NewConsistName != NULL) {

-          Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewConsistName);

-          FreePool(NewConsistName);

-        }

-      }

-

-      FreePool(NewDefaultName);

-    }

-    ShellCommandConsistMappingUnInitialize(ConsistMappingTable);

-    SHELL_FREE_NON_NULL(HandleList);

-    SHELL_FREE_NON_NULL(DevicePathList);

-

-    HandleList = NULL;

-  } else {

-    Count = (UINTN)-1;

-  }

-  //

-  // Do it all over again for gEfiBlockIoProtocolGuid

-  //

-

-  return (Status);

-}

-

-/**

   Determine what type of device is represented and return it's string.  The 

   string is in allocated memory and must be callee freed.  The HII is is listed below.

   The actual string cannot be determined.

@@ -1199,7 +1098,7 @@ ShellCommandRunMap (
           //

           // Do the Update

           //

-          Status = UpdateMapping();

+          Status = ShellCommandUpdateMapping ();

           if (EFI_ERROR(Status)) {

             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);

             ShellStatus = SHELL_UNSUPPORTED;