X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FSerMode.c;h=fe612b877b484023f1b04c76db5b60980ae76c6f;hb=891417a74d5cd3bd202f63cec74c233cc0c57008;hp=52612283a2bb4c1df26d14bb86ea54651e8744c8;hpb=d08fadb0e21a899411b0799600190ce45c761fa5;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
index 52612283a2..fe612b877b 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
@@ -1,7 +1,8 @@
 /** @file
   Main file for SerMode shell Debug1 function.
 
-  Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2005 - 2011, 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
@@ -16,9 +17,19 @@
 #include <Library/ShellLib.h>
 #include <Protocol/SerialIo.h>
 
+/**
+  Display information about a serial device by it's handle.
+
+  If HandleValid is FALSE, do all devices.
+
+  @param[in] HandleIdx      The handle index for the device.
+  @param[in] HandleValid    TRUE if HandleIdx is valid.
+
+  @retval SHELL_INVALID_PARAMETER   A parameter was invalid.
+  @retval SHELL_SUCCESS             The operation was successful.
+**/
 SHELL_STATUS
-EFIAPI
-iDisplaySettings (
+DisplaySettings (
   IN UINTN                   HandleIdx,
   IN BOOLEAN                 HandleValid
   )
@@ -39,7 +50,7 @@ iDisplaySettings (
 
   Status    = gBS->LocateHandleBuffer (ByProtocol, &gEfiSerialIoProtocolGuid, NULL, &NoHandles, &Handles);
   if (EFI_ERROR (Status)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle);
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle, L"sermode");  
     return SHELL_INVALID_PARAMETER;
   }
 
@@ -127,7 +138,7 @@ iDisplaySettings (
         StopBits
        );
     } else {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle);
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle, L"sermode");  
       ShellStatus = SHELL_NOT_FOUND;
       break;
     }
@@ -139,7 +150,7 @@ iDisplaySettings (
 
   if (Index == NoHandles) {
     if ((NoHandles != 0 && HandleValid) || 0 == NoHandles) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NOT_FOUND), gShellDebug1HiiHandle);
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NOT_FOUND), gShellDebug1HiiHandle, L"sermode");  
       ShellStatus = SHELL_NOT_FOUND;
     }
   }
@@ -147,6 +158,12 @@ iDisplaySettings (
   return ShellStatus;
 }
 
+/**
+  Function for 'sermode' command.
+
+  @param[in] ImageHandle  Handle to the Image (NULL if Internal).
+  @param[in] SystemTable  Pointer to the System Table (NULL if Internal).
+**/
 SHELL_STATUS
 EFIAPI
 ShellCommandRunSerMode (
@@ -169,6 +186,7 @@ ShellCommandRunSerMode (
   LIST_ENTRY              *Package;
   CHAR16                  *ProblemParam;
   CONST CHAR16            *Temp;
+  UINT64                  Intermediate;
 
   ShellStatus = SHELL_SUCCESS;
   HandleIdx   = 0;
@@ -181,42 +199,43 @@ ShellCommandRunSerMode (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);
   if (EFI_ERROR(Status)) {
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, ProblemParam);
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"sermode", ProblemParam);  
       FreePool(ProblemParam);
       ShellStatus = SHELL_INVALID_PARAMETER;
     } else {
       ASSERT(FALSE);
     }
   } else {
-    if (ShellCommandLineGetCount(Package) < 5 && ShellCommandLineGetCount(Package) > 1) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);
+    if (ShellCommandLineGetCount(Package) < 6 && ShellCommandLineGetCount(Package) > 2) {
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"sermode");  
       ShellStatus = SHELL_INVALID_PARAMETER;
-    } else if (ShellCommandLineGetCount(Package) > 5) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);
+    } else if (ShellCommandLineGetCount(Package) > 6) {
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"sermode");  
       ShellStatus = SHELL_INVALID_PARAMETER;
     } else {
       Temp = ShellCommandLineGetRawValue(Package, 1);
       if (Temp != NULL) {
-        HandleIdx = StrHexToUintn(Temp);
+        Status = ShellConvertStringToUint64(Temp, &Intermediate, TRUE, FALSE);
+        HandleIdx = (UINTN)Intermediate;
         Temp = ShellCommandLineGetRawValue(Package, 2);
         if (Temp == NULL) {
-          ShellStatus = iDisplaySettings (HandleIdx, TRUE);
+          ShellStatus = DisplaySettings (HandleIdx, TRUE);
           goto Done;
         }
       } else {
-        ShellStatus = iDisplaySettings (0, FALSE);
+        ShellStatus = DisplaySettings (0, FALSE);
         goto Done;
       }
       Temp = ShellCommandLineGetRawValue(Package, 2);
       if (Temp != NULL) {
-        BaudRate = StrHexToUintn(Temp);
+        BaudRate = ShellStrToUintn(Temp);
       } else {
         ASSERT(FALSE);
         BaudRate = 0;
       }
       Temp = ShellCommandLineGetRawValue(Package, 3);
       if (Temp == NULL || StrLen(Temp)>1) {
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp);
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"sermode", Temp);  
         ShellStatus = SHELL_INVALID_PARAMETER;
       } else {
         switch(Temp[0]){
@@ -245,14 +264,14 @@ ShellCommandRunSerMode (
           Parity = SpaceParity;
           break;
         default:
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp);
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"sermode", Temp);  
           ShellStatus = SHELL_INVALID_PARAMETER;
           goto Done;
         }
       }
       Temp = ShellCommandLineGetRawValue(Package, 4);
       if (Temp != NULL) {
-        DataBits = StrHexToUintn(Temp);
+        DataBits = ShellStrToUintn(Temp);
       } else {
         //
         // make sure this is some number not in the list below.
@@ -265,12 +284,12 @@ ShellCommandRunSerMode (
       case 8:
         break;
       default:
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp);
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"sermode", Temp);  
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto Done;
       }
       Temp = ShellCommandLineGetRawValue(Package, 5);
-      Value = StrHexToUintn(Temp);
+      Value = ShellStrToUintn(Temp);
       switch (Value) {
       case 0:
         StopBits = DefaultStopBits;
@@ -289,13 +308,13 @@ ShellCommandRunSerMode (
         break;
 
       default:
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp);
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"sermode", Temp);  
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto Done;
       }
       Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiSerialIoProtocolGuid, NULL, &NoHandles, &Handles);
       if (EFI_ERROR (Status)) {
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle);
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_NO_FOUND), gShellDebug1HiiHandle, L"sermode");  
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto Done;
       }
@@ -317,8 +336,16 @@ ShellCommandRunSerMode (
                               StopBits
                              );
           if (EFI_ERROR (Status)) {
-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_SET_FAIL), gShellDebug1HiiHandle, ConvertHandleToHandleIndex(Handles[Index]), Status);
-            ShellStatus = SHELL_ACCESS_DENIED;
+            if (Status == EFI_INVALID_PARAMETER) {
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_SET_UNSUPPORTED), gShellDebug1HiiHandle, L"sermode", ConvertHandleToHandleIndex(Handles[Index]));  
+              ShellStatus = SHELL_UNSUPPORTED;
+            } else if (Status == EFI_DEVICE_ERROR) {
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_SET_DEV_ERROR), gShellDebug1HiiHandle, L"sermode", ConvertHandleToHandleIndex(Handles[Index]));  
+              ShellStatus = SHELL_ACCESS_DENIED;
+            } else {
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_SET_FAIL), gShellDebug1HiiHandle, L"sermode", ConvertHandleToHandleIndex(Handles[Index]));  
+              ShellStatus = SHELL_ACCESS_DENIED;
+            }
           } else {
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_SET_HANDLE), gShellDebug1HiiHandle, ConvertHandleToHandleIndex(Handles[Index]));
           }
@@ -328,8 +355,8 @@ ShellCommandRunSerMode (
     }
   }
 
-  if (Index == NoHandles) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_BAD_HANDLE), gShellDebug1HiiHandle, HandleIdx);
+  if (ShellStatus == SHELL_SUCCESS && Index == NoHandles) {
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SERMODE_BAD_HANDLE), gShellDebug1HiiHandle, L"sermode", HandleIdx);  
     ShellStatus = SHELL_INVALID_PARAMETER;
   }