tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 08:04:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead command and clean up some coding style stuff.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9972 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2010-02-10 20:04:08 +00:00
parent 9c0ce9f398
commit 0534bb8fd6
4 changed files with 51 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BeagleBoardPkg/BeagleBoardPkg.dsc
View File

@ -100,8 +100,8 @@
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
EblAddExternalCommandLib|EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf EblAddExternalCommandLib|EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
# UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf # UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

231
EmbeddedPkg/Ebl/Command.c
View File

@ -525,12 +525,9 @@ ConvertToTextLine (
IN CHAR8 Character IN CHAR8 Character
) )
{ {
if (Character < ' ' || Character > '~') if (Character < ' ' || Character > '~') {
{
return '.'; return '.';
} } else {
else
{
return Character; return Character;
} }
} }
@ -543,15 +540,15 @@ GetBytes (
{ {
UINTN Result = 0; UINTN Result = 0;
if (Bytes >= 1) if (Bytes >= 1) {
Result = *Address++; Result = *Address++;
}
if (Bytes >= 2) if (Bytes >= 2) {
Result = (Result << 8) + *Address++; Result = (Result << 8) + *Address++;
}
if (Bytes >= 3) if (Bytes >= 3) {
Result = (Result << 8) + *Address++; Result = (Result << 8) + *Address++;
}
return Result; return Result;
} }
@ -574,26 +571,20 @@ OutputData (
CHAR8 Blanks[80]; CHAR8 Blanks[80];
AsciiStrCpy (Blanks, mBlanks); AsciiStrCpy (Blanks, mBlanks);
for (EndAddress = Address + Length; Address < EndAddress; Offset += Line) for (EndAddress = Address + Length; Address < EndAddress; Offset += Line) {
{
AsciiPrint ("%08x: ", Offset); AsciiPrint ("%08x: ", Offset);
for (Line = 0; (Line < 0x10) && (Address < EndAddress);) for (Line = 0; (Line < 0x10) && (Address < EndAddress);) {
{
Bytes = EndAddress - Address; Bytes = EndAddress - Address;
switch (Width) switch (Width) {
{
case 4: case 4:
if (Bytes >= 4) if (Bytes >= 4) {
{
AsciiPrint ("%08x ", *((UINT32 *)Address)); AsciiPrint ("%08x ", *((UINT32 *)Address));
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
} } else {
else
{
AsciiPrint ("%08x ", GetBytes(Address, Bytes)); AsciiPrint ("%08x ", GetBytes(Address, Bytes));
Address += Bytes; Address += Bytes;
Line += Bytes; Line += Bytes;
@ -601,14 +592,11 @@ OutputData (
break; break;
case 2: case 2:
if (Bytes >= 2) if (Bytes >= 2) {
{
AsciiPrint ("%04x ", *((UINT16 *)Address)); AsciiPrint ("%04x ", *((UINT16 *)Address));
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
TextLine[Line++] = ConvertToTextLine(*Address++); TextLine[Line++] = ConvertToTextLine(*Address++);
} } else {
else
{
AsciiPrint ("%04x ", GetBytes(Address, Bytes)); AsciiPrint ("%04x ", GetBytes(Address, Bytes));
Address += Bytes; Address += Bytes;
Line += Bytes; Line += Bytes;
@ -627,10 +615,8 @@ OutputData (
} }
// Pad spaces // Pad spaces
if (Line < 0x10) if (Line < 0x10) {
{ switch (Width) {
switch (Width)
{
case 4: case 4:
Spaces = 9 * ((0x10 - Line)/4); Spaces = 9 * ((0x10 - Line)/4);
break; break;
@ -652,14 +638,12 @@ OutputData (
TextLine[Line] = 0; TextLine[Line] = 0;
AsciiPrint ("|%a|\n", TextLine); AsciiPrint ("|%a|\n", TextLine);
if (EblAnyKeyToContinueQtoQuit(&CurrentRow, FALSE)) if (EblAnyKeyToContinueQtoQuit (&CurrentRow, FALSE)) {
{
return EFI_END_OF_FILE; return EFI_END_OF_FILE;
} }
} }
if (Length % Width != 0) if (Length % Width != 0) {
{
AsciiPrint ("%08x\n", Offset); AsciiPrint ("%08x\n", Offset);
} }
@ -682,44 +666,38 @@ EblHexdumpCmd (
EFI_STATUS Status; EFI_STATUS Status;
UINTN Chunk = HEXDUMP_CHUNK; UINTN Chunk = HEXDUMP_CHUNK;
if ((Argc < 2) || (Argc > 3)) if ((Argc < 2) || (Argc > 3)) {
{
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (Argc == 3) if (Argc == 3) {
{
Width = AsciiStrDecimalToUintn(Argv[2]); Width = AsciiStrDecimalToUintn(Argv[2]);
} }
if ((Width != 1) && (Width != 2) && (Width != 4)) if ((Width != 1) && (Width != 2) && (Width != 4)) {
{
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
File = EfiOpen(Argv[1], EFI_FILE_MODE_READ, 0); File = EfiOpen (Argv[1], EFI_FILE_MODE_READ, 0);
if (File == NULL) if (File == NULL) {
{
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
Location = AllocatePool(Chunk); Location = AllocatePool (Chunk);
Size = EfiTell(File, NULL); Size = EfiTell(File, NULL);
for (Offset = 0; Offset + HEXDUMP_CHUNK <= Size; Offset += Chunk) for (Offset = 0; Offset + HEXDUMP_CHUNK <= Size; Offset += Chunk) {
{
Chunk = HEXDUMP_CHUNK; Chunk = HEXDUMP_CHUNK;
Status = EfiRead(File, Location, &Chunk); Status = EfiRead (File, Location, &Chunk);
if (EFI_ERROR(Status)) if (EFI_ERROR(Status))
{ {
AsciiPrint ("Error reading file content\n"); AsciiPrint ("Error reading file content\n");
goto Exit; goto Exit;
} }
Status = OutputData(Location, Chunk, Width, File->BaseOffset + Offset); Status = OutputData (Location, Chunk, Width, File->BaseOffset + Offset);
if (EFI_ERROR(Status)) if (EFI_ERROR(Status)) {
{
if (Status == EFI_END_OF_FILE) { if (Status == EFI_END_OF_FILE) {
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
} }
@ -728,19 +706,16 @@ EblHexdumpCmd (
} }
// Any left over? // Any left over?
if (Offset < Size) if (Offset < Size) {
{
Chunk = Size - Offset; Chunk = Size - Offset;
Status = EfiRead(File, Location, &Chunk); Status = EfiRead (File, Location, &Chunk);
if (EFI_ERROR(Status)) if (EFI_ERROR(Status)) {
{
AsciiPrint ("Error reading file content\n"); AsciiPrint ("Error reading file content\n");
goto Exit; goto Exit;
} }
Status = OutputData(Location, Chunk, Width, File->BaseOffset + Offset); Status = OutputData (Location, Chunk, Width, File->BaseOffset + Offset);
if (EFI_ERROR(Status)) if (EFI_ERROR(Status)) {
{
if (Status == EFI_END_OF_FILE) { if (Status == EFI_END_OF_FILE) {
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
} }
@ -749,141 +724,13 @@ EblHexdumpCmd (
} }
Exit: Exit:
EfiClose(File); EfiClose (File);
FreePool(Location); FreePool (Location);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
#define USE_DISKIO 1
EFI_STATUS
EblDiskIoCmd (
IN UINTN Argc,
IN CHAR8 **Argv
)
{
EFI_STATUS Status;
UINTN Offset;
UINT8 *EndOffset;
UINTN Length;
UINTN Line;
UINT8 *Buffer;
UINT8 *BufferOffset;
CHAR8 TextLine[0x11];
#if USE_DISKIO
EFI_DISK_IO_PROTOCOL *DiskIo;
#else
EFI_BLOCK_IO_PROTOCOL *BlockIo;
UINTN Lba;
#endif
if (AsciiStrCmp(Argv[1], "r") == 0)
{
Offset = AsciiStrHexToUintn(Argv[2]);
Length = AsciiStrHexToUintn(Argv[3]);
#if USE_DISKIO
Status = gBS->LocateProtocol(&gEfiDiskIoProtocolGuid, NULL, (VOID **)&DiskIo);
if (EFI_ERROR(Status))
{
AsciiPrint("Did not locate DiskIO\n");
return Status;
}
Buffer = AllocatePool(Length);
BufferOffset = Buffer;
Status = DiskIo->ReadDisk(DiskIo, SIGNATURE_32('f','l','s','h'), Offset, Length, Buffer);
if (EFI_ERROR(Status))
{
AsciiPrint("DiskIO read failed\n");
gBS->FreePool(Buffer);
return Status;
}
#else
Status = gBS->LocateProtocol(&gEfiBlockIoProtocolGuid, NULL, (VOID **)&BlockIo);
if (EFI_ERROR(Status))
{
AsciiPrint("Did not locate BlockIo\n");
return Status;
}
Length = BlockIo->Media->BlockSize;
Buffer = AllocatePool(Length);
BufferOffset = Buffer;
Lba = Offset/BlockIo->Media->BlockSize;
Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, Length, Buffer);
if (EFI_ERROR(Status))
{
AsciiPrint("BlockIo read failed\n");
gBS->FreePool(Buffer);
return Status;
}
// Whack offset to what we actually read from
Offset = Lba * BlockIo->Media->BlockSize;
Length = 0x100;
#endif
for (EndOffset = BufferOffset + Length; BufferOffset < EndOffset; Offset += 0x10)
{
AsciiPrint ("%08x: ", Offset);
for (Line = 0; Line < 0x10; Line++)
{
AsciiPrint ("%02x ", *BufferOffset);
if (*BufferOffset < ' ' || *BufferOffset > '~')
TextLine[Line] = '.';
else
TextLine[Line] = *BufferOffset;
BufferOffset++;
}
TextLine[Line] = '\0';
AsciiPrint ("|%a|\n", TextLine);
}
gBS->FreePool(Buffer);
return EFI_SUCCESS;
}
else if (AsciiStrCmp(Argv[1], "w") == 0)
{
Offset = AsciiStrHexToUintn(Argv[2]);
Length = AsciiStrHexToUintn(Argv[3]);
Buffer = (UINT8 *)AsciiStrHexToUintn(Argv[4]);
#if USE_DISKIO
Status = gBS->LocateProtocol(&gEfiDiskIoProtocolGuid, NULL, (VOID **)&DiskIo);
if (EFI_ERROR(Status))
{
AsciiPrint("Did not locate DiskIO\n");
return Status;
}
Status = DiskIo->WriteDisk(DiskIo, SIGNATURE_32('f','l','s','h'), Offset, Length, Buffer);
if (EFI_ERROR(Status))
{
AsciiPrint("DiskIO write failed\n");
return Status;
}
#else
#endif
return EFI_SUCCESS;
}
else
{
return EFI_INVALID_PARAMETER;
}
}
GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdTemplate[] = GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdTemplate[] =
{ {
@ -934,12 +781,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdTemplate[] =
" filename ; dump a file as hex bytes", " filename ; dump a file as hex bytes",
NULL, NULL,
EblHexdumpCmd EblHexdumpCmd
},
{
"diskio",
" [r|w] offset [length [dataptr]]; do a DiskIO read or write ",
NULL,
EblDiskIoCmd
} }
}; };

9
UnixPkg/UnixPkg.dsc
View File

@ -68,6 +68,11 @@
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
EblCmdLib|EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf
EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
[LibraryClasses.common.USER_DEFINED] [LibraryClasses.common.USER_DEFINED]
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
@ -276,6 +281,9 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000 gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000
gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"%a"
[PcdsFeatureFlag.common] [PcdsFeatureFlag.common]
gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
@ -470,3 +478,4 @@
#FatPkg/EnhancedFatDxe/Fat.inf #FatPkg/EnhancedFatDxe/Fat.inf
EmbeddedPkg/Ebl/Ebl.inf

3
UnixPkg/UnixPkg.fdf
View File

@ -258,8 +258,9 @@ INF MdeModulePkg/Application/HelloWorld/HelloWorld.inf
FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
SECTION COMPRESS PI_STD { SECTION COMPRESS PI_STD {
SECTION GUIDED { SECTION GUIDED {
SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi # SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
# SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi # SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi
SECTION PE32 = Build/Unix/DEBUG_XCODE32/IA32/Ebl.efi
} }
} }
} }