/** @file\r
Main file for Mm shell Debug1 function.\r
\r
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2005 - 2013, 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
which accompanies this distribution. The full text of the license may be found at\r
}\r
}\r
\r
- if (ShellCommandLineGetFlag (Package, L"-n")) {\r
+ //\r
+ // Non interactive for a script file or for the specific parameter\r
+ //\r
+ if (gEfiShellProtocol->BatchIsActive() || ShellCommandLineGetFlag (Package, L"-n")) {\r
Interactive = FALSE;\r
}\r
\r
\r
Temp = ShellCommandLineGetRawValue(Package, 2);\r
if (Temp != NULL) {\r
+ //\r
+ // Per spec if value is specified, then -n is assumed.\r
+ //\r
+ Interactive = FALSE;\r
+\r
if (!ShellIsHexOrDecimalNumber(Temp, TRUE, FALSE) || EFI_ERROR(ShellConvertStringToUint64(Temp, &Value, TRUE, FALSE))) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Temp);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
if (!Interactive) {\r
Buffer = 0;\r
if (AccessType == EFIMemoryMappedIo) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MMIO), gShellDebug1HiiHandle);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MMIO), gShellDebug1HiiHandle);\r
+ }\r
IoDev->Mem.Read (IoDev, Width, Address, 1, &Buffer);\r
} else if (AccessType == EfiIo) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_IO), gShellDebug1HiiHandle);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_IO), gShellDebug1HiiHandle);\r
+ }\r
IoDev->Io.Read (IoDev, Width, Address, 1, &Buffer);\r
} else if (AccessType == EfiPciConfig) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCI), gShellDebug1HiiHandle);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCI), gShellDebug1HiiHandle);\r
+ }\r
IoDev->Pci.Read (IoDev, Width, Address, 1, &Buffer);\r
} else if (AccessType == EfiPciEConfig) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCIE), gShellDebug1HiiHandle);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCIE), gShellDebug1HiiHandle);\r
+ }\r
IoDev->Pci.Read (IoDev, Width, PciEAddress, 1, &Buffer);\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MEM), gShellDebug1HiiHandle);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MEM), gShellDebug1HiiHandle);\r
+ }\r
ReadMem (Width, Address, 1, &Buffer);\r
}\r
-\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), gShellDebug1HiiHandle, Address);\r
+ if (!gEfiShellProtocol->BatchIsActive()) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), gShellDebug1HiiHandle, Address);\r
+ }\r
if (Size == 1) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), gShellDebug1HiiHandle, (UINTN)Buffer);\r
} else if (Size == 2) {\r