sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor coding style adjustment for DiskIo, Partition, English and Ebc modules.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5200 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8
2008-05-14 06:07:07 +00:00
parent d29270810c
commit ea7cb08c0a
11 changed files with 218 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
View File

@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef _DISK_IO_H
#define _DISK_IO_H
#ifndef _DISK_IO_H_
#define _DISK_IO_H_
#include <Uefi.h>
#include <Protocol/BlockIo.h>
@ -71,7 +71,7 @@ EFIAPI
DiskIoDriverBindingSupported (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
);
/**
@ -93,7 +93,7 @@ EFIAPI
DiskIoDriverBindingStart (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
);
/**

2
MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
View File

@ -166,7 +166,7 @@ PartitionInstallElToritoChildHandles (
Check += CheckBuffer[Index];
}
if (Check & 0xFFFF) {
if ((Check & 0xFFFF) != 0) {
DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));
continue;
}

23
MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
View File

@ -79,7 +79,7 @@ PartitionRestoreGptTable (
/**
Restore Partition Table to its alternate place
Restore Partition Table to its alternate place.
(Primary -> Backup or Backup -> Primary)
@param[in] PartHeader Partition table header structure
@ -97,7 +97,7 @@ PartitionCheckGptEntry (
/**
Checks the CRC32 value in the table header
Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Size The size of the table
@ -116,7 +116,7 @@ PartitionCheckCrcAltSize (
/**
Checks the CRC32 value in the table header
Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Hdr Table to check
@ -133,7 +133,7 @@ PartitionCheckCrc (
/**
Updates the CRC32 value in the table header
Updates the CRC32 value in the table header.
@param Size The size of the table
@param Hdr Table to update
@ -147,7 +147,7 @@ PartitionSetCrcAltSize (
/**
Updates the CRC32 value in the table header
Updates the CRC32 value in the table header.
@param Hdr Table to update
@ -619,7 +619,7 @@ Done:
/**
Restore Partition Table to its alternate place
Restore Partition Table to its alternate place.
(Primary -> Backup or Backup -> Primary)
@param[in] PartHeader Partition table header structure
@ -681,7 +681,7 @@ PartitionCheckGptEntry (
/**
Updates the CRC32 value in the table header
Updates the CRC32 value in the table header.
@param Hdr Table to update
@ -696,7 +696,7 @@ PartitionSetCrc (
/**
Updates the CRC32 value in the table header
Updates the CRC32 value in the table header.
@param Size The size of the table
@param Hdr Table to update
@ -707,7 +707,6 @@ PartitionSetCrcAltSize (
IN UINTN Size,
IN OUT EFI_TABLE_HEADER *Hdr
)
{
UINT32 Crc;
@ -718,7 +717,7 @@ PartitionSetCrcAltSize (
/**
Checks the CRC32 value in the table header
Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Hdr Table to check
@ -738,7 +737,7 @@ PartitionCheckCrc (
/**
Checks the CRC32 value in the table header
Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Size The size of the table
@ -768,7 +767,7 @@ PartitionCheckCrcAltSize (
return FALSE;
}
if (MaxSize && Size > MaxSize) {
if ((MaxSize != 0) && (Size > MaxSize)) {
DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));
return FALSE;
}

2
MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
View File

@ -93,7 +93,7 @@ PartitionValidMbr (
}
}
//
// Non of the regions overlapped so MBR is O.K.
// None of the regions overlapped so MBR is O.K.
//
return MbrValid;
}

20
MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
View File

@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef _PARTITION_H
#define _PARTITION_H
#ifndef _PARTITION_H_
#define _PARTITION_H_
#include <Uefi.h>
#include <Protocol/BlockIo.h>
@ -313,12 +313,11 @@ PartitionInstallChildHandle (
IN EFI_BLOCK_IO_PROTOCOL *ParentBlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode,
IN UINT64 Start,
IN UINT64 End,
IN EFI_LBA Start,
IN EFI_LBA End,
IN UINT32 BlockSize,
IN BOOLEAN InstallEspGuid
)
;
);
/**
Install child handles if the Handle supports GPT partition structure.
@ -341,8 +340,7 @@ PartitionInstallGptChildHandles (
IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
;
);
/**
Install child handles if the Handle supports El Torito format.
@ -366,8 +364,7 @@ PartitionInstallElToritoChildHandles (
IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
;
);
/**
Install child handles if the Handle supports MBR format.
@ -390,8 +387,7 @@ PartitionInstallMbrChildHandles (
IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
;
);
typedef
EFI_STATUS

40
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
View File

@ -122,7 +122,7 @@ InitializeUnicodeCollationEng (
}
}
for (Index = 0; mOtherChars[Index]; Index++) {
for (Index = 0; mOtherChars[Index] != 0; Index++) {
Index2 = mOtherChars[Index];
mEngInfoMap[Index2] |= CHAR_FAT_VALID;
}
@ -191,8 +191,8 @@ EngStriColl (
IN CHAR16 *Str2
)
{
while (*Str1) {
if (ToUpper (*Str1) != ToUpper (*Str2)) {
while (*Str1 != 0) {
if (TO_UPPER (*Str1) != TO_UPPER (*Str2)) {
break;
}
@ -200,7 +200,7 @@ EngStriColl (
Str2 += 1;
}
return ToUpper (*Str1) - ToUpper (*Str2);
return TO_UPPER (*Str1) - TO_UPPER (*Str2);
}
@ -219,8 +219,8 @@ EngStrLwr (
IN OUT CHAR16 *Str
)
{
while (*Str) {
*Str = ToLower (*Str);
while (*Str != 0) {
*Str = TO_LOWER (*Str);
Str += 1;
}
}
@ -241,8 +241,8 @@ EngStrUpr (
IN OUT CHAR16 *Str
)
{
while (*Str) {
*Str = ToUpper (*Str);
while (*Str != 0) {
*Str = TO_UPPER (*Str);
Str += 1;
}
}
@ -280,7 +280,7 @@ EngMetaiMatch (
//
// End of pattern. If end of string, TRUE match
//
if (*String) {
if (*String != 0) {
return FALSE;
} else {
return TRUE;
@ -290,7 +290,7 @@ EngMetaiMatch (
//
// Match zero or more chars
//
while (*String) {
while (*String != 0) {
if (EngMetaiMatch (This, String, Pattern)) {
return TRUE;
}
@ -304,7 +304,7 @@ EngMetaiMatch (
//
// Match any one char
//
if (!*String) {
if (*String == 0) {
return FALSE;
}
@ -316,7 +316,7 @@ EngMetaiMatch (
// Match char set
//
CharC = *String;
if (!CharC) {
if (CharC == 0) {
//
// syntax problem
//
@ -325,7 +325,7 @@ EngMetaiMatch (
Index3 = 0;
CharP = *Pattern++;
while (CharP) {
while (CharP != 0) {
if (CharP == ']') {
return FALSE;
}
@ -342,7 +342,7 @@ EngMetaiMatch (
return FALSE;
}
if (ToUpper (CharC) >= ToUpper (Index3) && ToUpper (CharC) <= ToUpper (CharP)) {
if (TO_UPPER (CharC) >= TO_UPPER (Index3) && TO_UPPER (CharC) <= TO_UPPER (CharP)) {
//
// if in range, it's a match
//
@ -351,7 +351,7 @@ EngMetaiMatch (
}
Index3 = CharP;
if (ToUpper (CharC) == ToUpper (CharP)) {
if (TO_UPPER (CharC) == TO_UPPER (CharP)) {
//
// if char matches
//
@ -363,7 +363,7 @@ EngMetaiMatch (
//
// skip to end of match char set
//
while (CharP && CharP != ']') {
while ((CharP != 0) && (CharP != ']')) {
CharP = *Pattern;
Pattern += 1;
}
@ -373,7 +373,7 @@ EngMetaiMatch (
default:
CharC = *String;
if (ToUpper (CharC) != ToUpper (CharP)) {
if (TO_UPPER (CharC) != TO_UPPER (CharP)) {
return FALSE;
}
@ -408,7 +408,7 @@ EngFatToStr (
//
// No DBCS issues, just expand and add null terminate to end of string
//
while (*Fat && FatSize) {
while ((*Fat != 0) && (FatSize != 0)) {
*String = *Fat;
String += 1;
Fat += 1;
@ -446,7 +446,7 @@ EngStrToFat (
BOOLEAN SpecialCharExist;
SpecialCharExist = FALSE;
while (*String && FatSize) {
while ((*String != 0) && (FatSize != 0)) {
//
// Skip '.' or ' ' when making a fat name
//
@ -455,7 +455,7 @@ EngStrToFat (
// If this is a valid fat char, move it.
// Otherwise, move a '_' and flag the fact that the name needs an Lfn
//
if (*String < 0x100 && (mEngInfoMap[*String] & CHAR_FAT_VALID)) {
if (*String < 0x100 && ((mEngInfoMap[*String] & CHAR_FAT_VALID) != 0)) {
*Fat = mEngUpperMap[*String];
} else {
*Fat = '_';

30
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef _UNICODE_COLLATION_ENG_H
#define _UNICODE_COLLATION_ENG_H
#ifndef _UNICODE_COLLATION_ENG_H_
#define _UNICODE_COLLATION_ENG_H_
@ -32,8 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
#define CHAR_FAT_VALID 0x01
#define ToUpper(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
#define ToLower(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
#define TO_UPPER(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
#define TO_LOWER(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
//
// Prototypes
@ -57,8 +57,7 @@ EngStriColl (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str1,
IN CHAR16 *Str2
)
;
);
/**
Performs a case-insensitive comparison of a Null-terminated Unicode
@ -78,8 +77,7 @@ EngMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern
)
;
);
/**
Converts all the Unicode characters in a Null-terminated Unicode string to
@ -94,8 +92,7 @@ EFIAPI
EngStrLwr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
;
);
/**
Converts all the Unicode characters in a Null-terminated Unicode string to upper
@ -110,8 +107,7 @@ EFIAPI
EngStrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
;
);
/**
Converts an 8.3 FAT file name in an OEM character set to a Null-terminated
@ -132,8 +128,7 @@ EngFatToStr (
IN UINTN FatSize,
IN CHAR8 *Fat,
OUT CHAR16 *String
)
;
);
/**
Converts a Null-terminated Unicode string to legal characters in a FAT
@ -157,8 +152,7 @@ EngStrToFat (
IN CHAR16 *String,
IN UINTN FatSize,
OUT CHAR8 *Fat
)
;
);
/**
The user Entry Point for English module.
@ -178,7 +172,7 @@ EFIAPI
InitializeUnicodeCollationEng (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
;
);
#endif

17
MdeModulePkg/Universal/EbcDxe/EbcExecute.h
View File

@ -239,8 +239,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
EFI_STATUS
EbcExecute (
IN VM_CONTEXT *VmPtr
)
;
);
@ -253,8 +252,7 @@ EbcExecute (
UINT64
GetVmVersion (
VOID
)
;
);
/**
Writes UINTN data to memory address.
@ -284,8 +282,7 @@ VmWriteMemN (
IN VM_CONTEXT *VmPtr,
IN UINTN Addr,
IN UINTN Data
)
;
);
/**
Writes 64-bit data to memory address.
@ -313,10 +310,9 @@ VmWriteMemN (
EFI_STATUS
VmWriteMem64 (
IN VM_CONTEXT *VmPtr,
UINTN Addr,
IN UINTN Addr,
IN UINT64 Data
)
;
);
//
// Define a protocol for an EBC VM test interface.
@ -385,7 +381,6 @@ EbcExecuteInstructions (
IN EFI_EBC_VM_TEST_PROTOCOL *This,
IN VM_CONTEXT *VmPtr,
IN OUT UINTN *InstructionCount
)
;
);
#endif // ifndef _EBC_EXECUTE_H_

2
MdeModulePkg/Universal/EbcDxe/EbcInt.c
View File

@ -187,7 +187,7 @@ EbcDebugPeriodic (
STATIC
EFI_STATUS
InitEbcVmTestProtocol (
IN EFI_HANDLE *Handle
IN EFI_HANDLE *IHandle
);
/**

24
MdeModulePkg/Universal/EbcDxe/EbcInt.h
View File

@ -102,8 +102,7 @@ EbcCreateThunks (
IN VOID *EbcEntryPoint,
OUT VOID **Thunk,
IN UINT32 Flags
)
;
);
/**
Add a thunk to our list of thunks for a given image handle.
@ -123,8 +122,7 @@ EbcAddImageThunk (
IN EFI_HANDLE ImageHandle,
IN VOID *ThunkBuffer,
IN UINT32 ThunkSize
)
;
);
//
// The interpreter calls these when an exception is detected,
@ -146,8 +144,7 @@ EbcDebugSignalException (
IN EFI_EXCEPTION_TYPE ExceptionType,
IN EXCEPTION_FLAGS ExceptionFlags,
IN VM_CONTEXT *VmPtr
)
;
);
//
// Define a constant of how often to call the debugger periodic callback
@ -174,8 +171,7 @@ UINTN
EFIAPI
EbcLLGetEbcEntryPoint (
VOID
)
;
);
/**
Returns the caller's value of the stack pointer.
@ -190,8 +186,7 @@ UINTN
EFIAPI
EbcLLGetStackPointer (
VOID
)
;
);
/**
This function is called to execute an EBC CALLEX instruction.
@ -212,8 +207,7 @@ EbcLLCALLEXNative (
IN UINTN CallAddr,
IN UINTN EbcSp,
IN VOID *FramePtr
)
;
);
/**
This function is called to execute an EBC CALLEX instruction.
@ -237,8 +231,7 @@ EbcLLCALLEX (
IN UINTN NewStackPointer,
IN VOID *FramePtr,
IN UINT8 Size
)
;
);
/**
When EBC calls native, on return the VM has to stuff the return
@ -253,8 +246,7 @@ INT64
EFIAPI
EbcLLGetReturnValue (
VOID
)
;
);
/**
Returns the stack index and buffer assosicated with the Handle parameter.