/** @file\r
Main file for Dblk shell Debug1 function.\r
\r
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+ Copyright (c) 2005 - 2017, 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
@retval SHELL_SUCCESS The display was successful.\r
**/\r
SHELL_STATUS\r
-EFIAPI\r
DisplayTheBlocks(\r
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath,\r
IN CONST UINT64 Lba,\r
EFI_STATUS Status;\r
SHELL_STATUS ShellStatus;\r
UINT8 *Buffer;\r
+ UINT8 *OriginalBuffer;\r
UINTN BufferSize;\r
\r
ShellStatus = SHELL_SUCCESS;\r
}\r
\r
BufferSize = BlockIo->Media->BlockSize * BlockCount;\r
+ if(BlockIo->Media->IoAlign == 0) {\r
+ BlockIo->Media->IoAlign = 1;\r
+ }\r
+\r
if (BufferSize > 0) {\r
- Buffer = AllocateZeroPool(BufferSize);\r
+ OriginalBuffer = AllocateZeroPool(BufferSize + BlockIo->Media->IoAlign);\r
+ Buffer = ALIGN_POINTER (OriginalBuffer,BlockIo->Media->IoAlign);\r
} else {\r
ShellPrintEx(-1,-1,L" BlockSize: 0x%08x, BlockCount: 0x%08x\r\n", BlockIo->Media->BlockSize, BlockCount);\r
- Buffer = NULL;\r
+ OriginalBuffer = NULL;\r
+ Buffer = NULL;\r
}\r
\r
Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer);\r
\r
DumpHex(2,0,BufferSize,Buffer);\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_READ_FAIL), gShellDebug1HiiHandle, L"BlockIo", Status);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_READ_FAIL), gShellDebug1HiiHandle, L"dblk", L"BlockIo"); \r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
\r
- if (Buffer != NULL) {\r
- FreePool(Buffer);\r
+ if (OriginalBuffer != NULL) {\r
+ FreePool (OriginalBuffer);\r
}\r
\r
gBS->CloseProtocol(BlockIoHandle, &gEfiBlockIoProtocolGuid, gImageHandle, NULL);\r
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);\r
if (EFI_ERROR(Status)) {\r
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, ProblemParam);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"dblk", ProblemParam); \r
FreePool(ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
}\r
} else {\r
if (ShellCommandLineGetCount(Package) > 4) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"dblk"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (ShellCommandLineGetCount(Package) < 2) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"dblk"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
//\r
Lba = 0;\r
} else {\r
if (!ShellIsHexOrDecimalNumber(LbaString, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, LbaString);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", LbaString); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
ShellConvertStringToUint64(LbaString, &Lba, TRUE, FALSE);\r
BlockCount = 1;\r
} else {\r
if (!ShellIsHexOrDecimalNumber(BlockCountString, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, BlockCountString);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
ShellConvertStringToUint64(BlockCountString, &BlockCount, TRUE, FALSE);\r
if (BlockCount > 0x10) {\r
BlockCount = 0x10;\r
} else if (BlockCount == 0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, BlockCountString);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
//\r
// do the work if we have a valid block identifier\r
//\r
- if (mEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, BlockName);\r
+ if (gEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockName); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- DevPath = (EFI_DEVICE_PATH_PROTOCOL*)mEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
+ DevPath = (EFI_DEVICE_PATH_PROTOCOL*)gEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
if (gBS->LocateDevicePath(&gEfiBlockIoProtocolGuid, &DevPath, NULL) == EFI_NOT_FOUND) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MAP_PROTOCOL), gShellDebug1HiiHandle, BlockName, L"BlockIo");\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MAP_PROTOCOL), gShellDebug1HiiHandle, L"dblk", BlockName, L"BlockIo"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ShellStatus = DisplayTheBlocks(mEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r
+ ShellStatus = DisplayTheBlocks(gEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r
}\r
}\r
}\r