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

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Map.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 4763cfccca535a38ce026fff184071d7d4bf84bf..5329be41921a59f0f8a894a125a052079070619c 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,6 +1,7 @@
 /** @file\r
   Main file for map shell level 2 command.\r
 \r
+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.\r
   Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -117,108 +118,6 @@ SearchList(
   return (FALSE);\r
 }\r
 \r
-/**\r
-  Add mappings for any devices without one.  Do not change any existing maps.\r
-\r
-  @retval EFI_SUCCESS   The operation was successful.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-UpdateMapping (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                *HandleList;\r
-  UINTN                     Count;\r
-  EFI_DEVICE_PATH_PROTOCOL  **DevicePathList;\r
-  CHAR16                    *NewDefaultName;\r
-  CHAR16                    *NewConsistName;\r
-  EFI_DEVICE_PATH_PROTOCOL  **ConsistMappingTable;\r
-\r
-  HandleList  = NULL;\r
-  Status      = EFI_SUCCESS;\r
-\r
-  //\r
-  // remove mappings that represent removed devices.\r
-  //\r
-\r
-  //\r
-  // Find each handle with Simple File System\r
-  //\r
-  HandleList = GetHandleListByProtocol(&gEfiSimpleFileSystemProtocolGuid);\r
-  if (HandleList != NULL) {\r
-    //\r
-    // Do a count of the handles\r
-    //\r
-    for (Count = 0 ; HandleList[Count] != NULL ; Count++);\r
-\r
-    //\r
-    // Get all Device Paths\r
-    //\r
-    DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);\r
-    ASSERT(DevicePathList != NULL);\r
-\r
-    for (Count = 0 ; HandleList[Count] != NULL ; Count++) {\r
-      DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);\r
-    }\r
-\r
-    //\r
-    // Sort all DevicePaths\r
-    //\r
-    PerformQuickSort(DevicePathList, Count, sizeof(EFI_DEVICE_PATH_PROTOCOL*), DevicePathCompare);\r
-\r
-    ShellCommandConsistMappingInitialize(&ConsistMappingTable);\r
-\r
-    //\r
-    // Assign new Mappings to remainders\r
-    //\r
-    for (Count = 0 ; HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) {\r
-      //\r
-      // Skip ones that already have\r
-      //\r
-      if (gEfiShellProtocol->GetMapFromDevicePath(&DevicePathList[Count]) != NULL) {\r
-        continue;\r
-      }\r
-      //\r
-      // Get default name\r
-      //\r
-      NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem);\r
-      ASSERT(NewDefaultName != NULL);\r
-\r
-      //\r
-      // Call shell protocol SetMap function now...\r
-      //\r
-      Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewDefaultName);\r
-\r
-      if (!EFI_ERROR(Status)) {\r
-        //\r
-        // Now do consistent name\r
-        //\r
-        NewConsistName = ShellCommandConsistMappingGenMappingName(DevicePathList[Count], ConsistMappingTable);\r
-        if (NewConsistName != NULL) {\r
-          Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewConsistName);\r
-          FreePool(NewConsistName);\r
-        }\r
-      }\r
-\r
-      FreePool(NewDefaultName);\r
-    }\r
-    ShellCommandConsistMappingUnInitialize(ConsistMappingTable);\r
-    SHELL_FREE_NON_NULL(HandleList);\r
-    SHELL_FREE_NON_NULL(DevicePathList);\r
-\r
-    HandleList = NULL;\r
-  } else {\r
-    Count = (UINTN)-1;\r
-  }\r
-  //\r
-  // Do it all over again for gEfiBlockIoProtocolGuid\r
-  //\r
-\r
-  return (Status);\r
-}\r
-\r
 /**\r
   Determine what type of device is represented and return it's string.  The \r
   string is in allocated memory and must be callee freed.  The HII is is listed below.\r
@@ -1199,7 +1098,7 @@ ShellCommandRunMap (
           //\r
           // Do the Update\r
           //\r
-          Status = UpdateMapping();\r
+          Status = ShellCommandUpdateMapping ();\r
           if (EFI_ERROR(Status)) {\r
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
             ShellStatus = SHELL_UNSUPPORTED;\r