#include <Library/UefiLib.h>\r
#include <Protocol/ShellParameters.h>\r
\r
-UINTN Argc;\r
-CHAR16 **Argv;\r
+UINTN Argc;\r
+CHAR16 **Argv;\r
\r
/**\r
\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters;\r
+ EFI_STATUS Status;\r
+ EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters;\r
\r
Status = gBS->HandleProtocol (\r
gImageHandle,\r
&gEfiShellParametersProtocolGuid,\r
- (VOID**)&ShellParameters\r
+ (VOID **)&ShellParameters\r
);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- RETURN_STATUS ReturnStatus;\r
+ EFI_STATUS Status;\r
+ RETURN_STATUS ReturnStatus;\r
\r
UINT8 HostIpAssignmentType;\r
EFI_IPv4_ADDRESS HostIpAddress;\r
EFI_IPv4_ADDRESS RedfishServiceIpMask;\r
UINTN RedfishServiceIpPort;\r
\r
- Status = GetArg();\r
- if (EFI_ERROR(Status)) {\r
+ Status = GetArg ();\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
// RedfishPlatformConfig.efi -s HostIpAddress HostIpMask RedfishServiceIpAddress RedfishServiceIpMask RedfishServiceIpPort\r
// RedfishPlatformConfig.efi -a RedfishServiceIpAddress RedfishServiceIpMask RedfishServiceIpPort\r
//\r
- if (Argc != 7 && Argc != 5) {\r
-\r
- PrintHelp();\r
+ if ((Argc != 7) && (Argc != 5)) {\r
+ PrintHelp ();\r
return EFI_UNSUPPORTED;\r
}\r
\r
- if (StrCmp(Argv[1], L"-s") == 0) {\r
-\r
+ if (StrCmp (Argv[1], L"-s") == 0) {\r
HostIpAssignmentType = 1;\r
\r
Status = NetLibStrToIp4 (Argv[2], &HostIpAddress);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
Status = NetLibStrToIp4 (Argv[3], &HostIpMask);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
Status = NetLibStrToIp4 (Argv[4], &RedfishServiceIpAddress);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
Status = NetLibStrToIp4 (Argv[5], &RedfishServiceIpMask);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
ReturnStatus = StrDecimalToUintnS (Argv[6], NULL, &RedfishServiceIpPort);\r
if (RETURN_ERROR (ReturnStatus)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
\r
Print (L"RedfishServiceIpMask: %s has been set Successfully!\n", Argv[5]);\r
Print (L"RedfishServiceIpPort: %s has been set Successfully!\n", Argv[6]);\r
Print (L"Please Restart!\n");\r
-\r
- } else if (StrCmp(Argv[1], L"-a") == 0) {\r
-\r
+ } else if (StrCmp (Argv[1], L"-a") == 0) {\r
HostIpAssignmentType = 3;\r
\r
Status = NetLibStrToIp4 (Argv[2], &RedfishServiceIpAddress);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
Status = NetLibStrToIp4 (Argv[3], &RedfishServiceIpMask);\r
if (EFI_ERROR (Status)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
+\r
ReturnStatus = StrDecimalToUintnS (Argv[4], NULL, &RedfishServiceIpPort);\r
if (RETURN_ERROR (ReturnStatus)) {\r
- PrintHelp();\r
+ PrintHelp ();\r
return Status;\r
}\r
\r
Print (L"RedfishServiceIpMask: %s has been set Successfully!\n", Argv[3]);\r
Print (L"RedfishServiceIpPort: %s has been set Successfully!\n", Argv[4]);\r
Print (L"Please Restart!\n");\r
- } else if (StrCmp(Argv[1], L"-h") == 0 || StrCmp(Argv[1], L"-help") == 0) {\r
-\r
- PrintHelp();\r
+ } else if ((StrCmp (Argv[1], L"-h") == 0) || (StrCmp (Argv[1], L"-help") == 0)) {\r
+ PrintHelp ();\r
} else {\r
-\r
- PrintHelp();\r
+ PrintHelp ();\r
return EFI_UNSUPPORTED;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PeimInitializeAutoScanPei (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_STATUS Status;\r
- EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor;\r
- EMU_THUNK_PPI *Thunk;\r
- UINT64 MemorySize;\r
- EFI_PHYSICAL_ADDRESS MemoryBase;\r
- UINTN Index;\r
- EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;\r
-\r
+ EFI_STATUS Status;\r
+ EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor;\r
+ EMU_THUNK_PPI *Thunk;\r
+ UINT64 MemorySize;\r
+ EFI_PHYSICAL_ADDRESS MemoryBase;\r
+ UINTN Index;\r
+ EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;\r
\r
DEBUG ((DEBUG_ERROR, "Emu Autoscan PEIM Loaded\n"));\r
\r
if (!EFI_ERROR (Status)) {\r
Attributes =\r
(\r
- EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
- EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
- EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
- EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
- EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
- EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
+ EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+ EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+ EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+ EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+ EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+ EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
);\r
\r
if (Index == 0) {\r
MemorySize\r
);\r
}\r
+\r
Index++;\r
} while (!EFI_ERROR (Status));\r
\r
\r
**/\r
\r
-\r
-\r
//\r
// The package level header files this module uses\r
//\r
#include <Library/PcdLib.h>\r
#include <Library/PeiServicesLib.h>\r
\r
-\r
//\r
// The protocols, PPI and GUID defintions for this module\r
//\r
#include <Library/DebugLib.h>\r
#include <Library/PeimEntryPoint.h>\r
\r
-\r
//\r
// Module globals\r
//\r
EFI_STATUS\r
EFIAPI\r
InitializeBootMode (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_STATUS Status;\r
- EFI_BOOT_MODE BootMode;\r
+ EFI_STATUS Status;\r
+ EFI_BOOT_MODE BootMode;\r
\r
DEBUG ((DEBUG_ERROR, "Emu Boot Mode PEIM Loaded\n"));\r
\r
- BootMode = FixedPcdGet32 (PcdEmuBootMode);\r
+ BootMode = FixedPcdGet32 (PcdEmuBootMode);\r
\r
- Status = PeiServicesSetBootMode (BootMode);\r
+ Status = PeiServicesSetBootMode (BootMode);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = PeiServicesInstallPpi (&mPpiListBootMode);\r
\r
UINT64 mTimerPeriod;\r
\r
-CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {\r
+CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {\r
CPU_ARCH_PROT_PRIVATE_SIGNATURE,\r
NULL,\r
{\r
TRUE\r
};\r
\r
-#define EFI_CPU_DATA_MAXIMUM_LENGTH 0x100\r
+#define EFI_CPU_DATA_MAXIMUM_LENGTH 0x100\r
\r
-SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {\r
- { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0},\r
+SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {\r
+ { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0 },\r
1, // Socket String\r
ProcessorOther, // ProcessorType; ///< The enumeration value from PROCESSOR_TYPE_DATA.\r
ProcessorFamilyOther, // ProcessorFamily; ///< The enumeration value from PROCESSOR_FAMILY_DATA.\r
2, // ProcessorManufacture String;\r
{ // ProcessorId;\r
- { // PROCESSOR_SIGNATURE\r
+ { // PROCESSOR_SIGNATURE\r
0, // ProcessorSteppingId:4;\r
0, // ProcessorModel: 4;\r
0, // ProcessorFamily: 4;\r
0, // ProcessorXFamily: 8;\r
0, // ProcessorReserved2: 4;\r
},\r
- { // PROCESSOR_FEATURE_FLAGS\r
+ { // PROCESSOR_FEATURE_FLAGS\r
0, // ProcessorFpu :1;\r
0, // ProcessorVme :1;\r
0, // ProcessorDe :1;\r
}\r
},\r
3, // ProcessorVersion String;\r
- { // Voltage;\r
+ { // Voltage;\r
1, // ProcessorVoltageCapability5V :1;\r
1, // ProcessorVoltageCapability3_3V :1;\r
1, // ProcessorVoltageCapability2_9V :1;\r
0, // ProcessorFamily2;\r
};\r
\r
-CHAR8 *mCpuSmbiosType4Strings[] = {\r
+CHAR8 *mCpuSmbiosType4Strings[] = {\r
"Socket",\r
"http://www.tianocore.org/edk2/",\r
"Emulated Processor",\r
NULL\r
};\r
\r
-\r
/**\r
Create SMBIOS record.\r
\r
**/\r
EFI_STATUS\r
LogSmbiosData (\r
- IN EFI_SMBIOS_TABLE_HEADER *Template,\r
- IN CHAR8 **StringPack\r
+ IN EFI_SMBIOS_TABLE_HEADER *Template,\r
+ IN CHAR8 **StringPack\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SMBIOS_PROTOCOL *Smbios;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
- EFI_SMBIOS_TABLE_HEADER *Record;\r
- UINTN Index;\r
- UINTN StringSize;\r
- UINTN Size;\r
- CHAR8 *Str;\r
+ EFI_STATUS Status;\r
+ EFI_SMBIOS_PROTOCOL *Smbios;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ EFI_SMBIOS_TABLE_HEADER *Record;\r
+ UINTN Index;\r
+ UINTN StringSize;\r
+ UINTN Size;\r
+ CHAR8 *Str;\r
\r
//\r
// Locate Smbios protocol.\r
} else {\r
for (Index = 0; StringPack[Index] != NULL; Index++) {\r
StringSize = AsciiStrSize (StringPack[Index]);\r
- Size += StringSize;\r
+ Size += StringSize;\r
}\r
+\r
if (StringPack[0] == NULL) {\r
// At least a double null is required\r
Size += 1;\r
}\r
+\r
// Don't forget the terminating double null\r
Size += 1;\r
}\r
if (Record == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
CopyMem (Record, Template, Template->Length);\r
\r
// Append string pack\r
CopyMem (Str, StringPack[Index], StringSize);\r
Str += StringSize;\r
}\r
+\r
*Str = 0;\r
\r
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
- Status = Smbios->Add (\r
- Smbios,\r
- gImageHandle,\r
- &SmbiosHandle,\r
- Record\r
- );\r
+ Status = Smbios->Add (\r
+ Smbios,\r
+ gImageHandle,\r
+ &SmbiosHandle,\r
+ Record\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
FreePool (Record);\r
return Status;\r
}\r
\r
-\r
-\r
-\r
VOID\r
CpuUpdateSmbios (\r
IN UINTN MaxCpus\r
)\r
{\r
- mCpuSmbiosType4.CoreCount = (UINT8) MaxCpus;\r
- mCpuSmbiosType4.EnabledCoreCount = (UINT8) MaxCpus;\r
- mCpuSmbiosType4.ThreadCount = (UINT8) MaxCpus;\r
+ mCpuSmbiosType4.CoreCount = (UINT8)MaxCpus;\r
+ mCpuSmbiosType4.EnabledCoreCount = (UINT8)MaxCpus;\r
+ mCpuSmbiosType4.ThreadCount = (UINT8)MaxCpus;\r
//\r
// The value of 1234 is fake value for CPU frequency\r
//\r
LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mCpuSmbiosType4, mCpuSmbiosType4Strings);\r
}\r
\r
-\r
//\r
// Service routines for the driver\r
//\r
//\r
return EFI_SUCCESS;\r
}\r
+\r
//\r
// Other flush types are not supported by Emu emulator\r
//\r
IN EFI_CPU_ARCH_PROTOCOL *This\r
)\r
{\r
- CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
+ CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
\r
Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
Private->InterruptState = TRUE;\r
IN EFI_CPU_ARCH_PROTOCOL *This\r
)\r
{\r
- CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
+ CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
\r
Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
Private->InterruptState = FALSE;\r
OUT BOOLEAN *State\r
)\r
{\r
- CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
+ CPU_ARCH_PROTOCOL_PRIVATE *Private;\r
\r
if (State == NULL) {\r
return EFI_INVALID_PARAMETER;\r
//\r
// Do parameter checking for EFI spec conformance\r
//\r
- if (InterruptType < 0 || InterruptType > 0xff) {\r
+ if ((InterruptType < 0) || (InterruptType > 0xff)) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Do nothing for Emu emulation\r
//\r
EFI_STATUS\r
EFIAPI\r
EmuGetTimerValue (\r
- IN EFI_CPU_ARCH_PROTOCOL *This,\r
- IN UINT32 TimerIndex,\r
- OUT UINT64 *TimerValue,\r
- OUT UINT64 *TimerPeriod OPTIONAL\r
+ IN EFI_CPU_ARCH_PROTOCOL *This,\r
+ IN UINT32 TimerIndex,\r
+ OUT UINT64 *TimerValue,\r
+ OUT UINT64 *TimerPeriod OPTIONAL\r
)\r
{\r
if (TimerValue == NULL) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuSetMemoryAttributes (\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
-\r
-\r
/**\r
Callback function for idle events.\r
\r
VOID\r
EFIAPI\r
IdleLoopEventCallback (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
gEmuThunk->CpuSleep ();\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
InitializeCpu (\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT64 Frequency;\r
- EFI_EVENT IdleLoopEvent;\r
- UINTN MaxCpu;\r
+ EFI_STATUS Status;\r
+ UINT64 Frequency;\r
+ EFI_EVENT IdleLoopEvent;\r
+ UINTN MaxCpu;\r
\r
//\r
// Retrieve the frequency of the performance counter in Hz.\r
\r
CpuUpdateSmbios (MaxCpu);\r
\r
-\r
Status = gBS->CreateEventEx (\r
EVT_NOTIFY_SIGNAL,\r
TPL_NOTIFY,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&mCpuTemplate.Handle,\r
- &gEfiCpuArchProtocolGuid, &mCpuTemplate.Cpu,\r
- &gEfiCpuIo2ProtocolGuid, &mCpuTemplate.CpuIo,\r
+ &gEfiCpuArchProtocolGuid,\r
+ &mCpuTemplate.Cpu,\r
+ &gEfiCpuIo2ProtocolGuid,\r
+ &mCpuTemplate.CpuIo,\r
NULL\r
);\r
ASSERT_EFI_ERROR (Status);\r
#ifndef _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
#define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
\r
-\r
#include <PiDxe.h>\r
#include <IndustryStandard/SmBios.h>\r
\r
#include <Library/UefiLib.h>\r
#include <Library/PcdLib.h>\r
\r
-\r
-\r
//\r
// Internal Data Structures\r
//\r
-#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')\r
+#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EFI_HANDLE Handle;\r
+ UINTN Signature;\r
+ EFI_HANDLE Handle;\r
\r
- EFI_CPU_ARCH_PROTOCOL Cpu;\r
- EFI_CPU_IO2_PROTOCOL CpuIo;\r
+ EFI_CPU_ARCH_PROTOCOL Cpu;\r
+ EFI_CPU_IO2_PROTOCOL CpuIo;\r
\r
//\r
// Local Data for CPU interface goes here\r
//\r
- BOOLEAN InterruptState;\r
-\r
+ BOOLEAN InterruptState;\r
} CPU_ARCH_PROTOCOL_PRIVATE;\r
\r
#define CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS(a) \\r
CPU_ARCH_PROT_PRIVATE_SIGNATURE \\r
)\r
\r
-\r
-\r
typedef enum {\r
CPU_STATE_IDLE,\r
CPU_STATE_BLOCKED,\r
CPU_STATE_FINISHED\r
} PROCESSOR_STATE;\r
\r
-\r
//\r
// Define Individual Processor Data block.\r
//\r
typedef struct {\r
- EFI_PROCESSOR_INFORMATION Info;\r
- EFI_AP_PROCEDURE Procedure;\r
- VOID *Parameter;\r
- VOID *StateLock;\r
- VOID *ProcedureLock;\r
- PROCESSOR_STATE State;\r
- EFI_EVENT CheckThisAPEvent;\r
+ EFI_PROCESSOR_INFORMATION Info;\r
+ EFI_AP_PROCEDURE Procedure;\r
+ VOID *Parameter;\r
+ VOID *StateLock;\r
+ VOID *ProcedureLock;\r
+ PROCESSOR_STATE State;\r
+ EFI_EVENT CheckThisAPEvent;\r
} PROCESSOR_DATA_BLOCK;\r
\r
-\r
//\r
// Define MP data block which consumes individual processor block.\r
//\r
typedef struct {\r
- UINTN NumberOfProcessors;\r
- UINTN NumberOfEnabledProcessors;\r
- EFI_EVENT CheckAllAPsEvent;\r
- EFI_EVENT WaitEvent;\r
- UINTN FinishCount;\r
- UINTN StartCount;\r
- EFI_AP_PROCEDURE Procedure;\r
- VOID *ProcedureArgument;\r
- BOOLEAN SingleThread;\r
- UINTN StartedNumber;\r
- PROCESSOR_DATA_BLOCK *ProcessorData;\r
- UINTN Timeout;\r
- UINTN *FailedList;\r
- UINTN FailedListIndex;\r
- BOOLEAN TimeoutActive;\r
+ UINTN NumberOfProcessors;\r
+ UINTN NumberOfEnabledProcessors;\r
+ EFI_EVENT CheckAllAPsEvent;\r
+ EFI_EVENT WaitEvent;\r
+ UINTN FinishCount;\r
+ UINTN StartCount;\r
+ EFI_AP_PROCEDURE Procedure;\r
+ VOID *ProcedureArgument;\r
+ BOOLEAN SingleThread;\r
+ UINTN StartedNumber;\r
+ PROCESSOR_DATA_BLOCK *ProcessorData;\r
+ UINTN Timeout;\r
+ UINTN *FailedList;\r
+ UINTN FailedListIndex;\r
+ BOOLEAN TimeoutActive;\r
} MP_SYSTEM_DATA;\r
\r
-\r
-\r
-\r
-\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceRead (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN OUT VOID *Buffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceWrite (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN OUT VOID *Buffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceRead (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 UserAddress,\r
- IN UINTN Count,\r
- IN OUT VOID *UserBuffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 UserAddress,\r
+ IN UINTN Count,\r
+ IN OUT VOID *UserBuffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceWrite (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 UserAddress,\r
- IN UINTN Count,\r
- IN OUT VOID *UserBuffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 UserAddress,\r
+ IN UINTN Count,\r
+ IN OUT VOID *UserBuffer\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
EmuGetTimerValue (\r
- IN EFI_CPU_ARCH_PROTOCOL *This,\r
- IN UINT32 TimerIndex,\r
- OUT UINT64 *TimerValue,\r
- OUT UINT64 *TimerPeriod OPTIONAL\r
+ IN EFI_CPU_ARCH_PROTOCOL *This,\r
+ IN UINT32 TimerIndex,\r
+ OUT UINT64 *TimerValue,\r
+ OUT UINT64 *TimerPeriod OPTIONAL\r
);\r
\r
EFI_STATUS\r
\r
EFI_STATUS\r
CpuMpServicesInit (\r
- OUT UINTN *MaxCores\r
+ OUT UINTN *MaxCores\r
);\r
\r
EFI_STATUS\r
\r
extern EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate;\r
\r
-\r
#endif\r
\r
EFI_STATUS\r
CpuIoCheckAddressRange (\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN VOID *Buffer,\r
- IN UINT64 Limit\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN VOID *Buffer,\r
+ IN UINT64 Limit\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceRead (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN OUT VOID *Buffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN OUT VOID *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceWrite (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN OUT VOID *Buffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN OUT VOID *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceRead (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 UserAddress,\r
- IN UINTN Count,\r
- IN OUT VOID *UserBuffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 UserAddress,\r
+ IN UINTN Count,\r
+ IN OUT VOID *UserBuffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Address = (UINTN) UserAddress;\r
+ Address = (UINTN)UserAddress;\r
\r
if (Width >= EfiCpuIoWidthMaximum) {\r
return EFI_INVALID_PARAMETER;\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceWrite (\r
- IN EFI_CPU_IO2_PROTOCOL *This,\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 UserAddress,\r
- IN UINTN Count,\r
- IN OUT VOID *UserBuffer\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 UserAddress,\r
+ IN UINTN Count,\r
+ IN OUT VOID *UserBuffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Address = (UINTN) UserAddress;\r
+ Address = (UINTN)UserAddress;\r
\r
if (Width >= EfiCpuIoWidthMaximum) {\r
return EFI_INVALID_PARAMETER;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
EFI_STATUS\r
CpuIoCheckAddressRange (\r
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
- IN UINT64 Address,\r
- IN UINTN Count,\r
- IN VOID *Buffer,\r
- IN UINT64 Limit\r
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
+ IN UINT64 Address,\r
+ IN UINTN Count,\r
+ IN VOID *Buffer,\r
+ IN UINT64 Limit\r
)\r
{\r
- UINTN AlignMask;\r
+ UINTN AlignMask;\r
\r
if (Address > Limit) {\r
return EFI_UNSUPPORTED;\r
//\r
// For FiFo type, the target address won't increase during the access, so treat count as 1\r
//\r
- if (Width >= EfiCpuIoWidthFifoUint8 && Width <= EfiCpuIoWidthFifoUint64) {\r
+ if ((Width >= EfiCpuIoWidthFifoUint8) && (Width <= EfiCpuIoWidthFifoUint64)) {\r
Count = 1;\r
}\r
\r
}\r
\r
AlignMask = (1 << Width) - 1;\r
- if ((UINTN) Buffer & AlignMask) {\r
+ if ((UINTN)Buffer & AlignMask) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
-\r
-\r
\r
#include "CpuDriver.h"\r
\r
-\r
-MP_SYSTEM_DATA gMPSystem;\r
-EMU_THREAD_THUNK_PROTOCOL *gThread = NULL;\r
-EFI_EVENT gReadToBootEvent;\r
-BOOLEAN gReadToBoot = FALSE;\r
-UINTN gPollInterval;\r
-\r
+MP_SYSTEM_DATA gMPSystem;\r
+EMU_THREAD_THUNK_PROTOCOL *gThread = NULL;\r
+EFI_EVENT gReadToBootEvent;\r
+BOOLEAN gReadToBoot = FALSE;\r
+UINTN gPollInterval;\r
\r
BOOLEAN\r
IsBSP (\r
return (gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_AS_BSP_BIT) != 0;\r
}\r
\r
-\r
VOID\r
SetApProcedure (\r
IN PROCESSOR_DATA_BLOCK *Processor,\r
)\r
{\r
gThread->MutexLock (Processor->ProcedureLock);\r
- Processor->Parameter = ProcedureArgument;\r
- Processor->Procedure = Procedure;\r
+ Processor->Parameter = ProcedureArgument;\r
+ Processor->Procedure = Procedure;\r
gThread->MutexUnlock (Processor->ProcedureLock);\r
}\r
\r
-\r
EFI_STATUS\r
GetNextBlockedNumber (\r
- OUT UINTN *NextNumber\r
+ OUT UINTN *NextNumber\r
)\r
{\r
UINTN Number;\r
**/\r
UINTN\r
CalculateAndStallInterval (\r
- IN UINTN Timeout\r
+ IN UINTN Timeout\r
)\r
{\r
- UINTN StallTime;\r
+ UINTN StallTime;\r
\r
- if (Timeout < gPollInterval && Timeout != 0) {\r
+ if ((Timeout < gPollInterval) && (Timeout != 0)) {\r
StallTime = Timeout;\r
} else {\r
StallTime = gPollInterval;\r
}\r
+\r
gBS->Stall (StallTime);\r
\r
return StallTime;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Gets detailed MP-related information on the requested processor at the\r
instant this call is made. This service may only be called from the BSP.\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
This service executes a caller provided function on all enabled APs. APs can\r
run either simultaneously or one at a time in sequence. This service supports\r
PROCESSOR_STATE ProcessorState;\r
UINTN Timeout;\r
\r
-\r
if (!IsBSP ()) {\r
return EFI_DEVICE_ERROR;\r
}\r
// Skip Disabled processors\r
continue;\r
}\r
- gThread->MutexLock(ProcessorData->StateLock);\r
+\r
+ gThread->MutexLock (ProcessorData->StateLock);\r
if (ProcessorData->State != CPU_STATE_IDLE) {\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
return EFI_NOT_READY;\r
}\r
- gThread->MutexUnlock(ProcessorData->StateLock);\r
+\r
+ gThread->MutexUnlock (ProcessorData->StateLock);\r
}\r
\r
if (FailedCpuList != NULL) {\r
if (gMPSystem.FailedList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
SetMemN (gMPSystem.FailedList, (gMPSystem.NumberOfProcessors + 1) * sizeof (UINTN), END_OF_CPU_LIST);\r
gMPSystem.FailedListIndex = 0;\r
- *FailedCpuList = gMPSystem.FailedList;\r
+ *FailedCpuList = gMPSystem.FailedList;\r
}\r
\r
Timeout = TimeoutInMicroseconds;\r
\r
- ProcessorData = NULL;\r
+ ProcessorData = NULL;\r
\r
- gMPSystem.FinishCount = 0;\r
- gMPSystem.StartCount = 0;\r
- gMPSystem.SingleThread = SingleThread;\r
- APInitialState = CPU_STATE_READY;\r
+ gMPSystem.FinishCount = 0;\r
+ gMPSystem.StartCount = 0;\r
+ gMPSystem.SingleThread = SingleThread;\r
+ APInitialState = CPU_STATE_READY;\r
\r
for (Number = 0; Number < gMPSystem.NumberOfProcessors; Number++) {\r
ProcessorData = &gMPSystem.ProcessorData[Number];\r
// state 1 by 1, until the previous 1 finished its task\r
// if not "SingleThread", all APs are put to ready state from the beginning\r
//\r
- gThread->MutexLock(ProcessorData->StateLock);\r
+ gThread->MutexLock (ProcessorData->StateLock);\r
ASSERT (ProcessorData->State == CPU_STATE_IDLE);\r
ProcessorData->State = APInitialState;\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
for (Number = 0; Number < gMPSystem.NumberOfProcessors; Number++) {\r
ProcessorData = &gMPSystem.ProcessorData[Number];\r
if ((ProcessorData->Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
- // Skip BSP\r
+ // Skip BSP\r
continue;\r
}\r
\r
gMPSystem.WaitEvent = WaitEvent;\r
gMPSystem.Timeout = TimeoutInMicroseconds;\r
gMPSystem.TimeoutActive = (BOOLEAN)(TimeoutInMicroseconds != 0);\r
- Status = gBS->SetTimer (\r
- gMPSystem.CheckAllAPsEvent,\r
- TimerPeriodic,\r
- gPollInterval\r
- );\r
+ Status = gBS->SetTimer (\r
+ gMPSystem.CheckAllAPsEvent,\r
+ TimerPeriodic,\r
+ gPollInterval\r
+ );\r
return Status;\r
-\r
}\r
\r
while (TRUE) {\r
for (Number = 0; Number < gMPSystem.NumberOfProcessors; Number++) {\r
ProcessorData = &gMPSystem.ProcessorData[Number];\r
if ((ProcessorData->Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
- // Skip BSP\r
+ // Skip BSP\r
continue;\r
}\r
\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
\r
switch (ProcessorState) {\r
- case CPU_STATE_READY:\r
- SetApProcedure (ProcessorData, Procedure, ProcedureArgument);\r
- break;\r
-\r
- case CPU_STATE_FINISHED:\r
- gMPSystem.FinishCount++;\r
- if (SingleThread) {\r
- Status = GetNextBlockedNumber (&NextNumber);\r
- if (!EFI_ERROR (Status)) {\r
- gThread->MutexLock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
- gMPSystem.ProcessorData[NextNumber].State = CPU_STATE_READY;\r
- gThread->MutexUnlock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
+ case CPU_STATE_READY:\r
+ SetApProcedure (ProcessorData, Procedure, ProcedureArgument);\r
+ break;\r
+\r
+ case CPU_STATE_FINISHED:\r
+ gMPSystem.FinishCount++;\r
+ if (SingleThread) {\r
+ Status = GetNextBlockedNumber (&NextNumber);\r
+ if (!EFI_ERROR (Status)) {\r
+ gThread->MutexLock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
+ gMPSystem.ProcessorData[NextNumber].State = CPU_STATE_READY;\r
+ gThread->MutexUnlock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
+ }\r
}\r
- }\r
\r
- gThread->MutexLock (ProcessorData->StateLock);\r
- ProcessorData->State = CPU_STATE_IDLE;\r
- gThread->MutexUnlock (ProcessorData->StateLock);\r
+ gThread->MutexLock (ProcessorData->StateLock);\r
+ ProcessorData->State = CPU_STATE_IDLE;\r
+ gThread->MutexUnlock (ProcessorData->StateLock);\r
\r
- break;\r
+ break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
This service lets the caller get one enabled AP to execute a caller-provided\r
function. The caller can request the BSP to either wait for the completion\r
OUT BOOLEAN *Finished OPTIONAL\r
)\r
{\r
- UINTN Timeout;\r
+ UINTN Timeout;\r
\r
if (!IsBSP ()) {\r
return EFI_DEVICE_ERROR;\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- gThread->MutexLock(gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+ gThread->MutexLock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
if (gMPSystem.ProcessorData[ProcessorNumber].State != CPU_STATE_IDLE) {\r
- gThread->MutexUnlock(gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+ gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
return EFI_NOT_READY;\r
}\r
- gThread->MutexUnlock(gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+\r
+ gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
\r
if ((WaitEvent != NULL) && gReadToBoot) {\r
return EFI_UNSUPPORTED;\r
\r
Timeout = TimeoutInMicroseconds;\r
\r
- gMPSystem.StartCount = 1;\r
- gMPSystem.FinishCount = 0;\r
+ gMPSystem.StartCount = 1;\r
+ gMPSystem.FinishCount = 0;\r
\r
SetApProcedure (&gMPSystem.ProcessorData[ProcessorNumber], Procedure, ProcedureArgument);\r
\r
}\r
\r
return EFI_SUCCESS;\r
-\r
}\r
\r
-\r
/**\r
This service switches the requested AP to be the BSP from that point onward.\r
This service changes the BSP for all purposes. This call can only be performed\r
IN BOOLEAN EnableOldBSP\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
if (!IsBSP ()) {\r
return EFI_DEVICE_ERROR;\r
break;\r
}\r
}\r
+\r
ASSERT (Index != gMPSystem.NumberOfProcessors);\r
\r
gThread->MutexLock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
return EFI_NOT_READY;\r
}\r
+\r
gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
\r
// Skip for now as we need switch a bunch of stack stuff around and it's complex\r
return EFI_NOT_READY;\r
}\r
\r
-\r
/**\r
This service lets the caller enable or disable an AP from this point onward.\r
This service may only be called from the BSP.\r
gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
return EFI_UNSUPPORTED;\r
}\r
+\r
gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
\r
if (EnableAP) {\r
if ((gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_ENABLED_BIT) == 0 ) {\r
gMPSystem.NumberOfEnabledProcessors++;\r
}\r
+\r
gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag |= PROCESSOR_ENABLED_BIT;\r
} else {\r
if ((gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_ENABLED_BIT) == PROCESSOR_ENABLED_BIT ) {\r
gMPSystem.NumberOfEnabledProcessors--;\r
}\r
+\r
gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag &= ~PROCESSOR_ENABLED_BIT;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
This return the handle number for the calling processor. This service may be\r
called from the BSP and APs.\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = {\r
CpuMpServicesGetNumberOfProcessors,\r
CpuMpServicesGetProcessorInfo,\r
CpuMpServicesWhoAmI\r
};\r
\r
-\r
-\r
/*++\r
If timeout occurs in StartupAllAps(), a timer is set, which invokes this\r
procedure periodically to check whether all APs have finished.\r
VOID\r
EFIAPI\r
CpuCheckAllAPsStatus (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
UINTN ProcessorNumber;\r
for (ProcessorNumber = 0; ProcessorNumber < gMPSystem.NumberOfProcessors; ProcessorNumber++) {\r
ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];\r
if ((ProcessorData->Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
- // Skip BSP\r
+ // Skip BSP\r
continue;\r
}\r
\r
// So, try lock it. If we can get it, cool, do our thing.\r
// otherwise, just dump out & try again on the next iteration.\r
Status = gThread->MutexTryLock (ProcessorData->StateLock);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return;\r
}\r
+\r
ProcessorState = ProcessorData->State;\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
\r
switch (ProcessorState) {\r
- case CPU_STATE_FINISHED:\r
- if (gMPSystem.SingleThread) {\r
- Status = GetNextBlockedNumber (&NextNumber);\r
- if (!EFI_ERROR (Status)) {\r
- NextData = &gMPSystem.ProcessorData[NextNumber];\r
+ case CPU_STATE_FINISHED:\r
+ if (gMPSystem.SingleThread) {\r
+ Status = GetNextBlockedNumber (&NextNumber);\r
+ if (!EFI_ERROR (Status)) {\r
+ NextData = &gMPSystem.ProcessorData[NextNumber];\r
\r
- gThread->MutexLock (NextData->StateLock);\r
- NextData->State = CPU_STATE_READY;\r
- gThread->MutexUnlock (NextData->StateLock);\r
+ gThread->MutexLock (NextData->StateLock);\r
+ NextData->State = CPU_STATE_READY;\r
+ gThread->MutexUnlock (NextData->StateLock);\r
\r
- SetApProcedure (NextData, gMPSystem.Procedure, gMPSystem.ProcedureArgument);\r
+ SetApProcedure (NextData, gMPSystem.Procedure, gMPSystem.ProcedureArgument);\r
+ }\r
}\r
- }\r
\r
- gThread->MutexLock (ProcessorData->StateLock);\r
- ProcessorData->State = CPU_STATE_IDLE;\r
- gThread->MutexUnlock (ProcessorData->StateLock);\r
- gMPSystem.FinishCount++;\r
- break;\r
+ gThread->MutexLock (ProcessorData->StateLock);\r
+ ProcessorData->State = CPU_STATE_IDLE;\r
+ gThread->MutexUnlock (ProcessorData->StateLock);\r
+ gMPSystem.FinishCount++;\r
+ break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
}\r
\r
- if (gMPSystem.TimeoutActive && gMPSystem.Timeout == 0) {\r
+ if (gMPSystem.TimeoutActive && (gMPSystem.Timeout == 0)) {\r
//\r
// Timeout\r
//\r
for (ProcessorNumber = 0; ProcessorNumber < gMPSystem.NumberOfProcessors; ProcessorNumber++) {\r
ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];\r
if ((ProcessorData->Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
- // Skip BSP\r
+ // Skip BSP\r
continue;\r
}\r
\r
\r
// Mark the\r
Status = gThread->MutexTryLock (ProcessorData->StateLock);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return;\r
}\r
+\r
ProcessorState = ProcessorData->State;\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
\r
if (gMPSystem.FailedList[Cpu] == END_OF_CPU_LIST) {\r
break;\r
}\r
+\r
if (gMPSystem.FailedList[ProcessorNumber] == Cpu) {\r
Found = TRUE;\r
break;\r
}\r
}\r
+\r
if (!Found) {\r
gMPSystem.FailedList[gMPSystem.FailedListIndex++] = Cpu;\r
}\r
}\r
}\r
}\r
+\r
// Force terminal exit\r
gMPSystem.FinishCount = gMPSystem.StartCount;\r
}\r
\r
Status = gBS->SignalEvent (gMPSystem.WaitEvent);\r
\r
- return ;\r
+ return;\r
}\r
\r
VOID\r
EFIAPI\r
CpuCheckThisAPStatus (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
EFI_STATUS Status;\r
PROCESSOR_DATA_BLOCK *ProcessorData;\r
PROCESSOR_STATE ProcessorState;\r
\r
- ProcessorData = (PROCESSOR_DATA_BLOCK *) Context;\r
+ ProcessorData = (PROCESSOR_DATA_BLOCK *)Context;\r
\r
//\r
// This is an Interrupt Service routine.\r
// otherwise, just dump out & try again on the next iteration.\r
//\r
Status = gThread->MutexTryLock (ProcessorData->StateLock);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return;\r
}\r
+\r
ProcessorState = ProcessorData->State;\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
\r
gThread->MutexUnlock (ProcessorData->StateLock);\r
}\r
\r
- return ;\r
+ return;\r
}\r
\r
-\r
/*++\r
This function is called by all processors (both BSP and AP) once and collects MP related data\r
\r
--*/\r
EFI_STATUS\r
FillInProcessorInformation (\r
- IN BOOLEAN BSP,\r
- IN UINTN ProcessorNumber\r
+ IN BOOLEAN BSP,\r
+ IN UINTN ProcessorNumber\r
)\r
{\r
- gMPSystem.ProcessorData[ProcessorNumber].Info.ProcessorId = gThread->Self ();\r
- gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag = PROCESSOR_ENABLED_BIT | PROCESSOR_HEALTH_STATUS_BIT;\r
+ gMPSystem.ProcessorData[ProcessorNumber].Info.ProcessorId = gThread->Self ();\r
+ gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag = PROCESSOR_ENABLED_BIT | PROCESSOR_HEALTH_STATUS_BIT;\r
if (BSP) {\r
gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag |= PROCESSOR_AS_BSP_BIT;\r
}\r
\r
- gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Package = (UINT32) ProcessorNumber;\r
+ gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Package = (UINT32)ProcessorNumber;\r
gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Core = 0;\r
gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Thread = 0;\r
- gMPSystem.ProcessorData[ProcessorNumber].State = BSP ? CPU_STATE_BUSY : CPU_STATE_IDLE;\r
+ gMPSystem.ProcessorData[ProcessorNumber].State = BSP ? CPU_STATE_BUSY : CPU_STATE_IDLE;\r
\r
- gMPSystem.ProcessorData[ProcessorNumber].Procedure = NULL;\r
- gMPSystem.ProcessorData[ProcessorNumber].Parameter = NULL;\r
- gMPSystem.ProcessorData[ProcessorNumber].StateLock = gThread->MutexInit ();\r
- gMPSystem.ProcessorData[ProcessorNumber].ProcedureLock = gThread->MutexInit ();\r
+ gMPSystem.ProcessorData[ProcessorNumber].Procedure = NULL;\r
+ gMPSystem.ProcessorData[ProcessorNumber].Parameter = NULL;\r
+ gMPSystem.ProcessorData[ProcessorNumber].StateLock = gThread->MutexInit ();\r
+ gMPSystem.ProcessorData[ProcessorNumber].ProcedureLock = gThread->MutexInit ();\r
\r
return EFI_SUCCESS;\r
}\r
PROCESSOR_DATA_BLOCK *ProcessorData;\r
\r
ProcessorNumber = (UINTN)Context;\r
- ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];\r
+ ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];\r
\r
ProcessorData->Info.ProcessorId = gThread->Self ();\r
\r
return 0;\r
}\r
\r
-\r
EFI_STATUS\r
InitializeMpSystemData (\r
- IN UINTN NumberOfProcessors\r
+ IN UINTN NumberOfProcessors\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
-\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
\r
//\r
// Clear the data structure area first.\r
//\r
// First BSP fills and inits all known values, including it's own records.\r
//\r
- gMPSystem.NumberOfProcessors = NumberOfProcessors;\r
- gMPSystem.NumberOfEnabledProcessors = NumberOfProcessors;\r
+ gMPSystem.NumberOfProcessors = NumberOfProcessors;\r
+ gMPSystem.NumberOfEnabledProcessors = NumberOfProcessors;\r
\r
gMPSystem.ProcessorData = AllocateZeroPool (gMPSystem.NumberOfProcessors * sizeof (PROCESSOR_DATA_BLOCK));\r
ASSERT (gMPSystem.ProcessorData != NULL);\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
for (Index = 0; Index < gMPSystem.NumberOfProcessors; Index++) {\r
if ((gMPSystem.ProcessorData[Index].Info.StatusFlag & PROCESSOR_AS_BSP_BIT) == PROCESSOR_AS_BSP_BIT) {\r
- // Skip BSP\r
+ // Skip BSP\r
continue;\r
}\r
\r
(VOID *)Index\r
);\r
\r
-\r
Status = gBS->CreateEvent (\r
- EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
- TPL_CALLBACK,\r
- CpuCheckThisAPStatus,\r
- (VOID *) &gMPSystem.ProcessorData[Index],\r
- &gMPSystem.ProcessorData[Index].CheckThisAPEvent\r
- );\r
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
+ TPL_CALLBACK,\r
+ CpuCheckThisAPStatus,\r
+ (VOID *)&gMPSystem.ProcessorData[Index],\r
+ &gMPSystem.ProcessorData[Index].CheckThisAPEvent\r
+ );\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Invoke a notification event\r
\r
VOID\r
EFIAPI\r
CpuReadToBootFunction (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
gReadToBoot = TRUE;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
CpuMpServicesInit (\r
- OUT UINTN *MaxCpus\r
+ OUT UINTN *MaxCpus\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDLE Handle;\r
- EMU_IO_THUNK_PROTOCOL *IoThunk;\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE Handle;\r
+ EMU_IO_THUNK_PROTOCOL *IoThunk;\r
\r
*MaxCpus = 1; // BSP\r
- IoThunk = GetIoThunkInstance (&gEmuThreadThunkProtocolGuid, 0);\r
+ IoThunk = GetIoThunkInstance (&gEmuThreadThunkProtocolGuid, 0);\r
if (IoThunk != NULL) {\r
Status = IoThunk->Open (IoThunk);\r
if (!EFI_ERROR (Status)) {\r
if (IoThunk->ConfigString != NULL) {\r
*MaxCpus += StrDecimalToUintn (IoThunk->ConfigString);\r
- gThread = IoThunk->Interface;\r
+ gThread = IoThunk->Interface;\r
}\r
}\r
}\r
return EFI_SUCCESS;\r
}\r
\r
- gPollInterval = (UINTN) PcdGet64 (PcdEmuMpServicesPollingInterval);\r
+ gPollInterval = (UINTN)PcdGet64 (PcdEmuMpServicesPollingInterval);\r
\r
- Status = InitializeMpSystemData (*MaxCpus);\r
+ Status = InitializeMpSystemData (*MaxCpus);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Handle = NULL;\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Handle,\r
- &gEfiMpServiceProtocolGuid, &mMpServicesTemplate,\r
+ &gEfiMpServiceProtocolGuid,\r
+ &mMpServicesTemplate,\r
NULL\r
);\r
return Status;\r
}\r
-\r
-\r
//\r
// EFI Component Name Functions\r
//\r
+\r
/**\r
Retrieves a Unicode string that is the user readable name of the driver.\r
\r
OUT CHAR16 **DriverName\r
);\r
\r
-\r
/**\r
Retrieves a Unicode string that is the user readable name of the controller\r
that is being managed by a driver.\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
);\r
\r
//\r
// EFI Component Name Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gEmuBlockIoComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gEmuBlockIoComponentName = {\r
EmuBlockIoComponentNameGetDriverName,\r
EmuBlockIoComponentNameGetControllerName,\r
"eng"\r
//\r
// EFI Component Name 2 Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuBlockIoComponentName2 = {\r
- (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuBlockIoComponentNameGetDriverName,\r
- (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuBlockIoComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuBlockIoComponentName2 = {\r
+ (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmuBlockIoComponentNameGetDriverName,\r
+ (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmuBlockIoComponentNameGetControllerName,\r
"en"\r
};\r
\r
-\r
-EFI_UNICODE_STRING_TABLE mEmuBlockIoDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mEmuBlockIoDriverNameTable[] = {\r
{ "eng;en", L"Emu Block I/O Driver" },\r
- { NULL , NULL }\r
+ { NULL, NULL }\r
};\r
\r
/**\r
)\r
{\r
return LookupUnicodeString2 (\r
- Language,\r
- This->SupportedLanguages,\r
- mEmuBlockIoDriverNameTable,\r
- DriverName,\r
+ Language,\r
+ This->SupportedLanguages,\r
+ mEmuBlockIoDriverNameTable,\r
+ DriverName,\r
(BOOLEAN)(This == &gEmuBlockIoComponentName)\r
- );\r
+ );\r
}\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_STATUS Status;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
\r
//\r
// This is a device driver, so ChildHandle must be NULL.\r
if (ChildHandle != NULL) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Make sure this driver is currently managing ControllerHandle\r
//\r
if (EFI_ERROR (Status)) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Get our context back\r
//\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (BlockIo);\r
\r
return LookupUnicodeString2 (\r
- Language,\r
+ Language,\r
This->SupportedLanguages,\r
Private->ControllerNameTable,\r
ControllerName,\r
(BOOLEAN)(This == &gEmuBlockIoComponentName)\r
- );\r
+ );\r
}\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationSetOptions (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationOptionsValid (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationForceDefaults (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN UINT32 DefaultType,\r
- OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN UINT32 DefaultType,\r
+ OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
);\r
\r
//\r
// EFI Driver Configuration Protocol\r
//\r
-EFI_DRIVER_CONFIGURATION_PROTOCOL gEmuBlockIoDriverConfiguration = {\r
+EFI_DRIVER_CONFIGURATION_PROTOCOL gEmuBlockIoDriverConfiguration = {\r
EmuBlockIoDriverConfigurationSetOptions,\r
EmuBlockIoDriverConfigurationOptionsValid,\r
EmuBlockIoDriverConfigurationForceDefaults,\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationSetOptions (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
- CHAR8 *SupportedLanguage;\r
+ EFI_STATUS Status;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ CHAR8 *SupportedLanguage;\r
\r
SupportedLanguage = This->SupportedLanguages;\r
\r
- Status = EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
while (*SupportedLanguage != 0) {\r
if (AsciiStrnCmp (Language, SupportedLanguage, 3) == 0) {\r
Status = EFI_SUCCESS;\r
return Status;\r
}\r
\r
- if (ActionRequired == NULL || ControllerHandle == NULL) {\r
+ if ((ActionRequired == NULL) || (ControllerHandle == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
\r
if (!EFI_ERROR (Status)) {\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- gEmuBlockIoDriverBinding.DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ gEmuBlockIoDriverBinding.DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return EFI_UNSUPPORTED;\r
}\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationOptionsValid (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ EFI_STATUS Status;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
\r
if (ChildHandle != NULL) {\r
return EFI_UNSUPPORTED;\r
\r
if (!EFI_ERROR (Status)) {\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- gEmuBlockIoDriverBinding.DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ gEmuBlockIoDriverBinding.DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return EFI_UNSUPPORTED;\r
}\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverConfigurationForceDefaults (\r
- IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN UINT32 DefaultType,\r
- OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
+ IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN UINT32 DefaultType,\r
+ OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ EFI_STATUS Status;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
\r
if (ChildHandle != NULL) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
- if (ActionRequired == NULL || ControllerHandle == NULL) {\r
+ if ((ActionRequired == NULL) || (ControllerHandle == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
\r
if (!EFI_ERROR (Status)) {\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- gEmuBlockIoDriverBinding.DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ gEmuBlockIoDriverBinding.DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return EFI_UNSUPPORTED;\r
}\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverDiagnosticsRunDiagnostics (\r
- IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN EFI_DRIVER_DIAGNOSTIC_TYPE DiagnosticType,\r
- IN CHAR8 *Language,\r
- OUT EFI_GUID **ErrorType,\r
- OUT UINTN *BufferSize,\r
- OUT CHAR16 **Buffer\r
+ IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN EFI_DRIVER_DIAGNOSTIC_TYPE DiagnosticType,\r
+ IN CHAR8 *Language,\r
+ OUT EFI_GUID **ErrorType,\r
+ OUT UINTN *BufferSize,\r
+ OUT CHAR16 **Buffer\r
);\r
\r
//\r
// EFI Driver Diagnostics Protocol\r
//\r
-EFI_DRIVER_DIAGNOSTICS_PROTOCOL gEmuBlockIoDriverDiagnostics = {\r
+EFI_DRIVER_DIAGNOSTICS_PROTOCOL gEmuBlockIoDriverDiagnostics = {\r
EmuBlockIoDriverDiagnosticsRunDiagnostics,\r
"eng"\r
};\r
//\r
// EFI Driver Diagnostics 2 Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gEmuBlockIoDriverDiagnostics2 = {\r
- (EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS) EmuBlockIoDriverDiagnosticsRunDiagnostics,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gEmuBlockIoDriverDiagnostics2 = {\r
+ (EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS)EmuBlockIoDriverDiagnosticsRunDiagnostics,\r
"en"\r
};\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverDiagnosticsRunDiagnostics (\r
- IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN EFI_DRIVER_DIAGNOSTIC_TYPE DiagnosticType,\r
- IN CHAR8 *Language,\r
- OUT EFI_GUID **ErrorType,\r
- OUT UINTN *BufferSize,\r
- OUT CHAR16 **Buffer\r
+ IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN EFI_DRIVER_DIAGNOSTIC_TYPE DiagnosticType,\r
+ IN CHAR8 *Language,\r
+ OUT EFI_GUID **ErrorType,\r
+ OUT UINTN *BufferSize,\r
+ OUT CHAR16 **Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- EFI_STATUS Status;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
- CHAR8 *SupportedLanguages;\r
- BOOLEAN Iso639Language;\r
- BOOLEAN Found;\r
- UINTN Index;\r
-\r
- if (Language == NULL ||\r
- ErrorType == NULL ||\r
- Buffer == NULL ||\r
- ControllerHandle == NULL ||\r
- BufferSize == NULL) {\r
-\r
+ EFI_STATUS Status;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ CHAR8 *SupportedLanguages;\r
+ BOOLEAN Iso639Language;\r
+ BOOLEAN Found;\r
+ UINTN Index;\r
+\r
+ if ((Language == NULL) ||\r
+ (ErrorType == NULL) ||\r
+ (Buffer == NULL) ||\r
+ (ControllerHandle == NULL) ||\r
+ (BufferSize == NULL))\r
+ {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
SupportedLanguages = This->SupportedLanguages;\r
- Iso639Language = (BOOLEAN)(This == &gEmuBlockIoDriverDiagnostics);\r
+ Iso639Language = (BOOLEAN)(This == &gEmuBlockIoDriverDiagnostics);\r
//\r
// Make sure Language is in the set of Supported Languages\r
//\r
if (Iso639Language) {\r
if (CompareMem (Language, SupportedLanguages, 3) == 0) {\r
Found = TRUE;\r
- break;\r
- }\r
+ break;\r
+ }\r
+\r
SupportedLanguages += 3;\r
} else {\r
- for (Index = 0; SupportedLanguages[Index] != 0 && SupportedLanguages[Index] != ';'; Index++);\r
- if ((AsciiStrnCmp(SupportedLanguages, Language, Index) == 0) && (Language[Index] == 0)) {\r
+ for (Index = 0; SupportedLanguages[Index] != 0 && SupportedLanguages[Index] != ';'; Index++) {\r
+ }\r
+\r
+ if ((AsciiStrnCmp (SupportedLanguages, Language, Index) == 0) && (Language[Index] == 0)) {\r
Found = TRUE;\r
break;\r
- }\r
+ }\r
+\r
SupportedLanguages += Index;\r
- for (; *SupportedLanguages != 0 && *SupportedLanguages == ';'; SupportedLanguages++);\r
+ for ( ; *SupportedLanguages != 0 && *SupportedLanguages == ';'; SupportedLanguages++) {\r
+ }\r
}\r
}\r
+\r
//\r
// If Language is not a member of SupportedLanguages, then return EFI_UNSUPPORTED\r
//\r
if (DiagnosticType != EfiDriverDiagnosticTypeStandard) {\r
*ErrorType = &gEfiBlockIoProtocolGuid;\r
*BufferSize = 0x60;\r
- Buffer = AllocatePool ((UINTN) (*BufferSize));\r
+ Buffer = AllocatePool ((UINTN)(*BufferSize));\r
CopyMem (*Buffer, L"Windows Block I/O Driver Diagnostics Failed\n", *BufferSize);\r
return EFI_DEVICE_ERROR;\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- gEmuBlockIoDriverBinding.DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ gEmuBlockIoDriverBinding.DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
#include "EmuBlockIo.h"\r
\r
-\r
/**\r
Reset the block device hardware.\r
\r
IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
\r
Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIo2ReadBlocksEx (\r
- IN EFI_BLOCK_IO2_PROTOCOL *This,\r
- IN UINT32 MediaId,\r
- IN EFI_LBA LBA,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
- IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_BLOCK_IO2_PROTOCOL *This,\r
+ IN UINT32 MediaId,\r
+ IN EFI_LBA LBA,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
+ IN UINTN BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
\r
Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Write BufferSize bytes from Lba into Buffer.\r
\r
EFIAPI\r
EmuBlockIo2WriteBlocksEx (\r
IN EFI_BLOCK_IO2_PROTOCOL *This,\r
- IN UINT32 MediaId,\r
- IN EFI_LBA LBA,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN UINT32 MediaId,\r
+ IN EFI_LBA LBA,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
\r
Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Flush the Block Device.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIo2Flush (\r
- IN EFI_BLOCK_IO2_PROTOCOL *This,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
+ IN EFI_BLOCK_IO2_PROTOCOL *This,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
\r
Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Reset the Block Device.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoReset (\r
- IN EFI_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EFI_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Read BufferSize bytes from Lba into Buffer.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoReadBlocks (\r
- IN EFI_BLOCK_IO_PROTOCOL *This,\r
- IN UINT32 MediaId,\r
- IN EFI_LBA Lba,\r
- IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_BLOCK_IO_PROTOCOL *This,\r
+ IN UINT32 MediaId,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
- EFI_BLOCK_IO2_TOKEN Token;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
+ EFI_BLOCK_IO2_TOKEN Token;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
Token.Event = NULL;\r
- Status = Private->Io->ReadBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);\r
+ Status = Private->Io->ReadBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);\r
\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
-\r
/**\r
Write BufferSize bytes from Lba into Buffer.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoWriteBlocks (\r
- IN EFI_BLOCK_IO_PROTOCOL *This,\r
- IN UINT32 MediaId,\r
- IN EFI_LBA Lba,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_BLOCK_IO_PROTOCOL *This,\r
+ IN UINT32 MediaId,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
- EFI_BLOCK_IO2_TOKEN Token;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
+ EFI_BLOCK_IO2_TOKEN Token;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
Token.Event = NULL;\r
- Status = Private->Io->WriteBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);\r
+ Status = Private->Io->WriteBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);\r
\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
IN EFI_BLOCK_IO_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- EFI_TPL OldTpl;\r
- EFI_BLOCK_IO2_TOKEN Token;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_TPL OldTpl;\r
+ EFI_BLOCK_IO2_TOKEN Token;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
Token.Event = NULL;\r
- Status = Private->Io->FlushBlocks (Private->Io, &Token);\r
+ Status = Private->Io->FlushBlocks (Private->Io, &Token);\r
\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Tests to see if this driver supports a given controller. If a child device is provided,\r
it further tests to see if this driver supports creating a handle for the specified child device.\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
\r
//\r
// Open the IO Abstraction(s) needed to perform the supported test\r
// Close the I/O Abstraction(s) used to perform the supported test\r
//\r
gBS->CloseProtocol (\r
- Handle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- Handle\r
- );\r
+ Handle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ Handle\r
+ );\r
return Status;\r
}\r
\r
-\r
/**\r
Starts a device controller or a bus controller.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuBlockIoDriverBindingStart (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE Handle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE Handle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EMU_BLOCK_IO_PRIVATE *Private = NULL;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EMU_BLOCK_IO_PRIVATE *Private = NULL;\r
\r
//\r
// Grab the protocols we need\r
\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Handle,\r
- &gEfiBlockIoProtocolGuid, &Private->BlockIo,\r
- &gEfiBlockIo2ProtocolGuid, &Private->BlockIo2,\r
+ &gEfiBlockIoProtocolGuid,\r
+ &Private->BlockIo,\r
+ &gEfiBlockIo2ProtocolGuid,\r
+ &Private->BlockIo2,\r
NULL\r
);\r
\r
}\r
\r
gBS->FreePool (Private);\r
-\r
}\r
\r
gBS->CloseProtocol (\r
- Handle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- Handle\r
- );\r
+ Handle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ Handle\r
+ );\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Stops a device controller or a bus controller.\r
\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
\r
//\r
// Get our context back\r
\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
Private->EfiHandle,\r
- &gEfiBlockIoProtocolGuid, &Private->BlockIo,\r
- &gEfiBlockIo2ProtocolGuid, &Private->BlockIo2,\r
+ &gEfiBlockIoProtocolGuid,\r
+ &Private->BlockIo,\r
+ &gEfiBlockIo2ProtocolGuid,\r
+ &Private->BlockIo2,\r
NULL\r
);\r
if (!EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
-\r
-\r
-\r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuBlockIoDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gEmuBlockIoDriverBinding = {\r
EmuBlockIoDriverBindingSupported,\r
EmuBlockIoDriverBindingStart,\r
EmuBlockIoDriverBindingStop,\r
NULL\r
};\r
\r
-\r
-\r
-\r
/**\r
The user Entry Point for module EmuBlockIo . The user code starts with this function.\r
\r
EFI_STATUS\r
EFIAPI\r
InitializeEmuBlockIo (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = EfiLibInstallAllDriverProtocols2 (\r
ImageHandle,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
return Status;\r
}\r
-\r
-\r
-\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
\r
-\r
//\r
// Language supported for driverconfiguration protocol\r
//\r
\r
-#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')\r
+#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')\r
typedef struct {\r
UINTN Signature;\r
EMU_IO_THUNK_PROTOCOL *IoThunk;\r
EFI_BLOCK_IO_MEDIA Media;\r
\r
EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
-\r
} EMU_BLOCK_IO_PRIVATE;\r
\r
#define EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS(a) \\r
#define EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, EMU_BLOCK_IO_PRIVATE, BlockIo2, EMU_BLOCK_IO_PRIVATE_SIGNATURE)\r
\r
-\r
//\r
// Block I/O Global Variables\r
//\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
);\r
\r
//\r
// EFI Component Name Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gEmuBusDriverComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gEmuBusDriverComponentName = {\r
EmuBusDriverComponentNameGetDriverName,\r
EmuBusDriverComponentNameGetControllerName,\r
"eng"\r
//\r
// EFI Component Name 2 Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuBusDriverComponentName2 = {\r
- (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuBusDriverComponentNameGetDriverName,\r
- (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuBusDriverComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuBusDriverComponentName2 = {\r
+ (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmuBusDriverComponentNameGetDriverName,\r
+ (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmuBusDriverComponentNameGetControllerName,\r
"en"\r
};\r
\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmuBusDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmuBusDriverNameTable[] = {\r
{ "eng", L"Emu Bus Driver" },\r
- { NULL , NULL }\r
+ { NULL, NULL }\r
};\r
\r
/**\r
)\r
{\r
return LookupUnicodeString2 (\r
- Language,\r
- This->SupportedLanguages,\r
- mEmuBusDriverNameTable,\r
- DriverName,\r
- (BOOLEAN)(This == &gEmuBusDriverComponentName)\r
- );\r
+ Language,\r
+ This->SupportedLanguages,\r
+ mEmuBusDriverNameTable,\r
+ DriverName,\r
+ (BOOLEAN)(This == &gEmuBusDriverComponentName)\r
+ );\r
}\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIo;\r
- EMU_IO_DEVICE *Private;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIo;\r
+ EMU_IO_DEVICE *Private;\r
\r
//\r
// Make sure this driver is currently managing ControllHandle\r
Status = gBS->OpenProtocol (\r
ChildHandle,\r
&gEmuIoThunkProtocolGuid,\r
- (VOID**)&EmuIo,\r
+ (VOID **)&EmuIo,\r
gEmuBusDriverBinding.DriverBindingHandle,\r
ChildHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
Private->ControllerNameTable,\r
ControllerName,\r
(BOOLEAN)(This == &gEmuBusDriverComponentName)\r
- );\r
+ );\r
}\r
\r
#include "EmuBusDriverDxe.h"\r
\r
-\r
-\r
//\r
// DriverBinding protocol global\r
//\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuBusDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gEmuBusDriverBinding = {\r
EmuBusDriverBindingSupported,\r
EmuBusDriverBindingStart,\r
EmuBusDriverBindingStop,\r
NULL\r
};\r
\r
-\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingSupported (\r
// If RemainingDevicePath isn't the End of Device Path Node,\r
// check its validation\r
//\r
- if (RemainingDevicePath->Type != HARDWARE_DEVICE_PATH ||\r
- RemainingDevicePath->SubType != HW_VENDOR_DP ||\r
- DevicePathNodeLength(RemainingDevicePath) != sizeof(EMU_VENDOR_DEVICE_PATH_NODE)) {\r
+ if ((RemainingDevicePath->Type != HARDWARE_DEVICE_PATH) ||\r
+ (RemainingDevicePath->SubType != HW_VENDOR_DP) ||\r
+ (DevicePathNodeLength (RemainingDevicePath) != sizeof (EMU_VENDOR_DEVICE_PATH_NODE)))\r
+ {\r
return EFI_UNSUPPORTED;\r
}\r
}\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEmuThunkProtocolGuid,\r
- (VOID **)&EmuThunk ,\r
+ (VOID **)&EmuThunk,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
// Close the I/O Abstraction(s) used to perform the supported test\r
//\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
//\r
// Open the EFI Device Path protocol needed to perform the supported test\r
return Status;\r
}\r
\r
-\r
//\r
// Close protocol, don't use device path protocol in the Support() function\r
//\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingStart (\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_STATUS InstallStatus;\r
- EMU_THUNK_PROTOCOL *EmuThunk;\r
- EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
- EMU_IO_DEVICE *EmuDevice;\r
- EMU_BUS_DEVICE *EmuBusDevice;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- UINT16 ComponentName[512];\r
- EMU_VENDOR_DEVICE_PATH_NODE *Node;\r
- BOOLEAN CreateDevice;\r
+ EFI_STATUS Status;\r
+ EFI_STATUS InstallStatus;\r
+ EMU_THUNK_PROTOCOL *EmuThunk;\r
+ EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
+ EMU_IO_DEVICE *EmuDevice;\r
+ EMU_BUS_DEVICE *EmuBusDevice;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ UINT16 ComponentName[512];\r
+ EMU_VENDOR_DEVICE_PATH_NODE *Node;\r
+ BOOLEAN CreateDevice;\r
\r
InstallStatus = EFI_UNSUPPORTED;\r
- Status = EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
\r
//\r
// Grab the protocols we need\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
);\r
- if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+ if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
return Status;\r
}\r
\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
);\r
- if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+ if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
return Status;\r
}\r
\r
FALSE\r
);\r
\r
-\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&ControllerHandle,\r
- &gEfiCallerIdGuid, EmuBusDevice,\r
+ &gEfiCallerIdGuid,\r
+ EmuBusDevice,\r
NULL\r
);\r
if (EFI_ERROR (Status)) {\r
}\r
}\r
\r
-\r
for (Status = EFI_SUCCESS, EmuIoThunk = NULL; !EFI_ERROR (Status); ) {\r
Status = EmuThunk->GetNextProtocol (TRUE, &EmuIoThunk);\r
if (EFI_ERROR (Status)) {\r
\r
CreateDevice = TRUE;\r
if (RemainingDevicePath != NULL) {\r
- CreateDevice = FALSE;\r
+ CreateDevice = FALSE;\r
//\r
// Check if RemainingDevicePath is the End of Device Path Node,\r
// if yes, don't create any child device\r
// If RemainingDevicePath isn't the End of Device Path Node,\r
// check its validation\r
//\r
- Node = (EMU_VENDOR_DEVICE_PATH_NODE *) RemainingDevicePath;\r
- if (Node->VendorDevicePath.Header.Type == HARDWARE_DEVICE_PATH &&\r
- Node->VendorDevicePath.Header.SubType == HW_VENDOR_DP &&\r
- DevicePathNodeLength (&Node->VendorDevicePath.Header) == sizeof (EMU_VENDOR_DEVICE_PATH_NODE)\r
- ) {\r
- if (CompareGuid (&Node->VendorDevicePath.Guid, EmuIoThunk->Protocol) && Node->Instance == EmuIoThunk->Instance) {\r
+ Node = (EMU_VENDOR_DEVICE_PATH_NODE *)RemainingDevicePath;\r
+ if ((Node->VendorDevicePath.Header.Type == HARDWARE_DEVICE_PATH) &&\r
+ (Node->VendorDevicePath.Header.SubType == HW_VENDOR_DP) &&\r
+ (DevicePathNodeLength (&Node->VendorDevicePath.Header) == sizeof (EMU_VENDOR_DEVICE_PATH_NODE))\r
+ )\r
+ {\r
+ if (CompareGuid (&Node->VendorDevicePath.Guid, EmuIoThunk->Protocol) && (Node->Instance == EmuIoThunk->Instance)) {\r
CreateDevice = TRUE;\r
}\r
}\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- EmuDevice->Handle = NULL;\r
- EmuDevice->ControllerHandle = ControllerHandle;\r
- EmuDevice->ParentDevicePath = ParentDevicePath;\r
+ EmuDevice->Handle = NULL;\r
+ EmuDevice->ControllerHandle = ControllerHandle;\r
+ EmuDevice->ParentDevicePath = ParentDevicePath;\r
CopyMem (&EmuDevice->EmuIoThunk, EmuIoThunk, sizeof (EMU_IO_THUNK_PROTOCOL));\r
\r
EmuDevice->ControllerNameTable = NULL;\r
);\r
\r
EmuDevice->DevicePath = EmuBusCreateDevicePath (\r
- ParentDevicePath,\r
- EmuIoThunk->Protocol,\r
- EmuIoThunk->Instance\r
- );\r
+ ParentDevicePath,\r
+ EmuIoThunk->Protocol,\r
+ EmuIoThunk->Instance\r
+ );\r
if (EmuDevice->DevicePath == NULL) {\r
gBS->FreePool (EmuDevice);\r
return EFI_OUT_OF_RESOURCES;\r
EmuDevice->Signature = EMU_IO_DEVICE_SIGNATURE;\r
\r
InstallStatus = gBS->InstallMultipleProtocolInterfaces (\r
- &EmuDevice->Handle,\r
- &gEfiDevicePathProtocolGuid, EmuDevice->DevicePath,\r
- &gEmuIoThunkProtocolGuid, &EmuDevice->EmuIoThunk,\r
- NULL\r
- );\r
+ &EmuDevice->Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ EmuDevice->DevicePath,\r
+ &gEmuIoThunkProtocolGuid,\r
+ &EmuDevice->EmuIoThunk,\r
+ NULL\r
+ );\r
if (EFI_ERROR (InstallStatus)) {\r
FreeUnicodeStringTable (EmuDevice->ControllerNameTable);\r
gBS->FreePool (EmuDevice);\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEmuThunkProtocolGuid,\r
- (VOID **)&EmuThunk ,\r
+ (VOID **)&EmuThunk,\r
This->DriverBindingHandle,\r
EmuDevice->Handle,\r
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
return InstallStatus;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingStop (\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
- BOOLEAN AllChildrenStopped;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EMU_BUS_DEVICE *EmuBusDevice;\r
- EMU_IO_DEVICE *EmuDevice;\r
- EMU_THUNK_PROTOCOL *EmuThunk;\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
+ BOOLEAN AllChildrenStopped;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EMU_BUS_DEVICE *EmuBusDevice;\r
+ EMU_IO_DEVICE *EmuDevice;\r
+ EMU_THUNK_PROTOCOL *EmuThunk;\r
\r
//\r
// Complete all outstanding transactions to Controller.\r
}\r
\r
gBS->UninstallMultipleProtocolInterfaces (\r
- ControllerHandle,\r
- &gEfiCallerIdGuid, EmuBusDevice,\r
- NULL\r
- );\r
+ ControllerHandle,\r
+ &gEfiCallerIdGuid,\r
+ EmuBusDevice,\r
+ NULL\r
+ );\r
\r
FreeUnicodeStringTable (EmuBusDevice->ControllerNameTable);\r
\r
gBS->FreePool (EmuBusDevice);\r
\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
return EFI_SUCCESS;\r
}\r
\r
AllChildrenStopped = TRUE;\r
\r
for (Index = 0; Index < NumberOfChildren; Index++) {\r
-\r
Status = gBS->OpenProtocol (\r
ChildHandleBuffer[Index],\r
&gEmuIoThunkProtocolGuid,\r
\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
EmuDevice->Handle,\r
- &gEfiDevicePathProtocolGuid, EmuDevice->DevicePath,\r
- &gEmuIoThunkProtocolGuid, &EmuDevice->EmuIoThunk,\r
+ &gEfiDevicePathProtocolGuid,\r
+ EmuDevice->DevicePath,\r
+ &gEmuIoThunkProtocolGuid,\r
+ &EmuDevice->EmuIoThunk,\r
NULL\r
);\r
\r
if (EFI_ERROR (Status)) {\r
gBS->OpenProtocol (\r
- ControllerHandle,\r
- &gEmuThunkProtocolGuid,\r
- (VOID **) &EmuThunk ,\r
- This->DriverBindingHandle,\r
- EmuDevice->Handle,\r
- EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
- );\r
+ ControllerHandle,\r
+ &gEmuThunkProtocolGuid,\r
+ (VOID **)&EmuThunk,\r
+ This->DriverBindingHandle,\r
+ EmuDevice->Handle,\r
+ EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+ );\r
} else {\r
//\r
// Close the child handle\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
{\r
EMU_VENDOR_DEVICE_PATH_NODE DevicePath;\r
\r
- DevicePath.VendorDevicePath.Header.Type = HARDWARE_DEVICE_PATH;\r
- DevicePath.VendorDevicePath.Header.SubType = HW_VENDOR_DP;\r
+ DevicePath.VendorDevicePath.Header.Type = HARDWARE_DEVICE_PATH;\r
+ DevicePath.VendorDevicePath.Header.SubType = HW_VENDOR_DP;\r
SetDevicePathNodeLength (&DevicePath.VendorDevicePath.Header, sizeof (EMU_VENDOR_DEVICE_PATH_NODE));\r
\r
//\r
DevicePath.Instance = InstanceNumber;\r
\r
return AppendDevicePathNode (\r
- RootDevicePath,\r
- (EFI_DEVICE_PATH_PROTOCOL *) &DevicePath\r
- );\r
+ RootDevicePath,\r
+ (EFI_DEVICE_PATH_PROTOCOL *)&DevicePath\r
+ );\r
}\r
\r
-\r
-\r
/**\r
The user Entry Point for module EmuBusDriver. The user code starts with this function.\r
\r
EFI_STATUS\r
EFIAPI\r
InitializeEmuBusDriver (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = EfiLibInstallAllDriverProtocols (\r
ImageHandle,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
return Status;\r
}\r
-\r
-\r
-\r
-\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/DevicePathLib.h>\r
\r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuBusDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuBusDriverComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuBusDriverComponentName2;\r
-\r
+extern EFI_DRIVER_BINDING_PROTOCOL gEmuBusDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gEmuBusDriverComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gEmuBusDriverComponentName2;\r
\r
//\r
// Unix Bus Controller Structure\r
//\r
-#define EMU_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('L', 'X', 'B', 'D')\r
+#define EMU_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('L', 'X', 'B', 'D')\r
\r
typedef struct {\r
- UINT64 Signature;\r
- EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
+ UINT64 Signature;\r
+ EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
} EMU_BUS_DEVICE;\r
\r
//\r
#define EMU_IO_DEVICE_SIGNATURE SIGNATURE_32 ('L', 'X', 'V', 'D')\r
\r
typedef struct {\r
- UINT64 Signature;\r
- EFI_HANDLE Handle;\r
- EMU_IO_THUNK_PROTOCOL EmuIoThunk;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ UINT64 Signature;\r
+ EFI_HANDLE Handle;\r
+ EMU_IO_THUNK_PROTOCOL EmuIoThunk;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
\r
//\r
// Private data about the parent\r
//\r
- EFI_HANDLE ControllerHandle;\r
- EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
-\r
- EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
+ EFI_HANDLE ControllerHandle;\r
+ EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
\r
+ EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
} EMU_IO_DEVICE;\r
\r
#define EMU_IO_DEVICE_FROM_THIS(a) \\r
CR(a, EMU_IO_DEVICE, EmuIoThunk, EMU_IO_DEVICE_SIGNATURE)\r
\r
-\r
-\r
//\r
// Driver Binding Protocol function prototypes\r
//\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingSupported (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE Handle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE Handle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingStart (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE ParentHandle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE ParentHandle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
EmuBusDriverBindingStop (\r
IN UINT16 InstanceNumber\r
);\r
\r
-\r
#endif\r
EFI_STATUS\r
EFIAPI\r
EmuGopComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
);\r
\r
//\r
// EFI Component Name Protocol\r
//\r
-EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName = {\r
EmuGopComponentNameGetDriverName,\r
EmuGopComponentNameGetControllerName,\r
"eng"\r
//\r
// EFI Component Name 2 Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2 = {\r
- (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuGopComponentNameGetDriverName,\r
- (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuGopComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2 = {\r
+ (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmuGopComponentNameGetDriverName,\r
+ (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmuGopComponentNameGetControllerName,\r
"en"\r
};\r
\r
-\r
-EFI_UNICODE_STRING_TABLE mEmuGopDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mEmuGopDriverNameTable[] = {\r
{ "eng", L"Emulator GOP Driver" },\r
- { NULL , NULL }\r
+ { NULL, NULL }\r
};\r
\r
-\r
/**\r
Retrieves a Unicode string that is the user readable name of the driver.\r
\r
);\r
}\r
\r
-\r
/**\r
Retrieves a Unicode string that is the user readable name of the controller\r
that is being managed by a driver.\r
EFI_STATUS\r
EFIAPI\r
EmuGopComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
)\r
{\r
EFI_STATUS Status;\r
if (EFI_ERROR (Status)) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Get our context back\r
//\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/KeyMapLib.h>\r
\r
-\r
-#define MAX_Q 256\r
+#define MAX_Q 256\r
\r
typedef struct {\r
- UINTN Front;\r
- UINTN Rear;\r
- UINTN Count;\r
- EFI_INPUT_KEY Q[MAX_Q];\r
+ UINTN Front;\r
+ UINTN Rear;\r
+ UINTN Count;\r
+ EFI_INPUT_KEY Q[MAX_Q];\r
} GOP_QUEUE_FIXED;\r
\r
-#define EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('U', 'g', 'S', 'n')\r
+#define EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('U', 'g', 'S', 'n')\r
typedef struct _EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY {\r
- UINTN Signature;\r
- EFI_HANDLE NotifyHandle;\r
- EFI_KEY_DATA KeyData;\r
- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFn;\r
- EFI_EVENT Event;\r
- LIST_ENTRY NotifyEntry;\r
+ UINTN Signature;\r
+ EFI_HANDLE NotifyHandle;\r
+ EFI_KEY_DATA KeyData;\r
+ EFI_KEY_NOTIFY_FUNCTION KeyNotificationFn;\r
+ EFI_EVENT Event;\r
+ LIST_ENTRY NotifyEntry;\r
} EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY;\r
\r
-#define GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER 0xffff\r
+#define GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER 0xffff\r
\r
typedef struct {\r
- UINT32 HorizontalResolution;\r
- UINT32 VerticalResolution;\r
- UINT32 ColorDepth;\r
- UINT32 RefreshRate;\r
+ UINT32 HorizontalResolution;\r
+ UINT32 VerticalResolution;\r
+ UINT32 ColorDepth;\r
+ UINT32 RefreshRate;\r
} GOP_MODE_DATA;\r
\r
+extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;\r
\r
-\r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;\r
-\r
-#define EMU_UGA_CLASS_NAME L"EmuGopWindow"\r
+#define EMU_UGA_CLASS_NAME L"EmuGopWindow"\r
\r
#define GOP_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('G', 'o', 'p', 'N')\r
typedef struct {\r
- UINT64 Signature;\r
+ UINT64 Signature;\r
\r
- EFI_HANDLE Handle;\r
- EFI_GRAPHICS_OUTPUT_PROTOCOL GraphicsOutput;\r
- EFI_SIMPLE_TEXT_INPUT_PROTOCOL SimpleTextIn;\r
- EFI_SIMPLE_POINTER_PROTOCOL SimplePointer;\r
+ EFI_HANDLE Handle;\r
+ EFI_GRAPHICS_OUTPUT_PROTOCOL GraphicsOutput;\r
+ EFI_SIMPLE_TEXT_INPUT_PROTOCOL SimpleTextIn;\r
+ EFI_SIMPLE_POINTER_PROTOCOL SimplePointer;\r
\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *EmuGraphicsWindow;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *EmuGraphicsWindow;\r
\r
- EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
+ EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
\r
- EFI_SIMPLE_POINTER_MODE PointerMode;\r
+ EFI_SIMPLE_POINTER_MODE PointerMode;\r
//\r
// GOP Private Data for QueryMode ()\r
//\r
- GOP_MODE_DATA *ModeData;\r
-\r
+ GOP_MODE_DATA *ModeData;\r
\r
//\r
// UGA Private Data knowing when to start hardware\r
//\r
- BOOLEAN HardwareNeedsStarting;\r
+ BOOLEAN HardwareNeedsStarting;\r
\r
- CHAR16 *WindowName;\r
+ CHAR16 *WindowName;\r
\r
- GOP_QUEUE_FIXED Queue;\r
+ GOP_QUEUE_FIXED Queue;\r
\r
- EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL SimpleTextInEx;\r
- EFI_KEY_STATE KeyState;\r
- LIST_ENTRY NotifyList;\r
+ EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL SimpleTextInEx;\r
+ EFI_KEY_STATE KeyState;\r
+ LIST_ENTRY NotifyList;\r
} GOP_PRIVATE_DATA;\r
\r
-\r
#define GOP_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, GOP_PRIVATE_DATA, GraphicsOutput, GOP_PRIVATE_DATA_SIGNATURE)\r
\r
#define GOP_PRIVATE_DATA_FROM_POINTER_MODE_THIS(a) \\r
CR(a, GOP_PRIVATE_DATA, SimplePointer, GOP_PRIVATE_DATA_SIGNATURE)\r
\r
-\r
//\r
// Global Protocol Variables\r
//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2;\r
\r
//\r
// Gop Hardware abstraction internal worker functions\r
\r
EFI_STATUS\r
EmuGopConstructor (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
);\r
\r
EFI_STATUS\r
EmuGopDestructor (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
);\r
\r
-\r
EFI_STATUS\r
GopPrivateAddQ (\r
- IN GOP_PRIVATE_DATA *Private,\r
- IN EFI_INPUT_KEY Key\r
+ IN GOP_PRIVATE_DATA *Private,\r
+ IN EFI_INPUT_KEY Key\r
);\r
\r
EFI_STATUS\r
EmuGopInitializeSimpleTextInForWindow (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
);\r
\r
EFI_STATUS\r
EmuGopInitializeSimplePointerForWindow (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
);\r
\r
EFI_STATUS\r
EmuGopStartWindow (\r
- IN GOP_PRIVATE_DATA *Private,\r
- IN UINT32 HorizontalResolution,\r
- IN UINT32 VerticalResolution,\r
- IN UINT32 ColorDepth,\r
- IN UINT32 RefreshRate\r
+ IN GOP_PRIVATE_DATA *Private,\r
+ IN UINT32 HorizontalResolution,\r
+ IN UINT32 VerticalResolution,\r
+ IN UINT32 ColorDepth,\r
+ IN UINT32 RefreshRate\r
);\r
\r
VOID\r
VOID\r
EFIAPI\r
GopPrivateMakeCallbackFunction (\r
- IN VOID *Context,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN VOID *Context,\r
+ IN EFI_KEY_DATA *KeyData\r
);\r
\r
VOID\r
EFIAPI\r
GopPrivateBreakCallbackFunction (\r
- IN VOID *Context,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN VOID *Context,\r
+ IN EFI_KEY_DATA *KeyData\r
);\r
\r
#endif\r
\r
#include "Gop.h"\r
\r
-\r
EFI_STATUS\r
FreeNotifyList (\r
- IN OUT LIST_ENTRY *ListHead\r
+ IN OUT LIST_ENTRY *ListHead\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *NotifyNode;\r
+ EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *NotifyNode;\r
\r
if (ListHead == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
while (!IsListEmpty (ListHead)) {\r
NotifyNode = CR (\r
ListHead->ForwardLink,\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Tests to see if this driver supports a given controller. If a child device is provided,\r
it further tests to see if this driver supports creating a handle for the specified child device.\r
EFI_STATUS\r
EFIAPI\r
EmuGopDriverBindingSupported (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE Handle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE Handle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
\r
//\r
// Open the IO Abstraction(s) needed to perform the supported test\r
// Close the I/O Abstraction(s) used to perform the supported test\r
//\r
gBS->CloseProtocol (\r
- Handle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- Handle\r
- );\r
+ Handle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ Handle\r
+ );\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Starts a device controller or a bus controller.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGopDriverBindingStart (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE Handle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE Handle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EFI_STATUS Status;\r
- GOP_PRIVATE_DATA *Private;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EFI_STATUS Status;\r
+ GOP_PRIVATE_DATA *Private;\r
\r
//\r
// Grab the protocols we need\r
// Allocate Private context data for SGO inteface.\r
//\r
Private = NULL;\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- sizeof (GOP_PRIVATE_DATA),\r
- (VOID **)&Private\r
- );\r
+ Status = gBS->AllocatePool (\r
+ EfiBootServicesData,\r
+ sizeof (GOP_PRIVATE_DATA),\r
+ (VOID **)&Private\r
+ );\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
+\r
//\r
// Set up context record\r
//\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
+\r
//\r
// Publish the Gop interface to the world\r
//\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Private->Handle,\r
- &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,\r
- &gEfiSimpleTextInProtocolGuid, &Private->SimpleTextIn,\r
- &gEfiSimplePointerProtocolGuid, &Private->SimplePointer,\r
- &gEfiSimpleTextInputExProtocolGuid, &Private->SimpleTextInEx,\r
+ &gEfiGraphicsOutputProtocolGuid,\r
+ &Private->GraphicsOutput,\r
+ &gEfiSimpleTextInProtocolGuid,\r
+ &Private->SimpleTextIn,\r
+ &gEfiSimplePointerProtocolGuid,\r
+ &Private->SimplePointer,\r
+ &gEfiSimpleTextInputExProtocolGuid,\r
+ &Private->SimpleTextInEx,\r
NULL\r
);\r
\r
Done:\r
if (EFI_ERROR (Status)) {\r
-\r
gBS->CloseProtocol (\r
- Handle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- Handle\r
- );\r
+ Handle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ Handle\r
+ );\r
\r
if (Private != NULL) {\r
//\r
if (Private->ControllerNameTable != NULL) {\r
FreeUnicodeStringTable (Private->ControllerNameTable);\r
}\r
+\r
if (Private->SimpleTextIn.WaitForKey != NULL) {\r
gBS->CloseEvent (Private->SimpleTextIn.WaitForKey);\r
}\r
+\r
if (Private->SimpleTextInEx.WaitForKeyEx != NULL) {\r
gBS->CloseEvent (Private->SimpleTextInEx.WaitForKeyEx);\r
}\r
+\r
FreeNotifyList (&Private->NotifyList);\r
\r
gBS->FreePool (Private);\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Stops a device controller or a bus controller.\r
\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
- EFI_STATUS Status;\r
- GOP_PRIVATE_DATA *Private;\r
+ EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
+ EFI_STATUS Status;\r
+ GOP_PRIVATE_DATA *Private;\r
\r
Status = gBS->OpenProtocol (\r
Handle,\r
//\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
Private->Handle,\r
- &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,\r
- &gEfiSimpleTextInProtocolGuid, &Private->SimpleTextIn,\r
- &gEfiSimplePointerProtocolGuid, &Private->SimplePointer,\r
- &gEfiSimpleTextInputExProtocolGuid, &Private->SimpleTextInEx,\r
+ &gEfiGraphicsOutputProtocolGuid,\r
+ &Private->GraphicsOutput,\r
+ &gEfiSimpleTextInProtocolGuid,\r
+ &Private->SimpleTextIn,\r
+ &gEfiSimplePointerProtocolGuid,\r
+ &Private->SimplePointer,\r
+ &gEfiSimpleTextInputExProtocolGuid,\r
+ &Private->SimpleTextInEx,\r
NULL\r
);\r
if (!EFI_ERROR (Status)) {\r
}\r
\r
gBS->CloseProtocol (\r
- Handle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- Handle\r
- );\r
+ Handle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ Handle\r
+ );\r
\r
//\r
// Free our instance data\r
FreeNotifyList (&Private->NotifyList);\r
\r
gBS->FreePool (Private);\r
-\r
}\r
\r
return Status;\r
}\r
\r
-\r
///\r
/// This protocol provides the services required to determine if a driver supports a given controller.\r
/// If a controller is supported, then it also provides routines to start and stop the controller.\r
///\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding = {\r
EmuGopDriverBindingSupported,\r
EmuGopDriverBindingStart,\r
EmuGopDriverBindingStop,\r
NULL\r
};\r
\r
-\r
-\r
/**\r
The user Entry Point for module EmuGop. The user code starts with this function.\r
\r
EFI_STATUS\r
EFIAPI\r
InitializeEmuGop (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = EfiLibInstallDriverBindingComponentName2 (\r
ImageHandle,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
return Status;\r
}\r
-\r
\r
#include "Gop.h"\r
\r
-\r
BOOLEAN\r
GopPrivateIsKeyRegistered (\r
IN EFI_KEY_DATA *RegsiteredData,\r
IN EFI_KEY_DATA *InputData\r
)\r
+\r
/*++\r
\r
Routine Description:\r
ASSERT (RegsiteredData != NULL && InputData != NULL);\r
\r
if ((RegsiteredData->Key.ScanCode != InputData->Key.ScanCode) ||\r
- (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar)) {\r
+ (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))\r
+ {\r
return FALSE;\r
}\r
\r
//\r
// Assume KeyShiftState/KeyToggleState = 0 in Registered key data means these state could be ignored.\r
//\r
- if (RegsiteredData->KeyState.KeyShiftState != 0 &&\r
- RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState) {\r
+ if ((RegsiteredData->KeyState.KeyShiftState != 0) &&\r
+ (RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState))\r
+ {\r
return FALSE;\r
}\r
- if (RegsiteredData->KeyState.KeyToggleState != 0 &&\r
- RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState) {\r
+\r
+ if ((RegsiteredData->KeyState.KeyToggleState != 0) &&\r
+ (RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState))\r
+ {\r
return FALSE;\r
}\r
\r
return TRUE;\r
-\r
}\r
\r
-\r
VOID\r
EFIAPI\r
GopPrivateMakeCallbackFunction (\r
- IN VOID *Context,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN VOID *Context,\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
- LIST_ENTRY *Link;\r
+ LIST_ENTRY *Link;\r
EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;\r
- GOP_PRIVATE_DATA *Private = (GOP_PRIVATE_DATA *)Context;\r
+ GOP_PRIVATE_DATA *Private = (GOP_PRIVATE_DATA *)Context;\r
\r
KeyMapMake (KeyData);\r
\r
}\r
}\r
\r
-\r
VOID\r
EFIAPI\r
GopPrivateBreakCallbackFunction (\r
- IN VOID *Context,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN VOID *Context,\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
KeyMapBreak (KeyData);\r
}\r
\r
-\r
-\r
//\r
// Simple Text In implementation.\r
//\r
EFI_STATUS\r
EFIAPI\r
EmuGopSimpleTextInReset (\r
- IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
GOP_PRIVATE_DATA *Private;\r
//\r
// A reset is draining the Queue\r
//\r
- while (Private->EmuGraphicsWindow->GetKey (Private->EmuGraphicsWindow, &KeyData) == EFI_SUCCESS)\r
- ;\r
+ while (Private->EmuGraphicsWindow->GetKey (Private->EmuGraphicsWindow, &KeyData) == EFI_SUCCESS) {\r
+ }\r
\r
//\r
// Leave critical section and return\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Reads the next keystroke from the input device. The WaitForKey Event can\r
be used to test for existence of a keystroke via WaitForEvent () call.\r
EFI_STATUS\r
EFIAPI\r
EmuGopSimpleTextInReadKeyStroke (\r
- IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
- OUT EFI_INPUT_KEY *Key\r
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
+ OUT EFI_INPUT_KEY *Key\r
)\r
{\r
GOP_PRIVATE_DATA *Private;\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->GetKey (Private->EmuGraphicsWindow, &KeyData);\r
+ Status = Private->EmuGraphicsWindow->GetKey (Private->EmuGraphicsWindow, &KeyData);\r
if (!EFI_ERROR (Status)) {\r
if ((KeyData.Key.ScanCode == 0) && (KeyData.Key.UnicodeChar == 0)) {\r
// Modifier key was pressed\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
SimpleTextIn and SimpleTextInEx Notify Wait Event\r
\r
VOID\r
EFIAPI\r
EmuGopSimpleTextInWaitForKey (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
GOP_PRIVATE_DATA *Private;\r
EFI_STATUS Status;\r
EFI_TPL OldTpl;\r
\r
- Private = (GOP_PRIVATE_DATA *) Context;\r
+ Private = (GOP_PRIVATE_DATA *)Context;\r
if (Private->EmuGraphicsWindow == NULL) {\r
return;\r
}\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->CheckKey (Private->EmuGraphicsWindow);\r
+ Status = Private->EmuGraphicsWindow->CheckKey (Private->EmuGraphicsWindow);\r
if (!EFI_ERROR (Status)) {\r
//\r
// If a there is a key in the queue signal our event.\r
//\r
gBS->SignalEvent (Event);\r
}\r
+\r
//\r
// Leave critical section and return\r
//\r
gBS->RestoreTPL (OldTpl);\r
}\r
\r
-\r
//\r
// Simple Text Input Ex protocol functions\r
//\r
\r
-\r
/**\r
The Reset() function resets the input device hardware. As part\r
of initialization process, the firmware/device will make a quick\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
)\r
+\r
/*++\r
\r
Routine Description:\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
The function reads the next keystroke from the input device. If\r
there is no pending keystroke the function returns\r
EFI_STATUS\r
EFIAPI\r
EmuGopSimpleTextInExReadKeyStrokeEx (\r
- IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
- OUT EFI_KEY_DATA *KeyData\r
+ IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+ OUT EFI_KEY_DATA *KeyData\r
)\r
+\r
/*++\r
\r
Routine Description:\r
GOP_PRIVATE_DATA *Private;\r
EFI_TPL OldTpl;\r
\r
-\r
if (KeyData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->GetKey(Private->EmuGraphicsWindow, KeyData);\r
+ Status = Private->EmuGraphicsWindow->GetKey (Private->EmuGraphicsWindow, KeyData);\r
\r
//\r
// Leave critical section and return\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
The SetState() function allows the input device hardware to\r
have state settings adjusted.\r
}\r
\r
if (((Private->KeyState.KeyToggleState & EFI_TOGGLE_STATE_VALID) != EFI_TOGGLE_STATE_VALID) ||\r
- ((*KeyToggleState & EFI_TOGGLE_STATE_VALID) != EFI_TOGGLE_STATE_VALID)) {\r
+ ((*KeyToggleState & EFI_TOGGLE_STATE_VALID) != EFI_TOGGLE_STATE_VALID))\r
+ {\r
return EFI_UNSUPPORTED;\r
}\r
\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->KeySetState (Private->EmuGraphicsWindow, KeyToggleState);\r
+ Status = Private->EmuGraphicsWindow->KeySetState (Private->EmuGraphicsWindow, KeyToggleState);\r
//\r
// Leave critical section and return\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
SimpleTextIn and SimpleTextInEx Notify Wait Event\r
\r
VOID\r
EFIAPI\r
EmuGopRegisterKeyCallback (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *ExNotify = (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *)Context;\r
+ EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *ExNotify = (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *)Context;\r
\r
ExNotify->KeyNotificationFn (&ExNotify->KeyData);\r
}\r
\r
-\r
-\r
/**\r
The RegisterKeystrokeNotify() function registers a function\r
which will be called when a specified keystroke will occur.\r
OUT VOID **NotifyHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- GOP_PRIVATE_DATA *Private;\r
- EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;\r
- LIST_ENTRY *Link;\r
- EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *NewNotify;\r
+ EFI_STATUS Status;\r
+ GOP_PRIVATE_DATA *Private;\r
+ EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;\r
+ LIST_ENTRY *Link;\r
+ EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *NewNotify;\r
\r
- if (KeyData == NULL || KeyNotificationFunction == NULL || NotifyHandle == NULL) {\r
+ if ((KeyData == NULL) || (KeyNotificationFunction == NULL) || (NotifyHandle == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// Allocate resource to save the notification function\r
//\r
- NewNotify = (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *) AllocateZeroPool (sizeof (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY));\r
+ NewNotify = (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *)AllocateZeroPool (sizeof (EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY));\r
if (NewNotify == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
NewNotify->Signature = EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE;\r
NewNotify->KeyNotificationFn = KeyNotificationFunction;\r
- NewNotify->NotifyHandle = (EFI_HANDLE) NewNotify;\r
+ NewNotify->NotifyHandle = (EFI_HANDLE)NewNotify;\r
CopyMem (&NewNotify->KeyData, KeyData, sizeof (KeyData));\r
InsertTailList (&Private->NotifyList, &NewNotify->NotifyEntry);\r
\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
*NotifyHandle = NewNotify->NotifyHandle;\r
\r
return EFI_SUCCESS;\r
-\r
}\r
\r
-\r
/**\r
The UnregisterKeystrokeNotify() function removes the\r
notification which was previously registered.\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
IN VOID *NotificationHandle\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- GOP_PRIVATE_DATA *Private;\r
- LIST_ENTRY *Link;\r
- EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;\r
+ GOP_PRIVATE_DATA *Private;\r
+ LIST_ENTRY *Link;\r
+ EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;\r
\r
if (NotificationHandle == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (((EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *) NotificationHandle)->Signature != EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE) {\r
+ if (((EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY *)NotificationHandle)->Signature != EMU_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
-\r
-\r
/**\r
Initialize SimplelTextIn and SimpleTextInEx protocols in the Private\r
context structure.\r
**/\r
EFI_STATUS\r
EmuGopInitializeSimpleTextInForWindow (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
)\r
{\r
EFI_STATUS Status;\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
//\r
// Initialize Simple Text In Ex\r
//\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
-\r
return Status;\r
}\r
\r
-\r
-\r
-\r
-\r
-\r
-\r
//\r
// Simple Pointer implementation.\r
//\r
\r
-\r
/**\r
Resets the pointer device hardware.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGopSimplePointerReset (\r
- IN EFI_SIMPLE_POINTER_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EFI_SIMPLE_POINTER_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- GOP_PRIVATE_DATA *Private;\r
- EFI_SIMPLE_POINTER_STATE State;\r
- EFI_TPL OldTpl;\r
+ GOP_PRIVATE_DATA *Private;\r
+ EFI_SIMPLE_POINTER_STATE State;\r
+ EFI_TPL OldTpl;\r
\r
Private = GOP_PRIVATE_DATA_FROM_POINTER_MODE_THIS (This);\r
if (Private->EmuGraphicsWindow == NULL) {\r
//\r
// A reset is draining the Queue\r
//\r
- while (Private->EmuGraphicsWindow->GetPointerState (Private->EmuGraphicsWindow, &State) == EFI_SUCCESS)\r
- ;\r
+ while (Private->EmuGraphicsWindow->GetPointerState (Private->EmuGraphicsWindow, &State) == EFI_SUCCESS) {\r
+ }\r
\r
//\r
// Leave critical section and return\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Retrieves the current state of a pointer device.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGopSimplePointerGetState (\r
- IN EFI_SIMPLE_POINTER_PROTOCOL *This,\r
- IN OUT EFI_SIMPLE_POINTER_STATE *State\r
+ IN EFI_SIMPLE_POINTER_PROTOCOL *This,\r
+ IN OUT EFI_SIMPLE_POINTER_STATE *State\r
)\r
{\r
GOP_PRIVATE_DATA *Private;\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->GetPointerState (Private->EmuGraphicsWindow, State);\r
+ Status = Private->EmuGraphicsWindow->GetPointerState (Private->EmuGraphicsWindow, State);\r
//\r
// Leave critical section and return\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
SimplePointer Notify Wait Event\r
\r
VOID\r
EFIAPI\r
EmuGopSimplePointerWaitForInput (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
GOP_PRIVATE_DATA *Private;\r
EFI_STATUS Status;\r
EFI_TPL OldTpl;\r
\r
- Private = (GOP_PRIVATE_DATA *) Context;\r
+ Private = (GOP_PRIVATE_DATA *)Context;\r
if (Private->EmuGraphicsWindow == NULL) {\r
return;\r
}\r
//\r
// Enter critical section\r
//\r
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- Status = Private->EmuGraphicsWindow->CheckPointer (Private->EmuGraphicsWindow);\r
+ Status = Private->EmuGraphicsWindow->CheckPointer (Private->EmuGraphicsWindow);\r
if (!EFI_ERROR (Status)) {\r
//\r
// If the pointer state has changed, signal our event.\r
//\r
gBS->SignalEvent (Event);\r
}\r
+\r
//\r
// Leave critical section and return\r
//\r
gBS->RestoreTPL (OldTpl);\r
}\r
\r
-\r
/**\r
SimplePointer constructor\r
\r
**/\r
EFI_STATUS\r
EmuGopInitializeSimplePointerForWindow (\r
- IN GOP_PRIVATE_DATA *Private\r
+ IN GOP_PRIVATE_DATA *Private\r
)\r
{\r
EFI_STATUS Status;\r
Private->PointerMode.LeftButton = TRUE;\r
Private->PointerMode.RightButton = TRUE;\r
\r
- Private->SimplePointer.Reset = EmuGopSimplePointerReset;\r
- Private->SimplePointer.GetState = EmuGopSimplePointerGetState;\r
- Private->SimplePointer.Mode = &Private->PointerMode;\r
+ Private->SimplePointer.Reset = EmuGopSimplePointerReset;\r
+ Private->SimplePointer.GetState = EmuGopSimplePointerGetState;\r
+ Private->SimplePointer.Mode = &Private->PointerMode;\r
\r
Status = gBS->CreateEvent (\r
EVT_NOTIFY_WAIT,\r
\r
#include "Gop.h"\r
\r
+EFI_EVENT mGopScreenExitBootServicesEvent;\r
\r
-EFI_EVENT mGopScreenExitBootServicesEvent;\r
-\r
-GOP_MODE_DATA mGopModeData[] = {\r
- { 800, 600, 0, 0 },\r
- { 640, 480, 0, 0 },\r
- { 720, 400, 0, 0 },\r
- {1024, 768, 0, 0 },\r
- {1280, 1024, 0, 0 }\r
- };\r
-\r
+GOP_MODE_DATA mGopModeData[] = {\r
+ { 800, 600, 0, 0 },\r
+ { 640, 480, 0, 0 },\r
+ { 720, 400, 0, 0 },\r
+ { 1024, 768, 0, 0 },\r
+ { 1280, 1024, 0, 0 }\r
+};\r
\r
/**\r
Returns information for an available graphics mode that the graphics device\r
\r
Private = GOP_PRIVATE_DATA_FROM_THIS (This);\r
\r
- if (Info == NULL || SizeOfInfo == NULL || (UINTN) ModeNumber >= This->Mode->MaxMode) {\r
+ if ((Info == NULL) || (SizeOfInfo == NULL) || ((UINTN)ModeNumber >= This->Mode->MaxMode)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
\r
*SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
\r
- (*Info)->Version = 0;\r
+ (*Info)->Version = 0;\r
(*Info)->HorizontalResolution = Private->ModeData[ModeNumber].HorizontalResolution;\r
(*Info)->VerticalResolution = Private->ModeData[ModeNumber].VerticalResolution;\r
- (*Info)->PixelFormat = PixelBltOnly;\r
- (*Info)->PixelsPerScanLine = (*Info)->HorizontalResolution;\r
+ (*Info)->PixelFormat = PixelBltOnly;\r
+ (*Info)->PixelsPerScanLine = (*Info)->HorizontalResolution;\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Set the video device into the specified mode and clears the visible portions of\r
the output display to black.\r
IN UINT32 ModeNumber\r
)\r
{\r
- EFI_STATUS Status;\r
- GOP_PRIVATE_DATA *Private;\r
- GOP_MODE_DATA *ModeData;\r
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL Fill;\r
+ EFI_STATUS Status;\r
+ GOP_PRIVATE_DATA *Private;\r
+ GOP_MODE_DATA *ModeData;\r
+ EFI_GRAPHICS_OUTPUT_BLT_PIXEL Fill;\r
\r
Private = GOP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
- ModeData = &Private->ModeData[ModeNumber];\r
- This->Mode->Mode = ModeNumber;\r
+ ModeData = &Private->ModeData[ModeNumber];\r
+ This->Mode->Mode = ModeNumber;\r
Private->GraphicsOutput.Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;\r
- Private->GraphicsOutput.Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
- Private->GraphicsOutput.Mode->Info->PixelsPerScanLine = ModeData->HorizontalResolution;\r
+ Private->GraphicsOutput.Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
+ Private->GraphicsOutput.Mode->Info->PixelsPerScanLine = ModeData->HorizontalResolution;\r
\r
if (Private->HardwareNeedsStarting) {\r
Status = EmuGopStartWindow (\r
- Private,\r
- ModeData->HorizontalResolution,\r
- ModeData->VerticalResolution,\r
- ModeData->ColorDepth,\r
- ModeData->RefreshRate\r
- );\r
+ Private,\r
+ ModeData->HorizontalResolution,\r
+ ModeData->VerticalResolution,\r
+ ModeData->ColorDepth,\r
+ ModeData->RefreshRate\r
+ );\r
if (EFI_ERROR (Status)) {\r
return EFI_DEVICE_ERROR;\r
}\r
Private->HardwareNeedsStarting = FALSE;\r
}\r
\r
-\r
- Status = Private->EmuGraphicsWindow->Size(\r
- Private->EmuGraphicsWindow,\r
- ModeData->HorizontalResolution,\r
- ModeData->VerticalResolution\r
- );\r
-\r
+ Status = Private->EmuGraphicsWindow->Size (\r
+ Private->EmuGraphicsWindow,\r
+ ModeData->HorizontalResolution,\r
+ ModeData->VerticalResolution\r
+ );\r
\r
Fill.Red = 0;\r
Fill.Green = 0;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGopBlt (\r
- IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL,\r
- IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,\r
- IN UINTN SourceX,\r
- IN UINTN SourceY,\r
- IN UINTN DestinationX,\r
- IN UINTN DestinationY,\r
- IN UINTN Width,\r
- IN UINTN Height,\r
- IN UINTN Delta OPTIONAL\r
+ IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
+ IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL,\r
+ IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,\r
+ IN UINTN SourceX,\r
+ IN UINTN SourceY,\r
+ IN UINTN DestinationX,\r
+ IN UINTN DestinationY,\r
+ IN UINTN Width,\r
+ IN UINTN Height,\r
+ IN UINTN Delta OPTIONAL\r
)\r
{\r
- GOP_PRIVATE_DATA *Private;\r
- EFI_TPL OriginalTPL;\r
- EFI_STATUS Status;\r
- EMU_GRAPHICS_WINDOWS__BLT_ARGS GopBltArgs;\r
+ GOP_PRIVATE_DATA *Private;\r
+ EFI_TPL OriginalTPL;\r
+ EFI_STATUS Status;\r
+ EMU_GRAPHICS_WINDOWS__BLT_ARGS GopBltArgs;\r
\r
Private = GOP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (Width == 0 || Height == 0) {\r
+ if ((Width == 0) || (Height == 0)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
//\r
// If Delta is zero, then the entire BltBuffer is being used, so Delta\r
// is the number of bytes in each row of BltBuffer. Since BltBuffer is Width pixels size,\r
GopBltArgs.SourceX = SourceX;\r
GopBltArgs.SourceY = SourceY;\r
GopBltArgs.Delta = Delta;\r
- Status = Private->EmuGraphicsWindow->Blt (\r
- Private->EmuGraphicsWindow,\r
- (EFI_UGA_PIXEL *)BltBuffer,\r
- (EFI_UGA_BLT_OPERATION)BltOperation,\r
- &GopBltArgs\r
- );\r
+ Status = Private->EmuGraphicsWindow->Blt (\r
+ Private->EmuGraphicsWindow,\r
+ (EFI_UGA_PIXEL *)BltBuffer,\r
+ (EFI_UGA_BLT_OPERATION)BltOperation,\r
+ &GopBltArgs\r
+ );\r
\r
gBS->RestoreTPL (OriginalTPL);\r
\r
return Status;\r
}\r
\r
-\r
//\r
// Construction and Destruction functions\r
//\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EmuGopStartWindow (\r
- IN GOP_PRIVATE_DATA *Private,\r
- IN UINT32 HorizontalResolution,\r
- IN UINT32 VerticalResolution,\r
- IN UINT32 ColorDepth,\r
- IN UINT32 RefreshRate\r
+ IN GOP_PRIVATE_DATA *Private,\r
+ IN UINT32 HorizontalResolution,\r
+ IN UINT32 VerticalResolution,\r
+ IN UINT32 ColorDepth,\r
+ IN UINT32 RefreshRate\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
//\r
// Register to be notified on exit boot services so we can destroy the window.\r
Private->EmuGraphicsWindow = Private->EmuIoThunk->Interface;\r
\r
// Register callback to support RegisterKeyNotify()\r
- Status = Private->EmuGraphicsWindow->RegisterKeyNotify (\r
- Private->EmuGraphicsWindow,\r
- GopPrivateMakeCallbackFunction,\r
- GopPrivateBreakCallbackFunction,\r
- Private\r
- );\r
+ Status = Private->EmuGraphicsWindow->RegisterKeyNotify (\r
+ Private->EmuGraphicsWindow,\r
+ GopPrivateMakeCallbackFunction,\r
+ GopPrivateBreakCallbackFunction,\r
+ Private\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
}\r
+\r
return Status;\r
}\r
\r
EFI_STATUS\r
EmuGopConstructor (\r
- GOP_PRIVATE_DATA *Private\r
+ GOP_PRIVATE_DATA *Private\r
)\r
{\r
Private->ModeData = mGopModeData;\r
\r
- Private->GraphicsOutput.QueryMode = EmuGopQuerytMode;\r
- Private->GraphicsOutput.SetMode = EmuGopSetMode;\r
- Private->GraphicsOutput.Blt = EmuGopBlt;\r
+ Private->GraphicsOutput.QueryMode = EmuGopQuerytMode;\r
+ Private->GraphicsOutput.SetMode = EmuGopSetMode;\r
+ Private->GraphicsOutput.Blt = EmuGopBlt;\r
\r
//\r
// Allocate buffer for Graphics Output Protocol mode information\r
if (Private->GraphicsOutput.Mode == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
Private->GraphicsOutput.Mode->Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
if (Private->GraphicsOutput.Mode->Info == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- Private->GraphicsOutput.Mode->MaxMode = sizeof(mGopModeData) / sizeof(GOP_MODE_DATA);\r
+ Private->GraphicsOutput.Mode->MaxMode = sizeof (mGopModeData) / sizeof (GOP_MODE_DATA);\r
//\r
// Till now, we have no idea about the window size.\r
//\r
- Private->GraphicsOutput.Mode->Mode = GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER;\r
- Private->GraphicsOutput.Mode->Info->Version = 0;\r
+ Private->GraphicsOutput.Mode->Mode = GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER;\r
+ Private->GraphicsOutput.Mode->Info->Version = 0;\r
Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;\r
- Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;\r
- Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;\r
- Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
- Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
- Private->GraphicsOutput.Mode->FrameBufferSize = 0;\r
+ Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;\r
+ Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;\r
+ Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+ Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS)(UINTN)NULL;\r
+ Private->GraphicsOutput.Mode->FrameBufferSize = 0;\r
\r
- Private->HardwareNeedsStarting = TRUE;\r
- Private->EmuGraphicsWindow = NULL;\r
+ Private->HardwareNeedsStarting = TRUE;\r
+ Private->EmuGraphicsWindow = NULL;\r
\r
EmuGopInitializeSimpleTextInForWindow (Private);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
EmuGopDestructor (\r
- GOP_PRIVATE_DATA *Private\r
+ GOP_PRIVATE_DATA *Private\r
)\r
{\r
if (!Private->HardwareNeedsStarting) {\r
if (Private->GraphicsOutput.Mode->Info != NULL) {\r
FreePool (Private->GraphicsOutput.Mode->Info);\r
}\r
+\r
FreePool (Private->GraphicsOutput.Mode);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
VOID\r
EFIAPI\r
ShutdownGopEvent (\r
IN EFI_EVENT Event,\r
IN VOID *Context\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
);\r
\r
//\r
"en"\r
};\r
\r
-EFI_UNICODE_STRING_TABLE mEmuSimpleFileSystemDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mEmuSimpleFileSystemDriverNameTable[] = {\r
{\r
"eng;en",\r
L"Emu Simple File System Driver"\r
)\r
{\r
return LookupUnicodeString2 (\r
- Language,\r
- This->SupportedLanguages,\r
- mEmuSimpleFileSystemDriverNameTable,\r
- DriverName,\r
- (BOOLEAN)(This == &gEmuSimpleFileSystemComponentName)\r
- );\r
+ Language,\r
+ This->SupportedLanguages,\r
+ mEmuSimpleFileSystemDriverNameTable,\r
+ DriverName,\r
+ (BOOLEAN)(This == &gEmuSimpleFileSystemComponentName)\r
+ );\r
}\r
\r
-\r
/**\r
Retrieves a Unicode string that is the user readable name of the controller\r
that is being managed by a driver.\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ EFI_STATUS Status;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
\r
//\r
// This is a device driver, so ChildHandle must be NULL.\r
if (EFI_ERROR (Status)) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Get our context back\r
//\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiSimpleFileSystemProtocolGuid,\r
- (VOID**)&SimpleFileSystem,\r
+ (VOID **)&SimpleFileSystem,\r
gEmuSimpleFileSystemDriverBinding.DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
Private = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (SimpleFileSystem);\r
\r
return LookupUnicodeString2 (\r
- Language,\r
- This->SupportedLanguages,\r
- Private->ControllerNameTable,\r
- ControllerName,\r
- (BOOLEAN)(This == &gEmuSimpleFileSystemComponentName)\r
- );\r
+ Language,\r
+ This->SupportedLanguages,\r
+ Private->ControllerNameTable,\r
+ ControllerName,\r
+ (BOOLEAN)(This == &gEmuSimpleFileSystemComponentName)\r
+ );\r
}\r
\r
#include "EmuSimpleFileSystem.h"\r
\r
-\r
-\r
-\r
/**\r
Opens a new file relative to the source file's location.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemOpen (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **NewHandle,\r
- IN CHAR16 *FileName,\r
- IN UINT64 OpenMode,\r
- IN UINT64 Attributes\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
+ IN CHAR16 *FileName,\r
+ IN UINT64 OpenMode,\r
+ IN UINT64 Attributes\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EMU_EFI_FILE_PRIVATE *NewPrivateFile;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EMU_EFI_FILE_PRIVATE *NewPrivateFile;\r
\r
//\r
// Check for obvious invalid parameters.\r
//\r
- if (This == NULL || NewHandle == NULL || FileName == NULL) {\r
+ if ((This == NULL) || (NewHandle == NULL) || (FileName == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
switch (OpenMode) {\r
- case EFI_FILE_MODE_CREATE | EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
- if (Attributes &~EFI_FILE_VALID_ATTR) {\r
- return EFI_INVALID_PARAMETER;\r
- }\r
+ case EFI_FILE_MODE_CREATE | EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
+ if (Attributes &~EFI_FILE_VALID_ATTR) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
- if (Attributes & EFI_FILE_READ_ONLY) {\r
- return EFI_INVALID_PARAMETER;\r
- }\r
+ if (Attributes & EFI_FILE_READ_ONLY) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
- //\r
- // fall through\r
- //\r
- case EFI_FILE_MODE_READ:\r
- case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
- break;\r
+ //\r
+ // fall through\r
+ //\r
+ case EFI_FILE_MODE_READ:\r
+ case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
+ break;\r
\r
- default:\r
- return EFI_INVALID_PARAMETER;\r
+ default:\r
+ return EFI_INVALID_PARAMETER;\r
}\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
goto Done;\r
}\r
\r
-\r
Status = PrivateFile->Io->Open (PrivateFile->Io, &NewPrivateFile->Io, FileName, OpenMode, Attributes);\r
if (!EFI_ERROR (Status)) {\r
*NewHandle = &NewPrivateFile->EfiFile;\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Close the file handle\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return Status;\r
}\r
\r
-\r
/**\r
Close and delete the file handle.\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return Status;\r
}\r
\r
-\r
/**\r
Read data from the file.\r
\r
OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
- if (This == NULL || BufferSize == NULL) {\r
+ if ((This == NULL) || (BufferSize == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Write data to a file.\r
\r
)\r
{\r
EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
EFI_TPL OldTpl;\r
\r
- if (This == NULL || BufferSize == NULL || Buffer == NULL) {\r
+ if ((This == NULL) || (BufferSize == NULL) || (Buffer == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Get a file's current position\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemGetPosition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT UINT64 *Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT UINT64 *Position\r
)\r
{\r
EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
EFI_TPL OldTpl;\r
\r
- if (This == NULL || Position == NULL) {\r
+ if ((This == NULL) || (Position == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
- PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
Status = PrivateFile->Io->GetPosition (PrivateFile->Io, Position);\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Set file's current position\r
\r
IN UINT64 Position\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return Status;\r
}\r
\r
-\r
/**\r
Get information about a file.\r
\r
OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
- if (This == NULL || InformationType == NULL || BufferSize == NULL) {\r
+ if ((This == NULL) || (InformationType == NULL) || (BufferSize == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Set information about a file\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemSetInfo (\r
- IN EFI_FILE_PROTOCOL*This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
//\r
// Check for invalid parameters.\r
//\r
- if (This == NULL || InformationType == NULL || BufferSize == 0 || Buffer == NULL) {\r
+ if ((This == NULL) || (InformationType == NULL) || (BufferSize == 0) || (Buffer == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
- PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
Status = PrivateFile->Io->SetInfo (PrivateFile->Io, InformationType, BufferSize, Buffer);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Flush data back for the file handle.\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Open the root directory on a volume.\r
\r
OUT EFI_FILE_PROTOCOL **Root\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
Status = EFI_UNSUPPORTED;\r
\r
- if (This == NULL || Root == NULL) {\r
+ if ((This == NULL) || (Root == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
goto Done;\r
}\r
\r
- PrivateFile->Signature = EMU_EFI_FILE_PRIVATE_SIGNATURE;\r
- PrivateFile->IoThunk = Private->IoThunk;\r
- PrivateFile->SimpleFileSystem = This;\r
+ PrivateFile->Signature = EMU_EFI_FILE_PRIVATE_SIGNATURE;\r
+ PrivateFile->IoThunk = Private->IoThunk;\r
+ PrivateFile->SimpleFileSystem = This;\r
\r
ZeroMem (&PrivateFile->EfiFile, sizeof (PrivateFile->EfiFile));\r
- PrivateFile->EfiFile.Revision = EFI_FILE_PROTOCOL_REVISION;\r
- PrivateFile->EfiFile.Open = EmuSimpleFileSystemOpen;\r
- PrivateFile->EfiFile.Close = EmuSimpleFileSystemClose;\r
- PrivateFile->EfiFile.Delete = EmuSimpleFileSystemDelete;\r
- PrivateFile->EfiFile.Read = EmuSimpleFileSystemRead;\r
- PrivateFile->EfiFile.Write = EmuSimpleFileSystemWrite;\r
- PrivateFile->EfiFile.GetPosition = EmuSimpleFileSystemGetPosition;\r
- PrivateFile->EfiFile.SetPosition = EmuSimpleFileSystemSetPosition;\r
- PrivateFile->EfiFile.GetInfo = EmuSimpleFileSystemGetInfo;\r
- PrivateFile->EfiFile.SetInfo = EmuSimpleFileSystemSetInfo;\r
- PrivateFile->EfiFile.Flush = EmuSimpleFileSystemFlush;\r
+ PrivateFile->EfiFile.Revision = EFI_FILE_PROTOCOL_REVISION;\r
+ PrivateFile->EfiFile.Open = EmuSimpleFileSystemOpen;\r
+ PrivateFile->EfiFile.Close = EmuSimpleFileSystemClose;\r
+ PrivateFile->EfiFile.Delete = EmuSimpleFileSystemDelete;\r
+ PrivateFile->EfiFile.Read = EmuSimpleFileSystemRead;\r
+ PrivateFile->EfiFile.Write = EmuSimpleFileSystemWrite;\r
+ PrivateFile->EfiFile.GetPosition = EmuSimpleFileSystemGetPosition;\r
+ PrivateFile->EfiFile.SetPosition = EmuSimpleFileSystemSetPosition;\r
+ PrivateFile->EfiFile.GetInfo = EmuSimpleFileSystemGetInfo;\r
+ PrivateFile->EfiFile.SetInfo = EmuSimpleFileSystemSetInfo;\r
+ PrivateFile->EfiFile.Flush = EmuSimpleFileSystemFlush;\r
\r
*Root = &PrivateFile->EfiFile;\r
\r
FALSE\r
);\r
\r
-\r
Done:\r
if (EFI_ERROR (Status)) {\r
if (PrivateFile) {\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
\r
//\r
// Close the I/O Abstraction(s) used to perform the supported test\r
//\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Starts a device controller or a bus controller.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSimpleFileSystemDriverBindingStart (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
\r
Private = NULL;\r
\r
Private->IoThunk = EmuIoThunk;\r
Private->Io = EmuIoThunk->Interface;\r
\r
- Private->SimpleFileSystem.Revision = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION;\r
- Private->SimpleFileSystem.OpenVolume = EmuSimpleFileSystemOpenVolume;\r
+ Private->SimpleFileSystem.Revision = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION;\r
+ Private->SimpleFileSystem.OpenVolume = EmuSimpleFileSystemOpenVolume;\r
\r
Private->ControllerNameTable = NULL;\r
\r
\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&ControllerHandle,\r
- &gEfiSimpleFileSystemProtocolGuid, &Private->SimpleFileSystem,\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ &Private->SimpleFileSystem,\r
NULL\r
);\r
\r
}\r
\r
gBS->FreePool (Private);\r
-\r
}\r
\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Stops a device controller or a bus controller.\r
\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ EFI_STATUS Status;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
\r
//\r
// Get our context back\r
//\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
ControllerHandle,\r
- &gEfiSimpleFileSystemProtocolGuid, &Private->SimpleFileSystem,\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ &Private->SimpleFileSystem,\r
NULL\r
);\r
if (!EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuSimpleFileSystemDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gEmuSimpleFileSystemDriverBinding = {\r
EmuSimpleFileSystemDriverBindingSupported,\r
EmuSimpleFileSystemDriverBindingStart,\r
EmuSimpleFileSystemDriverBindingStop,\r
NULL\r
};\r
\r
-\r
-\r
-\r
/**\r
The user Entry Point for module EmuSimpleFileSystem. The user code starts with this function.\r
\r
**/\r
EFI_STATUS\r
EFIAPI\r
-InitializeEmuSimpleFileSystem(\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+InitializeEmuSimpleFileSystem (\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = EfiLibInstallDriverBindingComponentName2 (\r
ImageHandle,\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
\r
+extern EFI_DRIVER_BINDING_PROTOCOL gEmuSimpleFileSystemDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gEmuSimpleFileSystemComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gEmuSimpleFileSystemComponentName2;\r
\r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuSimpleFileSystemDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuSimpleFileSystemComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuSimpleFileSystemComponentName2;\r
-\r
-#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'f', 's')\r
+#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'f', 's')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *IoThunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Io;\r
- EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *IoThunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Io;\r
+ EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
} EMU_SIMPLE_FILE_SYSTEM_PRIVATE;\r
\r
#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS(a) \\r
EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \\r
)\r
\r
-#define EMU_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('e', 'm', 'f', 's')\r
+#define EMU_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('e', 'm', 'f', 's')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *IoThunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
- EFI_FILE_PROTOCOL EfiFile;\r
- EFI_FILE_PROTOCOL *Io;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *IoThunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
+ EFI_FILE_PROTOCOL EfiFile;\r
+ EFI_FILE_PROTOCOL *Io;\r
} EMU_EFI_FILE_PRIVATE;\r
\r
#define EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS(a) \\r
EMU_EFI_FILE_PRIVATE_SIGNATURE \\r
)\r
\r
-\r
-\r
#endif\r
//\r
// EFI Component Name Functions\r
//\r
+\r
/**\r
Retrieves a Unicode string that is the user readable name of the driver.\r
\r
OUT CHAR16 **DriverName\r
);\r
\r
-\r
/**\r
Retrieves a Unicode string that is the user readable name of the controller\r
that is being managed by a driver.\r
EFI_STATUS\r
EFIAPI\r
EmuSnpDriverComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
);\r
\r
-\r
//\r
// EFI Component Name Protocol\r
//\r
//\r
// EFI Component Name 2 Protocol\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuSnpDriverComponentName2 = {\r
- (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuSnpDriverComponentNameGetDriverName,\r
- (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuSnpDriverComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuSnpDriverComponentName2 = {\r
+ (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmuSnpDriverComponentNameGetDriverName,\r
+ (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmuSnpDriverComponentNameGetControllerName,\r
"en"\r
};\r
\r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmuSnpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmuSnpDriverNameTable[] = {\r
{\r
"eng;en",\r
L"Emu SNP Driver"\r
EFI_STATUS\r
EFIAPI\r
EmuSnpDriverComponentNameGetControllerName (\r
- IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN EFI_HANDLE ChildHandle OPTIONAL,\r
- IN CHAR8 *Language,\r
- OUT CHAR16 **ControllerName\r
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN EFI_HANDLE ChildHandle OPTIONAL,\r
+ IN CHAR8 *Language,\r
+ OUT CHAR16 **ControllerName\r
)\r
{\r
return EFI_UNSUPPORTED;\r
\r
#include "EmuSnpDxe.h"\r
\r
-\r
-\r
-EFI_SIMPLE_NETWORK_PROTOCOL gEmuSnpTemplate = {\r
+EFI_SIMPLE_NETWORK_PROTOCOL gEmuSnpTemplate = {\r
EFI_SIMPLE_NETWORK_PROTOCOL_REVISION,\r
EmuSnpStart,\r
EmuSnpStop,\r
EmuSnpReceive,\r
NULL, // WaitForPacket\r
NULL // Mode\r
- };\r
+};\r
\r
-EFI_SIMPLE_NETWORK_MODE gEmuSnpModeTemplate = {\r
+EFI_SIMPLE_NETWORK_MODE gEmuSnpModeTemplate = {\r
EfiSimpleNetworkStopped, // State\r
NET_ETHER_ADDR_LEN, // HwAddressSize\r
NET_ETHER_HEADER_SIZE, // MediaHeaderSize\r
MAX_MCAST_FILTER_CNT, // MaxMCastFilterCount\r
0, // MCastFilterCount\r
{\r
- { { 0 } }\r
+ {\r
+ { 0 }\r
+ }\r
}, // MCastFilter\r
{\r
{ 0 }\r
TRUE // MediaPresent\r
};\r
\r
-\r
/**\r
Changes the state of a network interface from "stopped" to "started".\r
\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpStart(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+EmuSnpStart (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Changes the state of a network interface from "started" to "stopped".\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpStop (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Resets a network adapter and allocates the transmit and receive buffers\r
required by the network interface; optionally, also requests allocation\r
EFI_STATUS\r
EFIAPI\r
EmuSnpInitialize (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpReset (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpShutdown (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpReceiveFilters (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN UINT32 EnableBits,\r
- IN UINT32 DisableBits,\r
- IN BOOLEAN ResetMcastFilter,\r
- IN UINTN McastFilterCount OPTIONAL,\r
- IN EFI_MAC_ADDRESS *McastFilter OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINT32 EnableBits,\r
+ IN UINT32 DisableBits,\r
+ IN BOOLEAN ResetMcastFilter,\r
+ IN UINTN McastFilterCount OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *McastFilter OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpStationAddress (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS *NewMacAddr OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *NewMacAddr OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpStatistics (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN *StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpMcastIptoMac (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN BOOLEAN Ipv6,\r
- IN EFI_IP_ADDRESS *Ip,\r
- OUT EFI_MAC_ADDRESS *Mac\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Ipv6,\r
+ IN EFI_IP_ADDRESS *Ip,\r
+ OUT EFI_MAC_ADDRESS *Mac\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Performs read and write operations on the NVRAM device attached to a\r
network interface.\r
EFI_STATUS\r
EFIAPI\r
EmuSnpNvdata (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN BOOLEAN ReadOrWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID *Buffer\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN ReadOrWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Reads the current interrupt status and recycled transmit buffer status from\r
a network interface.\r
EFI_STATUS\r
EFIAPI\r
EmuSnpGetStatus (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- OUT UINT32 *InterruptStatus,\r
- OUT VOID **TxBuffer\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus,\r
+ OUT VOID **TxBuffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Places a packet in the transmit queue of a network interface.\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpTransmit (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID* Buffer,\r
- IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- IN UINT16 *Protocol OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpReceive (\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
- OUT UINTN *HeaderSize OPTIONAL,\r
- IN OUT UINTN *BuffSize,\r
- OUT VOID *Buffer,\r
- OUT EFI_MAC_ADDRESS *SourceAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS *DestinationAddr OPTIONAL,\r
- OUT UINT16 *Protocol OPTIONAL\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BuffSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SourceAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestinationAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS (This);\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Test to see if this driver supports ControllerHandle. This service\r
is called by the EFI boot service ConnectController(). In\r
if (RemainingDevicePath != NULL) {\r
if (!IsDevicePathEnd (RemainingDevicePath)) {\r
Node = (MAC_ADDR_DEVICE_PATH *)RemainingDevicePath;\r
- if (Node->Header.Type != MESSAGING_DEVICE_PATH ||\r
- Node->Header.SubType != MSG_MAC_ADDR_DP) {\r
+ if ((Node->Header.Type != MESSAGING_DEVICE_PATH) ||\r
+ (Node->Header.SubType != MSG_MAC_ADDR_DP))\r
+ {\r
// If the remaining device path does not match we don't support the request\r
return EFI_UNSUPPORTED;\r
}\r
}\r
}\r
\r
-\r
//\r
// Open the IO Abstraction(s) needed to perform the supported test\r
//\r
// Close the I/O Abstraction(s) used to perform the supported test\r
//\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEmuIoThunkProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
-\r
+ ControllerHandle,\r
+ &gEmuIoThunkProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
//\r
// Open the EFI Device Path protocol needed to perform the supported test\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiDevicePathProtocolGuid,\r
- (VOID **) &ParentDevicePath,\r
+ (VOID **)&ParentDevicePath,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
// Close protocol, don't use device path protocol in the Support() function\r
//\r
gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Start this driver on ControllerHandle. This service is called by the\r
EFI boot service ConnectController(). In order to make\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
- EMU_SNP_PRIVATE_DATA *Private;\r
- MAC_ADDR_DEVICE_PATH Node;\r
- EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EMU_SNP_PRIVATE_DATA *Private;\r
+ MAC_ADDR_DEVICE_PATH Node;\r
+ EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
\r
Private = NULL;\r
\r
//\r
// Grab the protocols we need\r
//\r
- Status = gBS->OpenProtocol(\r
+ Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiDevicePathProtocolGuid,\r
- ( VOID ** ) &ParentDevicePath,\r
+ (VOID **)&ParentDevicePath,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
CopyMem (&Private->Snp, &gEmuSnpTemplate, sizeof (EFI_SIMPLE_NETWORK_PROTOCOL));\r
CopyMem (&Private->Mode, &gEmuSnpModeTemplate, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
\r
- Private->Signature = EMU_SNP_PRIVATE_DATA_SIGNATURE;\r
- Private->IoThunk = EmuIoThunk;\r
- Private->Io = EmuIoThunk->Interface;\r
- Private->EfiHandle = ControllerHandle;\r
- Private->DeviceHandle = NULL;\r
- Private->Snp.Mode = &Private->Mode;\r
+ Private->Signature = EMU_SNP_PRIVATE_DATA_SIGNATURE;\r
+ Private->IoThunk = EmuIoThunk;\r
+ Private->Io = EmuIoThunk->Interface;\r
+ Private->EfiHandle = ControllerHandle;\r
+ Private->DeviceHandle = NULL;\r
+ Private->Snp.Mode = &Private->Mode;\r
Private->ControllerNameTable = NULL;\r
\r
-\r
Status = Private->Io->CreateMapping (Private->Io, &Private->Mode);\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
//\r
ZeroMem (&Node, sizeof (MAC_ADDR_DEVICE_PATH));\r
\r
- Node.Header.Type = MESSAGING_DEVICE_PATH;\r
- Node.Header.SubType = MSG_MAC_ADDR_DP;\r
- Node.IfType = Private->Mode.IfType;\r
+ Node.Header.Type = MESSAGING_DEVICE_PATH;\r
+ Node.Header.SubType = MSG_MAC_ADDR_DP;\r
+ Node.IfType = Private->Mode.IfType;\r
\r
- SetDevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL * )&Node, sizeof (MAC_ADDR_DEVICE_PATH));\r
+ SetDevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *)&Node, sizeof (MAC_ADDR_DEVICE_PATH));\r
\r
CopyMem (&Node.MacAddress, &Private->Mode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
\r
//\r
// Create Child Handle\r
//\r
- Status = gBS->InstallMultipleProtocolInterfaces(\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
&Private->DeviceHandle,\r
- &gEfiSimpleNetworkProtocolGuid, &Private->Snp,\r
- &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ &Private->Snp,\r
+ &gEfiDevicePathProtocolGuid,\r
+ Private->DevicePath,\r
NULL\r
);\r
if (EFI_ERROR (Status)) {\r
if (Private != NULL) {\r
FreePool (Private);\r
}\r
+\r
if (ParentDevicePath != NULL) {\r
- gBS->CloseProtocol(\r
- ControllerHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- This->DriverBindingHandle,\r
- ControllerHandle\r
- );\r
+ gBS->CloseProtocol (\r
+ ControllerHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle\r
+ );\r
}\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
EmuSnpDriverBindingStop (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN UINTN NumberOfChildren,\r
- IN EFI_HANDLE *ChildHandleBuffer\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN UINTN NumberOfChildren,\r
+ IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE_DATA *Private = NULL;\r
- EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
- VOID *EmuIoThunk;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE_DATA *Private = NULL;\r
+ EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
+ VOID *EmuIoThunk;\r
\r
//\r
// Complete all outstanding transactions to Controller.\r
\r
ASSERT (NumberOfChildren == 1);\r
\r
-\r
//\r
// Get our context back.\r
//\r
- Status = gBS->OpenProtocol(\r
+ Status = gBS->OpenProtocol (\r
ChildHandleBuffer[0],\r
&gEfiSimpleNetworkProtocolGuid,\r
- ( VOID ** ) &Snp,\r
+ (VOID **)&Snp,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
ASSERT (Private->DeviceHandle == ChildHandleBuffer[0]);\r
ASSERT (Private->EfiHandle == ControllerHandle);\r
\r
- Status = gBS->CloseProtocol(\r
+ Status = gBS->CloseProtocol (\r
ControllerHandle,\r
&gEmuIoThunkProtocolGuid,\r
This->DriverBindingHandle,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
- Status = gBS->UninstallMultipleProtocolInterfaces(\r
+ Status = gBS->UninstallMultipleProtocolInterfaces (\r
Private->DeviceHandle,\r
- &gEfiSimpleNetworkProtocolGuid, &Private->Snp,\r
- &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ &Private->Snp,\r
+ &gEfiDevicePathProtocolGuid,\r
+ Private->DevicePath,\r
NULL\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuSnpDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gEmuSnpDriverBinding = {\r
EmuSnpDriverBindingSupported,\r
EmuSnpDriverBindingStart,\r
EmuSnpDriverBindingStop,\r
NULL\r
};\r
\r
-\r
-\r
/**\r
This is the declaration of an EFI image entry point. This entry point is\r
the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
EFIAPI\r
InitializeEmuSnpDriver (\r
IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
//\r
// Install the Driver Protocols\r
//\r
- Status = EfiLibInstallDriverBindingComponentName2(\r
- ImageHandle,\r
- SystemTable,\r
- &gEmuSnpDriverBinding,\r
- ImageHandle,\r
- &gEmuSnpDriverComponentName,\r
- &gEmuSnpDriverComponentName2\r
- );\r
+ Status = EfiLibInstallDriverBindingComponentName2 (\r
+ ImageHandle,\r
+ SystemTable,\r
+ &gEmuSnpDriverBinding,\r
+ ImageHandle,\r
+ &gEmuSnpDriverComponentName,\r
+ &gEmuSnpDriverComponentName2\r
+ );\r
\r
return Status;\r
}\r
#include <Protocol/EmuIoThunk.h>\r
#include <Protocol/EmuSnp.h>\r
\r
-\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/NetLib.h>\r
\r
-#define NET_ETHER_HEADER_SIZE 14\r
+#define NET_ETHER_HEADER_SIZE 14\r
\r
//\r
// Private data for driver.\r
//\r
-#define EMU_SNP_PRIVATE_DATA_SIGNATURE SIGNATURE_32( 'U', 'S', 'N', 'P' )\r
+#define EMU_SNP_PRIVATE_DATA_SIGNATURE SIGNATURE_32( 'U', 'S', 'N', 'P' )\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *IoThunk;\r
- EMU_SNP_PROTOCOL *Io;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
-\r
- EFI_HANDLE EfiHandle;\r
- EFI_HANDLE DeviceHandle;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *IoThunk;\r
+ EMU_SNP_PROTOCOL *Io;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
\r
- EFI_SIMPLE_NETWORK_PROTOCOL Snp;\r
- EFI_SIMPLE_NETWORK_MODE Mode;\r
+ EFI_HANDLE EfiHandle;\r
+ EFI_HANDLE DeviceHandle;\r
\r
- EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
+ EFI_SIMPLE_NETWORK_PROTOCOL Snp;\r
+ EFI_SIMPLE_NETWORK_MODE Mode;\r
\r
+ EFI_UNICODE_STRING_TABLE *ControllerNameTable;\r
} EMU_SNP_PRIVATE_DATA;\r
\r
#define EMU_SNP_PRIVATE_DATA_FROM_SNP_THIS(a) \\r
CR( a, EMU_SNP_PRIVATE_DATA, Snp, EMU_SNP_PRIVATE_DATA_SIGNATURE )\r
\r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuSnpDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuSnpDriverComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuSnpDriverComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gEmuSnpDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gEmuSnpDriverComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gEmuSnpDriverComponentName2;\r
\r
/**\r
Test to see if this driver supports ControllerHandle. This service\r
EFI_STATUS\r
EFIAPI\r
EmuSnpDriverBindingSupported (\r
- IN EFI_DRIVER_BINDING_PROTOCOL * This,\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
IN EFI_HANDLE ControllerHandle,\r
- IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
EmuSnpDriverBindingStart (\r
- IN EFI_DRIVER_BINDING_PROTOCOL * This,\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
IN EFI_HANDLE ControllerHandle,\r
- IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpStart(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This\r
+EmuSnpStart (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpStop(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This\r
+EmuSnpStop (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpInitialize(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+EmuSnpInitialize (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpReset(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN BOOLEAN ExtendedVerification\r
+EmuSnpReset (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpShutdown(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This\r
+EmuSnpShutdown (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpReceiveFilters(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN UINT32 EnableBits,\r
- IN UINT32 DisableBits,\r
- IN BOOLEAN ResetMcastFilter,\r
- IN UINTN McastFilterCount OPTIONAL,\r
- IN EFI_MAC_ADDRESS* McastFilter OPTIONAL\r
+EmuSnpReceiveFilters (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINT32 EnableBits,\r
+ IN UINT32 DisableBits,\r
+ IN BOOLEAN ResetMcastFilter,\r
+ IN UINTN McastFilterCount OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *McastFilter OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpStationAddress(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS* NewMacAddr OPTIONAL\r
+EmuSnpStationAddress (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *NewMacAddr OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpStatistics(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN* StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS* StatisticsTable OPTIONAL\r
+EmuSnpStatistics (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpMcastIptoMac(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN BOOLEAN Ipv6,\r
- IN EFI_IP_ADDRESS* Ip,\r
- OUT EFI_MAC_ADDRESS* Mac\r
+EmuSnpMcastIptoMac (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN Ipv6,\r
+ IN EFI_IP_ADDRESS *Ip,\r
+ OUT EFI_MAC_ADDRESS *Mac\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpNvdata(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN BOOLEAN ReadOrWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID* Buffer\r
+EmuSnpNvdata (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN BOOLEAN ReadOrWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpGetStatus(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- OUT UINT32* InterruptStatus,\r
- OUT VOID** TxBuffer\r
+EmuSnpGetStatus (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus,\r
+ OUT VOID **TxBuffer\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpTransmit(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID* Buffer,\r
- IN EFI_MAC_ADDRESS* SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS* DestAddr OPTIONAL,\r
- IN UINT16* Protocol OPTIONAL\r
+EmuSnpTransmit (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
);\r
\r
/**\r
**/\r
EFI_STATUS\r
EFIAPI\r
-EmuSnpReceive(\r
- IN EFI_SIMPLE_NETWORK_PROTOCOL* This,\r
- OUT UINTN* HeaderSize OPTIONAL,\r
- IN OUT UINTN* BuffSize,\r
- OUT VOID* Buffer,\r
- OUT EFI_MAC_ADDRESS* SourceAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS* DestinationAddr OPTIONAL,\r
- OUT UINT16* Protocol OPTIONAL\r
+EmuSnpReceive (\r
+ IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BuffSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SourceAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestinationAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
);\r
\r
VOID\r
EFIAPI\r
-EmuSnpWaitForPacketNotify(\r
- IN EFI_EVENT Event,\r
- IN VOID* Private\r
+EmuSnpWaitForPacketNotify (\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Private\r
);\r
\r
-#endif // _EMU_SNP_H_\r
+#endif // _EMU_SNP_H_\r
//\r
// EmuThunk Device Path Protocol Instance\r
//\r
-EMU_THUNK_DEVICE_PATH mEmuThunkDevicePath = {\r
+EMU_THUNK_DEVICE_PATH mEmuThunkDevicePath = {\r
{\r
{\r
{\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ (UINT8)(sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8)((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
}\r
},\r
EMU_THUNK_PROTOCOL_GUID\r
}\r
};\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
InitializeEmuThunk (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
+\r
/*++\r
\r
Routine Description:\r
Handle = NULL;\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Handle,\r
- &gEmuThunkProtocolGuid, gEmuThunk,\r
- &gEfiDevicePathProtocolGuid, &mEmuThunkDevicePath,\r
+ &gEmuThunkProtocolGuid,\r
+ gEmuThunk,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mEmuThunkDevicePath,\r
NULL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
PeimInitializeFirmwareVolumePei (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
+\r
/*++\r
\r
Routine Description:\r
// Get the Fwh Information PPI\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid, // GUID\r
- 0, // INSTANCE\r
- &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
- (VOID **)&Thunk // PPI\r
- );\r
+ &gEmuThunkPpiGuid, // GUID\r
+ 0, // INSTANCE\r
+ &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
+ (VOID **)&Thunk // PPI\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
Index = 0;\r
//\r
// Assume the FD starts with an FV header\r
//\r
- FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FdBase;\r
+ FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FdBase;\r
\r
//\r
// Make an FV Hob for the first FV in the FD\r
(EFI_RESOURCE_ATTRIBUTE_PRESENT | EFI_RESOURCE_ATTRIBUTE_INITIALIZED | EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE),\r
FdBase,\r
(\r
- FvHeader->FvLength +\r
- PcdGet32 (PcdFlashNvStorageVariableSize) +\r
- PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
- PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
- PcdGet32 (PcdEmuFlashNvStorageEventLogSize)\r
+ FvHeader->FvLength +\r
+ PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+ PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+ PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+ PcdGet32 (PcdEmuFlashNvStorageEventLogSize)\r
)\r
- );\r
+ );\r
\r
//\r
// Hard code the address of the spare block and variable services.\r
// Assume it's a hard coded offset from FV0 in FD0.\r
//\r
- FdSize =\r
+ FdSize =\r
PcdGet32 (PcdFlashNvStorageVariableSize) +\r
PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
\r
**/\r
\r
-\r
#include "PiPei.h"\r
\r
#include <Guid/SystemNvDataGuid.h>\r
EFI_STATUS\r
EFIAPI\r
PeimInitializeFlashMap (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
+\r
/*++\r
\r
Routine Description:\r
// Get the Fwh Information PPI\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid, // GUID\r
- 0, // INSTANCE\r
- &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
- (VOID **)&Thunk // PPI\r
- );\r
+ &gEmuThunkPpiGuid, // GUID\r
+ 0, // INSTANCE\r
+ &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
+ (VOID **)&Thunk // PPI\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
\r
#include "FwBlockService.h"\r
\r
-ESAL_FWB_GLOBAL *mFvbModuleGlobal;\r
+ESAL_FWB_GLOBAL *mFvbModuleGlobal;\r
\r
-#define EFI_FVB2_STATUS (EFI_FVB2_READ_STATUS | EFI_FVB2_WRITE_STATUS | EFI_FVB2_LOCK_STATUS)\r
+#define EFI_FVB2_STATUS (EFI_FVB2_READ_STATUS | EFI_FVB2_WRITE_STATUS | EFI_FVB2_LOCK_STATUS)\r
\r
-EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {\r
+EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {\r
FVB_DEVICE_SIGNATURE,\r
{\r
{\r
}\r
};\r
\r
-\r
-\r
VOID\r
EFIAPI\r
FvbVirtualddressChangeEvent (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_INSTANCE *FwhInstance;\r
- UINTN Index;\r
+ EFI_FW_VOL_INSTANCE *FwhInstance;\r
+ UINTN Index;\r
\r
- EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal->FvInstance[FVB_VIRTUAL]);\r
+ EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal->FvInstance[FVB_VIRTUAL]);\r
\r
//\r
// Convert the base address of all the instances\r
Index = 0;\r
FwhInstance = mFvbModuleGlobal->FvInstance[FVB_PHYSICAL];\r
while (Index < mFvbModuleGlobal->NumFv) {\r
- EfiConvertPointer (0x0, (VOID **) &FwhInstance->FvBase[FVB_VIRTUAL]);\r
+ EfiConvertPointer (0x0, (VOID **)&FwhInstance->FvBase[FVB_VIRTUAL]);\r
FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
- (\r
- (UINTN) ((UINT8 *) FwhInstance) + FwhInstance->VolumeHeader.HeaderLength +\r
- (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
- );\r
+ (\r
+ (UINTN)((UINT8 *)FwhInstance) + FwhInstance->VolumeHeader.HeaderLength +\r
+ (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+ );\r
Index++;\r
}\r
\r
- EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal);\r
+ EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal);\r
}\r
\r
EFI_STATUS\r
GetFvbInstance (\r
- IN UINTN Instance,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- OUT EFI_FW_VOL_INSTANCE **FwhInstance,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ OUT EFI_FW_VOL_INSTANCE **FwhInstance,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_INSTANCE *FwhRecord;\r
+ EFI_FW_VOL_INSTANCE *FwhRecord;\r
\r
if (Instance >= Global->NumFv) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
//\r
// Find the right instance of the FVB private data\r
//\r
FwhRecord = Global->FvInstance[Virtual];\r
while (Instance > 0) {\r
FwhRecord = (EFI_FW_VOL_INSTANCE *)\r
- (\r
- (UINTN) ((UINT8 *) FwhRecord) + FwhRecord->VolumeHeader.HeaderLength +\r
- (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
- );\r
+ (\r
+ (UINTN)((UINT8 *)FwhRecord) + FwhRecord->VolumeHeader.HeaderLength +\r
+ (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+ );\r
Instance--;\r
}\r
\r
\r
EFI_STATUS\r
FvbGetPhysicalAddress (\r
- IN UINTN Instance,\r
- OUT EFI_PHYSICAL_ADDRESS *Address,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ OUT EFI_PHYSICAL_ADDRESS *Address,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
- EFI_STATUS Status;\r
+ EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
+ EFI_STATUS Status;\r
\r
//\r
// Find the right instance of the FVB private data\r
\r
EFI_STATUS\r
FvbGetVolumeAttributes (\r
- IN UINTN Instance,\r
- OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
- EFI_STATUS Status;\r
+ EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
+ EFI_STATUS Status;\r
\r
//\r
// Find the right instance of the FVB private data\r
\r
EFI_STATUS\r
FvbGetLbaAddress (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- OUT UINTN *LbaAddress,\r
- OUT UINTN *LbaLength,\r
- OUT UINTN *NumOfBlocks,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ OUT UINTN *LbaAddress,\r
+ OUT UINTN *LbaLength,\r
+ OUT UINTN *NumOfBlocks,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
ASSERT_EFI_ERROR (Status);\r
\r
- StartLba = 0;\r
- Offset = 0;\r
- BlockMap = &(FwhInstance->VolumeHeader.BlockMap[0]);\r
+ StartLba = 0;\r
+ Offset = 0;\r
+ BlockMap = &(FwhInstance->VolumeHeader.BlockMap[0]);\r
\r
//\r
// Parse the blockmap of the FV to find which map entry the Lba belongs to\r
NumBlocks = BlockMap->NumBlocks;\r
BlockLength = BlockMap->Length;\r
\r
- if (NumBlocks == 0 || BlockLength == 0) {\r
+ if ((NumBlocks == 0) || (BlockLength == 0)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// The map entry found\r
//\r
- if (Lba >= StartLba && Lba < NextLba) {\r
- Offset = Offset + (UINTN) MultU64x32 ((Lba - StartLba), BlockLength);\r
+ if ((Lba >= StartLba) && (Lba < NextLba)) {\r
+ Offset = Offset + (UINTN)MultU64x32 ((Lba - StartLba), BlockLength);\r
if (LbaAddress != NULL) {\r
*LbaAddress = FwhInstance->FvBase[Virtual] + Offset;\r
}\r
}\r
\r
if (NumOfBlocks != NULL) {\r
- *NumOfBlocks = (UINTN) (NextLba - Lba);\r
+ *NumOfBlocks = (UINTN)(NextLba - Lba);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
- StartLba = NextLba;\r
- Offset = Offset + NumBlocks * BlockLength;\r
+ StartLba = NextLba;\r
+ Offset = Offset + NumBlocks * BlockLength;\r
BlockMap++;\r
}\r
}\r
\r
EFI_STATUS\r
FvbReadBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN UINTN BlockOffset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BlockOffset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
**/\r
{\r
EFI_FVB_ATTRIBUTES_2 Attributes;\r
- UINTN LbaAddress;\r
- UINTN LbaLength;\r
- EFI_STATUS Status;\r
+ UINTN LbaAddress;\r
+ UINTN LbaLength;\r
+ EFI_STATUS Status;\r
\r
//\r
// Check for invalid conditions\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
//\r
// Check if the FV is read enabled\r
//\r
if ((Attributes & EFI_FVB2_READ_STATUS) == 0) {\r
return EFI_ACCESS_DENIED;\r
}\r
+\r
//\r
// Perform boundary checks and adjust NumBytes\r
//\r
}\r
\r
if (LbaLength < (*NumBytes + BlockOffset)) {\r
- *NumBytes = (UINT32) (LbaLength - BlockOffset);\r
+ *NumBytes = (UINT32)(LbaLength - BlockOffset);\r
Status = EFI_BAD_BUFFER_SIZE;\r
}\r
\r
- CopyMem (Buffer, (UINT8 *) (LbaAddress + BlockOffset), (UINTN) (*NumBytes));\r
+ CopyMem (Buffer, (UINT8 *)(LbaAddress + BlockOffset), (UINTN)(*NumBytes));\r
\r
return Status;\r
}\r
\r
EFI_STATUS\r
FvbWriteBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN UINTN BlockOffset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BlockOffset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
**/\r
{\r
EFI_FVB_ATTRIBUTES_2 Attributes;\r
- UINTN LbaAddress;\r
- UINTN LbaLength;\r
- EFI_STATUS Status;\r
+ UINTN LbaAddress;\r
+ UINTN LbaLength;\r
+ EFI_STATUS Status;\r
\r
//\r
// Check for invalid conditions\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
//\r
// Check if the FV is write enabled\r
//\r
if ((Attributes & EFI_FVB2_WRITE_STATUS) == 0) {\r
return EFI_ACCESS_DENIED;\r
}\r
+\r
//\r
// Perform boundary checks and adjust NumBytes\r
//\r
}\r
\r
if (LbaLength < (*NumBytes + BlockOffset)) {\r
- *NumBytes = (UINT32) (LbaLength - BlockOffset);\r
+ *NumBytes = (UINT32)(LbaLength - BlockOffset);\r
Status = EFI_BAD_BUFFER_SIZE;\r
}\r
+\r
//\r
// Write data\r
//\r
- CopyMem ((UINT8 *) (LbaAddress + BlockOffset), Buffer, (UINTN) (*NumBytes));\r
+ CopyMem ((UINT8 *)(LbaAddress + BlockOffset), Buffer, (UINTN)(*NumBytes));\r
\r
return Status;\r
}\r
\r
EFI_STATUS\r
FvbEraseBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
-\r
EFI_FVB_ATTRIBUTES_2 Attributes;\r
UINTN LbaAddress;\r
UINTN LbaLength;\r
if ((Attributes & EFI_FVB2_WRITE_STATUS) == 0) {\r
return EFI_ACCESS_DENIED;\r
}\r
+\r
//\r
// Get the starting address of the block for erase.\r
//\r
Data = 0x0;\r
}\r
\r
- SetMem ((UINT8 *) LbaAddress, LbaLength, Data);\r
+ SetMem ((UINT8 *)LbaAddress, LbaLength, Data);\r
\r
return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS\r
FvbSetVolumeAttributes (\r
- IN UINTN Instance,\r
- IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS Status;\r
EFI_FVB_ATTRIBUTES_2 UnchangedAttributes;\r
\r
-\r
//\r
// Find the right instance of the FVB private data\r
//\r
Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
ASSERT_EFI_ERROR (Status);\r
\r
- AttribPtr = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);\r
+ AttribPtr = (EFI_FVB_ATTRIBUTES_2 *)&(FwhInstance->VolumeHeader.Attributes);\r
OldAttributes = *AttribPtr;\r
Capabilities = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
EFI_FVB2_READ_ENABLED_CAP | \\r
EFI_FVB2_LOCK_CAP \\r
);\r
\r
- OldStatus = OldAttributes & EFI_FVB2_STATUS;\r
- NewStatus = *Attributes & EFI_FVB2_STATUS;\r
+ OldStatus = OldAttributes & EFI_FVB2_STATUS;\r
+ NewStatus = *Attributes & EFI_FVB2_STATUS;\r
UnchangedAttributes = EFI_FVB2_READ_DISABLED_CAP | \\r
EFI_FVB2_READ_ENABLED_CAP | \\r
EFI_FVB2_WRITE_DISABLED_CAP | \\r
return EFI_ACCESS_DENIED;\r
}\r
}\r
+\r
//\r
// Test read disable\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
//\r
// Test read enable\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
//\r
// Test write disable\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
//\r
// Test write enable\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
//\r
// Test lock\r
//\r
\r
return EFI_SUCCESS;\r
}\r
+\r
//\r
// FVB protocol APIs\r
//\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetPhysicalAddress (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- OUT EFI_PHYSICAL_ADDRESS *Address\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ OUT EFI_PHYSICAL_ADDRESS *Address\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetBlockSize (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- OUT UINTN *BlockSize,\r
- OUT UINTN *NumOfBlocks\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ OUT UINTN *BlockSize,\r
+ OUT UINTN *NumOfBlocks\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
return FvbGetLbaAddress (\r
- FvbDevice->Instance,\r
- Lba,\r
- NULL,\r
- BlockSize,\r
- NumOfBlocks,\r
- mFvbModuleGlobal,\r
- EfiGoneVirtual ()\r
- );\r
+ FvbDevice->Instance,\r
+ Lba,\r
+ NULL,\r
+ BlockSize,\r
+ NumOfBlocks,\r
+ mFvbModuleGlobal,\r
+ EfiGoneVirtual ()\r
+ );\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetAttributes (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolSetAttributes (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolEraseBlocks (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
...\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
- EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
- UINTN NumOfBlocks;\r
- VA_LIST args;\r
- EFI_LBA StartingLba;\r
- UINTN NumOfLba;\r
- EFI_STATUS Status;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_INSTANCE *FwhInstance = NULL;\r
+ UINTN NumOfBlocks;\r
+ VA_LIST args;\r
+ EFI_LBA StartingLba;\r
+ UINTN NumOfLba;\r
+ EFI_STATUS Status;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
- Status = GetFvbInstance (FvbDevice->Instance, mFvbModuleGlobal, &FwhInstance, EfiGoneVirtual ());\r
+ Status = GetFvbInstance (FvbDevice->Instance, mFvbModuleGlobal, &FwhInstance, EfiGoneVirtual ());\r
ASSERT_EFI_ERROR (Status);\r
\r
NumOfBlocks = FwhInstance->NumOfBlocks;\r
//\r
// Check input parameters\r
//\r
- if (NumOfLba == 0 || (StartingLba + NumOfLba) > NumOfBlocks) {\r
+ if ((NumOfLba == 0) || ((StartingLba + NumOfLba) > NumOfBlocks)) {\r
VA_END (args);\r
return EFI_INVALID_PARAMETER;\r
}\r
StartingLba++;\r
NumOfLba--;\r
}\r
-\r
} while (1);\r
\r
VA_END (args);\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolWrite (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
-\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolRead (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
-\r
- EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+ EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
\r
FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
\r
return FvbReadBlock (FvbDevice->Instance, Lba, Offset, NumBytes, Buffer, mFvbModuleGlobal, EfiGoneVirtual ());\r
}\r
+\r
EFI_STATUS\r
ValidateFvHeader (\r
- EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader\r
+ EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader\r
)\r
+\r
/*++\r
\r
Routine Description:\r
//\r
if ((FwVolHeader->Revision != EFI_FVH_REVISION) ||\r
(FwVolHeader->Signature != EFI_FVH_SIGNATURE) ||\r
- (FwVolHeader->FvLength == ((UINTN) -1)) ||\r
+ (FwVolHeader->FvLength == ((UINTN)-1)) ||\r
((FwVolHeader->HeaderLength & 0x01) != 0)\r
- ) {\r
+ )\r
+ {\r
return EFI_NOT_FOUND;\r
}\r
+\r
//\r
// Verify the header checksum\r
//\r
- HeaderLength = (UINT16) (FwVolHeader->HeaderLength / 2);\r
- Ptr = (UINT16 *) FwVolHeader;\r
- Checksum = 0;\r
+ HeaderLength = (UINT16)(FwVolHeader->HeaderLength / 2);\r
+ Ptr = (UINT16 *)FwVolHeader;\r
+ Checksum = 0;\r
while (HeaderLength > 0) {\r
Checksum = Checksum + (*Ptr);\r
HeaderLength--;\r
EFI_STATUS\r
EFIAPI\r
FvbInitialize (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
+\r
/*++\r
\r
Routine Description:\r
UINTN NumOfBlocks;\r
EFI_PEI_HOB_POINTERS FvHob;\r
\r
- //\r
+ //\r
// Get the DXE services table\r
//\r
DxeServices = gDS;\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
sizeof (ESAL_FWB_GLOBAL),\r
- (VOID**) &mFvbModuleGlobal\r
+ (VOID **)&mFvbModuleGlobal\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Calculate the total size for all firmware volume block instances\r
//\r
- BufferSize = 0;\r
+ BufferSize = 0;\r
\r
FvHob.Raw = GetHobList ();\r
while ((FvHob.Raw = GetNextHob (EFI_HOB_TYPE_FV, FvHob.Raw)) != NULL) {\r
continue;\r
}\r
\r
- FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) BaseAddress;\r
+ FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)BaseAddress;\r
Status = ValidateFvHeader (FwVolHeader);\r
if (EFI_ERROR (Status)) {\r
//\r
}\r
\r
BufferSize += (sizeof (EFI_FW_VOL_INSTANCE) + FwVolHeader->HeaderLength - sizeof (EFI_FIRMWARE_VOLUME_HEADER));\r
- FvHob.Raw = GET_NEXT_HOB (FvHob);\r
+ FvHob.Raw = GET_NEXT_HOB (FvHob);\r
}\r
\r
//\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
BufferSize,\r
- (VOID**) &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
+ (VOID **)&mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Make a virtual copy of the FvInstance pointer.\r
//\r
- FwhInstance = mFvbModuleGlobal->FvInstance[FVB_PHYSICAL];\r
+ FwhInstance = mFvbModuleGlobal->FvInstance[FVB_PHYSICAL];\r
mFvbModuleGlobal->FvInstance[FVB_VIRTUAL] = FwhInstance;\r
\r
- mFvbModuleGlobal->NumFv = 0;\r
- MaxLbaSize = 0;\r
+ mFvbModuleGlobal->NumFv = 0;\r
+ MaxLbaSize = 0;\r
\r
FvHob.Raw = GetHobList ();\r
while (NULL != (FvHob.Raw = GetNextHob (EFI_HOB_TYPE_FV, FvHob.Raw))) {\r
continue;\r
}\r
\r
- FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) BaseAddress;\r
+ FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)BaseAddress;\r
Status = ValidateFvHeader (FwVolHeader);\r
if (EFI_ERROR (Status)) {\r
//\r
FvHob.Raw = GET_NEXT_HOB (FvHob);\r
continue;\r
}\r
+\r
//\r
// Write healthy FV header back.\r
//\r
CopyMem (\r
- (VOID *) (UINTN) BaseAddress,\r
- (VOID *) FwVolHeader,\r
+ (VOID *)(UINTN)BaseAddress,\r
+ (VOID *)FwVolHeader,\r
FwVolHeader->HeaderLength\r
);\r
}\r
\r
- FwhInstance->FvBase[FVB_PHYSICAL] = (UINTN) BaseAddress;\r
- FwhInstance->FvBase[FVB_VIRTUAL] = (UINTN) BaseAddress;\r
+ FwhInstance->FvBase[FVB_PHYSICAL] = (UINTN)BaseAddress;\r
+ FwhInstance->FvBase[FVB_VIRTUAL] = (UINTN)BaseAddress;\r
\r
- CopyMem ((UINTN *) &(FwhInstance->VolumeHeader), (UINTN *) FwVolHeader, FwVolHeader->HeaderLength);\r
+ CopyMem ((UINTN *)&(FwhInstance->VolumeHeader), (UINTN *)FwVolHeader, FwVolHeader->HeaderLength);\r
FwVolHeader = &(FwhInstance->VolumeHeader);\r
EfiInitializeLock (&(FwhInstance->FvbDevLock), TPL_HIGH_LEVEL);\r
\r
\r
NumOfBlocks = NumOfBlocks + PtrBlockMapEntry->NumBlocks;\r
}\r
+\r
//\r
// The total number of blocks in the FV.\r
//\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
sizeof (EFI_FW_VOL_BLOCK_DEVICE),\r
- (VOID**) &FvbDevice\r
+ (VOID **)&FvbDevice\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Find a handle with a matching device path that has supports FW Block protocol\r
//\r
- TempFwbDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) &TempFvbDevicePathData;\r
+ TempFwbDevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&TempFvbDevicePathData;\r
CopyMem (TempFwbDevicePath, &FvbDevice->DevicePath, sizeof (FV_DEVICE_PATH));\r
Status = gBS->LocateDevicePath (&gEfiFirmwareVolumeBlockProtocolGuid, &TempFwbDevicePath, &FwbHandle);\r
if (EFI_ERROR (Status)) {\r
// LocateDevicePath fails so install a new interface and device path\r
//\r
FwbHandle = NULL;\r
- Status = gBS->InstallMultipleProtocolInterfaces (\r
- &FwbHandle,\r
- &gEfiFirmwareVolumeBlockProtocolGuid,\r
- &FvbDevice->FwVolBlockInstance,\r
- &gEfiDevicePathProtocolGuid,\r
- &FvbDevice->DevicePath,\r
- NULL\r
- );\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &FwbHandle,\r
+ &gEfiFirmwareVolumeBlockProtocolGuid,\r
+ &FvbDevice->FwVolBlockInstance,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &FvbDevice->DevicePath,\r
+ NULL\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
} else if (IsDevicePathEnd (TempFwbDevicePath)) {\r
//\r
Status = gBS->HandleProtocol (\r
FwbHandle,\r
&gEfiFirmwareVolumeBlockProtocolGuid,\r
- (VOID**)&OldFwbInterface\r
+ (VOID **)&OldFwbInterface\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
&FvbDevice->FwVolBlockInstance\r
);\r
ASSERT_EFI_ERROR (Status);\r
-\r
} else {\r
//\r
// There was a FVB protocol on an End Device Path node\r
}\r
\r
FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
- (\r
- (UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength +\r
- (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
- );\r
+ (\r
+ (UINTN)((UINT8 *)FwhInstance) + FwVolHeader->HeaderLength +\r
+ (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+ );\r
\r
FvHob.Raw = GET_NEXT_HOB (FvHob);\r
}\r
#include <Library/PcdLib.h>\r
#include <Library/DevicePathLib.h>\r
\r
-\r
typedef struct {\r
- UINT64 FvLength;\r
- EFI_FIRMWARE_VOLUME_HEADER FvbInfo;\r
+ UINT64 FvLength;\r
+ EFI_FIRMWARE_VOLUME_HEADER FvbInfo;\r
//\r
// EFI_FV_BLOCK_MAP_ENTRY ExtraBlockMap[n];//n=0\r
//\r
- EFI_FV_BLOCK_MAP_ENTRY End[1];\r
+ EFI_FV_BLOCK_MAP_ENTRY End[1];\r
} EFI_FVB_MEDIA_INFO;\r
\r
EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = {\r
FixedPcdGet32 (PcdEmuFlashFvRecoverySize),\r
EFI_FVH_SIGNATURE,\r
EFI_FVB2_READ_ENABLED_CAP |\r
- EFI_FVB2_READ_STATUS |\r
- EFI_FVB2_WRITE_ENABLED_CAP |\r
- EFI_FVB2_WRITE_STATUS |\r
- EFI_FVB2_ERASE_POLARITY,\r
+ EFI_FVB2_READ_STATUS |\r
+ EFI_FVB2_WRITE_ENABLED_CAP |\r
+ EFI_FVB2_WRITE_STATUS |\r
+ EFI_FVB2_ERASE_POLARITY,\r
sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
0, // CheckSum\r
0, // ExtHeaderOffset\r
FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize),\r
EFI_FVH_SIGNATURE,\r
EFI_FVB2_READ_ENABLED_CAP |\r
- EFI_FVB2_READ_STATUS |\r
- EFI_FVB2_WRITE_ENABLED_CAP |\r
- EFI_FVB2_WRITE_STATUS |\r
- EFI_FVB2_ERASE_POLARITY,\r
+ EFI_FVB2_READ_STATUS |\r
+ EFI_FVB2_WRITE_ENABLED_CAP |\r
+ EFI_FVB2_WRITE_STATUS |\r
+ EFI_FVB2_ERASE_POLARITY,\r
sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
0, // CheckSum\r
0, // ExtHeaderOffset\r
{\r
{\r
(FixedPcdGet32 (PcdFlashNvStorageVariableSize) + \\r
- FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \\r
- FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \\r
- FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),\r
+ FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \\r
+ FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \\r
+ FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),\r
FixedPcdGet32 (PcdEmuFirmwareBlockSize),\r
}\r
}\r
\r
EFI_STATUS\r
GetFvbInfo (\r
- IN UINT64 FvLength,\r
- OUT EFI_FIRMWARE_VOLUME_HEADER **FvbInfo\r
+ IN UINT64 FvLength,\r
+ OUT EFI_FIRMWARE_VOLUME_HEADER **FvbInfo\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
for (Index = 0; Index < sizeof (mPlatformFvbMediaInfo) / sizeof (EFI_FVB_MEDIA_INFO); Index += 1) {\r
if (mPlatformFvbMediaInfo[Index].FvLength == FvLength) {\r
#define FVB_VIRTUAL 1\r
\r
typedef struct {\r
- EFI_LOCK FvbDevLock;\r
- UINTN FvBase[2];\r
- UINTN NumOfBlocks;\r
- EFI_FIRMWARE_VOLUME_HEADER VolumeHeader;\r
+ EFI_LOCK FvbDevLock;\r
+ UINTN FvBase[2];\r
+ UINTN NumOfBlocks;\r
+ EFI_FIRMWARE_VOLUME_HEADER VolumeHeader;\r
} EFI_FW_VOL_INSTANCE;\r
\r
typedef struct {\r
- UINT32 NumFv;\r
- EFI_FW_VOL_INSTANCE *FvInstance[2];\r
+ UINT32 NumFv;\r
+ EFI_FW_VOL_INSTANCE *FvInstance[2];\r
} ESAL_FWB_GLOBAL;\r
\r
//\r
//\r
#define FVB_DEVICE_FROM_THIS(a) CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
#define FVB_EXTEND_DEVICE_FROM_THIS(a) CR (a, EFI_FW_VOL_BLOCK_DEVICE, FvbExtension, FVB_DEVICE_SIGNATURE)\r
-#define FVB_DEVICE_SIGNATURE SIGNATURE_32 ('F', 'V', 'B', 'N')\r
+#define FVB_DEVICE_SIGNATURE SIGNATURE_32 ('F', 'V', 'B', 'N')\r
\r
typedef struct {\r
- MEMMAP_DEVICE_PATH MemMapDevPath;\r
- EFI_DEVICE_PATH_PROTOCOL EndDevPath;\r
+ MEMMAP_DEVICE_PATH MemMapDevPath;\r
+ EFI_DEVICE_PATH_PROTOCOL EndDevPath;\r
} FV_DEVICE_PATH;\r
\r
typedef struct {\r
- UINTN Signature;\r
- FV_DEVICE_PATH DevicePath;\r
- UINTN Instance;\r
- EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL FwVolBlockInstance;\r
+ UINTN Signature;\r
+ FV_DEVICE_PATH DevicePath;\r
+ UINTN Instance;\r
+ EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL FwVolBlockInstance;\r
} EFI_FW_VOL_BLOCK_DEVICE;\r
\r
EFI_STATUS\r
GetFvbInfo (\r
- IN UINT64 FvLength,\r
- OUT EFI_FIRMWARE_VOLUME_HEADER **FvbInfo\r
+ IN UINT64 FvLength,\r
+ OUT EFI_FIRMWARE_VOLUME_HEADER **FvbInfo\r
)\r
;\r
\r
EFI_STATUS\r
FvbReadBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN UINTN BlockOffset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BlockOffset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
FvbWriteBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN UINTN BlockOffset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BlockOffset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
FvbEraseBlock (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
FvbSetVolumeAttributes (\r
- IN UINTN Instance,\r
- IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
FvbGetVolumeAttributes (\r
- IN UINTN Instance,\r
- OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ OUT EFI_FVB_ATTRIBUTES_2 *Attributes,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
FvbGetPhysicalAddress (\r
- IN UINTN Instance,\r
- OUT EFI_PHYSICAL_ADDRESS *Address,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ OUT EFI_PHYSICAL_ADDRESS *Address,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbInitialize (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
;\r
\r
-\r
VOID\r
EFIAPI\r
FvbClassAddressChangeEvent (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
;\r
\r
EFI_STATUS\r
FvbGetLbaAddress (\r
- IN UINTN Instance,\r
- IN EFI_LBA Lba,\r
- OUT UINTN *LbaAddress,\r
- OUT UINTN *LbaLength,\r
- OUT UINTN *NumOfBlocks,\r
- IN ESAL_FWB_GLOBAL *Global,\r
- IN BOOLEAN Virtual\r
+ IN UINTN Instance,\r
+ IN EFI_LBA Lba,\r
+ OUT UINTN *LbaAddress,\r
+ OUT UINTN *LbaLength,\r
+ OUT UINTN *NumOfBlocks,\r
+ IN ESAL_FWB_GLOBAL *Global,\r
+ IN BOOLEAN Virtual\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetAttributes (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolSetAttributes (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetPhysicalAddress (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- OUT EFI_PHYSICAL_ADDRESS *Address\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ OUT EFI_PHYSICAL_ADDRESS *Address\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolGetBlockSize (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- OUT UINTN *BlockSize,\r
- OUT UINTN *NumOfBlocks\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ OUT UINTN *BlockSize,\r
+ OUT UINTN *NumOfBlocks\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolRead (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolWrite (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer\r
)\r
;\r
\r
EFI_STATUS\r
EFIAPI\r
FvbProtocolEraseBlocks (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,\r
...\r
)\r
;\r
#define EFI_EMU_PHYSICAL_DISK_GUID \\r
{ 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }\r
\r
-extern EFI_GUID gEmuPhysicalDisksGuid;\r
+extern EFI_GUID gEmuPhysicalDisksGuid;\r
\r
#endif\r
#define EFI_EMU_SYSTEM_CONFIG_GUID \\r
{ 0x9C4FB516, 0x3A1E, 0xD847, { 0xA1, 0xA1, 0x70, 0x58, 0xB6, 0x98, 0x67, 0x32 } }\r
\r
-\r
#pragma pack(1)\r
typedef struct {\r
//\r
// Console output mode\r
//\r
- UINT32 ConOutColumn;\r
- UINT32 ConOutRow;\r
+ UINT32 ConOutColumn;\r
+ UINT32 ConOutRow;\r
} EMU_SYSTEM_CONFIGURATION;\r
#pragma pack()\r
\r
-\r
-extern EFI_GUID gEmuSystemConfigGuid;\r
+extern EFI_GUID gEmuSystemConfigGuid;\r
\r
#endif\r
#define EFI_EMU_VIRTUAL_DISK_GUID \\r
{ 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }\r
\r
-extern EFI_GUID gEmuVirtualDisksGuid;\r
+extern EFI_GUID gEmuVirtualDisksGuid;\r
\r
#endif\r
typedef struct {\r
// Used by PEI Core and PEIMs to store the PEI Services pointer.\r
// Privilege issues prevent using the PI mechanism in the emulator.\r
- CONST EFI_PEI_SERVICES **PeiServicesTablePointer;\r
+ CONST EFI_PEI_SERVICES **PeiServicesTablePointer;\r
\r
// Used by SecPeiServicesLib\r
- EFI_PEI_PPI_DESCRIPTOR *PpiList;\r
+ EFI_PEI_PPI_DESCRIPTOR *PpiList;\r
\r
// Needed by PEI PEI PeCoffLoaderExtraActionLib\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
} EMU_MAGIC_PAGE_LAYOUT;\r
\r
-#define EMU_MAGIC_PAGE() ((EMU_MAGIC_PAGE_LAYOUT *)((UINTN)PcdGet64 (PcdPeiServicesTablePage)))\r
+#define EMU_MAGIC_PAGE() ((EMU_MAGIC_PAGE_LAYOUT *)((UINTN)PcdGet64 (PcdPeiServicesTablePage)))\r
\r
#endif\r
\r
#include <Protocol/EmuThunk.h>\r
\r
-\r
-extern EMU_THUNK_PROTOCOL *gEmuThunk;\r
-\r
+extern EMU_THUNK_PROTOCOL *gEmuThunk;\r
\r
/**\r
Serach the EMU IO Thunk database for a matching EMU IO Thunk\r
IN UINTN Instance\r
);\r
\r
-\r
#endif\r
\r
#include <Protocol/SimpleTextInEx.h>\r
\r
-\r
/**\r
KeyMapMake gets called on key presses.\r
\r
EFI_STATUS\r
EFIAPI\r
KeyMapMake (\r
- IN EFI_KEY_DATA *KeyData\r
+ IN EFI_KEY_DATA *KeyData\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
KeyMapBreak (\r
- IN EFI_KEY_DATA *KeyData\r
+ IN EFI_KEY_DATA *KeyData\r
);\r
#ifndef __PPI_LIST_LIB_H__\r
#define __PPI_LIST_LIB_H__\r
\r
-\r
extern CONST EFI_PEI_PPI_DESCRIPTOR *gPpiList;\r
\r
-\r
#endif\r
#include <IndustryStandard/SmBios.h>\r
#include <Protocol/Smbios.h>\r
\r
-\r
///\r
/// Cache copy of the SMBIOS Protocol pointer\r
///\r
-extern EFI_SMBIOS_PROTOCOL *gSmbios;\r
-\r
+extern EFI_SMBIOS_PROTOCOL *gSmbios;\r
\r
///\r
/// Template for SMBIOS table initialization.\r
CHAR8 **StringArray;\r
} SMBIOS_TEMPLATE_ENTRY;\r
\r
-\r
/**\r
Create an initial SMBIOS Table from an array of SMBIOS_TEMPLATE_ENTRY\r
entries. SMBIOS_TEMPLATE_ENTRY.NULL indicates the end of the table.\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibInitializeFromTemplate (\r
- IN SMBIOS_TEMPLATE_ENTRY *Template\r
+ IN SMBIOS_TEMPLATE_ENTRY *Template\r
);\r
\r
-\r
-\r
/**\r
Create SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibCreateEntry (\r
- IN SMBIOS_STRUCTURE *SmbiosEntry,\r
- IN CHAR8 **StringArray\r
+ IN SMBIOS_STRUCTURE *SmbiosEntry,\r
+ IN CHAR8 **StringArray\r
);\r
\r
-\r
/**\r
Update the string associated with an existing SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibUpdateString (\r
- IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
- IN SMBIOS_TABLE_STRING StringNumber,\r
- IN CHAR8 *String\r
+ IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
+ IN SMBIOS_TABLE_STRING StringNumber,\r
+ IN CHAR8 *String\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibUpdateUnicodeString (\r
- IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
- IN SMBIOS_TABLE_STRING StringNumber,\r
- IN CHAR16 *String\r
+ IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
+ IN SMBIOS_TABLE_STRING StringNumber,\r
+ IN CHAR16 *String\r
);\r
\r
/**\r
IN EFI_SMBIOS_STRING StringNumber\r
);\r
\r
-\r
/**\r
Allow the caller to discover a specific SMBIOS entry, and patch it if necissary.\r
\r
SMBIOS_STRUCTURE *\r
EFIAPI\r
SmbiosLibGetRecord (\r
- IN EFI_SMBIOS_TYPE Type,\r
- IN UINTN Instance,\r
- OUT EFI_SMBIOS_HANDLE *SmbiosHandle\r
+ IN EFI_SMBIOS_TYPE Type,\r
+ IN UINTN Instance,\r
+ OUT EFI_SMBIOS_HANDLE *SmbiosHandle\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibRemove (\r
- OUT EFI_SMBIOS_HANDLE SmbiosHandle\r
+ OUT EFI_SMBIOS_HANDLE SmbiosHandle\r
);\r
\r
-\r
-\r
-\r
#endif\r
\r
#include <PiPei.h>\r
\r
-\r
EFI_PEI_PPI_DESCRIPTOR *\r
GetThunkPpiList (\r
VOID\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
AddThunkPpi (\r
IN EFI_GUID *Guid,\r
IN VOID *Ppi\r
);\r
-\r
-\r
#include <Uefi.h>\r
#include <Protocol/EmuIoThunk.h>\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
AddThunkProtocol (\r
- IN EMU_IO_THUNK_PROTOCOL *ThunkIo,\r
- IN CHAR16 *ConfigString,\r
- IN BOOLEAN EmuBusDriver\r
+ IN EMU_IO_THUNK_PROTOCOL *ThunkIo,\r
+ IN CHAR16 *ConfigString,\r
+ IN BOOLEAN EmuBusDriver\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GetNextThunkProtocol (\r
- IN BOOLEAN EmuBusDriver,\r
- OUT EMU_IO_THUNK_PROTOCOL **Instance\r
+ IN BOOLEAN EmuBusDriver,\r
+ OUT EMU_IO_THUNK_PROTOCOL **Instance\r
);\r
-\r
-\r
#define EMU_THUNK_PPI_GUID \\r
{ 0xB958B78C, 0x1D3E, 0xEE40, { 0x8B, 0xF4, 0xF0, 0x63, 0x2D, 0x06, 0x39, 0x16 } }\r
\r
-\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_PEI_AUTOSCAN) (\r
+(EFIAPI *EMU_PEI_AUTOSCAN)(\r
IN UINTN Index,\r
OUT EFI_PHYSICAL_ADDRESS *MemoryBase,\r
OUT UINT64 *MemorySize\r
);\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_PEI_FD_INFORMATION) (\r
+(EFIAPI *EMU_PEI_FD_INFORMATION)(\r
IN UINTN Index,\r
IN OUT EFI_PHYSICAL_ADDRESS *FdBase,\r
IN OUT UINT64 *FdSize,\r
IN OUT EFI_PHYSICAL_ADDRESS *FixUp\r
);\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
typedef\r
VOID *\r
-(EFIAPI *EMU_PEI_THUNK_INTERFACE) (\r
+(EFIAPI *EMU_PEI_THUNK_INTERFACE)(\r
VOID\r
);\r
\r
-\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_PEI_LOAD_FILE) (\r
+(EFIAPI *EMU_PEI_LOAD_FILE)(\r
VOID *Pe32Data,\r
EFI_PHYSICAL_ADDRESS *ImageAddress,\r
UINT64 *ImageSize,\r
EFI_PHYSICAL_ADDRESS *EntryPoint\r
);\r
\r
-\r
typedef struct {\r
- EMU_PEI_AUTOSCAN MemoryAutoScan;\r
- EMU_PEI_FD_INFORMATION FirmwareDevices;\r
- EMU_PEI_THUNK_INTERFACE Thunk;\r
+ EMU_PEI_AUTOSCAN MemoryAutoScan;\r
+ EMU_PEI_FD_INFORMATION FirmwareDevices;\r
+ EMU_PEI_THUNK_INTERFACE Thunk;\r
} EMU_THUNK_PPI;\r
\r
-extern EFI_GUID gEmuThunkPpiGuid;\r
+extern EFI_GUID gEmuThunkPpiGuid;\r
\r
#endif\r
#define EMU_BLOCK_IO_PROTOCOL_GUID \\r
{ 0x6888A4AE, 0xAFCE, 0xE84B, { 0x91, 0x02, 0xF7, 0xB9, 0xDA, 0xE6, 0xA0, 0x30 } }\r
\r
-typedef struct _EMU_BLOCK_IO_PROTOCOL EMU_BLOCK_IO_PROTOCOL;\r
-\r
-\r
+typedef struct _EMU_BLOCK_IO_PROTOCOL EMU_BLOCK_IO_PROTOCOL;\r
\r
/**\r
Reset the block device hardware.\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_BLOCK_RESET) (\r
+(EFIAPI *EMU_BLOCK_RESET)(\r
IN EMU_BLOCK_IO_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
);\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_BLOCK_READ) (\r
+(EFIAPI *EMU_BLOCK_READ)(\r
IN EMU_BLOCK_IO_PROTOCOL *This,\r
IN UINT32 MediaId,\r
IN EFI_LBA LBA,\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ OUT VOID *Buffer\r
);\r
\r
/**\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_BLOCK_WRITE) (\r
+(EFIAPI *EMU_BLOCK_WRITE)(\r
IN EMU_BLOCK_IO_PROTOCOL *This,\r
IN UINT32 MediaId,\r
IN EFI_LBA LBA,\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_BLOCK_FLUSH) (\r
+(EFIAPI *EMU_BLOCK_FLUSH)(\r
IN EMU_BLOCK_IO_PROTOCOL *This,\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
);\r
\r
-\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_BLOCK_CREATE_MAPPING) (\r
+(EFIAPI *EMU_BLOCK_CREATE_MAPPING)(\r
IN EMU_BLOCK_IO_PROTOCOL *This,\r
IN EFI_BLOCK_IO_MEDIA *Media\r
);\r
\r
-\r
///\r
/// The Block I/O2 protocol defines an extension to the Block I/O protocol which\r
/// enables the ability to read and write data at a block level in a non-blocking\r
// manner.\r
///\r
struct _EMU_BLOCK_IO_PROTOCOL {\r
- EMU_BLOCK_RESET Reset;\r
- EMU_BLOCK_READ ReadBlocks;\r
- EMU_BLOCK_WRITE WriteBlocks;\r
- EMU_BLOCK_FLUSH FlushBlocks;\r
- EMU_BLOCK_CREATE_MAPPING CreateMapping;\r
+ EMU_BLOCK_RESET Reset;\r
+ EMU_BLOCK_READ ReadBlocks;\r
+ EMU_BLOCK_WRITE WriteBlocks;\r
+ EMU_BLOCK_FLUSH FlushBlocks;\r
+ EMU_BLOCK_CREATE_MAPPING CreateMapping;\r
};\r
\r
-extern EFI_GUID gEmuBlockIoProtocolGuid;\r
+extern EFI_GUID gEmuBlockIoProtocolGuid;\r
\r
#endif\r
-\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
);\r
\r
-\r
typedef\r
VOID\r
-(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK)(\r
IN VOID *Context,\r
IN EFI_KEY_DATA *KeyData\r
);\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK CallBack,\r
IN VOID *Context\r
);\r
\r
-\r
typedef struct {\r
- UINTN SourceX;\r
- UINTN SourceY;\r
- UINTN DestinationX;\r
- UINTN DestinationY;\r
- UINTN Width;\r
- UINTN Height;\r
- UINTN Delta;\r
+ UINTN SourceX;\r
+ UINTN SourceY;\r
+ UINTN DestinationX;\r
+ UINTN DestinationY;\r
+ UINTN Width;\r
+ UINTN Height;\r
+ UINTN Delta;\r
} EMU_GRAPHICS_WINDOWS__BLT_ARGS;\r
\r
typedef\r
\r
typedef\r
BOOLEAN\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EFI_KEY_DATA *KeyData\r
);\r
);\r
\r
struct _EMU_GRAPHICS_WINDOW_PROTOCOL {\r
- EMU_GRAPHICS_WINDOWS_SIZE Size;\r
- EMU_GRAPHICS_WINDOWS_CHECK_KEY CheckKey;\r
- EMU_GRAPHICS_WINDOWS_KEY_SET_STATE KeySetState;\r
- EMU_GRAPHICS_WINDOWS_GET_KEY GetKey;\r
- EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY RegisterKeyNotify;\r
- EMU_GRAPHICS_WINDOWS_BLT Blt;\r
- EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED IsKeyPressed;\r
- EMU_GRAPHICS_WINDOWS_CHECK_POINTER CheckPointer;\r
- EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE GetPointerState;\r
+ EMU_GRAPHICS_WINDOWS_SIZE Size;\r
+ EMU_GRAPHICS_WINDOWS_CHECK_KEY CheckKey;\r
+ EMU_GRAPHICS_WINDOWS_KEY_SET_STATE KeySetState;\r
+ EMU_GRAPHICS_WINDOWS_GET_KEY GetKey;\r
+ EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY RegisterKeyNotify;\r
+ EMU_GRAPHICS_WINDOWS_BLT Blt;\r
+ EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED IsKeyPressed;\r
+ EMU_GRAPHICS_WINDOWS_CHECK_POINTER CheckPointer;\r
+ EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE GetPointerState;\r
};\r
\r
-\r
-extern EFI_GUID gEmuGraphicsWindowProtocolGuid;\r
+extern EFI_GUID gEmuGraphicsWindowProtocolGuid;\r
\r
#endif\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
);\r
\r
-\r
typedef\r
VOID\r
-(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK)(\r
IN VOID *Context,\r
IN EFI_KEY_DATA *KeyData\r
);\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
IN VOID *Context\r
);\r
\r
-\r
typedef struct {\r
- UINTN SourceX;\r
- UINTN SourceY;\r
- UINTN DestinationX;\r
- UINTN DestinationY;\r
- UINTN Width;\r
- UINTN Height;\r
- UINTN Delta;\r
+ UINTN SourceX;\r
+ UINTN SourceY;\r
+ UINTN DestinationX;\r
+ UINTN DestinationY;\r
+ UINTN Width;\r
+ UINTN Height;\r
+ UINTN Delta;\r
} EMU_GRAPHICS_WINDOWS__BLT_ARGS;\r
\r
typedef\r
\r
typedef\r
BOOLEAN\r
-(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED) (\r
+(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED)(\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
IN EFI_KEY_DATA *KeyData\r
);\r
);\r
\r
struct _EMU_GRAPHICS_WINDOW_PROTOCOL {\r
- EMU_GRAPHICS_WINDOWS_SIZE Size;\r
- EMU_GRAPHICS_WINDOWS_CHECK_KEY CheckKey;\r
- EMU_GRAPHICS_WINDOWS_KEY_SET_STATE KeySetState;\r
- EMU_GRAPHICS_WINDOWS_GET_KEY GetKey;\r
- EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY RegisterKeyNotify;\r
- EMU_GRAPHICS_WINDOWS_BLT Blt;\r
- EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED IsKeyPressed;\r
- EMU_GRAPHICS_WINDOWS_CHECK_POINTER CheckPointer;\r
- EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE GetPointerState;\r
+ EMU_GRAPHICS_WINDOWS_SIZE Size;\r
+ EMU_GRAPHICS_WINDOWS_CHECK_KEY CheckKey;\r
+ EMU_GRAPHICS_WINDOWS_KEY_SET_STATE KeySetState;\r
+ EMU_GRAPHICS_WINDOWS_GET_KEY GetKey;\r
+ EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY RegisterKeyNotify;\r
+ EMU_GRAPHICS_WINDOWS_BLT Blt;\r
+ EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED IsKeyPressed;\r
+ EMU_GRAPHICS_WINDOWS_CHECK_POINTER CheckPointer;\r
+ EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE GetPointerState;\r
};\r
\r
-\r
-extern EFI_GUID gEmuGraphicsWindowProtocolGuid;\r
+extern EFI_GUID gEmuGraphicsWindowProtocolGuid;\r
\r
#endif\r
#ifndef __EMU_IO_THUNK__\r
#define __EMU_IO_THUNK__\r
\r
-\r
#define EMU_IO_THUNK_PROTOCO_GUID \\r
{ 0x453368F6, 0x7C85, 0x434A, { 0xA9, 0x8A, 0x72, 0xD1, 0xB7, 0xFF, 0xA9, 0x26 } }\r
\r
-\r
-typedef struct _EMU_IO_THUNK_PROTOCOL EMU_IO_THUNK_PROTOCOL;\r
-\r
+typedef struct _EMU_IO_THUNK_PROTOCOL EMU_IO_THUNK_PROTOCOL;\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN) (\r
+(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN)(\r
IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE) (\r
+(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE)(\r
IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
struct _EMU_IO_THUNK_PROTOCOL {\r
- EFI_GUID *Protocol;\r
- VOID *Interface; /// Only be valid after Open() is called\r
- CHAR16 *ConfigString;\r
- UINT16 Instance;\r
- EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN Open;\r
- EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE Close;\r
- VOID *Private; /// Used by implementation\r
+ EFI_GUID *Protocol;\r
+ VOID *Interface; /// Only be valid after Open() is called\r
+ CHAR16 *ConfigString;\r
+ UINT16 Instance;\r
+ EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN Open;\r
+ EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE Close;\r
+ VOID *Private; /// Used by implementation\r
};\r
\r
-extern EFI_GUID gEmuIoThunkProtocolGuid;\r
+extern EFI_GUID gEmuIoThunkProtocolGuid;\r
\r
#endif\r
#define EMU_SNP_PROTOCOL_GUID \\r
{ 0xFD5FBE54, 0x8C35, 0xB345, { 0x8A, 0x0F, 0x7A, 0xC8, 0xA5, 0xFD, 0x05, 0x21 } }\r
\r
-typedef struct _EMU_SNP_PROTOCOL EMU_SNP_PROTOCOL;\r
-\r
+typedef struct _EMU_SNP_PROTOCOL EMU_SNP_PROTOCOL;\r
\r
/**\r
Register storage for SNP Mode.\r
IN EFI_SIMPLE_NETWORK_MODE *Mode\r
);\r
\r
-\r
/**\r
Changes the state of a network interface from "stopped" to "started".\r
\r
//\r
// Revision defined in EFI1.1\r
//\r
-#define EMU_SNP_INTERFACE_REVISION EMU_SNP_PROTOCOL_REVISION\r
+#define EMU_SNP_INTERFACE_REVISION EMU_SNP_PROTOCOL_REVISION\r
\r
///\r
/// The EMU_SNP_PROTOCOL protocol abstracts OS network sercices\r
/// from the EFI driver that produces EFI Simple Network Protocol.\r
///\r
struct _EMU_SNP_PROTOCOL {\r
- EMU_SNP_CREATE_MAPPING CreateMapping;\r
- EMU_SNP_START Start;\r
- EMU_SNP_STOP Stop;\r
- EMU_SNP_INITIALIZE Initialize;\r
- EMU_SNP_RESET Reset;\r
- EMU_SNP_SHUTDOWN Shutdown;\r
- EMU_SNP_RECEIVE_FILTERS ReceiveFilters;\r
- EMU_SNP_STATION_ADDRESS StationAddress;\r
- EMU_SNP_STATISTICS Statistics;\r
- EMU_SNP_MCAST_IP_TO_MAC MCastIpToMac;\r
- EMU_SNP_NVDATA NvData;\r
- EMU_SNP_GET_STATUS GetStatus;\r
- EMU_SNP_TRANSMIT Transmit;\r
- EMU_SNP_RECEIVE Receive;\r
+ EMU_SNP_CREATE_MAPPING CreateMapping;\r
+ EMU_SNP_START Start;\r
+ EMU_SNP_STOP Stop;\r
+ EMU_SNP_INITIALIZE Initialize;\r
+ EMU_SNP_RESET Reset;\r
+ EMU_SNP_SHUTDOWN Shutdown;\r
+ EMU_SNP_RECEIVE_FILTERS ReceiveFilters;\r
+ EMU_SNP_STATION_ADDRESS StationAddress;\r
+ EMU_SNP_STATISTICS Statistics;\r
+ EMU_SNP_MCAST_IP_TO_MAC MCastIpToMac;\r
+ EMU_SNP_NVDATA NvData;\r
+ EMU_SNP_GET_STATUS GetStatus;\r
+ EMU_SNP_TRANSMIT Transmit;\r
+ EMU_SNP_RECEIVE Receive;\r
};\r
\r
-extern EFI_GUID gEmuSnpProtocolGuid;\r
+extern EFI_GUID gEmuSnpProtocolGuid;\r
\r
#endif\r
#ifndef __EMU_THREAD_THUNK__\r
#define __EMU_THREAD_THUNK__\r
\r
-\r
-typedef struct _EMU_THREAD_THUNK_PROTOCOL EMU_THREAD_THUNK_PROTOCOL;\r
-\r
+typedef struct _EMU_THREAD_THUNK_PROTOCOL EMU_THREAD_THUNK_PROTOCOL;\r
\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_MUTEX_LOCK) (\r
+(EFIAPI *THREAD_THUNK_MUTEX_LOCK)(\r
IN VOID *Mutex\r
);\r
\r
-\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_MUTEX_UNLOCK) (\r
+(EFIAPI *THREAD_THUNK_MUTEX_UNLOCK)(\r
IN VOID *Mutex\r
);\r
\r
-\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_MUTEX_TRY_LOCK) (\r
+(EFIAPI *THREAD_THUNK_MUTEX_TRY_LOCK)(\r
IN VOID *Mutex\r
);\r
\r
-\r
typedef\r
VOID *\r
-(EFIAPI *THREAD_THUNK_MUTEX_INIT) (\r
+(EFIAPI *THREAD_THUNK_MUTEX_INIT)(\r
IN VOID\r
);\r
\r
-\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_MUTEX_DISTROY) (\r
+(EFIAPI *THREAD_THUNK_MUTEX_DISTROY)(\r
IN VOID *Mutex\r
);\r
\r
-\r
-\r
typedef\r
VOID *\r
-(EFIAPI *THREAD_THUNK_THREAD_ENTRY) (\r
+(EFIAPI *THREAD_THUNK_THREAD_ENTRY)(\r
IN VOID *Context\r
);\r
\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_CREATE_THREAD) (\r
+(EFIAPI *THREAD_THUNK_CREATE_THREAD)(\r
IN VOID *Thread,\r
IN VOID *Attribute,\r
IN THREAD_THUNK_THREAD_ENTRY Start,\r
\r
typedef\r
VOID\r
-(EFIAPI *THREAD_THUNK_EXIT_THREAD) (\r
+(EFIAPI *THREAD_THUNK_EXIT_THREAD)(\r
IN VOID *ValuePtr\r
);\r
\r
-\r
typedef\r
UINTN\r
-(EFIAPI *THREAD_THUNK_SELF) (\r
+(EFIAPI *THREAD_THUNK_SELF)(\r
VOID\r
);\r
\r
-\r
struct _EMU_THREAD_THUNK_PROTOCOL {\r
- THREAD_THUNK_MUTEX_LOCK MutexLock;\r
- THREAD_THUNK_MUTEX_UNLOCK MutexUnlock;\r
- THREAD_THUNK_MUTEX_TRY_LOCK MutexTryLock;\r
- THREAD_THUNK_MUTEX_INIT MutexInit;\r
- THREAD_THUNK_MUTEX_DISTROY MutexDistroy;\r
- THREAD_THUNK_CREATE_THREAD CreateThread;\r
- THREAD_THUNK_EXIT_THREAD ExitThread;\r
- THREAD_THUNK_SELF Self;\r
+ THREAD_THUNK_MUTEX_LOCK MutexLock;\r
+ THREAD_THUNK_MUTEX_UNLOCK MutexUnlock;\r
+ THREAD_THUNK_MUTEX_TRY_LOCK MutexTryLock;\r
+ THREAD_THUNK_MUTEX_INIT MutexInit;\r
+ THREAD_THUNK_MUTEX_DISTROY MutexDistroy;\r
+ THREAD_THUNK_CREATE_THREAD CreateThread;\r
+ THREAD_THUNK_EXIT_THREAD ExitThread;\r
+ THREAD_THUNK_SELF Self;\r
};\r
\r
-extern EFI_GUID gEmuThreadThunkProtocolGuid;\r
+extern EFI_GUID gEmuThreadThunkProtocolGuid;\r
\r
#endif\r
-\r
#include <Protocol/EmuIoThunk.h>\r
#include <Protocol/DevicePath.h>\r
\r
-\r
typedef struct {\r
- VENDOR_DEVICE_PATH VendorDevicePath;\r
- UINT32 Instance;\r
+ VENDOR_DEVICE_PATH VendorDevicePath;\r
+ UINT32 Instance;\r
} EMU_VENDOR_DEVICE_PATH_NODE;\r
\r
typedef struct {\r
- EMU_VENDOR_DEVICE_PATH_NODE Vendor;\r
- EFI_DEVICE_PATH_PROTOCOL EndDevicePath;\r
+ EMU_VENDOR_DEVICE_PATH_NODE Vendor;\r
+ EFI_DEVICE_PATH_PROTOCOL EndDevicePath;\r
} EMU_THUNK_DEVICE_PATH;\r
\r
-\r
-\r
-typedef struct _EMU_THUNK_PROTOCOL EMU_THUNK_PROTOCOL;\r
-\r
-\r
+typedef struct _EMU_THUNK_PROTOCOL EMU_THUNK_PROTOCOL;\r
\r
typedef\r
UINTN\r
-(EFIAPI *EMU_WRITE_STD_ERROR) (\r
+(EFIAPI *EMU_WRITE_STD_ERROR)(\r
IN UINT8 *Buffer,\r
IN UINTN NumberOfBytes\r
);\r
\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_CONFIG_STD_IN) (\r
+(EFIAPI *EMU_CONFIG_STD_IN)(\r
VOID\r
);\r
\r
typedef\r
UINTN\r
-(EFIAPI *EMU_WRITE_STD_OUT) (\r
+(EFIAPI *EMU_WRITE_STD_OUT)(\r
IN UINT8 *Buffer,\r
IN UINTN NumberOfBytes\r
);\r
\r
typedef\r
UINTN\r
-(EFIAPI *EMU_READ_STD_IN) (\r
+(EFIAPI *EMU_READ_STD_IN)(\r
OUT UINT8 *Buffer,\r
IN UINTN NumberOfBytes\r
);\r
\r
typedef\r
BOOLEAN\r
-(EFIAPI *EMU_POLL_STD_IN) (\r
+(EFIAPI *EMU_POLL_STD_IN)(\r
VOID\r
);\r
\r
-\r
typedef\r
VOID *\r
-(EFIAPI *EMU_OS_MALLOC) (\r
+(EFIAPI *EMU_OS_MALLOC)(\r
IN UINTN Size\r
);\r
\r
typedef\r
VOID *\r
-(EFIAPI *EMU_OS_VMALLOC) (\r
+(EFIAPI *EMU_OS_VMALLOC)(\r
IN UINTN Size\r
);\r
\r
typedef\r
BOOLEAN\r
-(EFIAPI *EMU_OS_FREE) (\r
+(EFIAPI *EMU_OS_FREE)(\r
IN VOID *Ptr\r
);\r
\r
-\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_PE_COFF_GET_ENTRY_POINT) (\r
+(EFIAPI *EMU_PE_COFF_GET_ENTRY_POINT)(\r
IN VOID *Pe32Data,\r
IN OUT VOID **EntryPoint\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_PE_COFF_RELOCATE_EXTRA_ACTION) (\r
+(EFIAPI *EMU_PE_COFF_RELOCATE_EXTRA_ACTION)(\r
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_PE_COFF_UNLOAD_EXTRA_ACTION) (\r
+(EFIAPI *EMU_PE_COFF_UNLOAD_EXTRA_ACTION)(\r
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_ENABLE_INERRUPTS) (\r
+(EFIAPI *EMU_ENABLE_INERRUPTS)(\r
VOID\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_DISABLE_INERRUPTS) (\r
+(EFIAPI *EMU_DISABLE_INERRUPTS)(\r
VOID\r
);\r
\r
typedef\r
UINT64\r
-(EFIAPI *EMU_QUERY_PERFORMANCE_FREQENCY) (\r
+(EFIAPI *EMU_QUERY_PERFORMANCE_FREQENCY)(\r
VOID\r
);\r
\r
typedef\r
UINT64\r
-(EFIAPI *EMU_QUERY_PERFORMANCE_COUNTER) (\r
+(EFIAPI *EMU_QUERY_PERFORMANCE_COUNTER)(\r
VOID\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_SLEEP) (\r
+(EFIAPI *EMU_SLEEP)(\r
IN UINT64 Milliseconds\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_CPU_SLEEP) (\r
+(EFIAPI *EMU_CPU_SLEEP)(\r
VOID\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_EXIT) (\r
+(EFIAPI *EMU_EXIT)(\r
IN UINTN Status\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_GET_TIME) (\r
+(EFIAPI *EMU_GET_TIME)(\r
OUT EFI_TIME *Time,\r
OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_SET_TIME) (\r
+(EFIAPI *EMU_SET_TIME)(\r
IN EFI_TIME *Time\r
);\r
\r
-\r
typedef\r
VOID\r
-(EFIAPI EMU_SET_TIMER_CALLBACK) (\r
+(EFIAPI EMU_SET_TIMER_CALLBACK)(\r
IN UINT64 DeltaMs\r
);\r
\r
typedef\r
VOID\r
-(EFIAPI *EMU_SET_TIMER) (\r
+(EFIAPI *EMU_SET_TIMER)(\r
IN UINT64 PeriodMs,\r
IN EMU_SET_TIMER_CALLBACK CallBack\r
);\r
\r
-\r
-\r
/**\r
Enumerates the current set of protocol instances that abstract OS services from EFI.\r
\r
**/\r
typedef\r
EFI_STATUS\r
-(EFIAPI *EMU_GET_NEXT_PROTOCOL) (\r
+(EFIAPI *EMU_GET_NEXT_PROTOCOL)(\r
IN BOOLEAN EmuBusDriver,\r
OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
);\r
\r
-\r
struct _EMU_THUNK_PROTOCOL {\r
// Used for early debug printing\r
- EMU_WRITE_STD_ERROR WriteStdErr;\r
- EMU_CONFIG_STD_IN ConfigStdIn;\r
- EMU_WRITE_STD_OUT WriteStdOut;\r
- EMU_READ_STD_IN ReadStdIn;\r
- EMU_POLL_STD_IN PollStdIn;\r
+ EMU_WRITE_STD_ERROR WriteStdErr;\r
+ EMU_CONFIG_STD_IN ConfigStdIn;\r
+ EMU_WRITE_STD_OUT WriteStdOut;\r
+ EMU_READ_STD_IN ReadStdIn;\r
+ EMU_POLL_STD_IN PollStdIn;\r
\r
//\r
// Map OS malloc/free so we can use OS based guard malloc\r
//\r
- EMU_OS_MALLOC Malloc;\r
- EMU_OS_VMALLOC Valloc;\r
- EMU_OS_FREE Free;\r
-\r
+ EMU_OS_MALLOC Malloc;\r
+ EMU_OS_VMALLOC Valloc;\r
+ EMU_OS_FREE Free;\r
\r
///\r
/// PE/COFF loader hooks to get symbols loaded\r
///\r
- EMU_PE_COFF_GET_ENTRY_POINT PeCoffGetEntryPoint;\r
- EMU_PE_COFF_RELOCATE_EXTRA_ACTION PeCoffRelocateImageExtraAction;\r
- EMU_PE_COFF_UNLOAD_EXTRA_ACTION PeCoffUnloadImageExtraAction;\r
+ EMU_PE_COFF_GET_ENTRY_POINT PeCoffGetEntryPoint;\r
+ EMU_PE_COFF_RELOCATE_EXTRA_ACTION PeCoffRelocateImageExtraAction;\r
+ EMU_PE_COFF_UNLOAD_EXTRA_ACTION PeCoffUnloadImageExtraAction;\r
\r
///\r
/// DXE Architecture Protocol Services\r
///\r
- EMU_ENABLE_INERRUPTS EnableInterrupt;\r
- EMU_DISABLE_INERRUPTS DisableInterrupt;\r
- EMU_QUERY_PERFORMANCE_FREQENCY QueryPerformanceFrequency;\r
- EMU_QUERY_PERFORMANCE_COUNTER QueryPerformanceCounter;\r
-\r
- EMU_SLEEP Sleep;\r
- EMU_CPU_SLEEP CpuSleep;\r
- EMU_EXIT Exit;\r
- EMU_GET_TIME GetTime;\r
- EMU_SET_TIME SetTime;\r
- EMU_SET_TIMER SetTimer;\r
+ EMU_ENABLE_INERRUPTS EnableInterrupt;\r
+ EMU_DISABLE_INERRUPTS DisableInterrupt;\r
+ EMU_QUERY_PERFORMANCE_FREQENCY QueryPerformanceFrequency;\r
+ EMU_QUERY_PERFORMANCE_COUNTER QueryPerformanceCounter;\r
+\r
+ EMU_SLEEP Sleep;\r
+ EMU_CPU_SLEEP CpuSleep;\r
+ EMU_EXIT Exit;\r
+ EMU_GET_TIME GetTime;\r
+ EMU_SET_TIME SetTime;\r
+ EMU_SET_TIMER SetTimer;\r
\r
///\r
/// Generic System Services\r
///\r
- EMU_GET_NEXT_PROTOCOL GetNextProtocol;\r
+ EMU_GET_NEXT_PROTOCOL GetNextProtocol;\r
};\r
\r
-extern EFI_GUID gEmuThunkProtocolGuid;\r
+extern EFI_GUID gEmuThunkProtocolGuid;\r
\r
#endif\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/DevicePathLib.h>\r
\r
-\r
/**\r
Converts a Vendor device path structure to its string representative.\r
\r
CatPrint (Str, L"EmuThunk()");\r
return EFI_SUCCESS;\r
}\r
+\r
if (CompareGuid (&Vendor->VendorDevicePath.Guid, &gEmuGraphicsWindowProtocolGuid)) {\r
CatPrint (Str, L"EmuGraphics(%d)", Vendor->Instance);\r
return EFI_SUCCESS;\r
}\r
+\r
if (CompareGuid (&Vendor->VendorDevicePath.Guid, &gEfiSimpleFileSystemProtocolGuid)) {\r
CatPrint (Str, L"EmuFs(%d)", Vendor->Instance);\r
return EFI_SUCCESS;\r
}\r
+\r
if (CompareGuid (&Vendor->VendorDevicePath.Guid, &gEmuBlockIoProtocolGuid)) {\r
CatPrint (Str, L"EmuBlk(%d)", Vendor->Instance);\r
return EFI_SUCCESS;\r
}\r
+\r
if (CompareGuid (&Vendor->VendorDevicePath.Guid, &gEmuThreadThunkProtocolGuid)) {\r
CatPrint (Str, L"EmuThread()");\r
return EFI_SUCCESS;\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextEmuThunk (\r
- IN CHAR16 *TextDeviceNode\r
+ IN CHAR16 *TextDeviceNode\r
)\r
{\r
CHAR16 *Str;\r
VENDOR_DEVICE_PATH *Vendor;\r
\r
Str = GetNextParamStr (&TextDeviceNode);\r
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT16) sizeof (VENDOR_DEVICE_PATH)\r
- );\r
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+ );\r
CopyGuid (&Vendor->Guid, &gEmuThunkProtocolGuid);\r
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
}\r
\r
/**\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextEmuThread (\r
- IN CHAR16 *TextDeviceNode\r
+ IN CHAR16 *TextDeviceNode\r
)\r
{\r
CHAR16 *Str;\r
VENDOR_DEVICE_PATH *Vendor;\r
\r
Str = GetNextParamStr (&TextDeviceNode);\r
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT16) sizeof (VENDOR_DEVICE_PATH)\r
- );\r
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+ );\r
CopyGuid (&Vendor->Guid, &gEmuThreadThunkProtocolGuid);\r
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
}\r
\r
/**\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextEmuFs (\r
- IN CHAR16 *TextDeviceNode\r
+ IN CHAR16 *TextDeviceNode\r
)\r
{\r
CHAR16 *Str;\r
EMU_VENDOR_DEVICE_PATH_NODE *Vendor;\r
\r
- Str = GetNextParamStr (&TextDeviceNode);\r
- Vendor = (EMU_VENDOR_DEVICE_PATH_NODE *) CreateDeviceNode (\r
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT16) sizeof (EMU_VENDOR_DEVICE_PATH_NODE)\r
- );\r
+ Str = GetNextParamStr (&TextDeviceNode);\r
+ Vendor = (EMU_VENDOR_DEVICE_PATH_NODE *)CreateDeviceNode (\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ (UINT16)sizeof (EMU_VENDOR_DEVICE_PATH_NODE)\r
+ );\r
CopyGuid (&Vendor->VendorDevicePath.Guid, &gEfiSimpleFileSystemProtocolGuid);\r
- Vendor->Instance = (UINT32) StrDecimalToUintn (Str);\r
+ Vendor->Instance = (UINT32)StrDecimalToUintn (Str);\r
\r
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
}\r
\r
/**\r
\r
#include <Protocol/Timer.h>\r
\r
-\r
-\r
/**\r
Stalls the CPU for at least the given number of microseconds.\r
\r
UINTN\r
EFIAPI\r
MicroSecondDelay (\r
- IN UINTN MicroSeconds\r
+ IN UINTN MicroSeconds\r
)\r
{\r
return NanoSecondDelay (MicroSeconds * 1000);\r
}\r
\r
-\r
/**\r
Stalls the CPU for at least the given number of nanoseconds.\r
\r
UINTN\r
EFIAPI\r
NanoSecondDelay (\r
- IN UINTN NanoSeconds\r
+ IN UINTN NanoSeconds\r
)\r
{\r
gEmuThunk->Sleep (NanoSeconds);\r
return NanoSeconds;\r
}\r
\r
-\r
/**\r
Retrieves the current value of a 64-bit free running performance counter.\r
\r
UINT64\r
EFIAPI\r
GetPerformanceCounterProperties (\r
- OUT UINT64 *StartValue OPTIONAL,\r
- OUT UINT64 *EndValue OPTIONAL\r
+ OUT UINT64 *StartValue OPTIONAL,\r
+ OUT UINT64 *EndValue OPTIONAL\r
)\r
{\r
-\r
if (StartValue != NULL) {\r
*StartValue = 0ULL;\r
}\r
+\r
if (EndValue != NULL) {\r
*EndValue = (UINT64)-1LL;\r
}\r
// Since 2^29 < 1,000,000,000 = 0x3B9ACA00 < 2^30, Remainder should < 2^(64-30) = 2^34,\r
// i.e. highest bit set in Remainder should <= 33.\r
//\r
- Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
- Remainder = RShiftU64 (Remainder, (UINTN) Shift);\r
- Frequency = RShiftU64 (Frequency, (UINTN) Shift);\r
+ Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
+ Remainder = RShiftU64 (Remainder, (UINTN)Shift);\r
+ Frequency = RShiftU64 (Frequency, (UINTN)Shift);\r
NanoSeconds += DivU64x64Remainder (MultU64x32 (Remainder, 1000000000u), Frequency, NULL);\r
\r
return NanoSeconds;\r
#include <Library/EmuThunkLib.h>\r
#include <Library/BaseMemoryLib.h>\r
\r
-EMU_THUNK_PROTOCOL *gEmuThunk = NULL;\r
-\r
+EMU_THUNK_PROTOCOL *gEmuThunk = NULL;\r
\r
/**\r
The constructor function caches the pointer of EMU Thunk protocol.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_HOB_GUID_TYPE *GuidHob;\r
+ EFI_HOB_GUID_TYPE *GuidHob;\r
\r
GuidHob = GetFirstGuidHob (&gEmuThunkProtocolGuid);\r
ASSERT (GuidHob != NULL);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Serach the EMU IO Thunk database for a matching EMU IO Thunk\r
Protocol instance.\r
IN UINTN Instance\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
+ EFI_STATUS Status;\r
+ EMU_IO_THUNK_PROTOCOL *EmuIoThunk;\r
\r
for (Status = EFI_SUCCESS, EmuIoThunk = NULL; !EFI_ERROR (Status); ) {\r
Status = gEmuThunk->GetNextProtocol (FALSE, &EmuIoThunk);\r
//\r
// Cache of UnixThunk protocol\r
//\r
-EMU_THUNK_PROTOCOL *mThunk = NULL;\r
-\r
+EMU_THUNK_PROTOCOL *mThunk = NULL;\r
\r
/**\r
The constructor function gets the pointer of the WinNT thunk functions\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_HOB_GUID_TYPE *GuidHob;\r
+ EFI_HOB_GUID_TYPE *GuidHob;\r
\r
//\r
// Retrieve EmuThunkProtocol from GUID'ed HOB\r
}\r
}\r
\r
-\r
-\r
/**\r
Performs additional actions just before a PE/COFF image is unloaded. Any resources\r
that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r
\r
**/\r
\r
-\r
#include <PiDxe.h>\r
#include <Library/SerialPortLib.h>\r
#include <Library/EmuThunkLib.h>\r
\r
-\r
-\r
-\r
/**\r
Initialize the serial device hardware.\r
\r
UINTN\r
EFIAPI\r
SerialPortWrite (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
return gEmuThunk->WriteStdOut (Buffer, NumberOfBytes);\r
}\r
\r
-\r
/**\r
Read data from serial device and save the datas in buffer.\r
\r
UINTN\r
EFIAPI\r
SerialPortRead (\r
- OUT UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ OUT UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
return gEmuThunk->ReadStdIn (Buffer, NumberOfBytes);\r
RETURN_STATUS\r
EFIAPI\r
SerialPortSetControl (\r
- IN UINT32 Control\r
+ IN UINT32 Control\r
)\r
{\r
return RETURN_UNSUPPORTED;\r
RETURN_STATUS\r
EFIAPI\r
SerialPortGetControl (\r
- OUT UINT32 *Control\r
+ OUT UINT32 *Control\r
)\r
{\r
*Control = 0;\r
if (!SerialPortPoll ()) {\r
*Control = EFI_SERIAL_INPUT_BUFFER_EMPTY;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
SerialPortSetAttributes (\r
- IN OUT UINT64 *BaudRate,\r
- IN OUT UINT32 *ReceiveFifoDepth,\r
- IN OUT UINT32 *Timeout,\r
- IN OUT EFI_PARITY_TYPE *Parity,\r
- IN OUT UINT8 *DataBits,\r
- IN OUT EFI_STOP_BITS_TYPE *StopBits\r
+ IN OUT UINT64 *BaudRate,\r
+ IN OUT UINT32 *ReceiveFifoDepth,\r
+ IN OUT UINT32 *Timeout,\r
+ IN OUT EFI_PARITY_TYPE *Parity,\r
+ IN OUT UINT8 *DataBits,\r
+ IN OUT EFI_STOP_BITS_TYPE *StopBits\r
)\r
{\r
return RETURN_UNSUPPORTED;\r
}\r
-\r
\r
**/\r
\r
-\r
#include <PiDxe.h>\r
#include <Library/SerialPortLib.h>\r
#include <Library/EmuThunkLib.h>\r
\r
-\r
-\r
-\r
/**\r
Initialize the serial device hardware.\r
\r
UINTN\r
EFIAPI\r
SerialPortWrite (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
if (gEmuThunk == NULL) {\r
return gEmuThunk->WriteStdErr (Buffer, NumberOfBytes);\r
}\r
\r
-\r
/**\r
Read data from serial device and save the datas in buffer.\r
\r
UINTN\r
EFIAPI\r
SerialPortRead (\r
- OUT UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ OUT UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
return 0;\r
{\r
return FALSE;\r
}\r
-\r
-\r
\r
#include <Protocol/Timer.h>\r
\r
-\r
-STATIC UINT64 gTimerPeriod = 0;\r
-STATIC EFI_TIMER_ARCH_PROTOCOL *gTimerAp = NULL;\r
-STATIC EFI_EVENT gTimerEvent = NULL;\r
-STATIC VOID *gRegistration = NULL;\r
+STATIC UINT64 gTimerPeriod = 0;\r
+STATIC EFI_TIMER_ARCH_PROTOCOL *gTimerAp = NULL;\r
+STATIC EFI_EVENT gTimerEvent = NULL;\r
+STATIC VOID *gRegistration = NULL;\r
\r
VOID\r
EFIAPI\r
RegisterTimerArchProtocol (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
EFI_STATUS Status;\r
}\r
}\r
\r
-\r
-\r
/**\r
Stalls the CPU for at least the given number of microseconds.\r
\r
UINTN\r
EFIAPI\r
MicroSecondDelay (\r
- IN UINTN MicroSeconds\r
+ IN UINTN MicroSeconds\r
)\r
{\r
return NanoSecondDelay (MicroSeconds * 1000);\r
}\r
\r
-\r
/**\r
Stalls the CPU for at least the given number of nanoseconds.\r
\r
UINTN\r
EFIAPI\r
NanoSecondDelay (\r
- IN UINTN NanoSeconds\r
+ IN UINTN NanoSeconds\r
)\r
{\r
EFI_STATUS Status;\r
\r
if ((gTimerPeriod != 0) &&\r
((UINT64)NanoSeconds > gTimerPeriod) &&\r
- (EfiGetCurrentTpl () == TPL_APPLICATION)) {\r
+ (EfiGetCurrentTpl () == TPL_APPLICATION))\r
+ {\r
//\r
// This stall is long, so use gBS->WaitForEvent () to yield CPU to DXE Core\r
//\r
\r
HundredNanoseconds = DivU64x32 (NanoSeconds, 100);\r
- Status = gBS->SetTimer (gTimerEvent, TimerRelative, HundredNanoseconds);\r
+ Status = gBS->SetTimer (gTimerEvent, TimerRelative, HundredNanoseconds);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->WaitForEvent (sizeof (gTimerEvent)/sizeof (EFI_EVENT), &gTimerEvent, &Index);\r
ASSERT_EFI_ERROR (Status);\r
-\r
} else {\r
gEmuThunk->Sleep (NanoSeconds);\r
}\r
+\r
return NanoSeconds;\r
}\r
\r
-\r
/**\r
Retrieves the current value of a 64-bit free running performance counter.\r
\r
UINT64\r
EFIAPI\r
GetPerformanceCounterProperties (\r
- OUT UINT64 *StartValue OPTIONAL,\r
- OUT UINT64 *EndValue OPTIONAL\r
+ OUT UINT64 *StartValue OPTIONAL,\r
+ OUT UINT64 *EndValue OPTIONAL\r
)\r
{\r
-\r
if (StartValue != NULL) {\r
*StartValue = 0ULL;\r
}\r
+\r
if (EndValue != NULL) {\r
*EndValue = (UINT64)-1LL;\r
}\r
return gEmuThunk->QueryPerformanceFrequency ();\r
}\r
\r
-\r
/**\r
Register for the Timer AP protocol.\r
\r
// Since 2^29 < 1,000,000,000 = 0x3B9ACA00 < 2^30, Remainder should < 2^(64-30) = 2^34,\r
// i.e. highest bit set in Remainder should <= 33.\r
//\r
- Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
- Remainder = RShiftU64 (Remainder, (UINTN) Shift);\r
- Frequency = RShiftU64 (Frequency, (UINTN) Shift);\r
+ Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
+ Remainder = RShiftU64 (Remainder, (UINTN)Shift);\r
+ Frequency = RShiftU64 (Frequency, (UINTN)Shift);\r
NanoSeconds += DivU64x64Remainder (MultU64x32 (Remainder, 1000000000u), Frequency, NULL);\r
\r
return NanoSeconds;\r
\r
**/\r
\r
-\r
#include <Uefi.h>\r
\r
-\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/BaseMemoryLib.h>\r
IN UINTN Pages\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
ASSERT (Pages != 0);\r
if (!gEmuThunk->Free (Buffer)) {\r
// The Free thunk will not free memory allocated in emulated EFI memory.\r
// The assmuption is this was allocated directly by EFI. We need this as some\r
// times protocols or EFI BootServices can return dynamically allocated buffers.\r
- Status = gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer, Pages);\r
+ Status = gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Pages);\r
ASSERT_EFI_ERROR (Status);\r
}\r
}\r
IN UINTN Alignment\r
)\r
{\r
- EFI_STATUS Status;\r
- VOID *Memory;\r
- UINTN AlignedMemory;\r
- UINTN AlignmentMask;\r
- UINTN UnalignedPages;\r
- UINTN RealPages;\r
+ EFI_STATUS Status;\r
+ VOID *Memory;\r
+ UINTN AlignedMemory;\r
+ UINTN AlignmentMask;\r
+ UINTN UnalignedPages;\r
+ UINTN RealPages;\r
\r
//\r
// Alignment must be a power of two or zero.\r
if (Pages == 0) {\r
return NULL;\r
}\r
+\r
if (Alignment > EFI_PAGE_SIZE) {\r
//\r
// Caculate the total number of pages since alignment is larger than page size.\r
//\r
- AlignmentMask = Alignment - 1;\r
- RealPages = Pages + EFI_SIZE_TO_PAGES (Alignment);\r
+ AlignmentMask = Alignment - 1;\r
+ RealPages = Pages + EFI_SIZE_TO_PAGES (Alignment);\r
//\r
// Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
//\r
if (Memory != NULL) {\r
return NULL;\r
}\r
- AlignedMemory = ((UINTN) Memory + AlignmentMask) & ~AlignmentMask;\r
- UnalignedPages = EFI_SIZE_TO_PAGES (AlignedMemory - (UINTN) Memory);\r
+\r
+ AlignedMemory = ((UINTN)Memory + AlignmentMask) & ~AlignmentMask;\r
+ UnalignedPages = EFI_SIZE_TO_PAGES (AlignedMemory - (UINTN)Memory);\r
if (UnalignedPages > 0) {\r
//\r
// Free first unaligned page(s).\r
//\r
FreePages (Memory, UnalignedPages);\r
}\r
- Memory = (VOID *) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));\r
+\r
+ Memory = (VOID *)(AlignedMemory + EFI_PAGES_TO_SIZE (Pages));\r
UnalignedPages = RealPages - Pages - UnalignedPages;\r
if (UnalignedPages > 0) {\r
//\r
if (Memory != NULL) {\r
return NULL;\r
}\r
- AlignedMemory = (UINTN) Memory;\r
+\r
+ AlignedMemory = (UINTN)Memory;\r
}\r
- return (VOID *) AlignedMemory;\r
+\r
+ return (VOID *)AlignedMemory;\r
}\r
\r
/**\r
if (Memory != NULL) {\r
Memory = ZeroMem (Memory, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
VOID *Memory;\r
\r
ASSERT (Buffer != NULL);\r
- ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+ ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
\r
Memory = InternalAllocatePool (PoolType, AllocationSize);\r
if (Memory != NULL) {\r
- Memory = CopyMem (Memory, Buffer, AllocationSize);\r
+ Memory = CopyMem (Memory, Buffer, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
VOID *NewBuffer;\r
\r
NewBuffer = InternalAllocateZeroPool (PoolType, NewSize);\r
- if (NewBuffer != NULL && OldBuffer != NULL) {\r
+ if ((NewBuffer != NULL) && (OldBuffer != NULL)) {\r
CopyMem (NewBuffer, OldBuffer, MIN (OldSize, NewSize));\r
FreePool (OldBuffer);\r
}\r
+\r
return NewBuffer;\r
}\r
\r
VOID\r
EFIAPI\r
FreePool (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
if (!gEmuThunk->Free (Buffer)) {\r
// The Free thunk will not free memory allocated in emulated EFI memory.\r
ASSERT_EFI_ERROR (Status);\r
}\r
}\r
-\r
#include <Uefi.h>\r
#include <Protocol/SimpleTextInEx.h>\r
\r
-\r
/**\r
KeyMapMake gets called on key presses.\r
\r
EFI_STATUS\r
EFIAPI\r
KeyMapMake (\r
- IN EFI_KEY_DATA *KeyData\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
return EFI_SUCCESS;\r
EFI_STATUS\r
EFIAPI\r
KeyMapBreak (\r
- IN EFI_KEY_DATA *KeyData\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
return EFI_SUCCESS;\r
VOID\r
EFIAPI\r
SetPeiServicesTablePointer (\r
- IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+ IN CONST EFI_PEI_SERVICES **PeiServicesTablePointer\r
)\r
{\r
ASSERT (PeiServicesTablePointer != NULL);\r
return gPeiServices;\r
}\r
\r
-\r
/**\r
The constructor function caches the pointer to PEI services.\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesTablePointerLibConstructor (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
gPeiServices = PeiServices;\r
//\r
return;\r
}\r
-\r
//\r
// Cache of UnixThunk protocol\r
//\r
-EMU_THUNK_PROTOCOL *mThunk = NULL;\r
+EMU_THUNK_PROTOCOL *mThunk = NULL;\r
\r
/**\r
The function caches the pointer of the Unix thunk functions\r
EmuPeCoffGetThunkStucture (\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
-\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
\r
//\r
// Locate Unix ThunkPpi for retrieving standard output handle\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
- );\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
- EMU_MAGIC_PAGE()->Thunk = (EMU_THUNK_PROTOCOL *) ThunkPpi->Thunk ();\r
+ EMU_MAGIC_PAGE ()->Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
\r
return EFI_SUCCESS;\r
}\r
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
- if (EMU_MAGIC_PAGE()->Thunk == NULL) {\r
+ if (EMU_MAGIC_PAGE ()->Thunk == NULL) {\r
EmuPeCoffGetThunkStucture ();\r
}\r
- EMU_MAGIC_PAGE()->Thunk->PeCoffRelocateImageExtraAction (ImageContext);\r
- }\r
\r
+ EMU_MAGIC_PAGE ()->Thunk->PeCoffRelocateImageExtraAction (ImageContext);\r
+}\r
\r
/**\r
Performs additional actions just before a PE/COFF image is unloaded. Any resources\r
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
- if (EMU_MAGIC_PAGE()->Thunk == NULL) {\r
+ if (EMU_MAGIC_PAGE ()->Thunk == NULL) {\r
EmuPeCoffGetThunkStucture ();\r
}\r
- EMU_MAGIC_PAGE()->Thunk->PeCoffUnloadImageExtraAction (ImageContext);\r
+\r
+ EMU_MAGIC_PAGE ()->Thunk->PeCoffUnloadImageExtraAction (ImageContext);\r
}\r
#include <Ppi/EmuThunk.h>\r
#include <Protocol/EmuThunk.h>\r
\r
-\r
-\r
/**\r
Retrieves and returns a pointer to the entry point to a PE/COFF image that has been loaded\r
into system memory with the PE/COFF Loader Library functions.\r
IN OUT VOID **EntryPoint\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
\r
//\r
// Locate EmuThunkPpi for retrieving standard output handle\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
- Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
+ Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
\r
return Thunk->PeCoffGetEntryPoint (Pe32Data, EntryPoint);\r
}\r
\r
DosHdr = (EFI_IMAGE_DOS_HEADER *)Pe32Data;\r
if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {\r
- Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));\r
-\r
+ Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));\r
} else {\r
Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)(Pe32Data);\r
}\r
\r
if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {\r
return Hdr.Te->Machine;\r
- } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {\r
+ } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {\r
return Hdr.Pe32->FileHeader.Machine;\r
}\r
\r
IN VOID *Pe32Data\r
)\r
{\r
- EFI_IMAGE_DOS_HEADER *DosHdr;\r
- EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
- EFI_IMAGE_DATA_DIRECTORY *DirectoryEntry;\r
- EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *DebugEntry;\r
- UINTN DirCount;\r
- VOID *CodeViewEntryPointer;\r
- INTN TEImageAdjust;\r
- UINT32 NumberOfRvaAndSizes;\r
- UINT16 Magic;\r
+ EFI_IMAGE_DOS_HEADER *DosHdr;\r
+ EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
+ EFI_IMAGE_DATA_DIRECTORY *DirectoryEntry;\r
+ EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *DebugEntry;\r
+ UINTN DirCount;\r
+ VOID *CodeViewEntryPointer;\r
+ INTN TEImageAdjust;\r
+ UINT32 NumberOfRvaAndSizes;\r
+ UINT16 Magic;\r
\r
ASSERT (Pe32Data != NULL);\r
\r
//\r
// DOS image header is present, so read the PE header after the DOS image header.\r
//\r
- Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));\r
+ Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));\r
} else {\r
//\r
// DOS image header is not present, so PE header is at the image base.\r
\r
if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {\r
if (Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) {\r
- DirectoryEntry = &Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];\r
- TEImageAdjust = sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize;\r
- DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN) Hdr.Te +\r
- Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +\r
- TEImageAdjust);\r
+ DirectoryEntry = &Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];\r
+ TEImageAdjust = sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize;\r
+ DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Hdr.Te +\r
+ Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +\r
+ TEImageAdjust);\r
}\r
} else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {\r
//\r
// generate PE32+ image with PE32 Magic.\r
//\r
switch (Hdr.Pe32->FileHeader.Machine) {\r
- case EFI_IMAGE_MACHINE_IA32:\r
- //\r
- // Assume PE32 image with IA32 Machine field.\r
- //\r
- Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
- break;\r
- case EFI_IMAGE_MACHINE_X64:\r
- case EFI_IMAGE_MACHINE_IA64:\r
- //\r
- // Assume PE32+ image with X64 or IA64 Machine field\r
- //\r
- Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;\r
- break;\r
- default:\r
- //\r
- // For unknow Machine field, use Magic in optional Header\r
- //\r
- Magic = Hdr.Pe32->OptionalHeader.Magic;\r
+ case EFI_IMAGE_MACHINE_IA32:\r
+ //\r
+ // Assume PE32 image with IA32 Machine field.\r
+ //\r
+ Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
+ break;\r
+ case EFI_IMAGE_MACHINE_X64:\r
+ case EFI_IMAGE_MACHINE_IA64:\r
+ //\r
+ // Assume PE32+ image with X64 or IA64 Machine field\r
+ //\r
+ Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;\r
+ break;\r
+ default:\r
+ //\r
+ // For unknow Machine field, use Magic in optional Header\r
+ //\r
+ Magic = Hdr.Pe32->OptionalHeader.Magic;\r
}\r
\r
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {\r
// Use PE32 offset get Debug Directory Entry\r
//\r
NumberOfRvaAndSizes = Hdr.Pe32->OptionalHeader.NumberOfRvaAndSizes;\r
- DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);\r
- DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);\r
+ DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);\r
+ DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Pe32Data + DirectoryEntry->VirtualAddress);\r
} else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {\r
//\r
// Use PE32+ offset get Debug Directory Entry\r
//\r
NumberOfRvaAndSizes = Hdr.Pe32Plus->OptionalHeader.NumberOfRvaAndSizes;\r
- DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);\r
- DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);\r
+ DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);\r
+ DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Pe32Data + DirectoryEntry->VirtualAddress);\r
}\r
\r
if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {\r
DirectoryEntry = NULL;\r
- DebugEntry = NULL;\r
+ DebugEntry = NULL;\r
}\r
} else {\r
return NULL;\r
}\r
\r
- if (DebugEntry == NULL || DirectoryEntry == NULL) {\r
+ if ((DebugEntry == NULL) || (DirectoryEntry == NULL)) {\r
return NULL;\r
}\r
\r
for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {\r
if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
if (DebugEntry->SizeOfData > 0) {\r
- CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + ((UINTN)Pe32Data) + (UINTN)TEImageAdjust);\r
- switch (* (UINT32 *) CodeViewEntryPointer) {\r
- case CODEVIEW_SIGNATURE_NB10:\r
- return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY));\r
- case CODEVIEW_SIGNATURE_RSDS:\r
- return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));\r
- case CODEVIEW_SIGNATURE_MTOC:\r
- return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));\r
- default:\r
- break;\r
+ CodeViewEntryPointer = (VOID *)((UINTN)DebugEntry->RVA + ((UINTN)Pe32Data) + (UINTN)TEImageAdjust);\r
+ switch (*(UINT32 *)CodeViewEntryPointer) {\r
+ case CODEVIEW_SIGNATURE_NB10:\r
+ return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY));\r
+ case CODEVIEW_SIGNATURE_RSDS:\r
+ return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));\r
+ case CODEVIEW_SIGNATURE_MTOC:\r
+ return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));\r
+ default:\r
+ break;\r
}\r
}\r
}\r
return NULL;\r
}\r
\r
-\r
/**\r
Returns the size of the PE/COFF headers\r
\r
UINT32\r
EFIAPI\r
PeCoffGetSizeOfHeaders (\r
- IN VOID *Pe32Data\r
+ IN VOID *Pe32Data\r
)\r
{\r
- EFI_IMAGE_DOS_HEADER *DosHdr;\r
- EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
- UINTN SizeOfHeaders;\r
+ EFI_IMAGE_DOS_HEADER *DosHdr;\r
+ EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
+ UINTN SizeOfHeaders;\r
\r
ASSERT (Pe32Data != NULL);\r
\r
//\r
// DOS image header is present, so read the PE header after the DOS image header.\r
//\r
- Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));\r
+ Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));\r
} else {\r
//\r
// DOS image header is not present, so PE header is at the image base.\r
SizeOfHeaders = 0;\r
}\r
\r
- return (UINT32) SizeOfHeaders;\r
+ return (UINT32)SizeOfHeaders;\r
}\r
-\r
\r
**/\r
\r
-\r
#include <PiPei.h>\r
#include <Library/SerialPortLib.h>\r
#include <Library/PeiServicesLib.h>\r
#include <Ppi/EmuThunk.h>\r
#include <Protocol/EmuThunk.h>\r
\r
-\r
-\r
/**\r
Initialize the serial device hardware.\r
\r
UINTN\r
EFIAPI\r
SerialPortWrite (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
\r
//\r
// Locate EmuThunkPpi for retrieving standard output handle\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
);\r
if (!EFI_ERROR (Status)) {\r
- Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
+ Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
return Thunk->WriteStdErr (Buffer, NumberOfBytes);\r
}\r
\r
return 0;\r
}\r
\r
-\r
/**\r
Read data from serial device and save the datas in buffer.\r
\r
UINTN\r
EFIAPI\r
SerialPortRead (\r
- OUT UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ OUT UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
return 0;\r
{\r
return FALSE;\r
}\r
-\r
\r
#include <Ppi/MemoryDiscovered.h>\r
\r
-\r
CONST EFI_PEI_SERVICES **gPeiServices = NULL;\r
\r
/**\r
VOID\r
EFIAPI\r
SetPeiServicesTablePointer (\r
- IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+ IN CONST EFI_PEI_SERVICES **PeiServicesTablePointer\r
)\r
{\r
ASSERT (PeiServicesTablePointer != NULL);\r
return gPeiServices;\r
}\r
\r
-\r
-\r
/**\r
Notification service to be called when gEmuThunkPpiGuid is installed.\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesTablePointerNotifyCallback (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,\r
- IN VOID *Ppi\r
+ IN EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,\r
+ IN VOID *Ppi\r
)\r
{\r
gPeiServices = (CONST EFI_PEI_SERVICES **)PeiServices;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnThunkList = {\r
+EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnThunkList = {\r
(EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
&gEfiPeiMemoryDiscoveredPpiGuid,\r
PeiServicesTablePointerNotifyCallback\r
};\r
\r
-\r
/**\r
Constructor register notification on when PPI updates. If PPI is\r
alreay installed registering the notify will cause the handle to\r
EFI_STATUS\r
EFIAPI\r
PeiServicesTablePointerLibConstructor (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
gPeiServices = (CONST EFI_PEI_SERVICES **)PeiServices;\r
\r
//\r
return;\r
}\r
-\r
#include <Library/DebugLib.h>\r
#include <Library/EmuMagicPageLib.h>\r
\r
-\r
/**\r
Caches a pointer PEI Services Table.\r
\r
VOID\r
EFIAPI\r
SetPeiServicesTablePointer (\r
- IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+ IN CONST EFI_PEI_SERVICES **PeiServicesTablePointer\r
)\r
{\r
ASSERT (PeiServicesTablePointer != NULL);\r
ASSERT (*PeiServicesTablePointer != NULL);\r
- EMU_MAGIC_PAGE()->PeiServicesTablePointer = PeiServicesTablePointer;\r
+ EMU_MAGIC_PAGE ()->PeiServicesTablePointer = PeiServicesTablePointer;\r
}\r
\r
/**\r
VOID\r
)\r
{\r
- CONST EFI_PEI_SERVICES **PeiServicesTablePointer;\r
+ CONST EFI_PEI_SERVICES **PeiServicesTablePointer;\r
\r
- PeiServicesTablePointer = EMU_MAGIC_PAGE()->PeiServicesTablePointer;\r
+ PeiServicesTablePointer = EMU_MAGIC_PAGE ()->PeiServicesTablePointer;\r
ASSERT (PeiServicesTablePointer != NULL);\r
ASSERT (*PeiServicesTablePointer != NULL);\r
return PeiServicesTablePointer;\r
//\r
return;\r
}\r
-\r
-\r
UINTN\r
EFIAPI\r
MicroSecondDelay (\r
- IN UINTN MicroSeconds\r
+ IN UINTN MicroSeconds\r
)\r
{\r
return NanoSecondDelay (MicroSeconds * 1000);\r
UINTN\r
EFIAPI\r
NanoSecondDelay (\r
- IN UINTN NanoSeconds\r
+ IN UINTN NanoSeconds\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
\r
//\r
// Locate EmuThunkPpi for\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
);\r
if (!EFI_ERROR (Status)) {\r
- Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
+ Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
Thunk->Sleep (NanoSeconds * 100);\r
return NanoSeconds;\r
}\r
VOID\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
\r
//\r
// Locate EmuThunkPpi for\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
);\r
if (!EFI_ERROR (Status)) {\r
- Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
- return Thunk->QueryPerformanceCounter ();\r
+ Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
+ return Thunk->QueryPerformanceCounter ();\r
}\r
\r
return 0;\r
UINT64\r
EFIAPI\r
GetPerformanceCounterProperties (\r
- OUT UINT64 *StartValue OPTIONAL,\r
- OUT UINT64 *EndValue OPTIONAL\r
+ OUT UINT64 *StartValue OPTIONAL,\r
+ OUT UINT64 *EndValue OPTIONAL\r
)\r
{\r
- EMU_THUNK_PPI *ThunkPpi;\r
- EFI_STATUS Status;\r
- EMU_THUNK_PROTOCOL *Thunk;\r
+ EMU_THUNK_PPI *ThunkPpi;\r
+ EFI_STATUS Status;\r
+ EMU_THUNK_PROTOCOL *Thunk;\r
\r
//\r
// Locate EmuThunkPpi for\r
//\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **) &ThunkPpi\r
+ &gEmuThunkPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **)&ThunkPpi\r
);\r
if (!EFI_ERROR (Status)) {\r
if (StartValue != NULL) {\r
*StartValue = 0ULL;\r
}\r
+\r
if (EndValue != NULL) {\r
*EndValue = (UINT64)-1LL;\r
}\r
\r
- Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
- return Thunk->QueryPerformanceFrequency ();\r
+ Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();\r
+ return Thunk->QueryPerformanceFrequency ();\r
}\r
\r
return 0;\r
// Since 2^29 < 1,000,000,000 = 0x3B9ACA00 < 2^30, Remainder should < 2^(64-30) = 2^34,\r
// i.e. highest bit set in Remainder should <= 33.\r
//\r
- Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
- Remainder = RShiftU64 (Remainder, (UINTN) Shift);\r
- Frequency = RShiftU64 (Frequency, (UINTN) Shift);\r
+ Shift = MAX (0, HighBitSet64 (Remainder) - 33);\r
+ Remainder = RShiftU64 (Remainder, (UINTN)Shift);\r
+ Frequency = RShiftU64 (Frequency, (UINTN)Shift);\r
NanoSeconds += DivU64x64Remainder (MultU64x32 (Remainder, 1000000000u), Frequency, NULL);\r
\r
return NanoSeconds;\r
\r
#include "PlatformBm.h"\r
\r
-EFI_GUID mBootMenuFile = {\r
+EFI_GUID mBootMenuFile = {\r
0xEEC25BDC, 0x67F2, 0x4D95, { 0xB1, 0xD5, 0xF8, 0x1B, 0x20, 0x39, 0xD1, 0x1D }\r
};\r
\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Size;\r
- EMU_SYSTEM_CONFIGURATION SystemConfigData;\r
+ EFI_STATUS Status;\r
+ UINTN Size;\r
+ EMU_SYSTEM_CONFIGURATION SystemConfigData;\r
\r
- Size = sizeof (SystemConfigData);\r
+ Size = sizeof (SystemConfigData);\r
Status = gRT->GetVariable (\r
L"Setup",\r
&gEmuSystemConfigGuid,\r
NULL,\r
&Size,\r
- (VOID *) &SystemConfigData\r
+ (VOID *)&SystemConfigData\r
);\r
\r
if (EFI_ERROR (Status)) {\r
//\r
// SetupVariable is corrupt\r
//\r
- SystemConfigData.ConOutRow = PcdGet32 (PcdConOutColumn);\r
+ SystemConfigData.ConOutRow = PcdGet32 (PcdConOutColumn);\r
SystemConfigData.ConOutColumn = PcdGet32 (PcdConOutRow);\r
\r
Status = gRT->SetVariable (\r
&gEmuSystemConfigGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
sizeof (SystemConfigData),\r
- (VOID *) &SystemConfigData\r
+ (VOID *)&SystemConfigData\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_ERROR, "Failed to save Setup Variable to non-volatile storage, Status = %r\n", Status));\r
\r
EFI_DEVICE_PATH *\r
FvFilePath (\r
- EFI_GUID *FileGuid\r
+ EFI_GUID *FileGuid\r
)\r
{\r
-\r
EFI_STATUS Status;\r
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;\r
Status = gBS->HandleProtocol (\r
gImageHandle,\r
&gEfiLoadedImageProtocolGuid,\r
- (VOID **) &LoadedImage\r
+ (VOID **)&LoadedImage\r
);\r
ASSERT_EFI_ERROR (Status);\r
return AppendDevicePathNode (\r
DevicePathFromHandle (LoadedImage->DeviceHandle),\r
- (EFI_DEVICE_PATH_PROTOCOL *) &FileNode\r
+ (EFI_DEVICE_PATH_PROTOCOL *)&FileNode\r
);\r
}\r
\r
**/\r
UINTN\r
RegisterBootManagerMenuAppBootOption (\r
- EFI_GUID *FileGuid,\r
- CHAR16 *Description,\r
- UINTN Position,\r
- BOOLEAN IsBootCategory\r
+ EFI_GUID *FileGuid,\r
+ CHAR16 *Description,\r
+ UINTN Position,\r
+ BOOLEAN IsBootCategory\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BOOT_MANAGER_LOAD_OPTION NewOption;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- UINTN OptionNumber;\r
+ EFI_STATUS Status;\r
+ EFI_BOOT_MANAGER_LOAD_OPTION NewOption;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ UINTN OptionNumber;\r
\r
DevicePath = FvFilePath (FileGuid);\r
- Status = EfiBootManagerInitializeLoadOption (\r
- &NewOption,\r
- LoadOptionNumberUnassigned,\r
- LoadOptionTypeBoot,\r
- IsBootCategory ? LOAD_OPTION_ACTIVE : LOAD_OPTION_CATEGORY_APP,\r
- Description,\r
- DevicePath,\r
- NULL,\r
- 0\r
- );\r
+ Status = EfiBootManagerInitializeLoadOption (\r
+ &NewOption,\r
+ LoadOptionNumberUnassigned,\r
+ LoadOptionTypeBoot,\r
+ IsBootCategory ? LOAD_OPTION_ACTIVE : LOAD_OPTION_CATEGORY_APP,\r
+ Description,\r
+ DevicePath,\r
+ NULL,\r
+ 0\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
FreePool (DevicePath);\r
\r
**/\r
BOOLEAN\r
IsBootManagerMenuAppFilePath (\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
-)\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+ )\r
{\r
- EFI_HANDLE FvHandle;\r
- VOID *NameGuid;\r
- EFI_STATUS Status;\r
+ EFI_HANDLE FvHandle;\r
+ VOID *NameGuid;\r
+ EFI_STATUS Status;\r
\r
Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid, &DevicePath, &FvHandle);\r
if (!EFI_ERROR (Status)) {\r
- NameGuid = EfiGetNameGuidFromFwVolDevicePathNode ((CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) DevicePath);\r
+ NameGuid = EfiGetNameGuidFromFwVolDevicePathNode ((CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)DevicePath);\r
if (NameGuid != NULL) {\r
return CompareGuid (NameGuid, &mBootMenuFile);\r
}\r
VOID\r
)\r
{\r
- UINTN BootOptionCount;\r
- EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
- UINTN Index;\r
- UINTN OptionNumber;\r
+ UINTN BootOptionCount;\r
+ EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
+ UINTN Index;\r
+ UINTN OptionNumber;\r
\r
OptionNumber = 0;\r
\r
//\r
// If not found the BootManagerMenuApp, create it.\r
//\r
- OptionNumber = (UINT16) RegisterBootManagerMenuAppBootOption (&mBootMenuFile, L"UEFI BootManagerMenuApp", (UINTN) -1, FALSE);\r
+ OptionNumber = (UINT16)RegisterBootManagerMenuAppBootOption (&mBootMenuFile, L"UEFI BootManagerMenuApp", (UINTN)-1, FALSE);\r
}\r
\r
return OptionNumber;\r
VOID\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
SetupVariableInit ();\r
\r
EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid);\r
\r
- Index = 0;\r
+ Index = 0;\r
while (gPlatformConsole[Index].DevicePath != NULL) {\r
//\r
// Update the console variable with the connect type\r
**/\r
VOID\r
PlatformBdsDiagnostics (\r
- IN EXTENDMEM_COVERAGE_LEVEL MemoryTestLevel,\r
- IN BOOLEAN QuietBoot\r
+ IN EXTENDMEM_COVERAGE_LEVEL MemoryTestLevel,\r
+ IN BOOLEAN QuietBoot\r
)\r
{\r
EFI_STATUS Status;\r
F2.ScanCode = SCAN_F2;\r
F2.UnicodeChar = CHAR_NULL;\r
EfiBootManagerGetBootManagerMenu (&BootOption);\r
- EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL);\r
+ EfiBootManagerAddKeyOptionVariable (NULL, (UINT16)BootOption.OptionNumber, 0, &F2, NULL);\r
\r
//\r
// 3. Boot Device List menu\r
//\r
- F7.ScanCode = SCAN_F7;\r
- F7.UnicodeChar = CHAR_NULL;\r
- OptionNumber = GetBootManagerMenuAppOption ();\r
+ F7.ScanCode = SCAN_F7;\r
+ F7.UnicodeChar = CHAR_NULL;\r
+ OptionNumber = GetBootManagerMenuAppOption ();\r
EfiBootManagerAddKeyOptionVariable (NULL, (UINT16)OptionNumber, 0, &F7, NULL);\r
\r
PrintXY (10, 10, &White, &Black, L"F2 to enter Setup. ");\r
**/\r
UINTN\r
BootOptionPriority (\r
- CONST EFI_BOOT_MANAGER_LOAD_OPTION *BootOption\r
+ CONST EFI_BOOT_MANAGER_LOAD_OPTION *BootOption\r
)\r
{\r
//\r
if (StrCmp (BootOption->Description, L"UEFI Shell") == 0) {\r
return 0;\r
}\r
+\r
return 100;\r
}\r
\r
VOID\r
)\r
{\r
-\r
//\r
// Go the different platform policy with different boot mode\r
// Notes: this part code can be change with the table policy\r
//\r
switch (GetBootModeHob ()) {\r
+ case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES:\r
+ case BOOT_WITH_MINIMAL_CONFIGURATION:\r
+ PlatformBdsDiagnostics (IGNORE, TRUE);\r
+\r
+ //\r
+ // Perform some platform specific connect sequence\r
+ //\r
+ PlatformBdsConnectSequence ();\r
+ break;\r
\r
- case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES:\r
- case BOOT_WITH_MINIMAL_CONFIGURATION:\r
- PlatformBdsDiagnostics (IGNORE, TRUE);\r
+ case BOOT_IN_RECOVERY_MODE:\r
+ PlatformBdsDiagnostics (EXTENSIVE, FALSE);\r
+ break;\r
\r
- //\r
- // Perform some platform specific connect sequence\r
- //\r
- PlatformBdsConnectSequence ();\r
- break;\r
-\r
- case BOOT_IN_RECOVERY_MODE:\r
- PlatformBdsDiagnostics (EXTENSIVE, FALSE);\r
- break;\r
-\r
- case BOOT_WITH_FULL_CONFIGURATION:\r
- case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS:\r
- case BOOT_WITH_DEFAULT_SETTINGS:\r
- default:\r
- PlatformBdsDiagnostics (IGNORE, TRUE);\r
- PlatformBdsRegisterStaticBootOptions ();\r
- PlatformBdsConnectSequence ();\r
- EfiBootManagerRefreshAllBootOption ();\r
- EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, (SORT_COMPARE)CompareBootOption);\r
- break;\r
+ case BOOT_WITH_FULL_CONFIGURATION:\r
+ case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS:\r
+ case BOOT_WITH_DEFAULT_SETTINGS:\r
+ default:\r
+ PlatformBdsDiagnostics (IGNORE, TRUE);\r
+ PlatformBdsRegisterStaticBootOptions ();\r
+ PlatformBdsConnectSequence ();\r
+ EfiBootManagerRefreshAllBootOption ();\r
+ EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, (SORT_COMPARE)CompareBootOption);\r
+ break;\r
}\r
}\r
\r
VOID\r
EFIAPI\r
PlatformBootManagerWaitCallback (\r
- UINT16 TimeoutRemain\r
+ UINT16 TimeoutRemain\r
)\r
{\r
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;\r
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;\r
- UINT16 Timeout;\r
+ EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;\r
+ EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;\r
+ UINT16 Timeout;\r
\r
Timeout = PcdGet16 (PcdPlatformBootTimeOut);\r
\r
{\r
return;\r
}\r
-\r
#include <Library/HobLib.h>\r
#include <Library/HiiLib.h>\r
\r
-#define CONSOLE_OUT 0x00000001\r
-#define STD_ERROR 0x00000002\r
-#define CONSOLE_IN 0x00000004\r
-#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
+#define CONSOLE_OUT 0x00000001\r
+#define STD_ERROR 0x00000002\r
+#define CONSOLE_IN 0x00000004\r
+#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
\r
typedef struct {\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- UINTN ConnectType;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ UINTN ConnectType;\r
} BDS_CONSOLE_CONNECT_ENTRY;\r
\r
extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[];\r
}\\r
}\r
\r
-\r
typedef struct {\r
- EMU_VENDOR_DEVICE_PATH_NODE EmuBus;\r
- EMU_VENDOR_DEVICE_PATH_NODE EmuGraphicsWindow;\r
- EFI_DEVICE_PATH_PROTOCOL End;\r
+ EMU_VENDOR_DEVICE_PATH_NODE EmuBus;\r
+ EMU_VENDOR_DEVICE_PATH_NODE EmuGraphicsWindow;\r
+ EFI_DEVICE_PATH_PROTOCOL End;\r
} EMU_PLATFORM_UGA_DEVICE_PATH;\r
\r
-\r
//\r
// Platform BDS Functions\r
//\r
**/\r
EFI_STATUS\r
PlatformBootManagerMemoryTest (\r
- IN EXTENDMEM_COVERAGE_LEVEL Level\r
+ IN EXTENDMEM_COVERAGE_LEVEL Level\r
);\r
\r
-\r
VOID\r
PlatformBdsConnectSequence (\r
VOID\r
\r
#include "PlatformBm.h"\r
\r
-\r
-\r
-EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {\r
+EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {\r
{\r
{\r
{\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ (UINT8)(sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8)((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
}\r
},\r
EMU_THUNK_PROTOCOL_GUID\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ (UINT8)(sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8)((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
},\r
},\r
EMU_GRAPHICS_WINDOW_PROTOCOL_GUID,\r
gEndEntire\r
};\r
\r
-EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 = {\r
+EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 = {\r
{\r
{\r
{\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ (UINT8)(sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8)((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
}\r
},\r
EMU_THUNK_PROTOCOL_GUID\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ (UINT8)(sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8)((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
},\r
},\r
EMU_GRAPHICS_WINDOW_PROTOCOL_GUID,\r
//\r
// Predefined platform default console device path\r
//\r
-BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[] = {\r
+BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[] = {\r
{\r
- (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath,\r
+ (EFI_DEVICE_PATH_PROTOCOL *)&gGopDevicePath,\r
(CONSOLE_OUT | CONSOLE_IN)\r
},\r
{\r
- (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath2,\r
+ (EFI_DEVICE_PATH_PROTOCOL *)&gGopDevicePath2,\r
(CONSOLE_OUT | CONSOLE_IN)\r
},\r
{\r
0\r
}\r
};\r
-\r
**/\r
EFI_STATUS\r
PlatformBootManagerMemoryTest (\r
- IN EXTENDMEM_COVERAGE_LEVEL Level\r
+ IN EXTENDMEM_COVERAGE_LEVEL Level\r
)\r
{\r
EFI_STATUS Status;\r
ReturnStatus = EFI_SUCCESS;\r
ZeroMem (&Key, sizeof (EFI_INPUT_KEY));\r
\r
- TestedMemorySize = 0;\r
- TotalMemorySize = 0;\r
- ErrorOut = FALSE;\r
- TestAbort = FALSE;\r
+ TestedMemorySize = 0;\r
+ TotalMemorySize = 0;\r
+ ErrorOut = FALSE;\r
+ TestAbort = FALSE;\r
\r
RequireSoftECCInit = FALSE;\r
\r
Status = gBS->LocateProtocol (\r
&gEfiGenericMemTestProtocolGuid,\r
NULL,\r
- (VOID **) &GenMemoryTest\r
+ (VOID **)&GenMemoryTest\r
);\r
if (EFI_ERROR (Status)) {\r
return EFI_SUCCESS;\r
ASSERT (0);\r
}\r
\r
-\r
DEBUG ((DEBUG_INFO, "Perform memory test (ESC to skip).\n"));\r
\r
if (!PcdGetBool (PcdConInConnectOnDemand)) {\r
- KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+ KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {\r
if (!RequireSoftECCInit) {\r
Status = GenMemoryTest->Finished (GenMemoryTest);\r
#include <Guid/GlobalVariable.h>\r
#include <Guid/ImageAuthentication.h>\r
\r
-BOOLEAN mSecureBootDisabled = FALSE;\r
-BOOLEAN mStopRedfishService = FALSE;\r
+BOOLEAN mSecureBootDisabled = FALSE;\r
+BOOLEAN mStopRedfishService = FALSE;\r
\r
EFI_STATUS\r
EFIAPI\r
LibStopRedfishService (\r
- IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This,\r
- IN EDKII_REDFISH_CREDENTIAL_STOP_SERVICE_TYPE ServiceStopType\r
-);\r
+ IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This,\r
+ IN EDKII_REDFISH_CREDENTIAL_STOP_SERVICE_TYPE ServiceStopType\r
+ );\r
\r
/**\r
Return the credential for accessing to Redfish servcice.\r
**/\r
EFI_STATUS\r
GetRedfishCredential (\r
- OUT EDKII_REDFISH_AUTH_METHOD *AuthMethod,\r
- OUT CHAR8 **UserId,\r
- OUT CHAR8 **Password\r
-)\r
+ OUT EDKII_REDFISH_AUTH_METHOD *AuthMethod,\r
+ OUT CHAR8 **UserId,\r
+ OUT CHAR8 **Password\r
+ )\r
{\r
UINTN UserIdSize;\r
UINTN PasswordSize;\r
//\r
UserIdSize = AsciiStrSize ((CHAR8 *)PcdGetPtr (PcdRedfishServieUserId));\r
PasswordSize = AsciiStrSize ((CHAR8 *)PcdGetPtr (PcdRedfishServiePassword));\r
- if (UserIdSize == 0 || PasswordSize == 0) {\r
+ if ((UserIdSize == 0) || (PasswordSize == 0)) {\r
DEBUG ((DEBUG_ERROR, "Incorrect string of UserID or Password for REdfish service.\n"));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
*UserId = AllocateZeroPool (UserIdSize);\r
if (*UserId == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
CopyMem (*UserId, (CHAR8 *)PcdGetPtr (PcdRedfishServieUserId), UserIdSize);\r
\r
*Password = AllocateZeroPool (PasswordSize);\r
OUT EDKII_REDFISH_AUTH_METHOD *AuthMethod,\r
OUT CHAR8 **UserId,\r
OUT CHAR8 **Password\r
-)\r
+ )\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
- if (This == NULL || AuthMethod == NULL || UserId == NULL || Password == NULL) {\r
+ if ((This == NULL) || (AuthMethod == NULL) || (UserId == NULL) || (Password == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
\r
if (mSecureBootDisabled) {\r
Status = LibStopRedfishService (This, ServiceStopTypeSecureBootDisabled);\r
- if (EFI_ERROR (Status) && Status != EFI_UNSUPPORTED) {\r
+ if (EFI_ERROR (Status) && (Status != EFI_UNSUPPORTED)) {\r
DEBUG ((DEBUG_ERROR, "SecureBoot has been disabled, but failed to stop RedfishService - %r\n", Status));\r
return Status;\r
}\r
EFI_STATUS\r
EFIAPI\r
LibStopRedfishService (\r
- IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This,\r
- IN EDKII_REDFISH_CREDENTIAL_STOP_SERVICE_TYPE ServiceStopType\r
-)\r
+ IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This,\r
+ IN EDKII_REDFISH_CREDENTIAL_STOP_SERVICE_TYPE ServiceStopType\r
+ )\r
{\r
if (ServiceStopType >= ServiceStopTypeMax) {\r
return EFI_INVALID_PARAMETER;\r
mStopRedfishService = TRUE;\r
DEBUG ((DEBUG_INFO, "EFI Redfish service is stopped without Redfish service stop type!!\n"));\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
+\r
/**\r
Notification of Exit Boot Service.\r
\r
EFIAPI\r
LibCredentialExitBootServicesNotify (\r
IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This\r
-)\r
+ )\r
{\r
LibStopRedfishService (This, ServiceStopTypeExitBootService);\r
}\r
EFIAPI\r
LibCredentialEndOfDxeNotify (\r
IN EDKII_REDFISH_CREDENTIAL_PROTOCOL *This\r
-)\r
+ )\r
{\r
EFI_STATUS Status;\r
- UINT8 *SecureBootVar;\r
+ UINT8 *SecureBootVar;\r
\r
//\r
// Check Secure Boot status and lock Redfish service if Secure Boot is disabled.\r
//\r
- Status = GetVariable2 (EFI_SECURE_BOOT_MODE_NAME, &gEfiGlobalVariableGuid, (VOID**)&SecureBootVar, NULL);\r
+ Status = GetVariable2 (EFI_SECURE_BOOT_MODE_NAME, &gEfiGlobalVariableGuid, (VOID **)&SecureBootVar, NULL);\r
if (EFI_ERROR (Status) || (*SecureBootVar != SECURE_BOOT_MODE_ENABLE)) {\r
//\r
// Secure Boot is disabled\r
#define VERBOSE_COLUME_SIZE (16)\r
\r
REDFISH_OVER_IP_PROTOCOL_DATA *mRedfishOverIpProtocolData;\r
-UINT8 mRedfishProtocolDataSize;\r
+UINT8 mRedfishProtocolDataSize;\r
\r
/**\r
Get the MAC address of NIC.\r
**/\r
EFI_STATUS\r
GetMacAddressInformation (\r
- OUT EFI_MAC_ADDRESS *MacAddress\r
+ OUT EFI_MAC_ADDRESS *MacAddress\r
)\r
{\r
- MAC_ADDR_DEVICE_PATH *Mac;\r
- REST_EX_SERVICE_DEVICE_PATH_DATA *RestExServiceDevicePathData;\r
- EFI_DEVICE_PATH_PROTOCOL *RestExServiceDevicePath;\r
- MAC_ADDR_DEVICE_PATH *MacAddressDevicePath;\r
-\r
- Mac = NULL;\r
- RestExServiceDevicePathData = NULL;\r
- RestExServiceDevicePath = NULL;\r
-\r
- RestExServiceDevicePathData = (REST_EX_SERVICE_DEVICE_PATH_DATA *)PcdGetPtr(PcdRedfishRestExServiceDevicePath);\r
- if (RestExServiceDevicePathData == NULL ||\r
- RestExServiceDevicePathData->DevicePathNum == 0 ||\r
- !IsDevicePathValid (RestExServiceDevicePathData->DevicePath, 0)) {\r
+ MAC_ADDR_DEVICE_PATH *Mac;\r
+ REST_EX_SERVICE_DEVICE_PATH_DATA *RestExServiceDevicePathData;\r
+ EFI_DEVICE_PATH_PROTOCOL *RestExServiceDevicePath;\r
+ MAC_ADDR_DEVICE_PATH *MacAddressDevicePath;\r
+\r
+ Mac = NULL;\r
+ RestExServiceDevicePathData = NULL;\r
+ RestExServiceDevicePath = NULL;\r
+\r
+ RestExServiceDevicePathData = (REST_EX_SERVICE_DEVICE_PATH_DATA *)PcdGetPtr (PcdRedfishRestExServiceDevicePath);\r
+ if ((RestExServiceDevicePathData == NULL) ||\r
+ (RestExServiceDevicePathData->DevicePathNum == 0) ||\r
+ !IsDevicePathValid (RestExServiceDevicePathData->DevicePath, 0))\r
+ {\r
return EFI_NOT_FOUND;\r
}\r
\r
//\r
while (!IsDevicePathEnd (RestExServiceDevicePath) &&\r
((DevicePathType (RestExServiceDevicePath) != MESSAGING_DEVICE_PATH) ||\r
- (DevicePathSubType (RestExServiceDevicePath) != MSG_MAC_ADDR_DP))) {\r
+ (DevicePathSubType (RestExServiceDevicePath) != MSG_MAC_ADDR_DP)))\r
+ {\r
RestExServiceDevicePath = NextDevicePathNode (RestExServiceDevicePath);\r
}\r
\r
CopyMem ((VOID *)MacAddress, (VOID *)&MacAddressDevicePath->MacAddress, sizeof (EFI_MAC_ADDRESS));\r
return EFI_SUCCESS;\r
}\r
+\r
return EFI_NOT_FOUND;\r
}\r
\r
**/\r
EFI_STATUS\r
RedfishPlatformHostInterfaceDeviceDescriptor (\r
- OUT UINT8 *DeviceType,\r
+ OUT UINT8 *DeviceType,\r
OUT REDFISH_INTERFACE_DATA **DeviceDescriptor\r
-)\r
+ )\r
{\r
- EFI_STATUS Status;\r
- EFI_MAC_ADDRESS MacAddress;\r
- REDFISH_INTERFACE_DATA *RedfishInterfaceData;\r
- PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2 *ThisDeviceDescriptor;\r
+ EFI_STATUS Status;\r
+ EFI_MAC_ADDRESS MacAddress;\r
+ REDFISH_INTERFACE_DATA *RedfishInterfaceData;\r
+ PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2 *ThisDeviceDescriptor;\r
\r
RedfishInterfaceData = AllocateZeroPool (sizeof (PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2) + 1);\r
if (RedfishInterfaceData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
RedfishInterfaceData->DeviceType = REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2;\r
//\r
// Fill up device type information.\r
//\r
- ThisDeviceDescriptor = (PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2 *)((UINT8 *)RedfishInterfaceData + 1);\r
+ ThisDeviceDescriptor = (PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2 *)((UINT8 *)RedfishInterfaceData + 1);\r
ThisDeviceDescriptor->Length = sizeof (PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2) + 1;\r
- Status = GetMacAddressInformation (&MacAddress);\r
+ Status = GetMacAddressInformation (&MacAddress);\r
if (EFI_ERROR (Status)) {\r
FreePool (RedfishInterfaceData);\r
return EFI_NOT_FOUND;\r
}\r
+\r
CopyMem ((VOID *)&ThisDeviceDescriptor->MacAddress, (VOID *)&MacAddress, sizeof (ThisDeviceDescriptor->MacAddress));\r
- *DeviceType = REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2;\r
+ *DeviceType = REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2;\r
*DeviceDescriptor = RedfishInterfaceData;\r
return EFI_SUCCESS;\r
}\r
+\r
/**\r
Get platform Redfish host interface protocol data.\r
Caller should pass NULL in ProtocolRecord to retrive the first protocol record.\r
**/\r
EFI_STATUS\r
RedfishPlatformHostInterfaceProtocolData (\r
- OUT MC_HOST_INTERFACE_PROTOCOL_RECORD **ProtocolRecord,\r
- IN UINT8 IndexOfProtocolData\r
-)\r
+ OUT MC_HOST_INTERFACE_PROTOCOL_RECORD **ProtocolRecord,\r
+ IN UINT8 IndexOfProtocolData\r
+ )\r
{\r
- MC_HOST_INTERFACE_PROTOCOL_RECORD *ThisProtocolRecord;\r
+ MC_HOST_INTERFACE_PROTOCOL_RECORD *ThisProtocolRecord;\r
\r
if (mRedfishOverIpProtocolData == 0) {\r
return EFI_NOT_FOUND;\r
}\r
+\r
if (IndexOfProtocolData == 0) {\r
//\r
// Return the first Redfish protocol data to caller. We only have\r
// one protocol data in this case.\r
//\r
- ThisProtocolRecord = (MC_HOST_INTERFACE_PROTOCOL_RECORD *) AllocatePool (mRedfishProtocolDataSize + sizeof (MC_HOST_INTERFACE_PROTOCOL_RECORD) - 1);\r
- ThisProtocolRecord->ProtocolType = MCHostInterfaceProtocolTypeRedfishOverIP;\r
+ ThisProtocolRecord = (MC_HOST_INTERFACE_PROTOCOL_RECORD *)AllocatePool (mRedfishProtocolDataSize + sizeof (MC_HOST_INTERFACE_PROTOCOL_RECORD) - 1);\r
+ ThisProtocolRecord->ProtocolType = MCHostInterfaceProtocolTypeRedfishOverIP;\r
ThisProtocolRecord->ProtocolTypeDataLen = mRedfishProtocolDataSize;\r
CopyMem ((VOID *)&ThisProtocolRecord->ProtocolTypeData, (VOID *)mRedfishOverIpProtocolData, mRedfishProtocolDataSize);\r
*ProtocolRecord = ThisProtocolRecord;\r
return EFI_SUCCESS;\r
}\r
+\r
return EFI_NOT_FOUND;\r
}\r
+\r
/**\r
Dump IPv4 address.\r
\r
**/\r
VOID\r
InternalDumpIp4Addr (\r
- IN EFI_IPv4_ADDRESS *Ip\r
+ IN EFI_IPv4_ADDRESS *Ip\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
for (Index = 0; Index < 4; Index++) {\r
DEBUG ((DEBUG_VERBOSE, "%d", Ip->Addr[Index]));\r
\r
DEBUG ((DEBUG_VERBOSE, "\n"));\r
}\r
+\r
/**\r
Dump IPv6 address.\r
\r
**/\r
VOID\r
InternalDumpIp6Addr (\r
- IN EFI_IPv6_ADDRESS *Ip\r
+ IN EFI_IPv6_ADDRESS *Ip\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
for (Index = 0; Index < 16; Index++) {\r
if (Ip->Addr[Index] != 0) {\r
DEBUG ((DEBUG_VERBOSE, "%x", Ip->Addr[Index]));\r
}\r
+\r
Index++;\r
\r
if (Index > 15) {\r
if (((Ip->Addr[Index] & 0xf0) == 0) && (Ip->Addr[Index - 1] != 0)) {\r
DEBUG ((DEBUG_VERBOSE, "0"));\r
}\r
+\r
DEBUG ((DEBUG_VERBOSE, "%x", Ip->Addr[Index]));\r
\r
if (Index < 15) {\r
DEBUG ((DEBUG_VERBOSE, ":"));\r
}\r
}\r
+\r
DEBUG ((DEBUG_VERBOSE, "\n"));\r
}\r
+\r
/**\r
Dump data\r
\r
)\r
{\r
UINTN Index;\r
+\r
for (Index = 0; Index < Size; Index++) {\r
DEBUG ((DEBUG_VERBOSE, "%02x ", (UINTN)Data[Index]));\r
}\r
}\r
+\r
/**\r
Dump hex data\r
\r
IN UINTN Size\r
)\r
{\r
- UINTN Index;\r
- UINTN Count;\r
- UINTN Left;\r
+ UINTN Index;\r
+ UINTN Count;\r
+ UINTN Left;\r
\r
Count = Size / VERBOSE_COLUME_SIZE;\r
Left = Size % VERBOSE_COLUME_SIZE;\r
\r
DEBUG ((DEBUG_VERBOSE, "\n"));\r
}\r
+\r
/**\r
Dump Redfish over IP protocol data\r
\r
**/\r
VOID\r
DumpRedfishIpProtocolData (\r
- IN REDFISH_OVER_IP_PROTOCOL_DATA *RedfishProtocolData,\r
- IN UINT8 RedfishProtocolDataSize\r
+ IN REDFISH_OVER_IP_PROTOCOL_DATA *RedfishProtocolData,\r
+ IN UINT8 RedfishProtocolDataSize\r
)\r
{\r
- CHAR16 Hostname[16];\r
+ CHAR16 Hostname[16];\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData: \n"));\r
- InternalDumpHex ((UINT8 *) RedfishProtocolData, RedfishProtocolDataSize);\r
+ InternalDumpHex ((UINT8 *)RedfishProtocolData, RedfishProtocolDataSize);\r
\r
DEBUG ((DEBUG_VERBOSE, "Parsing as below: \n"));\r
\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->HostIpAddress: \n"));\r
if (RedfishProtocolData->HostIpAddressFormat == 0x01) {\r
- InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *) (RedfishProtocolData->HostIpAddress));\r
+ InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *)(RedfishProtocolData->HostIpAddress));\r
} else {\r
- InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *) (RedfishProtocolData->HostIpAddress));\r
+ InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *)(RedfishProtocolData->HostIpAddress));\r
}\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->HostIpMask: \n"));\r
if (RedfishProtocolData->HostIpAddressFormat == 0x01) {\r
- InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *) (RedfishProtocolData->HostIpMask));\r
+ InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *)(RedfishProtocolData->HostIpMask));\r
} else {\r
- InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *) (RedfishProtocolData->HostIpMask));\r
+ InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *)(RedfishProtocolData->HostIpMask));\r
}\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceIpDiscoveryType - %d\n", RedfishProtocolData->RedfishServiceIpDiscoveryType));\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceIpAddress: \n"));\r
if (RedfishProtocolData->RedfishServiceIpAddressFormat == 0x01) {\r
- InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *) (RedfishProtocolData->RedfishServiceIpAddress));\r
+ InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *)(RedfishProtocolData->RedfishServiceIpAddress));\r
} else {\r
- InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *) (RedfishProtocolData->RedfishServiceIpAddress));\r
+ InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *)(RedfishProtocolData->RedfishServiceIpAddress));\r
}\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceIpMask: \n"));\r
if (RedfishProtocolData->RedfishServiceIpAddressFormat == 0x01) {\r
- InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *) (RedfishProtocolData->RedfishServiceIpMask));\r
+ InternalDumpIp4Addr ((EFI_IPv4_ADDRESS *)(RedfishProtocolData->RedfishServiceIpMask));\r
} else {\r
- InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *) (RedfishProtocolData->RedfishServiceIpMask));\r
+ InternalDumpIp6Addr ((EFI_IPv6_ADDRESS *)(RedfishProtocolData->RedfishServiceIpMask));\r
}\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceIpPort - %d\n", RedfishProtocolData->RedfishServiceIpPort));\r
\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceHostnameLength - %d\n", RedfishProtocolData->RedfishServiceHostnameLength));\r
\r
- AsciiStrToUnicodeStrS((CHAR8 *) RedfishProtocolData->RedfishServiceHostname, Hostname, sizeof (Hostname) / sizeof (Hostname[0]));\r
+ AsciiStrToUnicodeStrS ((CHAR8 *)RedfishProtocolData->RedfishServiceHostname, Hostname, sizeof (Hostname) / sizeof (Hostname[0]));\r
DEBUG ((DEBUG_VERBOSE, "RedfishProtocolData->RedfishServiceHostname - %s\n", Hostname));\r
}\r
\r
**/\r
EFI_STATUS\r
GetRedfishRecordFromVariable (\r
- OUT REDFISH_OVER_IP_PROTOCOL_DATA **RedfishProtocolData,\r
- OUT UINT8 *RedfishProtocolDataSize\r
+ OUT REDFISH_OVER_IP_PROTOCOL_DATA **RedfishProtocolData,\r
+ OUT UINT8 *RedfishProtocolDataSize\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT8 HostIpAssignmentType;\r
- UINTN HostIpAssignmentTypeSize;\r
- EFI_IPv4_ADDRESS HostIpAddress;\r
- UINTN IPv4DataSize;\r
- EFI_IPv4_ADDRESS HostIpMask;\r
- EFI_IPv4_ADDRESS RedfishServiceIpAddress;\r
- EFI_IPv4_ADDRESS RedfishServiceIpMask;\r
- UINT16 RedfishServiceIpPort;\r
- UINTN IpPortDataSize;\r
- UINT8 HostNameSize;\r
- CHAR8 RedfishHostName[20];\r
-\r
- if (RedfishProtocolData == NULL || RedfishProtocolDataSize == NULL) {\r
+ EFI_STATUS Status;\r
+ UINT8 HostIpAssignmentType;\r
+ UINTN HostIpAssignmentTypeSize;\r
+ EFI_IPv4_ADDRESS HostIpAddress;\r
+ UINTN IPv4DataSize;\r
+ EFI_IPv4_ADDRESS HostIpMask;\r
+ EFI_IPv4_ADDRESS RedfishServiceIpAddress;\r
+ EFI_IPv4_ADDRESS RedfishServiceIpMask;\r
+ UINT16 RedfishServiceIpPort;\r
+ UINTN IpPortDataSize;\r
+ UINT8 HostNameSize;\r
+ CHAR8 RedfishHostName[20];\r
+\r
+ if ((RedfishProtocolData == NULL) || (RedfishProtocolDataSize == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
RedfishServiceIpAddress.Addr[3]\r
);\r
\r
- HostNameSize = (UINT8) AsciiStrLen (RedfishHostName) + 1;\r
+ HostNameSize = (UINT8)AsciiStrLen (RedfishHostName) + 1;\r
\r
//\r
// 2. Protocol Data Size.\r
//\r
// 3. Protocol Data.\r
//\r
- *RedfishProtocolData = (REDFISH_OVER_IP_PROTOCOL_DATA *) AllocateZeroPool (*RedfishProtocolDataSize);\r
+ *RedfishProtocolData = (REDFISH_OVER_IP_PROTOCOL_DATA *)AllocateZeroPool (*RedfishProtocolDataSize);\r
if (*RedfishProtocolData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
CopyGuid (&(*RedfishProtocolData)->ServiceUuid, &gEmuRedfishServiceGuid);\r
\r
(*RedfishProtocolData)->HostIpAssignmentType = HostIpAssignmentType;\r
- (*RedfishProtocolData)->HostIpAddressFormat = 1; // Only support IPv4\r
+ (*RedfishProtocolData)->HostIpAddressFormat = 1; // Only support IPv4\r
\r
if (HostIpAssignmentType == 1 ) {\r
(*RedfishProtocolData)->HostIpAddress[0] = HostIpAddress.Addr[0];\r
(*RedfishProtocolData)->RedfishServiceVlanId = 0xffffffff;\r
\r
(*RedfishProtocolData)->RedfishServiceHostnameLength = HostNameSize;\r
- AsciiStrCpyS ((CHAR8 *) ((*RedfishProtocolData)->RedfishServiceHostname), HostNameSize, RedfishHostName);\r
+ AsciiStrCpyS ((CHAR8 *)((*RedfishProtocolData)->RedfishServiceHostname), HostNameSize, RedfishHostName);\r
\r
return Status;\r
}\r
EFI_STATUS\r
EFIAPI\r
RedfishPlatformHostInterfaceConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
-)\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
+ )\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = GetRedfishRecordFromVariable (&mRedfishOverIpProtocolData, &mRedfishProtocolDataSize);\r
DEBUG ((DEBUG_INFO, "%a: GetRedfishRecordFromVariable() - %r\n", __FUNCTION__, Status));\r
if (!EFI_ERROR (Status)) {\r
DumpRedfishIpProtocolData (mRedfishOverIpProtocolData, mRedfishProtocolDataSize);\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
#include <PiPei.h>\r
\r
-\r
#define GET_OCCUPIED_SIZE(ActualSize, Alignment) \\r
(ActualSize) + (((Alignment) - ((ActualSize) & ((Alignment) - 1))) & ((Alignment) - 1))\r
\r
IN UINT8 ErasePolarity,\r
IN EFI_FFS_FILE_HEADER *FfsHeader\r
)\r
+\r
/*++\r
\r
Routine Description:\r
FileState = FfsHeader->State;\r
\r
if (ErasePolarity != 0) {\r
- FileState = (EFI_FFS_FILE_STATE)~FileState;\r
+ FileState = (EFI_FFS_FILE_STATE) ~FileState;\r
}\r
\r
HighestBit = 0x80;\r
CalculateHeaderChecksum (\r
IN EFI_FFS_FILE_HEADER *FileHeader\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- UINT8 *ptr;\r
- UINTN Index;\r
- UINT8 Sum;\r
+ UINT8 *ptr;\r
+ UINTN Index;\r
+ UINT8 Sum;\r
\r
Sum = 0;\r
- ptr = (UINT8 *) FileHeader;\r
+ ptr = (UINT8 *)FileHeader;\r
\r
for (Index = 0; Index < sizeof (EFI_FFS_FILE_HEADER) - 3; Index += 4) {\r
- Sum = (UINT8) (Sum + ptr[Index]);\r
- Sum = (UINT8) (Sum + ptr[Index + 1]);\r
- Sum = (UINT8) (Sum + ptr[Index + 2]);\r
- Sum = (UINT8) (Sum + ptr[Index + 3]);\r
+ Sum = (UINT8)(Sum + ptr[Index]);\r
+ Sum = (UINT8)(Sum + ptr[Index + 1]);\r
+ Sum = (UINT8)(Sum + ptr[Index + 2]);\r
+ Sum = (UINT8)(Sum + ptr[Index + 3]);\r
}\r
\r
- for (; Index < sizeof (EFI_FFS_FILE_HEADER); Index++) {\r
- Sum = (UINT8) (Sum + ptr[Index]);\r
+ for ( ; Index < sizeof (EFI_FFS_FILE_HEADER); Index++) {\r
+ Sum = (UINT8)(Sum + ptr[Index]);\r
}\r
+\r
//\r
// State field (since this indicates the different state of file).\r
//\r
- Sum = (UINT8) (Sum - FileHeader->State);\r
+ Sum = (UINT8)(Sum - FileHeader->State);\r
//\r
// Checksum field of the file is not part of the header checksum.\r
//\r
- Sum = (UINT8) (Sum - FileHeader->IntegrityCheck.Checksum.File);\r
+ Sum = (UINT8)(Sum - FileHeader->IntegrityCheck.Checksum.File);\r
\r
return Sum;\r
}\r
\r
EFI_STATUS\r
SecFfsFindNextFile (\r
- IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_PEI_FV_HANDLE FvHandle,\r
- IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
+ IN EFI_FV_FILETYPE SearchType,\r
+ IN EFI_PEI_FV_HANDLE FvHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_FFS_FILE_HEADER *FfsFileHeader;\r
- UINT32 FileLength;\r
- UINT32 FileOccupiedSize;\r
- UINT32 FileOffset;\r
- UINT64 FvLength;\r
- UINT8 ErasePolarity;\r
- UINT8 FileState;\r
+ EFI_FFS_FILE_HEADER *FfsFileHeader;\r
+ UINT32 FileLength;\r
+ UINT32 FileOccupiedSize;\r
+ UINT32 FileOffset;\r
+ UINT64 FvLength;\r
+ UINT8 ErasePolarity;\r
+ UINT8 FileState;\r
EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader;\r
EFI_FFS_FILE_HEADER **FileHeader;\r
\r
//\r
// Convert the handle of FV to FV header for memory-mapped firmware volume\r
//\r
- FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) FvHandle;\r
+ FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)FvHandle;\r
FileHeader = (EFI_FFS_FILE_HEADER **)FileHandle;\r
\r
FvLength = FwVolHeader->FvLength;\r
} else {\r
ErasePolarity = 0;\r
}\r
+\r
//\r
// If FileHeader is not specified (NULL) start with the first file in the\r
// firmware volume. Otherwise, start from the FileHeader.\r
//\r
if (*FileHeader == NULL) {\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FwVolHeader + FwVolHeader->HeaderLength);\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FwVolHeader + FwVolHeader->HeaderLength);\r
} else {\r
//\r
// Length is 24 bits wide so mask upper 8 bits\r
// FileLength is adjusted to FileOccupiedSize as it is 8 byte aligned.\r
//\r
- FileLength = *(UINT32 *) (*FileHeader)->Size & 0x00FFFFFF;\r
- FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) *FileHeader + FileOccupiedSize);\r
+ FileLength = *(UINT32 *)(*FileHeader)->Size & 0x00FFFFFF;\r
+ FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
}\r
\r
- FileOffset = (UINT32) ((UINT8 *) FfsFileHeader - (UINT8 *) FwVolHeader);\r
+ FileOffset = (UINT32)((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
\r
while (FileOffset < (FvLength - sizeof (EFI_FFS_FILE_HEADER))) {\r
//\r
FileState = GetFileState (ErasePolarity, FfsFileHeader);\r
\r
switch (FileState) {\r
-\r
- case EFI_FILE_HEADER_INVALID:\r
- FileOffset += sizeof (EFI_FFS_FILE_HEADER);\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
- break;\r
-\r
- case EFI_FILE_DATA_VALID:\r
- case EFI_FILE_MARKED_FOR_UPDATE:\r
- if (CalculateHeaderChecksum (FfsFileHeader) == 0) {\r
- FileLength = *(UINT32 *) (FfsFileHeader->Size) & 0x00FFFFFF;\r
- FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
-\r
- if ((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) {\r
-\r
- *FileHeader = FfsFileHeader;\r
-\r
- return EFI_SUCCESS;\r
+ case EFI_FILE_HEADER_INVALID:\r
+ FileOffset += sizeof (EFI_FFS_FILE_HEADER);\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
+ break;\r
+\r
+ case EFI_FILE_DATA_VALID:\r
+ case EFI_FILE_MARKED_FOR_UPDATE:\r
+ if (CalculateHeaderChecksum (FfsFileHeader) == 0) {\r
+ FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+ FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
+\r
+ if ((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) {\r
+ *FileHeader = FfsFileHeader;\r
+\r
+ return EFI_SUCCESS;\r
+ }\r
+\r
+ FileOffset += FileOccupiedSize;\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
+ } else {\r
+ return EFI_NOT_FOUND;\r
}\r
\r
- FileOffset += FileOccupiedSize;\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + FileOccupiedSize);\r
- } else {\r
- return EFI_NOT_FOUND;\r
- }\r
- break;\r
-\r
- case EFI_FILE_DELETED:\r
- FileLength = *(UINT32 *) (FfsFileHeader->Size) & 0x00FFFFFF;\r
- FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
- FileOffset += FileOccupiedSize;\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + FileOccupiedSize);\r
- break;\r
+ break;\r
\r
- default:\r
- return EFI_NOT_FOUND;\r
+ case EFI_FILE_DELETED:\r
+ FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+ FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
+ FileOffset += FileOccupiedSize;\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
+ break;\r
\r
+ default:\r
+ return EFI_NOT_FOUND;\r
}\r
}\r
\r
\r
EFI_STATUS\r
SecFfsFindSectionData (\r
- IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
- IN OUT VOID **SectionData\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
+ IN OUT VOID **SectionData\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- UINT32 FileSize;\r
- EFI_COMMON_SECTION_HEADER *Section;\r
- UINT32 SectionLength;\r
- UINT32 ParsedLength;\r
+ UINT32 FileSize;\r
+ EFI_COMMON_SECTION_HEADER *Section;\r
+ UINT32 SectionLength;\r
+ UINT32 ParsedLength;\r
\r
//\r
// Size is 24 bits wide so mask upper 8 bits.\r
// Does not include FfsFileHeader header size\r
// FileSize is adjusted to FileOccupiedSize as it is 8 byte aligned.\r
//\r
- Section = (EFI_COMMON_SECTION_HEADER *) (FfsFileHeader + 1);\r
- FileSize = *(UINT32 *) (FfsFileHeader->Size) & 0x00FFFFFF;\r
+ Section = (EFI_COMMON_SECTION_HEADER *)(FfsFileHeader + 1);\r
+ FileSize = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
FileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
\r
- *SectionData = NULL;\r
- ParsedLength = 0;\r
+ *SectionData = NULL;\r
+ ParsedLength = 0;\r
while (ParsedLength < FileSize) {\r
if (Section->Type == SectionType) {\r
- *SectionData = (VOID *) (Section + 1);\r
+ *SectionData = (VOID *)(Section + 1);\r
return EFI_SUCCESS;\r
}\r
+\r
//\r
// Size is 24 bits wide so mask upper 8 bits.\r
// SectionLength is adjusted it is 4 byte aligned.\r
// Go to the next section\r
//\r
- SectionLength = *(UINT32 *) Section->Size & 0x00FFFFFF;\r
+ SectionLength = *(UINT32 *)Section->Size & 0x00FFFFFF;\r
SectionLength = GET_OCCUPIED_SIZE (SectionLength, 4);\r
\r
ParsedLength += SectionLength;\r
- Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) Section + SectionLength);\r
+ Section = (EFI_COMMON_SECTION_HEADER *)((UINT8 *)Section + SectionLength);\r
}\r
\r
return EFI_NOT_FOUND;\r
}\r
-\r
\r
**/\r
\r
-\r
#include <PiPei.h>\r
#include <Library/EmuMagicPageLib.h>\r
#include <Library/PeiServicesLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseMemoryLib.h>\r
\r
-\r
-\r
EFI_STATUS\r
SecFfsFindNextFile (\r
- IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_PEI_FV_HANDLE VolumeHandle,\r
- IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
+ IN EFI_FV_FILETYPE SearchType,\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
);\r
\r
EFI_STATUS\r
SecFfsFindSectionData (\r
- IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- OUT VOID **SectionData\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ OUT VOID **SectionData\r
);\r
\r
-\r
/**\r
This service enables a given PEIM to register an interface into the PEI Foundation.\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesInstallPpi (\r
- IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesReInstallPpi (\r
- IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
- IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesLocatePpi (\r
- IN CONST EFI_GUID *Guid,\r
- IN UINTN Instance,\r
- IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor,\r
- IN OUT VOID **Ppi\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN Instance,\r
+ IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor,\r
+ IN OUT VOID **Ppi\r
)\r
{\r
- EFI_PEI_PPI_DESCRIPTOR *PpiList;\r
+ EFI_PEI_PPI_DESCRIPTOR *PpiList;\r
\r
if (Instance != 0) {\r
return EFI_NOT_FOUND;\r
}\r
\r
- for (PpiList = EMU_MAGIC_PAGE()->PpiList; ; PpiList++) {\r
+ for (PpiList = EMU_MAGIC_PAGE ()->PpiList; ; PpiList++) {\r
if (CompareGuid (PpiList->Guid, Guid)) {\r
if (PpiDescriptor != NULL) {\r
*PpiDescriptor = PpiList;\r
}\r
+\r
if (Ppi != NULL) {\r
*Ppi = PpiList->Ppi;\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
}\r
}\r
\r
-\r
return EFI_NOT_FOUND;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesGetBootMode (\r
- OUT EFI_BOOT_MODE *BootMode\r
+ OUT EFI_BOOT_MODE *BootMode\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesSetBootMode (\r
- IN EFI_BOOT_MODE BootMode\r
+ IN EFI_BOOT_MODE BootMode\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesGetHobList (\r
- OUT VOID **HobList\r
+ OUT VOID **HobList\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesCreateHob (\r
- IN UINT16 Type,\r
- IN UINT16 Length,\r
- OUT VOID **Hob\r
+ IN UINT16 Type,\r
+ IN UINT16 Length,\r
+ OUT VOID **Hob\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsFindNextVolume (\r
- IN UINTN Instance,\r
- IN OUT EFI_PEI_FV_HANDLE *VolumeHandle\r
+ IN UINTN Instance,\r
+ IN OUT EFI_PEI_FV_HANDLE *VolumeHandle\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsFindNextFile (\r
- IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_PEI_FV_HANDLE VolumeHandle,\r
- IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
+ IN EFI_FV_FILETYPE SearchType,\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
)\r
{\r
return SecFfsFindNextFile (SearchType, VolumeHandle, FileHandle);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsFindSectionData (\r
- IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- OUT VOID **SectionData\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ OUT VOID **SectionData\r
)\r
{\r
return SecFfsFindSectionData (SectionType, FileHandle, SectionData);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesInstallPeiMemory (\r
- IN EFI_PHYSICAL_ADDRESS MemoryBegin,\r
- IN UINT64 MemoryLength\r
+ IN EFI_PHYSICAL_ADDRESS MemoryBegin,\r
+ IN UINT64 MemoryLength\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesAllocatePages (\r
- IN EFI_MEMORY_TYPE MemoryType,\r
- IN UINTN Pages,\r
- OUT EFI_PHYSICAL_ADDRESS *Memory\r
+ IN EFI_MEMORY_TYPE MemoryType,\r
+ IN UINTN Pages,\r
+ OUT EFI_PHYSICAL_ADDRESS *Memory\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesAllocatePool (\r
- IN UINTN Size,\r
- OUT VOID **Buffer\r
+ IN UINTN Size,\r
+ OUT VOID **Buffer\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesRegisterForShadow (\r
- IN EFI_PEI_FILE_HANDLE FileHandle\r
+ IN EFI_PEI_FILE_HANDLE FileHandle\r
)\r
{\r
ASSERT (FALSE);\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsGetFileInfo (\r
- IN CONST EFI_PEI_FILE_HANDLE FileHandle,\r
- OUT EFI_FV_FILE_INFO *FileInfo\r
+ IN CONST EFI_PEI_FILE_HANDLE FileHandle,\r
+ OUT EFI_FV_FILE_INFO *FileInfo\r
)\r
{\r
ASSERT (FALSE);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
/**\r
This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services\r
Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsFindFileByName (\r
- IN CONST EFI_GUID *FileName,\r
- IN CONST EFI_PEI_FV_HANDLE VolumeHandle,\r
- OUT EFI_PEI_FILE_HANDLE *FileHandle\r
+ IN CONST EFI_GUID *FileName,\r
+ IN CONST EFI_PEI_FV_HANDLE VolumeHandle,\r
+ OUT EFI_PEI_FILE_HANDLE *FileHandle\r
)\r
{\r
ASSERT (FALSE);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
/**\r
This service is a wrapper for the PEI Service FfsGetVolumeInfo(), except the pointer to the PEI Services\r
Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface\r
EFI_STATUS\r
EFIAPI\r
PeiServicesFfsGetVolumeInfo (\r
- IN EFI_PEI_FV_HANDLE VolumeHandle,\r
- OUT EFI_FV_INFO *VolumeInfo\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ OUT EFI_FV_INFO *VolumeInfo\r
)\r
{\r
ASSERT (FALSE);\r
VOID\r
EFIAPI\r
PeiServicesInstallFvInfoPpi (\r
- IN CONST EFI_GUID *FvFormat OPTIONAL,\r
- IN CONST VOID *FvInfo,\r
- IN UINT32 FvInfoSize,\r
- IN CONST EFI_GUID *ParentFvName OPTIONAL,\r
- IN CONST EFI_GUID *ParentFileName OPTIONAL\r
+ IN CONST EFI_GUID *FvFormat OPTIONAL,\r
+ IN CONST VOID *FvInfo,\r
+ IN UINT32 FvInfoSize,\r
+ IN CONST EFI_GUID *ParentFvName OPTIONAL,\r
+ IN CONST EFI_GUID *ParentFileName OPTIONAL\r
)\r
{\r
ASSERT (FALSE);\r
#include <PiPei.h>\r
\r
CONST EFI_PEI_PPI_DESCRIPTOR *gPpiList = NULL;\r
-\r
#include <Library/UefiLib.h>\r
#include <Library/SmbiosLib.h>\r
\r
-\r
-EFI_SMBIOS_PROTOCOL *gSmbios = NULL;\r
-\r
+EFI_SMBIOS_PROTOCOL *gSmbios = NULL;\r
\r
/**\r
Create an initial SMBIOS Table from an array of SMBIOS_TEMPLATE_ENTRY\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibInitializeFromTemplate (\r
- IN SMBIOS_TEMPLATE_ENTRY *Template\r
+ IN SMBIOS_TEMPLATE_ENTRY *Template\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
\r
if (Template == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Create SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibCreateEntry (\r
- IN SMBIOS_STRUCTURE *SmbiosEntry,\r
- IN CHAR8 **StringArray\r
+ IN SMBIOS_STRUCTURE *SmbiosEntry,\r
+ IN CHAR8 **StringArray\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
- EFI_SMBIOS_TABLE_HEADER *Record;\r
- UINTN Index;\r
- UINTN StringSize;\r
- UINTN Size;\r
- CHAR8 *Str;\r
+ EFI_STATUS Status;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ EFI_SMBIOS_TABLE_HEADER *Record;\r
+ UINTN Index;\r
+ UINTN StringSize;\r
+ UINTN Size;\r
+ CHAR8 *Str;\r
\r
// Calculate the size of the fixed record and optional string pack\r
Size = SmbiosEntry->Length;\r
} else {\r
for (Index = 0; StringArray[Index] != NULL; Index++) {\r
StringSize = AsciiStrSize (StringArray[Index]);\r
- Size += StringSize;\r
+ Size += StringSize;\r
}\r
+\r
// Don't forget the terminating double null\r
Size += 1;\r
}\r
if (Record == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
CopyMem (Record, SmbiosEntry, SmbiosEntry->Length);\r
\r
if (StringArray != NULL) {\r
CopyMem (Str, StringArray[Index], StringSize);\r
Str += StringSize;\r
}\r
+\r
*Str = 0;\r
}\r
\r
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
- Status = gSmbios->Add (\r
- gSmbios,\r
- gImageHandle,\r
- &SmbiosHandle,\r
- Record\r
- );\r
+ Status = gSmbios->Add (\r
+ gSmbios,\r
+ gImageHandle,\r
+ &SmbiosHandle,\r
+ Record\r
+ );\r
\r
FreePool (Record);\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Update the string associated with an existing SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibUpdateString (\r
- IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
- IN SMBIOS_TABLE_STRING StringNumber,\r
- IN CHAR8 *String\r
+ IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
+ IN SMBIOS_TABLE_STRING StringNumber,\r
+ IN CHAR8 *String\r
)\r
{\r
- UINTN StringIndex;\r
+ UINTN StringIndex;\r
\r
if (String == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return gSmbios->UpdateString (gSmbios, &SmbiosHandle, &StringIndex, String);\r
}\r
\r
-\r
/**\r
Update the string associated with an existing SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibUpdateUnicodeString (\r
- IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
- IN SMBIOS_TABLE_STRING StringNumber,\r
- IN CHAR16 *String\r
+ IN EFI_SMBIOS_HANDLE SmbiosHandle,\r
+ IN SMBIOS_TABLE_STRING StringNumber,\r
+ IN CHAR16 *String\r
)\r
{\r
EFI_STATUS Status;\r
if (Ascii == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
UnicodeStrToAsciiStrS (String, Ascii, StrSize (String));\r
\r
StringIndex = StringNumber;\r
- Status = gSmbios->UpdateString (gSmbios, &SmbiosHandle, &StringIndex, Ascii);\r
+ Status = gSmbios->UpdateString (gSmbios, &SmbiosHandle, &StringIndex, Ascii);\r
\r
FreePool (Ascii);\r
return Status;\r
}\r
\r
-\r
/**\r
Allow caller to read a specific SMBIOS string\r
\r
IN EFI_SMBIOS_STRING StringNumber\r
)\r
{\r
- CHAR8 *Data;\r
- UINTN Match;\r
+ CHAR8 *Data;\r
+ UINTN Match;\r
\r
Data = (CHAR8 *)Header + Header->Length;\r
- for (Match = 1;!(*Data == 0 && *(Data+1) == 0); ) {\r
+ for (Match = 1; !(*Data == 0 && *(Data+1) == 0); ) {\r
if (StringNumber == Match) {\r
return Data;\r
}\r
+\r
Data++;\r
if (*(Data - 1) == '\0') {\r
Match++;\r
return NULL;\r
}\r
\r
-\r
/**\r
Allow the caller to discover a specific SMBIOS entry, and patch it if necissary.\r
\r
SMBIOS_STRUCTURE *\r
EFIAPI\r
SmbiosLibGetRecord (\r
- IN EFI_SMBIOS_TYPE Type,\r
- IN UINTN Instance,\r
- OUT EFI_SMBIOS_HANDLE *SmbiosHandle\r
+ IN EFI_SMBIOS_TYPE Type,\r
+ IN UINTN Instance,\r
+ OUT EFI_SMBIOS_HANDLE *SmbiosHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SMBIOS_TABLE_HEADER *Record;\r
- UINTN Match;\r
+ EFI_STATUS Status;\r
+ EFI_SMBIOS_TABLE_HEADER *Record;\r
+ UINTN Match;\r
\r
Match = 0;\r
*SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
if (Match == Instance) {\r
return (SMBIOS_STRUCTURE *)Record;\r
}\r
+\r
Match++;\r
}\r
} while (!EFI_ERROR (Status));\r
return NULL;\r
}\r
\r
-\r
/**\r
Remove an SMBIOS record.\r
\r
EFI_STATUS\r
EFIAPI\r
SmbiosLibRemove (\r
- OUT EFI_SMBIOS_HANDLE SmbiosHandle\r
+ OUT EFI_SMBIOS_HANDLE SmbiosHandle\r
)\r
{\r
return gSmbios->Remove (gSmbios, SmbiosHandle);\r
}\r
\r
-\r
-\r
/**\r
\r
@param ImageHandle ImageHandle of the loaded driver.\r
{\r
return gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **)&gSmbios);\r
}\r
-\r
#include <Library/BaseLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
\r
-\r
UINTN gThunkPpiListSize = 0;\r
-EFI_PEI_PPI_DESCRIPTOR *gThunkPpiList = NULL;\r
-\r
-\r
+EFI_PEI_PPI_DESCRIPTOR *gThunkPpiList = NULL;\r
\r
EFI_PEI_PPI_DESCRIPTOR *\r
GetThunkPpiList (\r
VOID\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
if (gThunkPpiList == NULL) {\r
return NULL;\r
}\r
\r
- Index = (gThunkPpiListSize/sizeof (EFI_PEI_PPI_DESCRIPTOR)) - 1;\r
+ Index = (gThunkPpiListSize/sizeof (EFI_PEI_PPI_DESCRIPTOR)) - 1;\r
gThunkPpiList[Index].Flags |= EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;\r
\r
return gThunkPpiList;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
AddThunkPpi (\r
IN VOID *Ppi\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
gThunkPpiList = ReallocatePool (\r
gThunkPpiListSize,\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- Index = (gThunkPpiListSize/sizeof (EFI_PEI_PPI_DESCRIPTOR));\r
+ Index = (gThunkPpiListSize/sizeof (EFI_PEI_PPI_DESCRIPTOR));\r
gThunkPpiList[Index].Flags = Flags;\r
gThunkPpiList[Index].Guid = Guid;\r
gThunkPpiList[Index].Ppi = Ppi;\r
- gThunkPpiListSize += sizeof (EFI_PEI_PPI_DESCRIPTOR);\r
+ gThunkPpiListSize += sizeof (EFI_PEI_PPI_DESCRIPTOR);\r
\r
return EFI_SUCCESS;\r
}\r
-\r
-\r
-\r
-\r
-\r
\r
#include <Protocol/EmuIoThunk.h>\r
\r
-\r
-#define EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE SIGNATURE_32('E','m','u','T')\r
+#define EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE SIGNATURE_32('E','m','u','T')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL Data;\r
- BOOLEAN EmuBusDriver;\r
- LIST_ENTRY Link;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL Data;\r
+ BOOLEAN EmuBusDriver;\r
+ LIST_ENTRY Link;\r
} EMU_IO_THUNK_PROTOCOL_DATA;\r
\r
LIST_ENTRY mThunkList = INITIALIZE_LIST_HEAD_VARIABLE (mThunkList);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
AddThunkProtocol (\r
- IN EMU_IO_THUNK_PROTOCOL *ThunkIo,\r
- IN CHAR16 *ConfigString,\r
- IN BOOLEAN EmuBusDriver\r
+ IN EMU_IO_THUNK_PROTOCOL *ThunkIo,\r
+ IN CHAR16 *ConfigString,\r
+ IN BOOLEAN EmuBusDriver\r
)\r
{\r
UINTN Size;\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Instance = 0;\r
- Size = StrSize (ConfigString);\r
+ Instance = 0;\r
+ Size = StrSize (ConfigString);\r
StartString = AllocatePool (Size);\r
if (StartString == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
StrCpyS (StartString, Size / sizeof (CHAR16), ConfigString);\r
while (*StartString != '\0') {\r
-\r
//\r
// Find the end of the sub string\r
//\r
if (Private == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- Private->Signature = EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE;\r
- Private->EmuBusDriver = EmuBusDriver;\r
+\r
+ Private->Signature = EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE;\r
+ Private->EmuBusDriver = EmuBusDriver;\r
\r
CopyMem (&Private->Data, ThunkIo, sizeof (EMU_IO_THUNK_PROTOCOL));\r
- Private->Data.Instance = (UINT16)Instance++;\r
- Private->Data.ConfigString = StartString;\r
+ Private->Data.Instance = (UINT16)Instance++;\r
+ Private->Data.ConfigString = StartString;\r
\r
InsertTailList (&mThunkList, &Private->Link);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
GetNextThunkProtocol (\r
- IN BOOLEAN EmuBusDriver,\r
- OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
+ IN BOOLEAN EmuBusDriver,\r
+ OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
)\r
{\r
- LIST_ENTRY *Link;\r
- EMU_IO_THUNK_PROTOCOL_DATA *Private;\r
+ LIST_ENTRY *Link;\r
+ EMU_IO_THUNK_PROTOCOL_DATA *Private;\r
\r
if (mThunkList.ForwardLink == &mThunkList) {\r
// Skip parsing an empty list\r
if (Link == &mThunkList) {\r
return EFI_NOT_FOUND;\r
}\r
- Private = CR (Link, EMU_IO_THUNK_PROTOCOL_DATA, Link, EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE);\r
+\r
+ Private = CR (Link, EMU_IO_THUNK_PROTOCOL_DATA, Link, EMU_IO_THUNK_PROTOCOL_DATA_SIGNATURE);\r
*Instance = &Private->Data;\r
return EFI_SUCCESS;\r
}\r
}\r
\r
-\r
return EFI_NOT_FOUND;\r
}\r
-\r
#include <Library/SmbiosLib.h>\r
#include <Library/HobLib.h>\r
\r
-extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[];\r
+extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[];\r
\r
-\r
-\r
-SMBIOS_TABLE_TYPE19 gSmbiosType19Template = {\r
+SMBIOS_TABLE_TYPE19 gSmbiosType19Template = {\r
{ EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof (SMBIOS_TABLE_TYPE19), 0 },\r
0xffffffff, // StartingAddress;\r
0xffffffff, // EndingAddress;\r
VOID\r
)\r
{\r
- EFI_PEI_HOB_POINTERS HobPtr;\r
- SMBIOS_STRUCTURE_POINTER Smbios16;\r
- SMBIOS_STRUCTURE_POINTER Smbios17;\r
- EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ EFI_PEI_HOB_POINTERS HobPtr;\r
+ SMBIOS_STRUCTURE_POINTER Smbios16;\r
+ SMBIOS_STRUCTURE_POINTER Smbios17;\r
+ EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
\r
Smbios16.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0, &PhyscialMemoryArrayHandle);\r
if (Smbios16.Hdr == NULL) {\r
\r
// Generate Type16 records\r
gSmbiosType19Template.MemoryArrayHandle = PhyscialMemoryArrayHandle;\r
- HobPtr.Raw = GetHobList ();\r
+ HobPtr.Raw = GetHobList ();\r
while ((HobPtr.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, HobPtr.Raw)) != NULL) {\r
if (HobPtr.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) {\r
gSmbiosType19Template.ExtendedStartingAddress = HobPtr.ResourceDescriptor->PhysicalStart;\r
- gSmbiosType19Template.ExtendedEndingAddress =\r
+ gSmbiosType19Template.ExtendedEndingAddress =\r
HobPtr.ResourceDescriptor->PhysicalStart +\r
HobPtr.ResourceDescriptor->ResourceLength - 1;\r
\r
SmbiosLibCreateEntry ((SMBIOS_STRUCTURE *)&gSmbiosType19Template, NULL);\r
}\r
+\r
HobPtr.Raw = GET_NEXT_HOB (HobPtr);\r
}\r
}\r
\r
-\r
/**\r
Main entry for this driver.\r
\r
EFI_STATUS\r
EFIAPI\r
PlatformSmbiosDriverEntryPoint (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
- SMBIOS_STRUCTURE_POINTER Smbios;\r
+ EFI_STATUS Status;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ SMBIOS_STRUCTURE_POINTER Smbios;\r
\r
// Phase 0 - Patch table to make SMBIOS 2.7 structures smaller to conform\r
// to an early version of the specification.\r
SmbiosLibUpdateUnicodeString (\r
SmbiosHandle,\r
Smbios.Type0->BiosVersion,\r
- (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString)\r
+ (CHAR16 *)PcdGetPtr (PcdFirmwareVersionString)\r
);\r
SmbiosLibUpdateUnicodeString (\r
SmbiosHandle,\r
Smbios.Type0->BiosReleaseDate,\r
- (CHAR16 *) PcdGetPtr (PcdFirmwareReleaseDateString)\r
+ (CHAR16 *)PcdGetPtr (PcdFirmwareReleaseDateString)\r
);\r
}\r
\r
#include <Protocol/Smbios.h>\r
#include <Library/SmbiosLib.h>\r
\r
-\r
-SMBIOS_TABLE_TYPE0 gSmbiosType0Template = {\r
+SMBIOS_TABLE_TYPE0 gSmbiosType0Template = {\r
{ EFI_SMBIOS_TYPE_BIOS_INFORMATION, sizeof (SMBIOS_TABLE_TYPE0), 0 },\r
1, // Vendor String\r
2, // BiosVersion String\r
0xE000, // BiosSegment\r
3, // BiosReleaseDate String\r
0x7F, // BiosSize\r
- { // BiosCharacteristics\r
+ { // BiosCharacteristics\r
0, // Reserved :2; ///< Bits 0-1.\r
0, // Unknown :1;\r
0, // BiosCharacteristicsNotSupported :1;\r
0, // CgaMonoIsSupported :1;\r
0, // NecPc98 :1;\r
0 // ReservedForVendor :32; ///< Bits 32-63. Bits 32-47 reserved for BIOS vendor\r
- ///< and bits 48-63 reserved for System Vendor.\r
+ ///< and bits 48-63 reserved for System Vendor.\r
},\r
{ // BIOSCharacteristicsExtensionBytes[]\r
0x81, // AcpiIsSupported :1;\r
// AtapiZipDriveBootIsSupported :1;\r
// Boot1394IsSupported :1;\r
// SmartBatteryIsSupported :1;\r
- // BIOSCharacteristicsExtensionBytes[1]\r
+ // BIOSCharacteristicsExtensionBytes[1]\r
0x0a, // BiosBootSpecIsSupported :1;\r
// FunctionKeyNetworkBootIsSupported :1;\r
// TargetContentDistributionEnabled :1;\r
0xFF, // EmbeddedControllerFirmwareMajorRelease\r
0xFF, // EmbeddedControllerFirmwareMinorRelease\r
};\r
-CHAR8 *gSmbiosType0Strings[] = {\r
- "http://www.tianocore.org/edk2/", // Vendor String\r
- __TIME__, // BiosVersion String\r
- __DATE__, // BiosReleaseDate String\r
+CHAR8 *gSmbiosType0Strings[] = {\r
+ "http://www.tianocore.org/edk2/", // Vendor String\r
+ __TIME__, // BiosVersion String\r
+ __DATE__, // BiosReleaseDate String\r
NULL\r
};\r
\r
-SMBIOS_TABLE_TYPE1 gSmbiosType1Template = {\r
- { EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, sizeof (SMBIOS_TABLE_TYPE1), 0 },\r
+SMBIOS_TABLE_TYPE1 gSmbiosType1Template = {\r
+ { EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, sizeof (SMBIOS_TABLE_TYPE1), 0 },\r
1, // Manufacturer String\r
2, // ProductName String\r
3, // Version String\r
4, // SerialNumber String\r
- { 0x25EF0280, 0xEC82, 0x42B0, { 0x8F, 0xB6, 0x10, 0xAD, 0xCC, 0xC6, 0x7C, 0x02 } },\r
+ { 0x25EF0280, 0xEC82, 0x42B0, { 0x8F, 0xB6, 0x10, 0xAD, 0xCC, 0xC6, 0x7C, 0x02}\r
+ },\r
SystemWakeupTypePowerSwitch,\r
5, // SKUNumber String\r
6, // Family String\r
};\r
-CHAR8 *gSmbiosType1Strings[] = {\r
+CHAR8 *gSmbiosType1Strings[] = {\r
"http://www.tianocore.org/edk2/",\r
"EmulatorPkg",\r
"1.0",\r
4, // SerialNumber String\r
5, // AssetTag String\r
{ // FeatureFlag\r
- 1, // Motherboard :1;\r
- 0, // RequiresDaughterCard :1;\r
- 0, // Removable :1;\r
- 0, // Replaceable :1;\r
- 0, // HotSwappable :1;\r
- 0, // Reserved :3;\r
+ 1, // Motherboard :1;\r
+ 0, // RequiresDaughterCard :1;\r
+ 0, // Removable :1;\r
+ 0, // Replaceable :1;\r
+ 0, // HotSwappable :1;\r
+ 0, // Reserved :3;\r
},\r
- 6, // LocationInChassis String\r
+ 6, // LocationInChassis String\r
0, // ChassisHandle;\r
BaseBoardTypeMotherBoard, // BoardType;\r
0, // NumberOfContainedObjectHandles;\r
{ 0 } // ContainedObjectHandles[1];\r
};\r
-CHAR8 *gSmbiosType2Strings[] = {\r
+CHAR8 *gSmbiosType2Strings[] = {\r
"http://www.tianocore.org/edk2/",\r
"EmulatorPkg",\r
"1.0",\r
\r
SMBIOS_TABLE_TYPE3 gSmbiosType3Template = {\r
{ EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, sizeof (SMBIOS_TABLE_TYPE3), 0 },\r
- 1, // Manufacturer String\r
- MiscChassisTypeLapTop, // Type;\r
- 2, // Version String\r
- 3, // SerialNumber String\r
- 4, // AssetTag String\r
- ChassisStateSafe, // BootupState;\r
- ChassisStateSafe, // PowerSupplyState;\r
- ChassisStateSafe, // ThermalState;\r
- ChassisSecurityStatusNone,// SecurityStatus;\r
- { 0, 0, 0, 0 }, // OemDefined[4];\r
- 0, // Height;\r
- 0, // NumberofPowerCords;\r
- 0, // ContainedElementCount;\r
- 0, // ContainedElementRecordLength;\r
- { { 0 } }, // ContainedElements[1];\r
-};\r
-CHAR8 *gSmbiosType3Strings[] = {\r
+ 1, // Manufacturer String\r
+ MiscChassisTypeLapTop, // Type;\r
+ 2, // Version String\r
+ 3, // SerialNumber String\r
+ 4, // AssetTag String\r
+ ChassisStateSafe, // BootupState;\r
+ ChassisStateSafe, // PowerSupplyState;\r
+ ChassisStateSafe, // ThermalState;\r
+ ChassisSecurityStatusNone, // SecurityStatus;\r
+ { 0, 0, 0, 0}, // OemDefined[4];\r
+ 0, // Height;\r
+ 0, // NumberofPowerCords;\r
+ 0, // ContainedElementCount;\r
+ 0, // ContainedElementRecordLength;\r
+ {\r
+ { 0 }\r
+ }, // ContainedElements[1];\r
+};\r
+CHAR8 *gSmbiosType3Strings[] = {\r
"http://www.tianocore.org/edk2/",\r
"EmulatorPkg",\r
"Chassis Board Serial#",\r
PortConnectorTypeNone, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeOther, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings1[] = {\r
+CHAR8 *gSmbiosType8Strings1[] = {\r
"Mini DisplayPort",\r
NULL\r
};\r
PortConnectorTypeNone, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeFireWire, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings2[] = {\r
+CHAR8 *gSmbiosType8Strings2[] = {\r
"FireWire 800",\r
NULL\r
};\r
\r
-\r
SMBIOS_TABLE_TYPE8 gSmbiosType8Template3 = {\r
{ EFI_SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE8), 0 },\r
0, // InternalReferenceDesignator String\r
PortConnectorTypeRJ45, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeNetworkPort, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings3[] = {\r
+CHAR8 *gSmbiosType8Strings3[] = {\r
"Ethernet",\r
NULL\r
};\r
PortConnectorTypeUsb, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeUsb, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings4[] = {\r
+CHAR8 *gSmbiosType8Strings4[] = {\r
"USB0",\r
NULL\r
};\r
PortConnectorTypeUsb, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeUsb, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings5[] = {\r
+CHAR8 *gSmbiosType8Strings5[] = {\r
"USB1",\r
NULL\r
};\r
PortConnectorTypeUsb, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeUsb, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings6[] = {\r
+CHAR8 *gSmbiosType8Strings6[] = {\r
"USB2",\r
NULL\r
};\r
PortConnectorTypeUsb, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeUsb, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings7[] = {\r
+CHAR8 *gSmbiosType8Strings7[] = {\r
"USB3",\r
NULL\r
};\r
\r
SMBIOS_TABLE_TYPE8 gSmbiosType8Template8 = {\r
{ EFI_SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE8), 0 },\r
- 0, // InternalReferenceDesignator String\r
- PortConnectorTypeNone, // InternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
- 1, // ExternalReferenceDesignator String\r
+ 0, // InternalReferenceDesignator String\r
+ PortConnectorTypeNone, // InternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
+ 1, // ExternalReferenceDesignator String\r
PortConnectorTypeHeadPhoneMiniJack, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeAudioPort, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings8[] = {\r
+CHAR8 *gSmbiosType8Strings8[] = {\r
"Audio Line In",\r
NULL\r
};\r
\r
SMBIOS_TABLE_TYPE8 gSmbiosType8Template9 = {\r
{ EFI_SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE8), 0 },\r
- 0, // InternalReferenceDesignator String\r
- PortConnectorTypeNone, // InternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
- 1, // ExternalReferenceDesignator String\r
+ 0, // InternalReferenceDesignator String\r
+ PortConnectorTypeNone, // InternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
+ 1, // ExternalReferenceDesignator String\r
PortConnectorTypeHeadPhoneMiniJack, // ExternalConnectorType; ///< The enumeration value from MISC_PORT_CONNECTOR_TYPE.\r
PortTypeAudioPort, // PortType; ///< The enumeration value from MISC_PORT_TYPE.\r
};\r
-CHAR8 *gSmbiosType8Strings9[] = {\r
+CHAR8 *gSmbiosType8Strings9[] = {\r
"Audio Line Out",\r
NULL\r
};\r
\r
SMBIOS_TABLE_TYPE9 gSmbiosType9Template = {\r
{ EFI_SMBIOS_TYPE_SYSTEM_SLOTS, sizeof (SMBIOS_TABLE_TYPE9), 0 },\r
- 1, // SlotDesignation String\r
- SlotTypeOther, // SlotType; ///< The enumeration value from MISC_SLOT_TYPE.\r
- SlotDataBusWidthOther, // SlotDataBusWidth; ///< The enumeration value from MISC_SLOT_DATA_BUS_WIDTH.\r
+ 1, // SlotDesignation String\r
+ SlotTypeOther, // SlotType; ///< The enumeration value from MISC_SLOT_TYPE.\r
+ SlotDataBusWidthOther, // SlotDataBusWidth; ///< The enumeration value from MISC_SLOT_DATA_BUS_WIDTH.\r
SlotUsageAvailable, // CurrentUsage; ///< The enumeration value from MISC_SLOT_USAGE.\r
- SlotLengthOther, // SlotLength; ///< The enumeration value from MISC_SLOT_LENGTH.\r
- 0, // SlotID;\r
+ SlotLengthOther, // SlotLength; ///< The enumeration value from MISC_SLOT_LENGTH.\r
+ 0, // SlotID;\r
{ // SlotCharacteristics1;\r
- 1, // CharacteristicsUnknown :1;\r
- 0, // Provides50Volts :1;\r
- 0, // Provides33Volts :1;\r
- 0, // SharedSlot :1;\r
- 0, // PcCard16Supported :1;\r
- 0, // CardBusSupported :1;\r
- 0, // ZoomVideoSupported :1;\r
- 0, // ModemRingResumeSupported:1;\r
+ 1, // CharacteristicsUnknown :1;\r
+ 0, // Provides50Volts :1;\r
+ 0, // Provides33Volts :1;\r
+ 0, // SharedSlot :1;\r
+ 0, // PcCard16Supported :1;\r
+ 0, // CardBusSupported :1;\r
+ 0, // ZoomVideoSupported :1;\r
+ 0, // ModemRingResumeSupported:1;\r
},\r
{ // SlotCharacteristics2;\r
0, // PmeSignalSupported :1;\r
0, // BusNum;\r
0, // DevFuncNum;\r
};\r
-CHAR8 *gSmbiosType9Strings[] = {\r
+CHAR8 *gSmbiosType9Strings[] = {\r
"SD Card",\r
NULL\r
};\r
\r
-SMBIOS_TABLE_TYPE11 gSmbiosType11Template = {\r
+SMBIOS_TABLE_TYPE11 gSmbiosType11Template = {\r
{ EFI_SMBIOS_TYPE_OEM_STRINGS, sizeof (SMBIOS_TABLE_TYPE11), 0 },\r
1 // StringCount\r
};\r
-CHAR8 *gSmbiosType11Strings[] = {\r
+CHAR8 *gSmbiosType11Strings[] = {\r
"https://svn.code.sf.net/p/edk2/code/trunk/edk2/EmulatorPkg/",\r
NULL\r
};\r
\r
-\r
-SMBIOS_TABLE_TYPE12 gSmbiosType12Template = {\r
+SMBIOS_TABLE_TYPE12 gSmbiosType12Template = {\r
{ EFI_SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS, sizeof (SMBIOS_TABLE_TYPE12), 0 },\r
1 // StringCount\r
};\r
-CHAR8 *gSmbiosType12Strings[] = {\r
+CHAR8 *gSmbiosType12Strings[] = {\r
"https://svn.code.sf.net/p/edk2/code/trunk/edk2/EmulatorPkg/EmulatorPkg.dsc",\r
NULL\r
};\r
\r
-SMBIOS_TABLE_TYPE16 gSmbiosType16Template = {\r
+SMBIOS_TABLE_TYPE16 gSmbiosType16Template = {\r
{ EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, sizeof (SMBIOS_TABLE_TYPE16), 0 },\r
MemoryArrayLocationSystemBoard, // Location; ///< The enumeration value from MEMORY_ARRAY_LOCATION.\r
MemoryArrayUseSystemMemory, // Use; ///< The enumeration value from MEMORY_ARRAY_USE.\r
0x3fffffffffffffffULL, // ExtendedMaximumCapacity;\r
};\r
\r
-SMBIOS_TABLE_TYPE17 gSmbiosType17Template = {\r
+SMBIOS_TABLE_TYPE17 gSmbiosType17Template = {\r
{ EFI_SMBIOS_TYPE_MEMORY_DEVICE, sizeof (SMBIOS_TABLE_TYPE17), 0 },\r
- 0, // MemoryArrayHandle;\r
- 0xFFFE, // MemoryErrorInformationHandle;\r
- 0xFFFF, // TotalWidth;\r
- 0xFFFF, // DataWidth;\r
- 0xFFFF, // Size;\r
+ 0, // MemoryArrayHandle;\r
+ 0xFFFE, // MemoryErrorInformationHandle;\r
+ 0xFFFF, // TotalWidth;\r
+ 0xFFFF, // DataWidth;\r
+ 0xFFFF, // Size;\r
MemoryFormFactorUnknown, // FormFactor; ///< The enumeration value from MEMORY_FORM_FACTOR.\r
- 0xff, // DeviceSet;\r
- 1, // DeviceLocator String\r
- 2, // BankLocator String\r
- MemoryTypeDram, // MemoryType; ///< The enumeration value from MEMORY_DEVICE_TYPE.\r
- { // TypeDetail;\r
+ 0xff, // DeviceSet;\r
+ 1, // DeviceLocator String\r
+ 2, // BankLocator String\r
+ MemoryTypeDram, // MemoryType; ///< The enumeration value from MEMORY_DEVICE_TYPE.\r
+ { // TypeDetail;\r
0, // Reserved :1;\r
0, // Other :1;\r
1, // Unknown :1;\r
0, // ExtendedSize;\r
0, // ConfiguredMemoryClockSpeed;\r
};\r
-CHAR8 *gSmbiosType17Strings[] = {\r
+CHAR8 *gSmbiosType17Strings[] = {\r
"OS Virtual Memory",\r
"malloc",\r
"OSV",\r
NULL\r
};\r
\r
-SMBIOS_TABLE_TYPE23 gSmbiosType23Template = {\r
+SMBIOS_TABLE_TYPE23 gSmbiosType23Template = {\r
{ EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, sizeof (SMBIOS_TABLE_TYPE23), 0 },\r
0, // Capabilities;\r
0, // ResetCount;\r
0 // Timeout;\r
};\r
\r
-SMBIOS_TABLE_TYPE32 gSmbiosType32Template = {\r
+SMBIOS_TABLE_TYPE32 gSmbiosType32Template = {\r
{ EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, sizeof (SMBIOS_TABLE_TYPE32), 0 },\r
- { 0, 0, 0, 0, 0, 0 }, // Reserved[6];\r
- BootInformationStatusNoError // BootStatus\r
+ { 0, 0, 0, 0, 0, 0}, // Reserved[6];\r
+ BootInformationStatusNoError // BootStatus\r
};\r
\r
-\r
-\r
-SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[] = {\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType0Template, gSmbiosType0Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType1Template, gSmbiosType1Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType2Template, gSmbiosType2Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType3Template, gSmbiosType3Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template1, gSmbiosType8Strings1 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template2, gSmbiosType8Strings2 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template3, gSmbiosType8Strings3 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template4, gSmbiosType8Strings4 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template5, gSmbiosType8Strings5 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template6, gSmbiosType8Strings6 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template7, gSmbiosType8Strings7 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template8, gSmbiosType8Strings8 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType8Template9, gSmbiosType8Strings9 },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType9Template, gSmbiosType9Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType11Template, gSmbiosType11Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType12Template, gSmbiosType12Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType16Template, NULL },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType17Template, gSmbiosType17Strings },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType23Template, NULL },\r
- { (SMBIOS_STRUCTURE *)&gSmbiosType32Template, NULL },\r
- { NULL, NULL }\r
+SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[] = {\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType0Template, gSmbiosType0Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType1Template, gSmbiosType1Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType2Template, gSmbiosType2Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType3Template, gSmbiosType3Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template1, gSmbiosType8Strings1 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template2, gSmbiosType8Strings2 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template3, gSmbiosType8Strings3 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template4, gSmbiosType8Strings4 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template5, gSmbiosType8Strings5 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template6, gSmbiosType8Strings6 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template7, gSmbiosType8Strings7 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template8, gSmbiosType8Strings8 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType8Template9, gSmbiosType8Strings9 },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType9Template, gSmbiosType9Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType11Template, gSmbiosType11Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType12Template, gSmbiosType12Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType16Template, NULL },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType17Template, gSmbiosType17Strings },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType23Template, NULL },\r
+ { (SMBIOS_STRUCTURE *)&gSmbiosType32Template, NULL },\r
+ { NULL, NULL }\r
};\r
\r
BOOLEAN\r
IsLeapYear (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
);\r
\r
EFI_STATUS\r
RtcTimeFieldsValid (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
InitializeRealTimeClock (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGetTime (\r
- OUT EFI_TIME * Time,\r
- OUT EFI_TIME_CAPABILITIES * Capabilities OPTIONAL\r
+ OUT EFI_TIME *Time,\r
+ OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
-\r
//\r
// Check parameter for null pointer\r
//\r
if (Time == NULL) {\r
return EFI_INVALID_PARAMETER;\r
-\r
}\r
\r
gEmuThunk->GetTime (Time, Capabilities);\r
EFI_STATUS\r
EFIAPI\r
EmuSetTime (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
if (Time == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
//\r
// Make sure that the time fields are valid\r
//\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
return EFI_UNSUPPORTED;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
EmuGetWakeupTime (\r
- OUT BOOLEAN *Enabled,\r
- OUT BOOLEAN *Pending,\r
- OUT EFI_TIME *Time\r
+ OUT BOOLEAN *Enabled,\r
+ OUT BOOLEAN *Pending,\r
+ OUT EFI_TIME *Time\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS\r
EFIAPI\r
EmuSetWakeupTime (\r
- IN BOOLEAN Enable,\r
- OUT EFI_TIME *Time\r
+ IN BOOLEAN Enable,\r
+ OUT EFI_TIME *Time\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EFI_STATUS\r
EFIAPI\r
InitializeRealTimeClock (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
EFI_STATUS\r
RtcTimeFieldsValid (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
)\r
+\r
/*++\r
\r
Routine Description:\r
Returns:\r
**/\r
{\r
- if (Time->Year < 1998 ||\r
- Time->Year > 2099 ||\r
- Time->Month < 1 ||\r
- Time->Month > 12 ||\r
+ if ((Time->Year < 1998) ||\r
+ (Time->Year > 2099) ||\r
+ (Time->Month < 1) ||\r
+ (Time->Month > 12) ||\r
(!DayValid (Time)) ||\r
- Time->Hour > 23 ||\r
- Time->Minute > 59 ||\r
- Time->Second > 59 ||\r
- Time->Nanosecond > 999999999 ||\r
- (!(Time->TimeZone == EFI_UNSPECIFIED_TIMEZONE || (Time->TimeZone >= -1440 && Time->TimeZone <= 1440))) ||\r
+ (Time->Hour > 23) ||\r
+ (Time->Minute > 59) ||\r
+ (Time->Second > 59) ||\r
+ (Time->Nanosecond > 999999999) ||\r
+ (!((Time->TimeZone == EFI_UNSPECIFIED_TIMEZONE) || ((Time->TimeZone >= -1440) && (Time->TimeZone <= 1440)))) ||\r
(Time->Daylight & (~(EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT)))\r
- ) {\r
+ )\r
+ {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
IN EFI_TIME *Time\r
)\r
{\r
-\r
STATIC const INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };\r
\r
- if (Time->Day < 1 ||\r
- Time->Day > DayOfMonth[Time->Month - 1] ||\r
- (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))\r
- ) {\r
+ if ((Time->Day < 1) ||\r
+ (Time->Day > DayOfMonth[Time->Month - 1]) ||\r
+ ((Time->Month == 2) && (!IsLeapYear (Time) && (Time->Day > 28)))\r
+ )\r
+ {\r
return FALSE;\r
}\r
\r
\r
BOOLEAN\r
IsLeapYear (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
)\r
{\r
if (Time->Year % 4 == 0) {\r
\r
#include <Protocol/Reset.h>\r
\r
-\r
VOID\r
EFIAPI\r
EmuResetSystem (\r
- IN EFI_RESET_TYPE ResetType,\r
- IN EFI_STATUS ResetStatus,\r
- IN UINTN DataSize,\r
- IN VOID *ResetData OPTIONAL\r
+ IN EFI_RESET_TYPE ResetType,\r
+ IN EFI_STATUS ResetStatus,\r
+ IN UINTN DataSize,\r
+ IN VOID *ResetData OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
gBS->FreePool (HandleBuffer);\r
}\r
\r
-\r
//\r
// Discard ResetType, always return 0 as exit code\r
//\r
return;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
EFIAPI\r
InitializeEmuReset (\r
IN EFI_HANDLE ImageHandle,\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
return Status;\r
}\r
-\r
VOID\r
EFIAPI\r
SecSwitchStack (\r
- UINT32 TemporaryMemoryBase,\r
- UINT32 PermenentMemoryBase\r
+ UINT32 TemporaryMemoryBase,\r
+ UINT32 PermenentMemoryBase\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
SecTemporaryRamSupport (\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
- IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
- IN UINTN CopySize\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
+ IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
+ IN UINTN CopySize\r
)\r
{\r
//\r
// Migrate the whole temporary memory to permanent memory.\r
//\r
CopyMem (\r
- (VOID*)(UINTN)PermanentMemoryBase,\r
- (VOID*)(UINTN)TemporaryMemoryBase,\r
+ (VOID *)(UINTN)PermanentMemoryBase,\r
+ (VOID *)(UINTN)TemporaryMemoryBase,\r
CopySize\r
);\r
\r
// immediately, also we need fixup the stack change caused by new call into\r
// permanent memory.\r
//\r
- SecSwitchStack ((UINT32) TemporaryMemoryBase, (UINT32) PermanentMemoryBase);\r
+ SecSwitchStack ((UINT32)TemporaryMemoryBase, (UINT32)PermanentMemoryBase);\r
\r
//\r
// We need *not* fix the return address because currently,\r
//\r
// Simulate to invalid temporary memory, terminate temporary memory\r
//\r
- //ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize);\r
+ // ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize);\r
\r
return EFI_SUCCESS;\r
}\r
\r
#include "Sec.h"\r
\r
-\r
-\r
-EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = {\r
+EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = {\r
SecTemporaryRamSupport\r
};\r
\r
-\r
EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = {\r
{\r
EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
}\r
};\r
\r
-\r
-\r
/**\r
The entry point of PE/COFF Image for the PEI Core, that has been hijacked by this\r
SEC that sits on top of an OS application. So the entry and exit of this module\r
VOID\r
EFIAPI\r
_ModuleEntryPoint (\r
- IN EFI_SEC_PEI_HAND_OFF *SecCoreData,\r
- IN EFI_PEI_PPI_DESCRIPTOR *PpiList\r
+ IN EFI_SEC_PEI_HAND_OFF *SecCoreData,\r
+ IN EFI_PEI_PPI_DESCRIPTOR *PpiList\r
)\r
{\r
EFI_STATUS Status;\r
UINTN Index;\r
EFI_PEI_PPI_DESCRIPTOR PpiArray[10];\r
\r
- EMU_MAGIC_PAGE()->PpiList = PpiList;\r
+ EMU_MAGIC_PAGE ()->PpiList = PpiList;\r
ProcessLibraryConstructorList ();\r
\r
DEBUG ((DEBUG_ERROR, "SEC Has Started\n"));\r
// Keep everything on a good alignment\r
SecReseveredMemorySize = ALIGN_VALUE (SecReseveredMemorySize, CPU_STACK_ALIGNMENT);\r
\r
-#if 0\r
+ #if 0\r
// Tell the PEI Core to not use our buffer in temp RAM\r
- SecPpiList = (EFI_PEI_PPI_DESCRIPTOR *)SecCoreData->PeiTemporaryRamBase;\r
- SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + SecReseveredMemorySize);\r
+ SecPpiList = (EFI_PEI_PPI_DESCRIPTOR *)SecCoreData->PeiTemporaryRamBase;\r
+ SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + SecReseveredMemorySize);\r
SecCoreData->PeiTemporaryRamSize -= SecReseveredMemorySize;\r
-#else\r
+ #else\r
//\r
// When I subtrack from SecCoreData->PeiTemporaryRamBase PEI Core crashes? Either there is a bug\r
// or I don't understand temp RAM correctly?\r
\r
SecPpiList = &PpiArray[0];\r
ASSERT (sizeof (PpiArray) >= SecReseveredMemorySize);\r
-#endif\r
+ #endif\r
// Copy existing list, and append our entries.\r
CopyMem (SecPpiList, PpiList, sizeof (EFI_PEI_PPI_DESCRIPTOR) * Index);\r
CopyMem (&SecPpiList[Index], gPrivateDispatchTable, sizeof (gPrivateDispatchTable));\r
// Find PEI Core and transfer control\r
VolumeHandle = (EFI_PEI_FV_HANDLE)(UINTN)SecCoreData->BootFirmwareVolumeBase;\r
FileHandle = NULL;\r
- Status = PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_PEI_CORE, VolumeHandle, &FileHandle);\r
+ Status = PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_PEI_CORE, VolumeHandle, &FileHandle);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = PeiServicesFfsFindSectionData (EFI_SECTION_PE32, FileHandle, &PeCoffImage);\r
#ifndef __SEC_H___\r
#define __SEC_H___\r
\r
-\r
#include <PiPei.h>\r
#include <Library/EmuMagicPageLib.h>\r
#include <Library/DebugLib.h>\r
\r
#include <Ppi/TemporaryRamSupport.h>\r
\r
-\r
//\r
// I think this should be defined in a MdePkg include file?\r
//\r
EFI_STATUS\r
EFIAPI\r
SecTemporaryRamSupport (\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
- IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
- IN UINTN CopySize\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
+ IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
+ IN UINTN CopySize\r
);\r
\r
-\r
#endif\r
-\r
#include <Ppi/EmuThunk.h>\r
#include <Protocol/EmuThunk.h>\r
\r
-\r
-\r
EFI_STATUS\r
EFIAPI\r
PeiInitialzeThunkPpiToProtocolPei (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
+\r
/*++\r
\r
Routine Description:\r
DEBUG ((DEBUG_ERROR, "Emu Thunk PEIM Loaded\n"));\r
\r
Status = PeiServicesLocatePpi (\r
- &gEmuThunkPpiGuid, // GUID\r
- 0, // INSTANCE\r
- &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
- (VOID **)&Thunk // PPI\r
- );\r
+ &gEmuThunkPpiGuid, // GUID\r
+ 0, // INSTANCE\r
+ &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
+ (VOID **)&Thunk // PPI\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
Ptr = Thunk->Thunk ();\r
//\r
// Pointer to the CPU Architectural Protocol instance\r
//\r
-EFI_CPU_ARCH_PROTOCOL *mCpu;\r
+EFI_CPU_ARCH_PROTOCOL *mCpu;\r
\r
//\r
// The Timer Architectural Protocol that this driver produces\r
//\r
-EFI_TIMER_ARCH_PROTOCOL mTimer = {\r
+EFI_TIMER_ARCH_PROTOCOL mTimer = {\r
EmuTimerDriverRegisterHandler,\r
EmuTimerDriverSetTimerPeriod,\r
EmuTimerDriverGetTimerPeriod,\r
//\r
// The notification function to call on every timer interrupt\r
//\r
-EFI_TIMER_NOTIFY mTimerNotifyFunction = NULL;\r
+EFI_TIMER_NOTIFY mTimerNotifyFunction = NULL;\r
\r
//\r
// The current period of the timer interrupt\r
//\r
-UINT64 mTimerPeriodMs;\r
-\r
+UINT64 mTimerPeriodMs;\r
\r
VOID\r
EFIAPI\r
-TimerCallback (UINT64 DeltaMs)\r
+TimerCallback (\r
+ UINT64 DeltaMs\r
+ )\r
{\r
EFI_TPL OriginalTPL;\r
EFI_TIMER_NOTIFY CallbackFunction;\r
\r
-\r
OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
\r
if (OriginalTPL < TPL_HIGH_LEVEL) {\r
}\r
\r
gBS->RestoreTPL (OriginalTPL);\r
-\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
EmuTimerDriverRegisterHandler (\r
- IN EFI_TIMER_ARCH_PROTOCOL *This,\r
- IN EFI_TIMER_NOTIFY NotifyFunction\r
+ IN EFI_TIMER_ARCH_PROTOCOL *This,\r
+ IN EFI_TIMER_NOTIFY NotifyFunction\r
)\r
+\r
/*++\r
\r
Routine Description:\r
//\r
// Check for invalid parameters\r
//\r
- if (NotifyFunction == NULL && mTimerNotifyFunction == NULL) {\r
+ if ((NotifyFunction == NULL) && (mTimerNotifyFunction == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (NotifyFunction != NULL && mTimerNotifyFunction != NULL) {\r
+ if ((NotifyFunction != NULL) && (mTimerNotifyFunction != NULL)) {\r
return EFI_ALREADY_STARTED;\r
}\r
\r
/* Enable Timer. */\r
gEmuThunk->SetTimer (mTimerPeriodMs, TimerCallback);\r
}\r
+\r
mTimerNotifyFunction = NotifyFunction;\r
\r
return EFI_SUCCESS;\r
IN EFI_TIMER_ARCH_PROTOCOL *This,\r
IN UINT64 TimerPeriod\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
-\r
//\r
// If TimerPeriod is 0, then the timer thread should be canceled\r
// If the TimerPeriod is valid, then create and/or adjust the period of the timer thread\r
//\r
- if (TimerPeriod == 0\r
- || ((TimerPeriod > TIMER_MINIMUM_VALUE)\r
- && (TimerPeriod < TIMER_MAXIMUM_VALUE))) {\r
+ if ( (TimerPeriod == 0)\r
+ || ( (TimerPeriod > TIMER_MINIMUM_VALUE)\r
+ && (TimerPeriod < TIMER_MAXIMUM_VALUE)))\r
+ {\r
mTimerPeriodMs = DivU64x32 (TimerPeriod + 5000, 10000);\r
\r
gEmuThunk->SetTimer (mTimerPeriodMs, TimerCallback);\r
EFI_STATUS\r
EFIAPI\r
EmuTimerDriverGetTimerPeriod (\r
- IN EFI_TIMER_ARCH_PROTOCOL *This,\r
- OUT UINT64 *TimerPeriod\r
+ IN EFI_TIMER_ARCH_PROTOCOL *This,\r
+ OUT UINT64 *TimerPeriod\r
)\r
+\r
/*++\r
\r
Routine Description:\r
EmuTimerDriverGenerateSoftInterrupt (\r
IN EFI_TIMER_ARCH_PROTOCOL *This\r
)\r
+\r
/*++\r
\r
Routine Description:\r
IN EFI_HANDLE ImageHandle,\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
+\r
/*++\r
\r
Routine Description:\r
return Status;\r
}\r
\r
-\r
return EFI_SUCCESS;\r
}\r
#ifndef _TIMER_H_\r
#define _TIMER_H_\r
\r
-\r
-\r
-\r
//\r
// Legal timer value range in 100 ns units\r
//\r
-#define TIMER_MINIMUM_VALUE 0\r
-#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)\r
+#define TIMER_MINIMUM_VALUE 0\r
+#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)\r
\r
//\r
// Default timer value in 100 ns units (50 ms)\r
//\r
-#define DEFAULT_TIMER_TICK_DURATION 500000\r
+#define DEFAULT_TIMER_TICK_DURATION 500000\r
\r
//\r
// Function Prototypes\r
EFI_STATUS\r
EFIAPI\r
EmuTimerDriverGetTimerPeriod (\r
- IN EFI_TIMER_ARCH_PROTOCOL *This,\r
- OUT UINT64 *TimerPeriod\r
+ IN EFI_TIMER_ARCH_PROTOCOL *This,\r
+ OUT UINT64 *TimerPeriod\r
);\r
\r
EFI_STATUS\r
\r
**/\r
\r
-\r
#include "Host.h"\r
\r
#ifdef __APPLE__\r
\r
+ #include <Library/NetLib.h>\r
\r
-#include <Library/NetLib.h>\r
-\r
-\r
-#define EMU_SNP_PRIVATE_SIGNATURE SIGNATURE_32('E', 'M', 's', 'n')\r
+#define EMU_SNP_PRIVATE_SIGNATURE SIGNATURE_32('E', 'M', 's', 'n')\r
typedef struct {\r
- UINTN Signature;\r
+ UINTN Signature;\r
\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EMU_SNP_PROTOCOL EmuSnp;\r
- EFI_SIMPLE_NETWORK_MODE *Mode;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EMU_SNP_PROTOCOL EmuSnp;\r
+ EFI_SIMPLE_NETWORK_MODE *Mode;\r
\r
- int BpfFd;\r
- char *InterfaceName;\r
- EFI_MAC_ADDRESS MacAddress;\r
- u_int ReadBufferSize;\r
- VOID *ReadBuffer;\r
+ int BpfFd;\r
+ char *InterfaceName;\r
+ EFI_MAC_ADDRESS MacAddress;\r
+ u_int ReadBufferSize;\r
+ VOID *ReadBuffer;\r
\r
//\r
// Two walking pointers to manage the multiple packets that can be returned\r
// in a single read.\r
//\r
- VOID *CurrentReadPointer;\r
- VOID *EndReadPointer;\r
-\r
- UINT32 ReceivedPackets;\r
- UINT32 DroppedPackets;\r
+ VOID *CurrentReadPointer;\r
+ VOID *EndReadPointer;\r
\r
+ UINT32 ReceivedPackets;\r
+ UINT32 DroppedPackets;\r
} EMU_SNP_PRIVATE;\r
\r
#define EMU_SNP_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, EMU_SNP_PRIVATE, EmuSnp, EMU_SNP_PRIVATE_SIGNATURE)\r
\r
-\r
//\r
// Strange, but there doesn't appear to be any structure for the Ethernet header in edk2...\r
//\r
\r
typedef struct {\r
- UINT8 DstAddr[NET_ETHER_ADDR_LEN];\r
- UINT8 SrcAddr[NET_ETHER_ADDR_LEN];\r
- UINT16 Type;\r
+ UINT8 DstAddr[NET_ETHER_ADDR_LEN];\r
+ UINT8 SrcAddr[NET_ETHER_ADDR_LEN];\r
+ UINT16 Type;\r
} ETHERNET_HEADER;\r
\r
/**\r
IN EFI_SIMPLE_NETWORK_MODE *Mode\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-static struct bpf_insn mFilterInstructionTemplate[] = {\r
+static struct bpf_insn mFilterInstructionTemplate[] = {\r
// Load 4 bytes from the destination MAC address.\r
- BPF_STMT (BPF_LD + BPF_W + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[0])),\r
+ BPF_STMT (BPF_LD + BPF_W + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[0])),\r
\r
// Compare to first 4 bytes of fake MAC address.\r
- BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x12345678, 0, 3 ),\r
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x12345678, 0, 3),\r
\r
// Load remaining 2 bytes from the destination MAC address.\r
- BPF_STMT (BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( ETHERNET_HEADER, DstAddr[4])),\r
+ BPF_STMT (BPF_LD + BPF_H + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[4])),\r
\r
// Compare to remaining 2 bytes of fake MAC address.\r
- BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x9ABC, 5, 0 ),\r
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x9ABC, 5, 0),\r
\r
// Load 4 bytes from the destination MAC address.\r
- BPF_STMT (BPF_LD + BPF_W + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[0])),\r
+ BPF_STMT (BPF_LD + BPF_W + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[0])),\r
\r
// Compare to first 4 bytes of broadcast MAC address.\r
- BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0xFFFFFFFF, 0, 2),\r
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0xFFFFFFFF, 0, 2),\r
\r
// Load remaining 2 bytes from the destination MAC address.\r
- BPF_STMT (BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( ETHERNET_HEADER, DstAddr[4])),\r
+ BPF_STMT (BPF_LD + BPF_H + BPF_ABS, OFFSET_OF (ETHERNET_HEADER, DstAddr[4])),\r
\r
// Compare to remaining 2 bytes of broadcast MAC address.\r
- BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0xFFFF, 1, 0),\r
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0xFFFF, 1, 0),\r
\r
// Reject packet.\r
- BPF_STMT (BPF_RET + BPF_K, 0),\r
+ BPF_STMT (BPF_RET + BPF_K, 0),\r
\r
// Receive entire packet.\r
- BPF_STMT (BPF_RET + BPF_K, -1)\r
+ BPF_STMT (BPF_RET + BPF_K, -1)\r
};\r
\r
-\r
EFI_STATUS\r
OpenBpfFileDescriptor (\r
IN EMU_SNP_PRIVATE *Private,\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
/**\r
Changes the state of a network interface from "stopped" to "started".\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SNP_PRIVATE *Private;\r
- struct ifreq BoundIf;\r
- struct bpf_program BpfProgram;\r
- struct bpf_insn *FilterProgram;\r
+ EFI_STATUS Status;\r
+ EMU_SNP_PRIVATE *Private;\r
+ struct ifreq BoundIf;\r
+ struct bpf_program BpfProgram;\r
+ struct bpf_insn *FilterProgram;\r
u_int Value;\r
u_int ReadBufferSize;\r
- UINT16 Temp16;\r
- UINT32 Temp32;\r
+ UINT16 Temp16;\r
+ UINT32 Temp32;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
break;\r
}\r
\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
Private->ReadBuffer = NULL;\r
if (Private->BpfFd == 0) {\r
Status = OpenBpfFileDescriptor (Private, &Private->BpfFd);\r
// Allocate read buffer.\r
//\r
Private->ReadBufferSize = ReadBufferSize;\r
- Private->ReadBuffer = malloc (Private->ReadBufferSize);\r
+ Private->ReadBuffer = malloc (Private->ReadBufferSize);\r
if (Private->ReadBuffer == NULL) {\r
goto ErrorExit;\r
}\r
// Install our packet filter: successful reads should only produce broadcast or unicast\r
// packets directed to our fake MAC address.\r
//\r
- FilterProgram = malloc (sizeof (mFilterInstructionTemplate)) ;\r
+ FilterProgram = malloc (sizeof (mFilterInstructionTemplate));\r
if ( FilterProgram == NULL ) {\r
goto ErrorExit;\r
}\r
CopyMem (&Temp16, &Private->Mode->CurrentAddress.Addr[4], sizeof (UINT16));\r
FilterProgram[3].k = NTOHS (Temp16);\r
\r
- BpfProgram.bf_len = sizeof (mFilterInstructionTemplate) / sizeof (struct bpf_insn);\r
+ BpfProgram.bf_len = sizeof (mFilterInstructionTemplate) / sizeof (struct bpf_insn);\r
BpfProgram.bf_insns = FilterProgram;\r
\r
if (ioctl (Private->BpfFd, BIOCSETF, &BpfProgram) < 0) {\r
goto DeviceErrorExit;\r
}\r
\r
-\r
Private->Mode->State = EfiSimpleNetworkStarted;\r
}\r
\r
free (Private->ReadBuffer);\r
Private->ReadBuffer = NULL;\r
}\r
+\r
return Status;\r
}\r
\r
-\r
/**\r
Changes the state of a network interface from "started" to "stopped".\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
}\r
\r
if (Private->ReadBuffer != NULL) {\r
- free (Private->ReadBuffer );\r
+ free (Private->ReadBuffer);\r
Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer = NULL;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Resets a network adapter and allocates the transmit and receive buffers\r
required by the network interface; optionally, also requests allocation\r
**/\r
EFI_STATUS\r
EmuSnpInitialize (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
break;\r
}\r
\r
- Private->Mode->MCastFilterCount = 0;\r
+ Private->Mode->MCastFilterCount = 0;\r
Private->Mode->ReceiveFilterSetting = 0;\r
ZeroMem (Private->Mode->MCastFilter, sizeof (Private->Mode->MCastFilter));\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Resets a network adapter and re-initializes it with the parameters that were\r
provided in the previous call to Initialize().\r
**/\r
EFI_STATUS\r
EmuSnpReset (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Resets a network adapter and leaves it in a state that is safe for\r
another driver to initialize.\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
Private->Mode->State = EfiSimpleNetworkStarted;\r
\r
Private->Mode->ReceiveFilterSetting = 0;\r
- Private->Mode->MCastFilterCount = 0;\r
+ Private->Mode->MCastFilterCount = 0;\r
ZeroMem (Private->Mode->MCastFilter, sizeof (Private->Mode->MCastFilter));\r
\r
if (Private->BpfFd != 0) {\r
**/\r
EFI_STATUS\r
EmuSnpReceiveFilters (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINT32 Enable,\r
- IN UINT32 Disable,\r
- IN BOOLEAN ResetMCastFilter,\r
- IN UINTN MCastFilterCnt OPTIONAL,\r
- IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINT32 Enable,\r
+ IN UINT32 Disable,\r
+ IN BOOLEAN ResetMCastFilter,\r
+ IN UINTN MCastFilterCnt OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Modifies or resets the current station address, if supported.\r
\r
**/\r
EFI_STATUS\r
EmuSnpStationAddress (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS *New OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *New OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
/**\r
Resets or collects the statistics on a network interface.\r
\r
**/\r
EFI_STATUS\r
EmuSnpStatistics (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN *StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
/**\r
Converts a multicast IP address to a multicast HW MAC address.\r
\r
**/\r
EFI_STATUS\r
EmuSnpMCastIpToMac (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN IPv6,\r
- IN EFI_IP_ADDRESS *IP,\r
- OUT EFI_MAC_ADDRESS *MAC\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN IPv6,\r
+ IN EFI_IP_ADDRESS *IP,\r
+ OUT EFI_MAC_ADDRESS *MAC\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
/**\r
Performs read and write operations on the NVRAM device attached to a\r
network interface.\r
**/\r
EFI_STATUS\r
EmuSnpNvData (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ReadWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID *Buffer\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ReadWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpGetStatus (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINT32 *InterruptStatus OPTIONAL,\r
- OUT VOID **TxBuf OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus OPTIONAL,\r
+ OUT VOID **TxBuf OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Places a packet in the transmit queue of a network interface.\r
\r
**/\r
EFI_STATUS\r
EmuSnpTransmit (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer,\r
- IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- IN UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
- ETHERNET_HEADER *EnetHeader;\r
+ EMU_SNP_PRIVATE *Private;\r
+ ETHERNET_HEADER *EnetHeader;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
SrcAddr = &Private->Mode->CurrentAddress;\r
}\r
\r
- EnetHeader = (ETHERNET_HEADER *) Buffer;\r
+ EnetHeader = (ETHERNET_HEADER *)Buffer;\r
\r
CopyMem (EnetHeader->DstAddr, DestAddr, NET_ETHER_ADDR_LEN);\r
CopyMem (EnetHeader->SrcAddr, SrcAddr, NET_ETHER_ADDR_LEN);\r
\r
- EnetHeader->Type = HTONS(*Protocol);\r
+ EnetHeader->Type = HTONS (*Protocol);\r
}\r
\r
- if (write (Private->BpfFd, Buffer, BufferSize) < 0) {\r
+ if (write (Private->BpfFd, Buffer, BufferSize) < 0) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r
**/\r
EFI_STATUS\r
EmuSnpReceive (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINTN *HeaderSize OPTIONAL,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer,\r
- OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- OUT UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
- struct bpf_hdr *BpfHeader;\r
- struct bpf_stat BpfStats;\r
- ETHERNET_HEADER *EnetHeader;\r
- ssize_t Result;\r
+ EMU_SNP_PRIVATE *Private;\r
+ struct bpf_hdr *BpfHeader;\r
+ struct bpf_stat BpfStats;\r
+ ETHERNET_HEADER *EnetHeader;\r
+ ssize_t Result;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_NOT_STARTED;\r
}\r
\r
- ZeroMem (&BpfStats, sizeof( BpfStats));\r
+ ZeroMem (&BpfStats, sizeof (BpfStats));\r
\r
if (ioctl (Private->BpfFd, BIOCGSTATS, &BpfStats) == 0) {\r
Private->ReceivedPackets += BpfStats.bs_recv;\r
}\r
\r
Private->CurrentReadPointer = Private->ReadBuffer;\r
- Private->EndReadPointer = Private->CurrentReadPointer + Result;\r
+ Private->EndReadPointer = Private->CurrentReadPointer + Result;\r
}\r
\r
- BpfHeader = Private->CurrentReadPointer;\r
+ BpfHeader = Private->CurrentReadPointer;\r
EnetHeader = Private->CurrentReadPointer + BpfHeader->bh_hdrlen;\r
\r
if (BpfHeader->bh_caplen > *BufferSize) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EMU_SNP_PROTOCOL gEmuSnpProtocol = {\r
+EMU_SNP_PROTOCOL gEmuSnpProtocol = {\r
GasketSnpCreateMapping,\r
GasketSnpStart,\r
GasketSnpStop,\r
\r
EFI_STATUS\r
GetInterfaceMacAddr (\r
- EMU_SNP_PRIVATE *Private\r
+ EMU_SNP_PRIVATE *Private\r
)\r
{\r
EFI_STATUS Status;\r
);\r
\r
Status = EFI_NOT_FOUND;\r
- If = IfAddrs;\r
+ If = IfAddrs;\r
while (If != NULL) {\r
IfSdl = (struct sockaddr_dl *)If->ifa_addr;\r
\r
if (IfSdl->sdl_family == AF_LINK) {\r
- if (!AsciiStrCmp( Private->InterfaceName, If->ifa_name)) {\r
+ if (!AsciiStrCmp (Private->InterfaceName, If->ifa_name)) {\r
CopyMem (&Private->MacAddress, LLADDR (IfSdl), NET_ETHER_ADDR_LEN);\r
\r
Status = EFI_SUCCESS;\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EmuSnpThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SNP_PRIVATE *Private;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
Private->Signature = EMU_SNP_PRIVATE_SIGNATURE;\r
Private->Thunk = This;\r
CopyMem (&Private->EmuSnp, &gEmuSnpProtocol, sizeof (gEmuSnpProtocol));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EmuSnpThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SNP_PRIVATE *Private;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
-EMU_IO_THUNK_PROTOCOL gSnpThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gSnpThunkIo = {\r
&gEmuSnpProtocolGuid,\r
NULL,\r
NULL,\r
\r
#include "Host.h"\r
\r
-#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')\r
+#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')\r
typedef struct {\r
- UINTN Signature;\r
+ UINTN Signature;\r
\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
\r
- char *Filename;\r
- UINTN ReadMode;\r
- UINTN Mode;\r
+ char *Filename;\r
+ UINTN ReadMode;\r
+ UINTN Mode;\r
\r
- int fd;\r
+ int fd;\r
\r
- BOOLEAN RemovableMedia;\r
- BOOLEAN WriteProtected;\r
+ BOOLEAN RemovableMedia;\r
+ BOOLEAN WriteProtected;\r
\r
- UINT64 NumberOfBlocks;\r
- UINT32 BlockSize;\r
-\r
- EMU_BLOCK_IO_PROTOCOL EmuBlockIo;\r
- EFI_BLOCK_IO_MEDIA *Media;\r
+ UINT64 NumberOfBlocks;\r
+ UINT32 BlockSize;\r
\r
+ EMU_BLOCK_IO_PROTOCOL EmuBlockIo;\r
+ EFI_BLOCK_IO_MEDIA *Media;\r
} EMU_BLOCK_IO_PRIVATE;\r
\r
#define EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, EMU_BLOCK_IO_PRIVATE, EmuBlockIo, EMU_BLOCK_IO_PRIVATE_SIGNATURE)\r
\r
-\r
-\r
EFI_STATUS\r
EmuBlockIoReset (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
);\r
\r
-\r
/*++\r
\r
This function extends the capability of SetFilePointer to accept 64 bit parameters\r
**/\r
EFI_STATUS\r
SetFilePointer64 (\r
- IN EMU_BLOCK_IO_PRIVATE *Private,\r
- IN INT64 DistanceToMove,\r
- OUT UINT64 *NewFilePointer,\r
- IN INT32 MoveMethod\r
+ IN EMU_BLOCK_IO_PRIVATE *Private,\r
+ IN INT64 DistanceToMove,\r
+ OUT UINT64 *NewFilePointer,\r
+ IN INT32 MoveMethod\r
)\r
{\r
- EFI_STATUS Status;\r
- off_t res;\r
- off_t offset = DistanceToMove;\r
+ EFI_STATUS Status;\r
+ off_t res;\r
+ off_t offset = DistanceToMove;\r
\r
Status = EFI_SUCCESS;\r
- res = lseek (Private->fd, offset, (int)MoveMethod);\r
+ res = lseek (Private->fd, offset, (int)MoveMethod);\r
if (res == -1) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EmuBlockIoOpenDevice (\r
- IN EMU_BLOCK_IO_PRIVATE *Private\r
+ IN EMU_BLOCK_IO_PRIVATE *Private\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT64 FileSize;\r
- struct statfs buf;\r
-\r
+ EFI_STATUS Status;\r
+ UINT64 FileSize;\r
+ struct statfs buf;\r
\r
//\r
// If the device is already opened, close it\r
//\r
Private->fd = open (Private->Filename, Private->Mode, 0644);\r
if (Private->fd < 0) {\r
- printf ("EmuOpenBlock: Could not open %s: %s\n", Private->Filename, strerror(errno));\r
- Private->Media->MediaPresent = FALSE;\r
- Status = EFI_NO_MEDIA;\r
+ printf ("EmuOpenBlock: Could not open %s: %s\n", Private->Filename, strerror (errno));\r
+ Private->Media->MediaPresent = FALSE;\r
+ Status = EFI_NO_MEDIA;\r
goto Done;\r
}\r
\r
\r
if (FileSize == 0) {\r
// lseek fails on a real device. ioctl calls are OS specific\r
-#if __APPLE__\r
+ #if __APPLE__\r
{\r
- UINT32 BlockSize;\r
+ UINT32 BlockSize;\r
\r
if (ioctl (Private->fd, DKIOCGETBLOCKSIZE, &BlockSize) == 0) {\r
Private->Media->BlockSize = BlockSize;\r
}\r
+\r
if (ioctl (Private->fd, DKIOCGETBLOCKCOUNT, &Private->NumberOfBlocks) == 0) {\r
if ((Private->NumberOfBlocks == 0) && (BlockSize == 0x800)) {\r
// A DVD is ~ 4.37 GB so make up a number\r
Private->Media->LastBlock = Private->NumberOfBlocks - 1;\r
}\r
}\r
+\r
ioctl (Private->fd, DKIOCGETMAXBLOCKCOUNTWRITE, &Private->Media->OptimalTransferLengthGranularity);\r
}\r
-#else\r
+ #else\r
{\r
- size_t BlockSize;\r
- UINT64 DiskSize;\r
+ size_t BlockSize;\r
+ UINT64 DiskSize;\r
\r
if (ioctl (Private->fd, BLKSSZGET, &BlockSize) == 0) {\r
Private->Media->BlockSize = BlockSize;\r
}\r
+\r
if (ioctl (Private->fd, BLKGETSIZE64, &DiskSize) == 0) {\r
- Private->NumberOfBlocks = DivU64x32 (DiskSize, (UINT32)BlockSize);\r
+ Private->NumberOfBlocks = DivU64x32 (DiskSize, (UINT32)BlockSize);\r
Private->Media->LastBlock = Private->NumberOfBlocks - 1;\r
}\r
}\r
-#endif\r
-\r
+ #endif\r
} else {\r
Private->Media->BlockSize = Private->BlockSize;\r
- Private->NumberOfBlocks = DivU64x32 (FileSize, Private->Media->BlockSize);\r
+ Private->NumberOfBlocks = DivU64x32 (FileSize, Private->Media->BlockSize);\r
Private->Media->LastBlock = Private->NumberOfBlocks - 1;\r
\r
if (fstatfs (Private->fd, &buf) == 0) {\r
-#if __APPLE__\r
+ #if __APPLE__\r
Private->Media->OptimalTransferLengthGranularity = buf.f_iosize/buf.f_bsize;\r
-#else\r
+ #else\r
Private->Media->OptimalTransferLengthGranularity = buf.f_bsize/buf.f_bsize;\r
-#endif\r
+ #endif\r
}\r
}\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EmuBlockIoCreateMapping (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN EFI_BLOCK_IO_MEDIA *Media\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN EFI_BLOCK_IO_MEDIA *Media\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
Media->LowestAlignedLba = 0;\r
Media->LogicalBlocksPerPhysicalBlock = 0;\r
\r
-\r
// EFI_BLOCK_IO_PROTOCOL_REVISION3\r
Media->OptimalTransferLengthGranularity = 0;\r
\r
Status = EmuBlockIoOpenDevice (Private);\r
\r
-\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EmuBlockIoError (\r
- IN EMU_BLOCK_IO_PRIVATE *Private\r
+ IN EMU_BLOCK_IO_PRIVATE *Private\r
)\r
{\r
- EFI_STATUS Status;\r
- BOOLEAN ReinstallBlockIoFlag;\r
-\r
+ EFI_STATUS Status;\r
+ BOOLEAN ReinstallBlockIoFlag;\r
\r
switch (errno) {\r
-\r
- case EAGAIN:\r
- Status = EFI_NO_MEDIA;\r
- Private->Media->ReadOnly = FALSE;\r
- Private->Media->MediaPresent = FALSE;\r
- ReinstallBlockIoFlag = FALSE;\r
- break;\r
-\r
- case EACCES:\r
- Private->Media->ReadOnly = FALSE;\r
- Private->Media->MediaPresent = TRUE;\r
- Private->Media->MediaId += 1;\r
- ReinstallBlockIoFlag = TRUE;\r
- Status = EFI_MEDIA_CHANGED;\r
- break;\r
-\r
- case EROFS:\r
- Private->Media->ReadOnly = TRUE;\r
- ReinstallBlockIoFlag = FALSE;\r
- Status = EFI_WRITE_PROTECTED;\r
- break;\r
-\r
- default:\r
- ReinstallBlockIoFlag = FALSE;\r
- Status = EFI_DEVICE_ERROR;\r
- break;\r
+ case EAGAIN:\r
+ Status = EFI_NO_MEDIA;\r
+ Private->Media->ReadOnly = FALSE;\r
+ Private->Media->MediaPresent = FALSE;\r
+ ReinstallBlockIoFlag = FALSE;\r
+ break;\r
+\r
+ case EACCES:\r
+ Private->Media->ReadOnly = FALSE;\r
+ Private->Media->MediaPresent = TRUE;\r
+ Private->Media->MediaId += 1;\r
+ ReinstallBlockIoFlag = TRUE;\r
+ Status = EFI_MEDIA_CHANGED;\r
+ break;\r
+\r
+ case EROFS:\r
+ Private->Media->ReadOnly = TRUE;\r
+ ReinstallBlockIoFlag = FALSE;\r
+ Status = EFI_WRITE_PROTECTED;\r
+ break;\r
+\r
+ default:\r
+ ReinstallBlockIoFlag = FALSE;\r
+ Status = EFI_DEVICE_ERROR;\r
+ break;\r
}\r
+\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EmuBlockIoReadWriteCommon (\r
- IN EMU_BLOCK_IO_PRIVATE *Private,\r
- IN UINT32 MediaId,\r
- IN EFI_LBA Lba,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer,\r
- IN CHAR8 *CallerName\r
+ IN EMU_BLOCK_IO_PRIVATE *Private,\r
+ IN UINT32 MediaId,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN CHAR8 *CallerName\r
)\r
{\r
EFI_STATUS Status;\r
return EFI_MEDIA_CHANGED;\r
}\r
\r
- if ((UINTN) Buffer % Private->Media->IoAlign != 0) {\r
+ if ((UINTN)Buffer % Private->Media->IoAlign != 0) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
DEBUG ((DEBUG_INIT, "ReadBlocks: Attempted to read off end of device\n"));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
//\r
// Seek to End of File\r
//\r
DistanceToMove = MultU64x32 (Lba, BlockSize);\r
- Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, SEEK_SET);\r
+ Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, SEEK_SET);\r
\r
if (EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Read BufferSize bytes from Lba into Buffer.\r
\r
IN EFI_LBA LBA,\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- ssize_t len;\r
+ EFI_STATUS Status;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ ssize_t len;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
- Status = EmuBlockIoReadWriteCommon (Private, MediaId, LBA, BufferSize, Buffer, "UnixReadBlocks");\r
+ Status = EmuBlockIoReadWriteCommon (Private, MediaId, LBA, BufferSize, Buffer, "UnixReadBlocks");\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
// If we read then media is present.\r
//\r
Private->Media->MediaPresent = TRUE;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
Done:\r
if (Token != NULL) {\r
return EFI_SUCCESS;\r
}\r
}\r
+\r
return Status;\r
}\r
\r
-\r
/**\r
Write BufferSize bytes from Lba into Buffer.\r
\r
IN VOID *Buffer\r
)\r
{\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
- ssize_t len;\r
- EFI_STATUS Status;\r
-\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
+ ssize_t len;\r
+ EFI_STATUS Status;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
- Status = EmuBlockIoReadWriteCommon (Private, MediaId, LBA, BufferSize, Buffer, "UnixWriteBlocks");\r
+ Status = EmuBlockIoReadWriteCommon (Private, MediaId, LBA, BufferSize, Buffer, "UnixWriteBlocks");\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
//\r
Private->Media->MediaPresent = TRUE;\r
Private->Media->ReadOnly = FALSE;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
Done:\r
if (Token != NULL) {\r
return Status;\r
}\r
\r
-\r
/**\r
Flush the Block Device.\r
\r
**/\r
EFI_STATUS\r
EmuBlockIoFlushBlocks (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
)\r
{\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (Private->fd >= 0) {\r
fsync (Private->fd);\r
-#if __APPLE__\r
+ #if __APPLE__\r
fcntl (Private->fd, F_FULLFSYNC);\r
-#endif\r
+ #endif\r
}\r
\r
-\r
if (Token != NULL) {\r
if (Token->Event != NULL) {\r
// Caller is responsible for signaling EFI Event\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Reset the block device hardware.\r
\r
**/\r
EFI_STATUS\r
EmuBlockIoReset (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EMU_BLOCK_IO_PRIVATE *Private;\r
+ EMU_BLOCK_IO_PRIVATE *Private;\r
\r
Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
char *\r
StdDupUnicodeToAscii (\r
- IN CHAR16 *Str\r
+ IN CHAR16 *Str\r
)\r
{\r
- UINTN Size;\r
- char *Ascii;\r
- char *Ptr;\r
+ UINTN Size;\r
+ char *Ascii;\r
+ char *Ptr;\r
\r
- Size = StrLen (Str) + 1;\r
+ Size = StrLen (Str) + 1;\r
Ascii = malloc (Size);\r
if (Ascii == NULL) {\r
return NULL;\r
for (Ptr = Ascii; *Str != '\0'; Ptr++, Str++) {\r
*Ptr = *Str;\r
}\r
+\r
*Ptr = 0;\r
\r
return Ascii;\r
}\r
\r
-\r
-EMU_BLOCK_IO_PROTOCOL gEmuBlockIoProtocol = {\r
+EMU_BLOCK_IO_PROTOCOL gEmuBlockIoProtocol = {\r
GasketEmuBlockIoReset,\r
GasketEmuBlockIoReadBlocks,\r
GasketEmuBlockIoWriteBlocks,\r
\r
EFI_STATUS\r
EmuBlockIoThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_BLOCK_IO_PRIVATE *Private;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
Private->Signature = EMU_BLOCK_IO_PRIVATE_SIGNATURE;\r
Private->Thunk = This;\r
CopyMem (&Private->EmuBlockIo, &gEmuBlockIoProtocol, sizeof (gEmuBlockIoProtocol));\r
Private->WriteProtected = FALSE;\r
} else {\r
for (*Str++ = '\0'; *Str != 0; Str++) {\r
- if (*Str == 'R' || *Str == 'F') {\r
- Private->RemovableMedia = (BOOLEAN) (*Str == 'R');\r
+ if ((*Str == 'R') || (*Str == 'F')) {\r
+ Private->RemovableMedia = (BOOLEAN)(*Str == 'R');\r
}\r
- if (*Str == 'O' || *Str == 'W') {\r
- Private->WriteProtected = (BOOLEAN) (*Str == 'O');\r
+\r
+ if ((*Str == 'O') || (*Str == 'W')) {\r
+ Private->WriteProtected = (BOOLEAN)(*Str == 'O');\r
}\r
+\r
if (*Str == ':') {\r
Private->BlockSize = strtol (++Str, NULL, 0);\r
break;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EmuBlockIoThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_BLOCK_IO_PRIVATE *Private;\r
if (Private->Filename != NULL) {\r
free (Private->Filename);\r
}\r
+\r
free (This->Private);\r
This->Private = NULL;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
-EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo = {\r
&gEmuBlockIoProtocolGuid,\r
NULL,\r
NULL,\r
#include "Host.h"\r
\r
#ifdef __APPLE__\r
-#define DebugAssert _Mangle__DebugAssert\r
+#define DebugAssert _Mangle__DebugAssert\r
\r
-#include <assert.h>\r
-#include <CoreServices/CoreServices.h>\r
-#include <mach/mach.h>\r
-#include <mach/mach_time.h>\r
+ #include <CoreServices/CoreServices.h>\r
+ #include <mach/mach.h>\r
+ #include <mach/mach_time.h>\r
\r
-#undef DebugAssert\r
+ #undef DebugAssert\r
#endif\r
\r
-int settimer_initialized;\r
-struct timeval settimer_timeval;\r
-UINTN settimer_callback = 0;\r
-\r
-BOOLEAN gEmulatorInterruptEnabled = FALSE;\r
+int settimer_initialized;\r
+struct timeval settimer_timeval;\r
+UINTN settimer_callback = 0;\r
\r
+BOOLEAN gEmulatorInterruptEnabled = FALSE;\r
\r
UINTN\r
SecWriteStdErr (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- ssize_t Return;\r
+ ssize_t Return;\r
\r
Return = write (STDERR_FILENO, (const void *)Buffer, (size_t)NumberOfBytes);\r
\r
return (Return == -1) ? 0 : Return;\r
}\r
\r
-\r
EFI_STATUS\r
SecConfigStdIn (\r
VOID\r
)\r
{\r
- struct termios tty;\r
+ struct termios tty;\r
\r
//\r
// Need to turn off line buffering, ECHO, and make it unbuffered.\r
tty.c_lflag &= ~(ICANON | ECHO);\r
tcsetattr (STDIN_FILENO, TCSANOW, &tty);\r
\r
-// setvbuf (STDIN_FILENO, NULL, _IONBF, 0);\r
+ // setvbuf (STDIN_FILENO, NULL, _IONBF, 0);\r
\r
// now ioctl FIONREAD will do what we need\r
return EFI_SUCCESS;\r
\r
UINTN\r
SecWriteStdOut (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- ssize_t Return;\r
+ ssize_t Return;\r
\r
Return = write (STDOUT_FILENO, (const void *)Buffer, (size_t)NumberOfBytes);\r
\r
\r
UINTN\r
SecReadStdIn (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- ssize_t Return;\r
+ ssize_t Return;\r
\r
Return = read (STDIN_FILENO, Buffer, (size_t)NumberOfBytes);\r
\r
VOID\r
)\r
{\r
- int Result;\r
- int Bytes;\r
+ int Result;\r
+ int Bytes;\r
\r
Result = ioctl (STDIN_FILENO, FIONREAD, &Bytes);\r
if (Result == -1) {\r
return (BOOLEAN)(Bytes > 0);\r
}\r
\r
-\r
VOID *\r
SecMalloc (\r
- IN UINTN Size\r
+ IN UINTN Size\r
)\r
{\r
return malloc ((size_t)Size);\r
\r
VOID *\r
SecValloc (\r
- IN UINTN Size\r
+ IN UINTN Size\r
)\r
{\r
return valloc ((size_t)Size);\r
\r
BOOLEAN\r
SecFree (\r
- IN VOID *Ptr\r
+ IN VOID *Ptr\r
)\r
{\r
if (EfiSystemMemoryRange (Ptr)) {\r
return TRUE;\r
}\r
\r
-\r
void\r
-settimer_handler (int sig)\r
+settimer_handler (\r
+ int sig\r
+ )\r
{\r
- struct timeval timeval;\r
- UINT64 delta;\r
+ struct timeval timeval;\r
+ UINT64 delta;\r
\r
gettimeofday (&timeval, NULL);\r
delta = ((UINT64)timeval.tv_sec * 1000) + (timeval.tv_usec / 1000)\r
- - ((UINT64)settimer_timeval.tv_sec * 1000)\r
- - (settimer_timeval.tv_usec / 1000);\r
+ - ((UINT64)settimer_timeval.tv_sec * 1000)\r
+ - (settimer_timeval.tv_usec / 1000);\r
settimer_timeval = timeval;\r
\r
if (settimer_callback) {\r
IN EMU_SET_TIMER_CALLBACK CallBack\r
)\r
{\r
- struct itimerval timerval;\r
- UINT32 remainder;\r
+ struct itimerval timerval;\r
+ UINT32 remainder;\r
\r
if (!settimer_initialized) {\r
- struct sigaction act;\r
+ struct sigaction act;\r
\r
settimer_initialized = 1;\r
- act.sa_handler = settimer_handler;\r
- act.sa_flags = 0;\r
+ act.sa_handler = settimer_handler;\r
+ act.sa_flags = 0;\r
sigemptyset (&act.sa_mask);\r
gEmulatorInterruptEnabled = TRUE;\r
if (sigaction (SIGALRM, &act, NULL) != 0) {\r
printf ("SetTimer: sigaction error %s\n", strerror (errno));\r
}\r
+\r
if (gettimeofday (&settimer_timeval, NULL) != 0) {\r
printf ("SetTimer: gettimeofday error %s\n", strerror (errno));\r
}\r
}\r
- timerval.it_value.tv_sec = DivU64x32(PeriodMs, 1000);\r
- DivU64x32Remainder(PeriodMs, 1000, &remainder);\r
+\r
+ timerval.it_value.tv_sec = DivU64x32 (PeriodMs, 1000);\r
+ DivU64x32Remainder (PeriodMs, 1000, &remainder);\r
timerval.it_value.tv_usec = remainder * 1000;\r
- timerval.it_value.tv_sec = DivU64x32(PeriodMs, 1000);\r
- timerval.it_interval = timerval.it_value;\r
+ timerval.it_value.tv_sec = DivU64x32 (PeriodMs, 1000);\r
+ timerval.it_interval = timerval.it_value;\r
\r
if (setitimer (ITIMER_REAL, &timerval, NULL) != 0) {\r
printf ("SetTimer: setitimer error %s\n", strerror (errno));\r
}\r
+\r
settimer_callback = (UINTN)CallBack;\r
}\r
\r
-\r
VOID\r
SecEnableInterrupt (\r
VOID\r
pthread_sigmask (SIG_UNBLOCK, &sigset, NULL);\r
}\r
\r
-\r
VOID\r
SecDisableInterrupt (\r
VOID\r
gEmulatorInterruptEnabled = FALSE;\r
}\r
\r
-\r
BOOLEAN\r
-SecInterruptEanbled (void)\r
+SecInterruptEanbled (\r
+ void\r
+ )\r
{\r
return gEmulatorInterruptEnabled;\r
}\r
\r
-\r
UINT64\r
QueryPerformanceFrequency (\r
VOID\r
VOID\r
)\r
{\r
-#if __APPLE__\r
- UINT64 Start;\r
- static mach_timebase_info_data_t sTimebaseInfo;\r
-\r
+ #if __APPLE__\r
+ UINT64 Start;\r
+ static mach_timebase_info_data_t sTimebaseInfo;\r
\r
Start = mach_absolute_time ();\r
\r
// denominator is a fraction.\r
\r
if ( sTimebaseInfo.denom == 0 ) {\r
- (void) mach_timebase_info(&sTimebaseInfo);\r
+ (void)mach_timebase_info (&sTimebaseInfo);\r
}\r
\r
// Do the maths. We hope that the multiplication doesn't\r
// overflow; the price you pay for working in fixed point.\r
\r
return (Start * sTimebaseInfo.numer) / sTimebaseInfo.denom;\r
-#else\r
+ #else\r
// Need to figure out what to do for Linux?\r
return 0;\r
-#endif\r
+ #endif\r
}\r
\r
-\r
-\r
VOID\r
SecSleep (\r
- IN UINT64 Nanoseconds\r
+ IN UINT64 Nanoseconds\r
)\r
{\r
- struct timespec rq, rm;\r
- struct timeval start, end;\r
- unsigned long MicroSec;\r
+ struct timespec rq, rm;\r
+ struct timeval start, end;\r
+ unsigned long MicroSec;\r
\r
rq.tv_sec = DivU64x32 (Nanoseconds, 1000000000);\r
rq.tv_nsec = ModU64x32 (Nanoseconds, 1000000000);\r
//\r
gettimeofday (&start, NULL);\r
end.tv_sec = start.tv_sec + rq.tv_sec;\r
- MicroSec = (start.tv_usec + rq.tv_nsec/1000);\r
+ MicroSec = (start.tv_usec + rq.tv_nsec/1000);\r
end.tv_usec = MicroSec % 1000000;\r
if (MicroSec > 1000000) {\r
end.tv_sec++;\r
if (errno != EINTR) {\r
break;\r
}\r
+\r
gettimeofday (&start, NULL);\r
if (start.tv_sec > end.tv_sec) {\r
break;\r
- } if ((start.tv_sec == end.tv_sec) && (start.tv_usec > end.tv_usec)) {\r
+ }\r
+\r
+ if ((start.tv_sec == end.tv_sec) && (start.tv_usec > end.tv_usec)) {\r
break;\r
}\r
+\r
rq = rm;\r
}\r
}\r
\r
-\r
VOID\r
SecCpuSleep (\r
VOID\r
)\r
{\r
- struct timespec rq, rm;\r
+ struct timespec rq, rm;\r
\r
// nanosleep gets interrupted by the timer tic\r
rq.tv_sec = 1;\r
nanosleep (&rq, &rm);\r
}\r
\r
-\r
VOID\r
SecExit (\r
- UINTN Status\r
+ UINTN Status\r
)\r
{\r
exit (Status);\r
}\r
\r
-\r
VOID\r
SecGetTime (\r
- OUT EFI_TIME *Time,\r
- OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
+ OUT EFI_TIME *Time,\r
+ OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
)\r
{\r
- struct tm *tm;\r
- time_t t;\r
+ struct tm *tm;\r
+ time_t t;\r
\r
- t = time (NULL);\r
+ t = time (NULL);\r
tm = localtime (&t);\r
\r
- Time->Year = 1900 + tm->tm_year;\r
- Time->Month = tm->tm_mon + 1;\r
- Time->Day = tm->tm_mday;\r
- Time->Hour = tm->tm_hour;\r
- Time->Minute = tm->tm_min;\r
- Time->Second = tm->tm_sec;\r
+ Time->Year = 1900 + tm->tm_year;\r
+ Time->Month = tm->tm_mon + 1;\r
+ Time->Day = tm->tm_mday;\r
+ Time->Hour = tm->tm_hour;\r
+ Time->Minute = tm->tm_min;\r
+ Time->Second = tm->tm_sec;\r
Time->Nanosecond = 0;\r
- Time->TimeZone = timezone / 60;\r
- Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0)\r
- | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0);\r
+ Time->TimeZone = timezone / 60;\r
+ Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0)\r
+ | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0);\r
\r
if (Capabilities != NULL) {\r
- Capabilities->Resolution = 1;\r
- Capabilities->Accuracy = 50000000;\r
- Capabilities->SetsToZero = FALSE;\r
+ Capabilities->Resolution = 1;\r
+ Capabilities->Accuracy = 50000000;\r
+ Capabilities->SetsToZero = FALSE;\r
}\r
}\r
\r
-\r
-\r
VOID\r
SecSetTime (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
)\r
{\r
// Don't change the time on the system\r
return;\r
}\r
\r
-\r
EFI_STATUS\r
SecGetNextProtocol (\r
- IN BOOLEAN EmuBusDriver,\r
- OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
+ IN BOOLEAN EmuBusDriver,\r
+ OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
)\r
{\r
return GetNextThunkProtocol (EmuBusDriver, Instance);\r
}\r
\r
-\r
-EMU_THUNK_PROTOCOL gEmuThunkProtocol = {\r
+EMU_THUNK_PROTOCOL gEmuThunkProtocol = {\r
GasketSecWriteStdErr,\r
GasketSecConfigStdIn,\r
GasketSecWriteStdOut,\r
GasketSecGetNextProtocol\r
};\r
\r
-\r
VOID\r
SecInitThunkProtocol (\r
VOID\r
// timezone and daylight lib globals depend on tzset be called 1st.\r
tzset ();\r
}\r
-\r
UINTN\r
EFIAPI\r
GasketSecWriteStdErr (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
);\r
\r
EFI_STATUS\r
UINTN\r
EFIAPI\r
GasketSecWriteStdOut (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
);\r
\r
UINTN\r
EFIAPI\r
GasketSecReadStdIn (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
);\r
\r
BOOLEAN\r
VOID *\r
EFIAPI\r
GasketSecMalloc (\r
- IN UINTN Size\r
+ IN UINTN Size\r
);\r
\r
VOID *\r
EFIAPI\r
GasketSecValloc (\r
- IN UINTN Size\r
+ IN UINTN Size\r
);\r
\r
BOOLEAN\r
EFIAPI\r
GasketSecFree (\r
- IN VOID *Ptr\r
+ IN VOID *Ptr\r
);\r
\r
-\r
RETURN_STATUS\r
EFIAPI\r
GasketSecPeCoffGetEntryPoint (\r
VOID\r
);\r
\r
-\r
VOID\r
EFIAPI\r
GasketSecSleep (\r
- IN UINT64 Nanoseconds\r
+ IN UINT64 Nanoseconds\r
);\r
\r
VOID\r
VOID\r
EFIAPI\r
GasketSecExit (\r
- UINTN Status\r
+ UINTN Status\r
);\r
\r
VOID\r
EFIAPI\r
GasketSecGetTime (\r
- OUT EFI_TIME *Time,\r
- OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
+ OUT EFI_TIME *Time,\r
+ OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
);\r
\r
VOID\r
EFIAPI\r
GasketSecSetTime (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSecGetNextProtocol (\r
- IN BOOLEAN EmuBusDriver,\r
- OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
+ IN BOOLEAN EmuBusDriver,\r
+ OUT EMU_IO_THUNK_PROTOCOL **Instance OPTIONAL\r
);\r
\r
-\r
// PPIs produced by SEC\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
GasketSecUnixPeiAutoScan (\r
VOID\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
GasketSecUnixUnixFwhAddress (\r
IN OUT EFI_PHYSICAL_ADDRESS *FwhBase\r
);\r
\r
-\r
-\r
//\r
// Reverse (UNIX to EFIAPI) gaskets\r
//\r
\r
typedef\r
void\r
-(EFIAPI *CALL_BACK) (\r
+(EFIAPI *CALL_BACK)(\r
UINT64 Delta\r
);\r
\r
UINTN\r
ReverseGasketUint64 (\r
- UINTN CallBack,\r
- UINT64 a\r
+ UINTN CallBack,\r
+ UINT64 a\r
);\r
\r
UINTN\r
ReverseGasketUint64Uint64 (\r
- VOID *CallBack,\r
- VOID *Context,\r
- VOID *Key\r
+ VOID *CallBack,\r
+ VOID *Context,\r
+ VOID *Key\r
);\r
\r
//\r
// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL\r
//\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
GasketX11Size (\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
- UINT32 Width,\r
- UINT32 Height\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
+ UINT32 Width,\r
+ UINT32 Height\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11CheckKey (\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11GetKey (\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
- EFI_KEY_DATA *key\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
+ EFI_KEY_DATA *key\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketX11RegisterKeyNotify (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
- IN VOID *Context\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
+ IN VOID *Context\r
);\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
GasketX11Blt (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
- IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
- IN EFI_UGA_BLT_OPERATION BltOperation,\r
- IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows,\r
+ IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
+ IN EFI_UGA_BLT_OPERATION BltOperation,\r
+ IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11CheckPointer (\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11GetPointerState (\r
- EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
- EFI_SIMPLE_POINTER_STATE *state\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindowsIo,\r
+ EFI_SIMPLE_POINTER_STATE *state\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11GraphicsWindowOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketX11GraphicsWindowClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
// Pthreads\r
UINTN\r
EFIAPI\r
GasketPthreadMutexLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
);\r
\r
-\r
-\r
UINTN\r
EFIAPI\r
GasketPthreadMutexUnLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
);\r
\r
-\r
UINTN\r
EFIAPI\r
GasketPthreadMutexTryLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
);\r
\r
-\r
VOID *\r
EFIAPI\r
GasketPthreadMutexInit (\r
IN VOID\r
);\r
\r
-\r
UINTN\r
EFIAPI\r
GasketPthreadMutexDestroy (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
);\r
\r
-\r
UINTN\r
EFIAPI\r
GasketPthreadCreate (\r
- IN VOID *Thread,\r
- IN VOID *Attribute,\r
- IN THREAD_THUNK_THREAD_ENTRY Start,\r
- IN VOID *Context\r
+ IN VOID *Thread,\r
+ IN VOID *Attribute,\r
+ IN THREAD_THUNK_THREAD_ENTRY Start,\r
+ IN VOID *Context\r
);\r
\r
VOID\r
EFIAPI\r
GasketPthreadExit (\r
- IN VOID *ValuePtr\r
+ IN VOID *ValuePtr\r
);\r
\r
-\r
UINTN\r
EFIAPI\r
GasketPthreadSelf (\r
EFI_STATUS\r
EFIAPI\r
GasketPthreadOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPthreadClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
-\r
// PosixFileSystem\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixOpenVolume (\r
- IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **Root\r
+ IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **Root\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileOpen (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **NewHandle,\r
- IN CHAR16 *FileName,\r
- IN UINT64 OpenMode,\r
- IN UINT64 Attributes\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
+ IN CHAR16 *FileName,\r
+ IN UINT64 OpenMode,\r
+ IN UINT64 Attributes\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileRead (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileWrite (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileSetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN UINT64 Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN UINT64 Position\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileGetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT UINT64 *Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT UINT64 *Position\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileSystmeThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketPosixFileSystmeThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketEmuBlockIoReset (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
);\r
\r
EFI_STATUS\r
IN EFI_LBA LBA,\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketEmuBlockIoFlushBlocks (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketEmuBlockIoCreateMapping (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN EFI_BLOCK_IO_MEDIA *Media\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN EFI_BLOCK_IO_MEDIA *Media\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketBlockIoThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketBlockIoThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketSnpInitialize (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpReset (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
GasketSnpReceiveFilters (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINT32 Enable,\r
- IN UINT32 Disable,\r
- IN BOOLEAN ResetMCastFilter,\r
- IN UINTN MCastFilterCnt OPTIONAL,\r
- IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINT32 Enable,\r
+ IN UINT32 Disable,\r
+ IN BOOLEAN ResetMCastFilter,\r
+ IN UINTN MCastFilterCnt OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpStationAddress (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS *New OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *New OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpStatistics (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN *StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpMCastIpToMac (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN IPv6,\r
- IN EFI_IP_ADDRESS *IP,\r
- OUT EFI_MAC_ADDRESS *MAC\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN IPv6,\r
+ IN EFI_IP_ADDRESS *IP,\r
+ OUT EFI_MAC_ADDRESS *MAC\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpNvData (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ReadWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID *Buffer\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ReadWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpGetStatus (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINT32 *InterruptStatus OPTIONAL,\r
- OUT VOID **TxBuf OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus OPTIONAL,\r
+ OUT VOID **TxBuf OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpTransmit (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer,\r
- IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- IN UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSnpReceive (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINTN *HeaderSize OPTIONAL,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer,\r
- OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- OUT UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
);\r
\r
-\r
#endif\r
-\r
-\r
#include "Host.h"\r
\r
#ifdef __APPLE__\r
-#define MAP_ANONYMOUS MAP_ANON\r
+#define MAP_ANONYMOUS MAP_ANON\r
#endif\r
\r
-\r
//\r
// Globals\r
//\r
\r
-EMU_THUNK_PPI mSecEmuThunkPpi = {\r
+EMU_THUNK_PPI mSecEmuThunkPpi = {\r
GasketSecUnixPeiAutoScan,\r
GasketSecUnixFdAddress,\r
GasketSecEmuThunkAddress\r
};\r
\r
-char *gGdbWorkingFileName = NULL;\r
-unsigned int mScriptSymbolChangesCount = 0;\r
-\r
+char *gGdbWorkingFileName = NULL;\r
+unsigned int mScriptSymbolChangesCount = 0;\r
\r
//\r
// Default information about where the FD is located.\r
// The number of array elements is allocated base on parsing\r
// EFI_FIRMWARE_VOLUMES and the memory is never freed.\r
//\r
-UINTN gFdInfoCount = 0;\r
-EMU_FD_INFO *gFdInfo;\r
+UINTN gFdInfoCount = 0;\r
+EMU_FD_INFO *gFdInfo;\r
\r
//\r
// Array that supports separate memory ranges.\r
UINTN gSystemMemoryCount = 0;\r
EMU_SYSTEM_MEMORY *gSystemMemory;\r
\r
-\r
-\r
UINTN mImageContextModHandleArraySize = 0;\r
-IMAGE_CONTEXT_TO_MOD_HANDLE *mImageContextModHandleArray = NULL;\r
+IMAGE_CONTEXT_TO_MOD_HANDLE *mImageContextModHandleArray = NULL;\r
\r
EFI_PEI_PPI_DESCRIPTOR *gPpiList;\r
\r
-\r
-int gInXcode = 0;\r
-\r
+int gInXcode = 0;\r
\r
/*++\r
Breakpoint target for Xcode project. Set in the Xcode XML\r
{\r
}\r
\r
-\r
-\r
/*++\r
\r
Routine Description:\r
// If dlopen doesn't work, then we build a gdb script to allow the\r
// symbols to be loaded.\r
//\r
- Index = strlen (*Argv);\r
- gGdbWorkingFileName = AllocatePool (Index + strlen(".gdb") + 1);\r
+ Index = strlen (*Argv);\r
+ gGdbWorkingFileName = AllocatePool (Index + strlen (".gdb") + 1);\r
strcpy (gGdbWorkingFileName, *Argv);\r
strcat (gGdbWorkingFileName, ".gdb");\r
\r
setbuf (stdout, 0);\r
setbuf (stderr, 0);\r
\r
- MemorySizeStr = (CHAR16 *) PcdGetPtr (PcdEmuMemorySize);\r
- FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume);\r
+ MemorySizeStr = (CHAR16 *)PcdGetPtr (PcdEmuMemorySize);\r
+ FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdEmuFirmwareVolume);\r
\r
//\r
// PPIs pased into PEI_CORE\r
//\r
// Allocate space for gSystemMemory Array\r
//\r
- gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1;\r
- gSystemMemory = AllocateZeroPool (gSystemMemoryCount * sizeof (EMU_SYSTEM_MEMORY));\r
+ gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1;\r
+ gSystemMemory = AllocateZeroPool (gSystemMemoryCount * sizeof (EMU_SYSTEM_MEMORY));\r
if (gSystemMemory == NULL) {\r
printf ("ERROR : Can not allocate memory for system. Exiting.\n");\r
exit (1);\r
}\r
+\r
//\r
// Allocate space for gSystemMemory Array\r
//\r
- gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;\r
- gFdInfo = AllocateZeroPool (gFdInfoCount * sizeof (EMU_FD_INFO));\r
+ gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;\r
+ gFdInfo = AllocateZeroPool (gFdInfoCount * sizeof (EMU_FD_INFO));\r
if (gFdInfo == NULL) {\r
printf ("ERROR : Can not allocate memory for fd info. Exiting.\n");\r
exit (1);\r
// on a real platform this would be SRAM, or using the cache as RAM.\r
// Set InitialStackMemory to zero so UnixOpenFile will allocate a new mapping\r
//\r
- InitialStackMemorySize = STACK_SIZE;\r
- InitialStackMemory = (UINTN)MapMemory (\r
- 0, (UINT32) InitialStackMemorySize,\r
- PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE\r
- );\r
+ InitialStackMemorySize = STACK_SIZE;\r
+ InitialStackMemory = (UINTN)MapMemory (\r
+ 0,\r
+ (UINT32)InitialStackMemorySize,\r
+ PROT_READ | PROT_WRITE | PROT_EXEC,\r
+ MAP_ANONYMOUS | MAP_PRIVATE\r
+ );\r
if (InitialStackMemory == 0) {\r
printf ("ERROR : Can not open SecStack Exiting\n");\r
exit (1);\r
}\r
\r
- printf (" OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n",\r
+ printf (\r
+ " OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n",\r
(unsigned int)(InitialStackMemorySize / 1024),\r
(unsigned long)InitialStackMemory\r
);\r
\r
- for (StackPointer = (UINTN*) (UINTN) InitialStackMemory;\r
- StackPointer < (UINTN*)(UINTN)((UINTN) InitialStackMemory + (UINT64) InitialStackMemorySize);\r
- StackPointer ++) {\r
+ for (StackPointer = (UINTN *)(UINTN)InitialStackMemory;\r
+ StackPointer < (UINTN *)(UINTN)((UINTN)InitialStackMemory + (UINT64)InitialStackMemorySize);\r
+ StackPointer++)\r
+ {\r
*StackPointer = 0x5AA55AA5;\r
}\r
\r
//\r
// Open All the firmware volumes and remember the info in the gFdInfo global\r
//\r
- FileName = (CHAR8 *) AllocatePool (StrLen (FirmwareVolumesStr) + 1);\r
+ FileName = (CHAR8 *)AllocatePool (StrLen (FirmwareVolumesStr) + 1);\r
if (FileName == NULL) {\r
printf ("ERROR : Can not allocate memory for firmware volume string\n");\r
exit (1);\r
Index2 = 0;\r
for (Done = FALSE, Index = 0, PeiIndex = 0, SecFile = NULL;\r
FirmwareVolumesStr[Index2] != 0;\r
- Index++) {\r
+ Index++)\r
+ {\r
for (Index1 = 0; (FirmwareVolumesStr[Index2] != '!') && (FirmwareVolumesStr[Index2] != 0); Index2++) {\r
FileName[Index1++] = FirmwareVolumesStr[Index2];\r
}\r
+\r
if (FirmwareVolumesStr[Index2] == '!') {\r
Index2++;\r
}\r
- FileName[Index1] = '\0';\r
+\r
+ FileName[Index1] = '\0';\r
\r
if (Index == 0) {\r
// Map FV Recovery Read Only and other areas Read/Write\r
Status = MapFd0 (\r
- FileName,\r
- &gFdInfo[0].Address,\r
- &gFdInfo[0].Size\r
- );\r
+ FileName,\r
+ &gFdInfo[0].Address,\r
+ &gFdInfo[0].Size\r
+ );\r
} else {\r
//\r
// Open the FD and remember where it got mapped into our processes address space\r
// Maps Read Only\r
//\r
Status = MapFile (\r
- FileName,\r
- &gFdInfo[Index].Address,\r
- &gFdInfo[Index].Size\r
- );\r
+ FileName,\r
+ &gFdInfo[Index].Address,\r
+ &gFdInfo[Index].Size\r
+ );\r
}\r
+\r
if (EFI_ERROR (Status)) {\r
printf ("ERROR : Can not open Firmware Device File %s (%x). Exiting.\n", FileName, (unsigned int)Status);\r
exit (1);\r
}\r
\r
- printf (" FD loaded from %s at 0x%08lx",FileName, (unsigned long)gFdInfo[Index].Address);\r
+ printf (" FD loaded from %s at 0x%08lx", FileName, (unsigned long)gFdInfo[Index].Address);\r
\r
if (SecFile == NULL) {\r
//\r
// Load the first one we find.\r
//\r
FileHandle = NULL;\r
- Status = PeiServicesFfsFindNextFile (\r
- EFI_FV_FILETYPE_SECURITY_CORE,\r
- (EFI_PEI_FV_HANDLE)(UINTN)gFdInfo[Index].Address,\r
- &FileHandle\r
- );\r
+ Status = PeiServicesFfsFindNextFile (\r
+ EFI_FV_FILETYPE_SECURITY_CORE,\r
+ (EFI_PEI_FV_HANDLE)(UINTN)gFdInfo[Index].Address,\r
+ &FileHandle\r
+ );\r
if (!EFI_ERROR (Status)) {\r
Status = PeiServicesFfsFindSectionData (EFI_SECTION_PE32, FileHandle, &SecFile);\r
if (!EFI_ERROR (Status)) {\r
// map this memory into the SEC process memory space.\r
//\r
Index1 = 0;\r
- Index = 0;\r
+ Index = 0;\r
while (1) {\r
- UINTN val = 0;\r
+ UINTN val = 0;\r
//\r
// Save the size of the memory.\r
//\r
val = val * 10 + MemorySizeStr[Index1] - '0';\r
Index1++;\r
}\r
+\r
gSystemMemory[Index++].Size = val * 0x100000;\r
if (MemorySizeStr[Index1] == 0) {\r
break;\r
}\r
+\r
Index1++;\r
}\r
\r
//\r
// Hand off to SEC\r
//\r
- SecLoadFromCore ((UINTN) InitialStackMemory, (UINTN) InitialStackMemorySize, (UINTN) gFdInfo[0].Address, SecFile);\r
+ SecLoadFromCore ((UINTN)InitialStackMemory, (UINTN)InitialStackMemorySize, (UINTN)gFdInfo[0].Address, SecFile);\r
\r
//\r
// If we get here, then the SEC Core returned. This is an error as SEC should\r
exit (1);\r
}\r
\r
-\r
EFI_PHYSICAL_ADDRESS *\r
MapMemory (\r
- IN INTN fd,\r
- IN UINT64 length,\r
- IN INTN prot,\r
- IN INTN flags\r
+ IN INTN fd,\r
+ IN UINT64 length,\r
+ IN INTN prot,\r
+ IN INTN flags\r
)\r
{\r
- STATIC UINTN base = 0x40000000;\r
- CONST UINTN align = (1 << 24);\r
- VOID *res = NULL;\r
- BOOLEAN isAligned = 0;\r
+ STATIC UINTN base = 0x40000000;\r
+ CONST UINTN align = (1 << 24);\r
+ VOID *res = NULL;\r
+ BOOLEAN isAligned = 0;\r
\r
//\r
// Try to get an aligned block somewhere in the address space of this\r
// process.\r
//\r
- while((!isAligned) && (base != 0)) {\r
+ while ((!isAligned) && (base != 0)) {\r
res = mmap ((void *)base, length, prot, flags, fd, 0);\r
if (res == MAP_FAILED) {\r
return NULL;\r
}\r
+\r
if ((((UINTN)res) & ~(align-1)) == (UINTN)res) {\r
- isAligned=1;\r
+ isAligned = 1;\r
} else {\r
- munmap(res, length);\r
+ munmap (res, length);\r
base += align;\r
}\r
}\r
+\r
return res;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
OUT UINT64 *Length\r
)\r
{\r
- int fd;\r
- VOID *res;\r
- UINTN FileSize;\r
+ int fd;\r
+ VOID *res;\r
+ UINTN FileSize;\r
\r
fd = open (FileName, O_RDWR);\r
if (fd < 0) {\r
return EFI_NOT_FOUND;\r
}\r
- FileSize = lseek (fd, 0, SEEK_END);\r
\r
+ FileSize = lseek (fd, 0, SEEK_END);\r
\r
res = MapMemory (fd, FileSize, PROT_READ | PROT_EXEC, MAP_PRIVATE);\r
\r
return EFI_DEVICE_ERROR;\r
}\r
\r
- *Length = (UINT64) FileSize;\r
- *BaseAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) res;\r
+ *Length = (UINT64)FileSize;\r
+ *BaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)res;\r
\r
return EFI_SUCCESS;\r
}\r
OUT UINT64 *Length\r
)\r
{\r
- int fd;\r
- void *res, *res2, *res3;\r
- UINTN FileSize;\r
- UINTN FvSize;\r
- void *EmuMagicPage;\r
+ int fd;\r
+ void *res, *res2, *res3;\r
+ UINTN FileSize;\r
+ UINTN FvSize;\r
+ void *EmuMagicPage;\r
\r
fd = open (FileName, O_RDWR);\r
if (fd < 0) {\r
return EFI_NOT_FOUND;\r
}\r
+\r
FileSize = lseek (fd, 0, SEEK_END);\r
\r
FvSize = FixedPcdGet64 (PcdEmuFlashFvRecoverySize);\r
\r
// Map the rest of the FD as read/write\r
res2 = mmap (\r
- (void *)(UINTN)(FixedPcdGet64 (PcdEmuFlashFvRecoveryBase) + FvSize),\r
- FileSize - FvSize,\r
- PROT_READ | PROT_WRITE | PROT_EXEC,\r
- MAP_SHARED,\r
- fd,\r
- FvSize\r
- );\r
+ (void *)(UINTN)(FixedPcdGet64 (PcdEmuFlashFvRecoveryBase) + FvSize),\r
+ FileSize - FvSize,\r
+ PROT_READ | PROT_WRITE | PROT_EXEC,\r
+ MAP_SHARED,\r
+ fd,\r
+ FvSize\r
+ );\r
close (fd);\r
if (res2 == MAP_FAILED) {\r
perror ("MapFd0() Failed res2 =");\r
}\r
}\r
\r
- *Length = (UINT64) FileSize;\r
- *BaseAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) res;\r
+ *Length = (UINT64)FileSize;\r
+ *BaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)res;\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
VOID\r
SecLoadFromCore (\r
- IN UINTN LargestRegion,\r
- IN UINTN LargestRegionSize,\r
- IN UINTN BootFirmwareVolumeBase,\r
- IN VOID *PeiCorePe32File\r
+ IN UINTN LargestRegion,\r
+ IN UINTN LargestRegionSize,\r
+ IN UINTN BootFirmwareVolumeBase,\r
+ IN VOID *PeiCorePe32File\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_PHYSICAL_ADDRESS TopOfMemory;\r
- VOID *TopOfStack;\r
- EFI_PHYSICAL_ADDRESS PeiCoreEntryPoint;\r
- EFI_SEC_PEI_HAND_OFF *SecCoreData;\r
- UINTN PeiStackSize;\r
+ EFI_STATUS Status;\r
+ EFI_PHYSICAL_ADDRESS TopOfMemory;\r
+ VOID *TopOfStack;\r
+ EFI_PHYSICAL_ADDRESS PeiCoreEntryPoint;\r
+ EFI_SEC_PEI_HAND_OFF *SecCoreData;\r
+ UINTN PeiStackSize;\r
\r
//\r
// Compute Top Of Memory for Stack and PEI Core Allocations\r
//\r
TopOfMemory = LargestRegion + LargestRegionSize;\r
- PeiStackSize = (UINTN)RShiftU64((UINT64)STACK_SIZE,1);\r
+ PeiStackSize = (UINTN)RShiftU64 ((UINT64)STACK_SIZE, 1);\r
\r
//\r
// |-----------| <---- TemporaryRamBase + TemporaryRamSize\r
//\r
// Reservet space for storing PeiCore's parament in stack.\r
//\r
- TopOfStack = (VOID *)((UINTN)TopOfStack - sizeof (EFI_SEC_PEI_HAND_OFF) - CPU_STACK_ALIGNMENT);\r
- TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
-\r
+ TopOfStack = (VOID *)((UINTN)TopOfStack - sizeof (EFI_SEC_PEI_HAND_OFF) - CPU_STACK_ALIGNMENT);\r
+ TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
\r
//\r
// Bind this information into the SEC hand-off state\r
//\r
- SecCoreData = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;\r
- SecCoreData->DataSize = sizeof(EFI_SEC_PEI_HAND_OFF);\r
- SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;\r
+ SecCoreData = (EFI_SEC_PEI_HAND_OFF *)(UINTN)TopOfStack;\r
+ SecCoreData->DataSize = sizeof (EFI_SEC_PEI_HAND_OFF);\r
+ SecCoreData->BootFirmwareVolumeBase = (VOID *)BootFirmwareVolumeBase;\r
SecCoreData->BootFirmwareVolumeSize = PcdGet32 (PcdEmuFirmwareFdSize);\r
- SecCoreData->TemporaryRamBase = (VOID*)(UINTN)LargestRegion;\r
+ SecCoreData->TemporaryRamBase = (VOID *)(UINTN)LargestRegion;\r
SecCoreData->TemporaryRamSize = STACK_SIZE;\r
SecCoreData->StackBase = SecCoreData->TemporaryRamBase;\r
SecCoreData->StackSize = PeiStackSize;\r
- SecCoreData->PeiTemporaryRamBase = (VOID*) ((UINTN) SecCoreData->TemporaryRamBase + PeiStackSize);\r
+ SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->TemporaryRamBase + PeiStackSize);\r
SecCoreData->PeiTemporaryRamSize = STACK_SIZE - PeiStackSize;\r
\r
//\r
//\r
Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID **)&PeiCoreEntryPoint);\r
if (EFI_ERROR (Status)) {\r
- return ;\r
+ return;\r
}\r
\r
//\r
// Transfer control to the SEC Core\r
//\r
PeiSwitchStacks (\r
- (SWITCH_STACK_ENTRY_POINT) (UINTN) PeiCoreEntryPoint,\r
+ (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint,\r
SecCoreData,\r
(VOID *)gPpiList,\r
TopOfStack\r
//\r
// If we get here, then the SEC Core returned. This is an error\r
//\r
- return ;\r
+ return;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
OUT UINT64 *MemorySize\r
)\r
{\r
- void *res;\r
+ void *res;\r
\r
if (Index >= gSystemMemoryCount) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
*MemoryBase = 0;\r
- res = MapMemory (\r
- 0, gSystemMemory[Index].Size,\r
- PROT_READ | PROT_WRITE | PROT_EXEC,\r
- MAP_PRIVATE | MAP_ANONYMOUS\r
- );\r
+ res = MapMemory (\r
+ 0,\r
+ gSystemMemory[Index].Size,\r
+ PROT_READ | PROT_WRITE | PROT_EXEC,\r
+ MAP_PRIVATE | MAP_ANONYMOUS\r
+ );\r
if (res == MAP_FAILED) {\r
return EFI_DEVICE_ERROR;\r
}\r
- *MemorySize = gSystemMemory[Index].Size;\r
- *MemoryBase = (UINTN)res;\r
+\r
+ *MemorySize = gSystemMemory[Index].Size;\r
+ *MemoryBase = (UINTN)res;\r
gSystemMemory[Index].Memory = *MemoryBase;\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
BOOLEAN\r
EfiSystemMemoryRange (\r
- IN VOID *MemoryAddress\r
+ IN VOID *MemoryAddress\r
)\r
{\r
UINTN Index;\r
MemoryBase = (EFI_PHYSICAL_ADDRESS)(UINTN)MemoryAddress;\r
for (Index = 0; Index < gSystemMemoryCount; Index++) {\r
if ((MemoryBase >= gSystemMemory[Index].Memory) &&\r
- (MemoryBase < (gSystemMemory[Index].Memory + gSystemMemory[Index].Size)) ) {\r
+ (MemoryBase < (gSystemMemory[Index].Memory + gSystemMemory[Index].Size)))\r
+ {\r
return TRUE;\r
}\r
}\r
return FALSE;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
return &gEmuThunkProtocol;\r
}\r
\r
-\r
-\r
RETURN_STATUS\r
EFIAPI\r
SecPeCoffGetEntryPoint (\r
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;\r
\r
ZeroMem (&ImageContext, sizeof (ImageContext));\r
- ImageContext.Handle = Pe32Data;\r
- ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) SecImageRead;\r
+ ImageContext.Handle = Pe32Data;\r
+ ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE)SecImageRead;\r
\r
- Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
+ Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
// Relocate image to match the address where it resides\r
//\r
ImageContext.ImageAddress = (UINTN)Pe32Data;\r
- Status = PeCoffLoaderLoadImage (&ImageContext);\r
+ Status = PeCoffLoaderLoadImage (&ImageContext);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
// Or just return image entry point\r
//\r
ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer (Pe32Data);\r
- Status = PeCoffLoaderGetEntryPoint (Pe32Data, EntryPoint);\r
+ Status = PeCoffLoaderGetEntryPoint (Pe32Data, EntryPoint);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
ImageContext.EntryPoint = (UINTN)*EntryPoint;\r
}\r
\r
return Status;\r
}\r
\r
-\r
-\r
/*++\r
\r
Routine Description:\r
*FdSize = gFdInfo[Index].Size;\r
*FixUp = 0;\r
\r
- if (*FdBase == 0 && *FdSize == 0) {\r
+ if ((*FdBase == 0) && (*FdSize == 0)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
UINTN\r
CountSeparatorsInString (\r
- IN const CHAR16 *String,\r
- IN CHAR16 Separator\r
+ IN const CHAR16 *String,\r
+ IN CHAR16 Separator\r
)\r
{\r
- UINTN Count;\r
+ UINTN Count;\r
\r
for (Count = 0; *String != '\0'; String++) {\r
if (*String == Separator) {\r
return Count;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
SecImageRead (\r
- IN VOID *FileHandle,\r
- IN UINTN FileOffset,\r
- IN OUT UINTN *ReadSize,\r
- OUT VOID *Buffer\r
+ IN VOID *FileHandle,\r
+ IN UINTN FileOffset,\r
+ IN OUT UINTN *ReadSize,\r
+ OUT VOID *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
**/\r
{\r
- CHAR8 *Destination8;\r
- CHAR8 *Source8;\r
- UINTN Length;\r
+ CHAR8 *Destination8;\r
+ CHAR8 *Source8;\r
+ UINTN Length;\r
\r
- Destination8 = Buffer;\r
- Source8 = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
- Length = *ReadSize;\r
+ Destination8 = Buffer;\r
+ Source8 = (CHAR8 *)((UINTN)FileHandle + FileOffset);\r
+ Length = *ReadSize;\r
while (Length--) {\r
*(Destination8++) = *(Source8++);\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
EFI_STATUS\r
AddHandle (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
- IN VOID *ModHandle\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
+ IN VOID *ModHandle\r
)\r
{\r
- UINTN Index;\r
- IMAGE_CONTEXT_TO_MOD_HANDLE *Array;\r
- UINTN PreviousSize;\r
-\r
+ UINTN Index;\r
+ IMAGE_CONTEXT_TO_MOD_HANDLE *Array;\r
+ UINTN PreviousSize;\r
\r
Array = mImageContextModHandleArray;\r
for (Index = 0; Index < mImageContextModHandleArraySize; Index++, Array++) {\r
// copy the old values to the new location. But it does\r
// not zero the new memory area.\r
//\r
- PreviousSize = mImageContextModHandleArraySize * sizeof (IMAGE_CONTEXT_TO_MOD_HANDLE);\r
+ PreviousSize = mImageContextModHandleArraySize * sizeof (IMAGE_CONTEXT_TO_MOD_HANDLE);\r
mImageContextModHandleArraySize += MAX_IMAGE_CONTEXT_TO_MOD_HANDLE_ARRAY_SIZE;\r
\r
mImageContextModHandleArray = ReallocatePool (\r
return AddHandle (ImageContext, ModHandle);\r
}\r
\r
-\r
/*++\r
\r
Routine Description:\r
**/\r
VOID *\r
RemoveHandle (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
UINTN Index;\r
return NULL;\r
}\r
\r
-\r
-\r
BOOLEAN\r
IsPdbFile (\r
- IN CHAR8 *PdbFileName\r
+ IN CHAR8 *PdbFileName\r
)\r
{\r
- UINTN Len;\r
+ UINTN Len;\r
\r
if (PdbFileName == NULL) {\r
return FALSE;\r
}\r
\r
Len = strlen (PdbFileName);\r
- if ((Len < 5)|| (PdbFileName[Len - 4] != '.')) {\r
+ if ((Len < 5) || (PdbFileName[Len - 4] != '.')) {\r
return FALSE;\r
}\r
\r
- if ((PdbFileName[Len - 3] == 'P' || PdbFileName[Len - 3] == 'p') &&\r
- (PdbFileName[Len - 2] == 'D' || PdbFileName[Len - 2] == 'd') &&\r
- (PdbFileName[Len - 1] == 'B' || PdbFileName[Len - 1] == 'b')) {\r
+ if (((PdbFileName[Len - 3] == 'P') || (PdbFileName[Len - 3] == 'p')) &&\r
+ ((PdbFileName[Len - 2] == 'D') || (PdbFileName[Len - 2] == 'd')) &&\r
+ ((PdbFileName[Len - 1] == 'B') || (PdbFileName[Len - 1] == 'b')))\r
+ {\r
return TRUE;\r
}\r
\r
return FALSE;\r
}\r
\r
-\r
-#define MAX_SPRINT_BUFFER_SIZE 0x200\r
+#define MAX_SPRINT_BUFFER_SIZE 0x200\r
\r
void\r
PrintLoadAddress (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
if (ImageContext->PdbPointer == NULL) {\r
- fprintf (stderr,\r
+ fprintf (\r
+ stderr,\r
"0x%08lx Loading NO DEBUG with entry point 0x%08lx\n",\r
(unsigned long)(ImageContext->ImageAddress),\r
(unsigned long)ImageContext->EntryPoint\r
);\r
} else {\r
- fprintf (stderr,\r
+ fprintf (\r
+ stderr,\r
"0x%08lx Loading %s with entry point 0x%08lx\n",\r
(unsigned long)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders),\r
ImageContext->PdbPointer,\r
(unsigned long)ImageContext->EntryPoint\r
);\r
}\r
+\r
// Keep output synced up\r
fflush (stderr);\r
}\r
\r
-\r
/**\r
Loads the image using dlopen so symbols will be automatically\r
loaded by gdb.\r
**/\r
BOOLEAN\r
DlLoadImage (\r
- IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
-\r
-#ifdef __APPLE__\r
+ #ifdef __APPLE__\r
\r
return FALSE;\r
\r
-#else\r
+ #else\r
\r
- void *Handle = NULL;\r
- void *Entry = NULL;\r
+ void *Handle = NULL;\r
+ void *Entry = NULL;\r
\r
if (ImageContext->PdbPointer == NULL) {\r
return FALSE;\r
}\r
\r
fprintf (\r
- stderr,\r
- "Loading %s 0x%08lx - entry point 0x%08lx\n",\r
- ImageContext->PdbPointer,\r
- (unsigned long)ImageContext->ImageAddress,\r
- (unsigned long)ImageContext->EntryPoint\r
- );\r
+ stderr,\r
+ "Loading %s 0x%08lx - entry point 0x%08lx\n",\r
+ ImageContext->PdbPointer,\r
+ (unsigned long)ImageContext->ImageAddress,\r
+ (unsigned long)ImageContext->EntryPoint\r
+ );\r
\r
Handle = dlopen (ImageContext->PdbPointer, RTLD_NOW);\r
if (Handle != NULL) {\r
Entry = dlsym (Handle, "_ModuleEntryPoint");\r
AddHandle (ImageContext, Handle);\r
} else {\r
- printf("%s\n", dlerror());\r
+ printf ("%s\n", dlerror ());\r
}\r
\r
if (Entry != NULL) {\r
return FALSE;\r
}\r
\r
-#endif\r
+ #endif\r
}\r
\r
-\r
#ifdef __APPLE__\r
-__attribute__((noinline))\r
+__attribute__ ((noinline))\r
#endif\r
VOID\r
SecGdbScriptBreak (\r
- char *FileName,\r
- int FileNameLength,\r
- long unsigned int LoadAddress,\r
- int AddSymbolFlag\r
+ char *FileName,\r
+ int FileNameLength,\r
+ long unsigned int LoadAddress,\r
+ int AddSymbolFlag\r
)\r
{\r
return;\r
}\r
\r
-\r
/**\r
Adds the image to a gdb script so its symbols can be loaded.\r
The AddFirmwareSymbolFile helper macro is used.\r
**/\r
VOID\r
GdbScriptAddImage (\r
- IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
-\r
PrintLoadAddress (ImageContext);\r
\r
- if (ImageContext->PdbPointer != NULL && !IsPdbFile (ImageContext->PdbPointer)) {\r
+ if ((ImageContext->PdbPointer != NULL) && !IsPdbFile (ImageContext->PdbPointer)) {\r
FILE *GdbTempFile;\r
if (FeaturePcdGet (PcdEmulatorLazyLoadSymbols)) {\r
GdbTempFile = fopen (gGdbWorkingFileName, "a");\r
if (GdbTempFile != NULL) {\r
- long unsigned int SymbolsAddr = (long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders);\r
+ long unsigned int SymbolsAddr = (long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders);\r
mScriptSymbolChangesCount++;\r
fprintf (\r
GdbTempFile,\r
}\r
}\r
\r
-\r
VOID\r
EFIAPI\r
SecPeCoffRelocateImageExtraAction (\r
- IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
if (!DlLoadImage (ImageContext)) {\r
}\r
}\r
\r
-\r
/**\r
Adds the image to a gdb script so its symbols can be unloaded.\r
The RemoveFirmwareSymbolFile helper macro is used.\r
**/\r
VOID\r
GdbScriptRemoveImage (\r
- IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
FILE *GdbTempFile;\r
}\r
}\r
\r
-\r
VOID\r
EFIAPI\r
SecPeCoffUnloadImageExtraAction (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
- VOID *Handle;\r
+ VOID *Handle;\r
\r
//\r
// Check to see if the image symbols were loaded with gdb script, or dlopen\r
//\r
Handle = RemoveHandle (ImageContext);\r
if (Handle != NULL) {\r
-#ifndef __APPLE__\r
+ #ifndef __APPLE__\r
dlclose (Handle);\r
-#endif\r
+ #endif\r
return;\r
}\r
\r
GdbScriptRemoveImage (ImageContext);\r
}\r
-\r
-\r
#include <sys/time.h>\r
\r
#if __CYGWIN__\r
-#include <sys/dirent.h>\r
+ #include <sys/dirent.h>\r
#else\r
-#include <sys/dir.h>\r
+ #include <sys/dir.h>\r
#endif\r
\r
#include <sys/mman.h>\r
#include <ifaddrs.h>\r
\r
#ifdef __APPLE__\r
-#include <net/if_dl.h>\r
-#include <net/bpf.h>\r
-#include <sys/param.h>\r
-#include <sys/mount.h>\r
-#include <sys/disk.h>\r
+ #include <net/if_dl.h>\r
+ #include <net/bpf.h>\r
+ #include <sys/param.h>\r
+ #include <sys/mount.h>\r
+ #include <sys/disk.h>\r
#define _XOPEN_SOURCE\r
-#ifndef _Bool\r
- #define _Bool char // for clang debug\r
-#endif\r
+ #ifndef _Bool\r
+#define _Bool char // for clang debug\r
+ #endif\r
#else\r
-#include <termio.h>\r
-#include <sys/vfs.h>\r
-#include <linux/fs.h>\r
+ #include <termio.h>\r
+ #include <sys/vfs.h>\r
+ #include <linux/fs.h>\r
#endif\r
\r
#include <utime.h>\r
#include <Guid/FileSystemInfo.h>\r
#include <Guid/FileSystemVolumeLabelInfo.h>\r
\r
-\r
#include "Gasket.h"\r
\r
-\r
-#define STACK_SIZE 0x20000\r
+#define STACK_SIZE 0x20000\r
\r
typedef struct {\r
- EFI_PHYSICAL_ADDRESS Address;\r
- UINT64 Size;\r
+ EFI_PHYSICAL_ADDRESS Address;\r
+ UINT64 Size;\r
} EMU_FD_INFO;\r
\r
typedef struct {\r
- EFI_PHYSICAL_ADDRESS Memory;\r
- UINT64 Size;\r
+ EFI_PHYSICAL_ADDRESS Memory;\r
+ UINT64 Size;\r
} EMU_SYSTEM_MEMORY;\r
\r
-\r
-#define MAX_IMAGE_CONTEXT_TO_MOD_HANDLE_ARRAY_SIZE 0x100\r
+#define MAX_IMAGE_CONTEXT_TO_MOD_HANDLE_ARRAY_SIZE 0x100\r
\r
typedef struct {\r
- PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext;\r
- VOID *ModHandle;\r
+ PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext;\r
+ VOID *ModHandle;\r
} IMAGE_CONTEXT_TO_MOD_HANDLE;\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
SecUnixPeiLoadFile (\r
\r
VOID\r
SecLoadFromCore (\r
- IN UINTN LargestRegion,\r
- IN UINTN LargestRegionSize,\r
- IN UINTN BootFirmwareVolumeBase,\r
- IN VOID *PeiCoreFile\r
+ IN UINTN LargestRegion,\r
+ IN UINTN LargestRegionSize,\r
+ IN UINTN BootFirmwareVolumeBase,\r
+ IN VOID *PeiCoreFile\r
);\r
\r
EFI_STATUS\r
SecLoadFile (\r
- IN VOID *Pe32Data,\r
- IN EFI_PHYSICAL_ADDRESS *ImageAddress,\r
- IN UINT64 *ImageSize,\r
- IN EFI_PHYSICAL_ADDRESS *EntryPoint\r
+ IN VOID *Pe32Data,\r
+ IN EFI_PHYSICAL_ADDRESS *ImageAddress,\r
+ IN UINT64 *ImageSize,\r
+ IN EFI_PHYSICAL_ADDRESS *EntryPoint\r
);\r
\r
EFI_STATUS\r
\r
EFI_STATUS\r
SecFfsFindSectionData (\r
- IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
- IN OUT VOID **SectionData\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
+ IN OUT VOID **SectionData\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
SecUnixPeCoffLoaderLoadAsDll (\r
- IN CHAR8 *PdbFileName,\r
- IN VOID **ImageEntryPoint,\r
- OUT VOID **ModHandle\r
+ IN CHAR8 *PdbFileName,\r
+ IN VOID **ImageEntryPoint,\r
+ OUT VOID **ModHandle\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
SecUnixPeCoffLoaderFreeLibrary (\r
- OUT VOID *ModHandle\r
+ OUT VOID *ModHandle\r
);\r
\r
EFI_STATUS\r
)\r
;\r
\r
-\r
EFI_STATUS\r
GetImageReadFunction (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
- IN EFI_PHYSICAL_ADDRESS *TopOfMemory\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
+ IN EFI_PHYSICAL_ADDRESS *TopOfMemory\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
SecImageRead (\r
- IN VOID *FileHandle,\r
- IN UINTN FileOffset,\r
- IN OUT UINTN *ReadSize,\r
- OUT VOID *Buffer\r
+ IN VOID *FileHandle,\r
+ IN UINTN FileOffset,\r
+ IN OUT UINTN *ReadSize,\r
+ OUT VOID *Buffer\r
);\r
\r
CHAR16 *\r
AsciiToUnicode (\r
- IN CHAR8 *Ascii,\r
- IN UINTN *StrLen OPTIONAL\r
+ IN CHAR8 *Ascii,\r
+ IN UINTN *StrLen OPTIONAL\r
);\r
\r
UINTN\r
CountSeparatorsInString (\r
- IN const CHAR16 *String,\r
- IN CHAR16 Separator\r
+ IN const CHAR16 *String,\r
+ IN CHAR16 Separator\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
SecTemporaryRamSupport (\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
- IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
- IN UINTN CopySize\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
+ IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
+ IN UINTN CopySize\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
GasketSecTemporaryRamSupport (\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
- IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
- IN UINTN CopySize\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
+ IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
+ IN UINTN CopySize\r
);\r
\r
-\r
RETURN_STATUS\r
EFIAPI\r
SecPeCoffGetEntryPoint (\r
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
);\r
\r
-\r
VOID\r
PeiSwitchStacks (\r
IN SWITCH_STACK_ENTRY_POINT EntryPoint,\r
VOID\r
);\r
\r
-\r
EFI_PHYSICAL_ADDRESS *\r
MapMemory (\r
- INTN fd,\r
- UINT64 length,\r
- INTN prot,\r
- INTN flags);\r
+ INTN fd,\r
+ UINT64 length,\r
+ INTN prot,\r
+ INTN flags\r
+ );\r
\r
EFI_STATUS\r
MapFile (\r
\r
BOOLEAN\r
EfiSystemMemoryRange (\r
- IN VOID *MemoryAddress\r
+ IN VOID *MemoryAddress\r
+ );\r
+\r
+VOID\r
+SecSleep (\r
+ UINT64 Nanoseconds\r
);\r
\r
+VOID\r
+SecEnableInterrupt (\r
+ VOID\r
+ );\r
\r
-VOID SecSleep (UINT64 Nanoseconds);\r
-VOID SecEnableInterrupt (VOID);\r
-VOID SecDisableInterrupt (VOID);\r
-BOOLEAN SecInterruptEanbled (VOID);\r
+VOID\r
+SecDisableInterrupt (\r
+ VOID\r
+ );\r
\r
+BOOLEAN\r
+SecInterruptEanbled (\r
+ VOID\r
+ );\r
\r
-extern EMU_THUNK_PROTOCOL gEmuThunkProtocol;\r
-extern EMU_IO_THUNK_PROTOCOL gX11ThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL gPosixFileSystemThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL gPthreadThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL gSnpThunkIo;\r
+extern EMU_THUNK_PROTOCOL gEmuThunkProtocol;\r
+extern EMU_IO_THUNK_PROTOCOL gX11ThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL gPosixFileSystemThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL gPthreadThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL gSnpThunkIo;\r
\r
#endif\r
\r
#include "Host.h"\r
\r
-\r
/**\r
Transfers control to a function starting with a new stack.\r
\r
//\r
ASSERT (((UINTN)NewStack & (CPU_STACK_ALIGNMENT - 1)) == 0);\r
\r
- JumpBuffer.Eip = (UINTN)EntryPoint;\r
- JumpBuffer.Esp = (UINTN)NewStack - sizeof (VOID*);\r
- JumpBuffer.Esp -= sizeof (Context1) + sizeof (Context2);\r
- ((VOID**)JumpBuffer.Esp)[1] = Context1;\r
- ((VOID**)JumpBuffer.Esp)[2] = Context2;\r
+ JumpBuffer.Eip = (UINTN)EntryPoint;\r
+ JumpBuffer.Esp = (UINTN)NewStack - sizeof (VOID *);\r
+ JumpBuffer.Esp -= sizeof (Context1) + sizeof (Context2);\r
+ ((VOID **)JumpBuffer.Esp)[1] = Context1;\r
+ ((VOID **)JumpBuffer.Esp)[2] = Context2;\r
\r
LongJump (&JumpBuffer, (UINTN)-1);\r
\r
-\r
//\r
// PeiSwitchStacks () will never return\r
//\r
\r
**/\r
\r
-\r
#include "Host.h"\r
\r
#ifndef __APPLE__\r
\r
-#define EMU_SNP_PRIVATE_SIGNATURE SIGNATURE_32('E', 'M', 's', 'n')\r
+#define EMU_SNP_PRIVATE_SIGNATURE SIGNATURE_32('E', 'M', 's', 'n')\r
typedef struct {\r
- UINTN Signature;\r
-\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
-\r
+ UINTN Signature;\r
\r
- EMU_SNP_PROTOCOL EmuSnp;\r
- EFI_SIMPLE_NETWORK_MODE *Mode;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
\r
+ EMU_SNP_PROTOCOL EmuSnp;\r
+ EFI_SIMPLE_NETWORK_MODE *Mode;\r
} EMU_SNP_PRIVATE;\r
\r
#define EMU_SNP_PRIVATE_DATA_FROM_THIS(a) \\r
IN EFI_SIMPLE_NETWORK_MODE *Mode\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpInitialize (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpReset (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpReceiveFilters (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINT32 Enable,\r
- IN UINT32 Disable,\r
- IN BOOLEAN ResetMCastFilter,\r
- IN UINTN MCastFilterCnt OPTIONAL,\r
- IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINT32 Enable,\r
+ IN UINT32 Disable,\r
+ IN BOOLEAN ResetMCastFilter,\r
+ IN UINTN MCastFilterCnt OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpStationAddress (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS *New OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *New OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpStatistics (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN *StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpMCastIpToMac (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN IPv6,\r
- IN EFI_IP_ADDRESS *IP,\r
- OUT EFI_MAC_ADDRESS *MAC\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN IPv6,\r
+ IN EFI_IP_ADDRESS *IP,\r
+ OUT EFI_MAC_ADDRESS *MAC\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpNvData (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ReadWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID *Buffer\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ReadWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpGetStatus (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINT32 *InterruptStatus OPTIONAL,\r
- OUT VOID **TxBuf OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus OPTIONAL,\r
+ OUT VOID **TxBuf OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpTransmit (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer,\r
- IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- IN UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
EmuSnpReceive (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINTN *HeaderSize OPTIONAL,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer,\r
- OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- OUT UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
)\r
{\r
- EMU_SNP_PRIVATE *Private;\r
+ EMU_SNP_PRIVATE *Private;\r
\r
Private = EMU_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
-EMU_SNP_PROTOCOL gEmuSnpProtocol = {\r
+EMU_SNP_PROTOCOL gEmuSnpProtocol = {\r
GasketSnpCreateMapping,\r
GasketSnpStart,\r
GasketSnpStop,\r
\r
EFI_STATUS\r
EmuSnpThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SNP_PRIVATE *Private;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
Private->Signature = EMU_SNP_PRIVATE_SIGNATURE;\r
Private->Thunk = This;\r
CopyMem (&Private->EmuSnp, &gEmuSnpProtocol, sizeof (gEmuSnpProtocol));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EmuSnpThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SNP_PRIVATE *Private;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
-EMU_IO_THUNK_PROTOCOL gSnpThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gSnpThunkIo = {\r
&gEmuSnpProtocolGuid,\r
NULL,\r
NULL,\r
IN UINTN AllocationSize\r
)\r
{\r
- return (VOID*) malloc (AllocationSize);\r
+ return (VOID *)malloc (AllocationSize);\r
}\r
\r
-\r
/**\r
Allocates and zeros a buffer of type EfiBootServicesData.\r
\r
IN UINTN AllocationSize\r
)\r
{\r
- VOID *Buffer;\r
+ VOID *Buffer;\r
\r
Buffer = AllocatePool (AllocationSize);\r
if (Buffer == NULL) {\r
return Buffer;\r
}\r
\r
-\r
/**\r
Reallocates a buffer of type EfiBootServicesData.\r
\r
IN VOID *OldBuffer OPTIONAL\r
)\r
{\r
- VOID *NewBuffer;\r
+ VOID *NewBuffer;\r
\r
NewBuffer = AllocatePool (NewSize);\r
if (NewBuffer == NULL) {\r
return NewBuffer;\r
}\r
\r
-\r
/**\r
Frees a buffer that was previously allocated with one of the pool allocation functions in the\r
Memory Allocation Library.\r
VOID\r
EFIAPI\r
FreePool (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- free ((void *) Buffer);\r
+ free ((void *)Buffer);\r
}\r
-\r
\r
#include "Host.h"\r
\r
-\r
-#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'P', 'f', 's')\r
+#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'P', 'f', 's')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
- CHAR8 *FilePath;\r
- CHAR16 *VolumeLabel;\r
- BOOLEAN FileHandlesOpen;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
+ CHAR8 *FilePath;\r
+ CHAR16 *VolumeLabel;\r
+ BOOLEAN FileHandlesOpen;\r
} EMU_SIMPLE_FILE_SYSTEM_PRIVATE;\r
\r
#define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS(a) \\r
EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \\r
)\r
\r
-\r
-#define EMU_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'P', 'f', 'i')\r
+#define EMU_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'P', 'f', 'i')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
- EFI_FILE_PROTOCOL EfiFile;\r
- int fd;\r
- DIR *Dir;\r
- BOOLEAN IsRootDirectory;\r
- BOOLEAN IsDirectoryPath;\r
- BOOLEAN IsOpenedByRead;\r
- char *FileName;\r
- struct dirent *Dirent;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
+ EFI_FILE_PROTOCOL EfiFile;\r
+ int fd;\r
+ DIR *Dir;\r
+ BOOLEAN IsRootDirectory;\r
+ BOOLEAN IsDirectoryPath;\r
+ BOOLEAN IsOpenedByRead;\r
+ char *FileName;\r
+ struct dirent *Dirent;\r
} EMU_EFI_FILE_PRIVATE;\r
\r
#define EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS(a) \\r
\r
EFI_STATUS\r
PosixFileGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
PosixFileSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
);\r
\r
-\r
-EFI_FILE_PROTOCOL gPosixFileProtocol = {\r
+EFI_FILE_PROTOCOL gPosixFileProtocol = {\r
EFI_FILE_REVISION,\r
GasketPosixFileOpen,\r
GasketPosixFileCLose,\r
GasketPosixFileFlush\r
};\r
\r
-EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gPosixFileSystemProtocol = {\r
+EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gPosixFileSystemProtocol = {\r
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION,\r
GasketPosixOpenVolume,\r
};\r
\r
-\r
/**\r
Open the root directory on a volume.\r
\r
**/\r
EFI_STATUS\r
PosixOpenVolume (\r
- IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **Root\r
+ IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **Root\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
\r
- Private = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (This);\r
+ Private = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (This);\r
\r
- Status = EFI_OUT_OF_RESOURCES;\r
+ Status = EFI_OUT_OF_RESOURCES;\r
PrivateFile = malloc (sizeof (EMU_EFI_FILE_PRIVATE));\r
if (PrivateFile == NULL) {\r
goto Done;\r
if (PrivateFile->FileName == NULL) {\r
goto Done;\r
}\r
+\r
AsciiStrCpyS (\r
PrivateFile->FileName,\r
AsciiStrSize (Private->FilePath),\r
Private->FilePath\r
);\r
\r
- PrivateFile->Signature = EMU_EFI_FILE_PRIVATE_SIGNATURE;\r
- PrivateFile->Thunk = Private->Thunk;\r
- PrivateFile->SimpleFileSystem = This;\r
- PrivateFile->IsRootDirectory = TRUE;\r
- PrivateFile->IsDirectoryPath = TRUE;\r
- PrivateFile->IsOpenedByRead = TRUE;\r
+ PrivateFile->Signature = EMU_EFI_FILE_PRIVATE_SIGNATURE;\r
+ PrivateFile->Thunk = Private->Thunk;\r
+ PrivateFile->SimpleFileSystem = This;\r
+ PrivateFile->IsRootDirectory = TRUE;\r
+ PrivateFile->IsDirectoryPath = TRUE;\r
+ PrivateFile->IsOpenedByRead = TRUE;\r
\r
CopyMem (&PrivateFile->EfiFile, &gPosixFileProtocol, sizeof (EFI_FILE_PROTOCOL));\r
\r
- PrivateFile->fd = -1;\r
- PrivateFile->Dir = NULL;\r
- PrivateFile->Dirent = NULL;\r
+ PrivateFile->fd = -1;\r
+ PrivateFile->Dir = NULL;\r
+ PrivateFile->Dirent = NULL;\r
\r
*Root = &PrivateFile->EfiFile;\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
-ErrnoToEfiStatus ()\r
+ErrnoToEfiStatus (\r
+ )\r
{\r
switch (errno) {\r
- case EACCES:\r
- return EFI_ACCESS_DENIED;\r
+ case EACCES:\r
+ return EFI_ACCESS_DENIED;\r
\r
- case EDQUOT:\r
- case ENOSPC:\r
- return EFI_VOLUME_FULL;\r
+ case EDQUOT:\r
+ case ENOSPC:\r
+ return EFI_VOLUME_FULL;\r
\r
- default:\r
- return EFI_DEVICE_ERROR;\r
+ default:\r
+ return EFI_DEVICE_ERROR;\r
}\r
}\r
\r
VOID\r
CutPrefix (\r
IN CHAR8 *Str,\r
- IN UINTN Count\r
+ IN UINTN Count\r
)\r
{\r
CHAR8 *Pointer;\r
*Pointer = *(Pointer + Count);\r
}\r
\r
-\r
VOID\r
PosixSystemTimeToEfiTime (\r
- IN time_t SystemTime,\r
- OUT EFI_TIME *Time\r
+ IN time_t SystemTime,\r
+ OUT EFI_TIME *Time\r
)\r
{\r
- struct tm *tm;\r
-\r
- tm = gmtime (&SystemTime);\r
- Time->Year = tm->tm_year;\r
- Time->Month = tm->tm_mon + 1;\r
- Time->Day = tm->tm_mday;\r
- Time->Hour = tm->tm_hour;\r
- Time->Minute = tm->tm_min;\r
- Time->Second = tm->tm_sec;\r
+ struct tm *tm;\r
+\r
+ tm = gmtime (&SystemTime);\r
+ Time->Year = tm->tm_year;\r
+ Time->Month = tm->tm_mon + 1;\r
+ Time->Day = tm->tm_mday;\r
+ Time->Hour = tm->tm_hour;\r
+ Time->Minute = tm->tm_min;\r
+ Time->Second = tm->tm_sec;\r
Time->Nanosecond = 0;\r
\r
Time->TimeZone = timezone / 60;\r
Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0) | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0);\r
}\r
\r
-\r
EFI_STATUS\r
UnixSimpleFileSystemFileInfo (\r
- EMU_EFI_FILE_PRIVATE *PrivateFile,\r
- IN CHAR8 *FileName,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile,\r
+ IN CHAR8 *FileName,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Size;\r
- UINTN NameSize;\r
- UINTN ResultSize;\r
- EFI_FILE_INFO *Info;\r
- CHAR8 *RealFileName;\r
- CHAR8 *TempPointer;\r
- CHAR16 *BufferFileName;\r
- struct stat buf;\r
+ EFI_STATUS Status;\r
+ UINTN Size;\r
+ UINTN NameSize;\r
+ UINTN ResultSize;\r
+ EFI_FILE_INFO *Info;\r
+ CHAR8 *RealFileName;\r
+ CHAR8 *TempPointer;\r
+ CHAR16 *BufferFileName;\r
+ struct stat buf;\r
\r
if (FileName != NULL) {\r
RealFileName = FileName;\r
} else if (PrivateFile->IsRootDirectory) {\r
RealFileName = "";\r
} else {\r
- RealFileName = PrivateFile->FileName;\r
+ RealFileName = PrivateFile->FileName;\r
}\r
\r
TempPointer = RealFileName;\r
TempPointer++;\r
}\r
\r
- Size = SIZE_OF_EFI_FILE_INFO;\r
- NameSize = AsciiStrSize (RealFileName) * 2;\r
- ResultSize = Size + NameSize;\r
+ Size = SIZE_OF_EFI_FILE_INFO;\r
+ NameSize = AsciiStrSize (RealFileName) * 2;\r
+ ResultSize = Size + NameSize;\r
\r
if (*BufferSize < ResultSize) {\r
*BufferSize = ResultSize;\r
return EFI_BUFFER_TOO_SMALL;\r
}\r
- if (stat (FileName == NULL ? PrivateFile->FileName : FileName, &buf) < 0) {\r
+\r
+ if (stat ((FileName == NULL) ? PrivateFile->FileName : FileName, &buf) < 0) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
- Info = Buffer;\r
+ Info = Buffer;\r
ZeroMem (Info, ResultSize);\r
\r
- Info->Size = ResultSize;\r
- Info->FileSize = buf.st_size;\r
- Info->PhysicalSize = MultU64x32 (buf.st_blocks, buf.st_blksize);\r
+ Info->Size = ResultSize;\r
+ Info->FileSize = buf.st_size;\r
+ Info->PhysicalSize = MultU64x32 (buf.st_blocks, buf.st_blksize);\r
\r
PosixSystemTimeToEfiTime (buf.st_ctime, &Info->CreateTime);\r
PosixSystemTimeToEfiTime (buf.st_atime, &Info->LastAccessTime);\r
Info->Attribute |= EFI_FILE_READ_ONLY;\r
}\r
\r
- if (S_ISDIR(buf.st_mode)) {\r
+ if (S_ISDIR (buf.st_mode)) {\r
Info->Attribute |= EFI_FILE_DIRECTORY;\r
}\r
\r
-\r
- BufferFileName = (CHAR16 *)((CHAR8 *) Buffer + Size);\r
+ BufferFileName = (CHAR16 *)((CHAR8 *)Buffer + Size);\r
while (*RealFileName) {\r
*BufferFileName++ = *RealFileName++;\r
}\r
+\r
*BufferFileName = 0;\r
\r
*BufferSize = ResultSize;\r
IN UINTN Length\r
)\r
{\r
- if (Buffer == NULL || Length == 0) {\r
+ if ((Buffer == NULL) || (Length == 0)) {\r
return FALSE;\r
}\r
\r
- if (*(UINT8 *) Buffer != 0) {\r
+ if (*(UINT8 *)Buffer != 0) {\r
return FALSE;\r
}\r
\r
if (Length > 1) {\r
- if (!CompareMem (Buffer, (UINT8 *) Buffer + 1, Length - 1)) {\r
+ if (!CompareMem (Buffer, (UINT8 *)Buffer + 1, Length - 1)) {\r
return FALSE;\r
}\r
}\r
return TRUE;\r
}\r
\r
-\r
-\r
/**\r
Opens a new file relative to the source file's location.\r
\r
**/\r
EFI_STATUS\r
PosixFileOpen (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **NewHandle,\r
- IN CHAR16 *FileName,\r
- IN UINT64 OpenMode,\r
- IN UINT64 Attributes\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
+ IN CHAR16 *FileName,\r
+ IN UINT64 OpenMode,\r
+ IN UINT64 Attributes\r
)\r
{\r
- EFI_FILE_PROTOCOL *Root;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EMU_EFI_FILE_PRIVATE *NewPrivateFile;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
- EFI_STATUS Status;\r
- CHAR16 *Src;\r
- char *Dst;\r
- CHAR8 *RealFileName;\r
- char *ParseFileName;\r
- char *GuardPointer;\r
- CHAR8 TempChar;\r
- UINTN Count;\r
- BOOLEAN TrailingDash;\r
- BOOLEAN LoopFinish;\r
- UINTN InfoSize;\r
- EFI_FILE_INFO *Info;\r
- struct stat finfo;\r
- int res;\r
- UINTN Size;\r
-\r
- PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
- PrivateRoot = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
- NewPrivateFile = NULL;\r
- Status = EFI_OUT_OF_RESOURCES;\r
+ EFI_FILE_PROTOCOL *Root;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EMU_EFI_FILE_PRIVATE *NewPrivateFile;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ EFI_STATUS Status;\r
+ CHAR16 *Src;\r
+ char *Dst;\r
+ CHAR8 *RealFileName;\r
+ char *ParseFileName;\r
+ char *GuardPointer;\r
+ CHAR8 TempChar;\r
+ UINTN Count;\r
+ BOOLEAN TrailingDash;\r
+ BOOLEAN LoopFinish;\r
+ UINTN InfoSize;\r
+ EFI_FILE_INFO *Info;\r
+ struct stat finfo;\r
+ int res;\r
+ UINTN Size;\r
+\r
+ PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateRoot = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
+ NewPrivateFile = NULL;\r
+ Status = EFI_OUT_OF_RESOURCES;\r
\r
//\r
// BUGBUG: assume an open of root\r
//\r
TrailingDash = FALSE;\r
if ((StrCmp (FileName, L"\\") == 0) ||\r
- (StrCmp (FileName, L".") == 0 && PrivateFile->IsRootDirectory)) {\r
+ ((StrCmp (FileName, L".") == 0) && PrivateFile->IsRootDirectory))\r
+ {\r
OpenRoot:\r
- Status = PosixOpenVolume (PrivateFile->SimpleFileSystem, &Root);\r
- NewPrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (Root);\r
+ Status = PosixOpenVolume (PrivateFile->SimpleFileSystem, &Root);\r
+ NewPrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (Root);\r
goto Done;\r
}\r
\r
if (FileName[StrLen (FileName) - 1] == L'\\') {\r
- TrailingDash = TRUE;\r
- FileName[StrLen (FileName) - 1] = 0;\r
+ TrailingDash = TRUE;\r
+ FileName[StrLen (FileName) - 1] = 0;\r
}\r
\r
//\r
\r
CopyMem (NewPrivateFile, PrivateFile, sizeof (EMU_EFI_FILE_PRIVATE));\r
\r
- Size = AsciiStrSize (PrivateFile->FileName) + 1 + StrLen (FileName) + 1;\r
+ Size = AsciiStrSize (PrivateFile->FileName) + 1 + StrLen (FileName) + 1;\r
NewPrivateFile->FileName = malloc (Size);\r
if (NewPrivateFile->FileName == NULL) {\r
goto Done;\r
AsciiStrCpyS (NewPrivateFile->FileName, Size, PrivateFile->FileName);\r
Src = FileName;\r
}\r
- Dst = NewPrivateFile->FileName + AsciiStrLen (NewPrivateFile->FileName);\r
+\r
+ Dst = NewPrivateFile->FileName + AsciiStrLen (NewPrivateFile->FileName);\r
GuardPointer = NewPrivateFile->FileName + AsciiStrLen (PrivateRoot->FilePath);\r
- *Dst++ = '/';\r
+ *Dst++ = '/';\r
// Convert unicode to ascii and '\' to '/'\r
while (*Src) {\r
if (*Src == '\\') {\r
} else {\r
*Dst++ = *Src;\r
}\r
+\r
Src++;\r
}\r
- *Dst = 0;\r
\r
+ *Dst = 0;\r
\r
//\r
// Get rid of . and .., except leading . or ..\r
// GuardPointer protect simplefilesystem root path not be destroyed\r
//\r
\r
- LoopFinish = FALSE;\r
+ LoopFinish = FALSE;\r
while (!LoopFinish) {\r
LoopFinish = TRUE;\r
\r
for (ParseFileName = GuardPointer; *ParseFileName; ParseFileName++) {\r
- if (*ParseFileName == '.' &&\r
- (*(ParseFileName + 1) == 0 || *(ParseFileName + 1) == '/') &&\r
- *(ParseFileName - 1) == '/'\r
- ) {\r
-\r
+ if ((*ParseFileName == '.') &&\r
+ ((*(ParseFileName + 1) == 0) || (*(ParseFileName + 1) == '/')) &&\r
+ (*(ParseFileName - 1) == '/')\r
+ )\r
+ {\r
//\r
// cut /.\r
//\r
break;\r
}\r
\r
- if (*ParseFileName == '.' &&\r
- *(ParseFileName + 1) == '.' &&\r
- (*(ParseFileName + 2) == 0 || *(ParseFileName + 2) == '/') &&\r
- *(ParseFileName - 1) == '/'\r
- ) {\r
-\r
+ if ((*ParseFileName == '.') &&\r
+ (*(ParseFileName + 1) == '.') &&\r
+ ((*(ParseFileName + 2) == 0) || (*(ParseFileName + 2) == '/')) &&\r
+ (*(ParseFileName - 1) == '/')\r
+ )\r
+ {\r
ParseFileName--;\r
Count = 3;\r
\r
goto OpenRoot;\r
}\r
\r
- RealFileName = NewPrivateFile->FileName + AsciiStrLen(NewPrivateFile->FileName) - 1;\r
+ RealFileName = NewPrivateFile->FileName + AsciiStrLen (NewPrivateFile->FileName) - 1;\r
while (RealFileName > NewPrivateFile->FileName && *RealFileName != '/') {\r
RealFileName--;\r
}\r
*(RealFileName - 1) = 0;\r
*(RealFileName - 1) = TempChar;\r
\r
-\r
//\r
// Test whether file or directory\r
//\r
NewPrivateFile->IsRootDirectory = FALSE;\r
- NewPrivateFile->fd = -1;\r
- NewPrivateFile->Dir = NULL;\r
+ NewPrivateFile->fd = -1;\r
+ NewPrivateFile->Dir = NULL;\r
if (OpenMode & EFI_FILE_MODE_CREATE) {\r
if (Attributes & EFI_FILE_DIRECTORY) {\r
NewPrivateFile->IsDirectoryPath = TRUE;\r
}\r
} else {\r
res = stat (NewPrivateFile->FileName, &finfo);\r
- if (res == 0 && S_ISDIR(finfo.st_mode)) {\r
+ if ((res == 0) && S_ISDIR (finfo.st_mode)) {\r
NewPrivateFile->IsDirectoryPath = TRUE;\r
} else {\r
NewPrivateFile->IsDirectoryPath = FALSE;\r
//\r
if (mkdir (NewPrivateFile->FileName, 0777) != 0) {\r
if (errno != EEXIST) {\r
- //free (TempFileName);\r
+ // free (TempFileName);\r
Status = EFI_ACCESS_DENIED;\r
goto Done;\r
}\r
\r
goto Done;\r
}\r
-\r
} else {\r
//\r
// deal with file\r
//\r
NewPrivateFile->fd = open (\r
- NewPrivateFile->FileName,\r
- ((OpenMode & EFI_FILE_MODE_CREATE) ? O_CREAT : 0) | (NewPrivateFile->IsOpenedByRead ? O_RDONLY : O_RDWR),\r
- 0666\r
- );\r
+ NewPrivateFile->FileName,\r
+ ((OpenMode & EFI_FILE_MODE_CREATE) ? O_CREAT : 0) | (NewPrivateFile->IsOpenedByRead ? O_RDONLY : O_RDWR),\r
+ 0666\r
+ );\r
if (NewPrivateFile->fd < 0) {\r
if (errno == ENOENT) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if ((OpenMode & EFI_FILE_MODE_CREATE) && Status == EFI_SUCCESS) {\r
+ if ((OpenMode & EFI_FILE_MODE_CREATE) && (Status == EFI_SUCCESS)) {\r
//\r
// Set the attribute\r
//\r
- InfoSize = 0;\r
- Info = NULL;\r
- Status = PosixFileGetInfo (&NewPrivateFile->EfiFile, &gEfiFileInfoGuid, &InfoSize, Info);\r
+ InfoSize = 0;\r
+ Info = NULL;\r
+ Status = PosixFileGetInfo (&NewPrivateFile->EfiFile, &gEfiFileInfoGuid, &InfoSize, Info);\r
if (Status != EFI_BUFFER_TOO_SMALL) {\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
free (Info);\r
}\r
\r
-Done: ;\r
+Done:;\r
if (TrailingDash) {\r
- FileName[StrLen (FileName) + 1] = 0;\r
- FileName[StrLen (FileName)] = L'\\';\r
+ FileName[StrLen (FileName) + 1] = 0;\r
+ FileName[StrLen (FileName)] = L'\\';\r
}\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Close the file handle\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->fd >= 0) {\r
close (PrivateFile->fd);\r
}\r
+\r
if (PrivateFile->Dir != NULL) {\r
closedir (PrivateFile->Dir);\r
}\r
\r
- PrivateFile->fd = -1;\r
+ PrivateFile->fd = -1;\r
PrivateFile->Dir = NULL;\r
\r
if (PrivateFile->FileName) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Close and delete the file handle.\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
Status = EFI_WARN_DELETE_FAILURE;\r
return Status;\r
}\r
\r
-\r
/**\r
Read data from the file.\r
\r
**/\r
EFI_STATUS\r
PosixFileRead (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_STATUS Status;\r
- int Res;\r
- UINTN Size;\r
- UINTN NameSize;\r
- UINTN ResultSize;\r
- CHAR8 *FullFileName;\r
- UINTN FullFileNameSize;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ int Res;\r
+ UINTN Size;\r
+ UINTN NameSize;\r
+ UINTN ResultSize;\r
+ CHAR8 *FullFileName;\r
+ UINTN FullFileNameSize;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
}\r
+\r
*BufferSize = Res;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
goto Done;\r
}\r
\r
PrivateFile->Dirent = readdir (PrivateFile->Dir);\r
if (PrivateFile->Dirent == NULL) {\r
*BufferSize = 0;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
goto Done;\r
}\r
}\r
\r
- Size = SIZE_OF_EFI_FILE_INFO;\r
- NameSize = AsciiStrLen (PrivateFile->Dirent->d_name) + 1;\r
- ResultSize = Size + 2 * NameSize;\r
+ Size = SIZE_OF_EFI_FILE_INFO;\r
+ NameSize = AsciiStrLen (PrivateFile->Dirent->d_name) + 1;\r
+ ResultSize = Size + 2 * NameSize;\r
\r
if (*BufferSize < ResultSize) {\r
*BufferSize = ResultSize;\r
- Status = EFI_BUFFER_TOO_SMALL;\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
goto Done;\r
}\r
- Status = EFI_SUCCESS;\r
+\r
+ Status = EFI_SUCCESS;\r
\r
*BufferSize = ResultSize;\r
\r
- FullFileNameSize = AsciiStrLen(PrivateFile->FileName) + 1 + NameSize;\r
- FullFileName = malloc (FullFileNameSize);\r
+ FullFileNameSize = AsciiStrLen (PrivateFile->FileName) + 1 + NameSize;\r
+ FullFileName = malloc (FullFileNameSize);\r
if (FullFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
AsciiStrCatS (FullFileName, FullFileNameSize, "/");\r
AsciiStrCatS (FullFileName, FullFileNameSize, PrivateFile->Dirent->d_name);\r
Status = UnixSimpleFileSystemFileInfo (\r
- PrivateFile,\r
- FullFileName,\r
- BufferSize,\r
- Buffer\r
- );\r
+ PrivateFile,\r
+ FullFileName,\r
+ BufferSize,\r
+ Buffer\r
+ );\r
free (FullFileName);\r
\r
PrivateFile->Dirent = NULL;\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Write data to a file.\r
\r
**/\r
EFI_STATUS\r
PosixFileWrite (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
EMU_EFI_FILE_PRIVATE *PrivateFile;\r
int Res;\r
\r
-\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->fd < 0) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Set a files current position\r
\r
**/\r
EFI_STATUS\r
PosixFileSetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN UINT64 Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN UINT64 Position\r
)\r
{\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- off_t Pos;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ off_t Pos;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->Dir == NULL) {\r
return EFI_DEVICE_ERROR;\r
}\r
+\r
rewinddir (PrivateFile->Dir);\r
return EFI_SUCCESS;\r
} else {\r
- if (Position == (UINT64) -1) {\r
+ if (Position == (UINT64)-1) {\r
Pos = lseek (PrivateFile->fd, 0, SEEK_END);\r
} else {\r
Pos = lseek (PrivateFile->fd, Position, SEEK_SET);\r
}\r
+\r
if (Pos == (off_t)-1) {\r
return ErrnoToEfiStatus ();\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
}\r
\r
-\r
-\r
/**\r
Get a file's current position\r
\r
**/\r
EFI_STATUS\r
PosixFileGetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT UINT64 *Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT UINT64 *Position\r
)\r
{\r
EFI_STATUS Status;\r
EMU_EFI_FILE_PRIVATE *PrivateFile;\r
\r
- PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->IsDirectoryPath) {\r
Status = EFI_UNSUPPORTED;\r
} else {\r
*Position = (UINT64)lseek (PrivateFile->fd, 0, SEEK_CUR);\r
- Status = (*Position == (UINT64) -1) ? ErrnoToEfiStatus () : EFI_SUCCESS;\r
+ Status = (*Position == (UINT64)-1) ? ErrnoToEfiStatus () : EFI_SUCCESS;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Get information about a file.\r
\r
**/\r
EFI_STATUS\r
PosixFileGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_FILE_SYSTEM_INFO *FileSystemInfoBuffer;\r
- int UnixStatus;\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
- struct statfs buf;\r
+ EFI_STATUS Status;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_FILE_SYSTEM_INFO *FileSystemInfoBuffer;\r
+ int UnixStatus;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ struct statfs buf;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
PrivateRoot = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
return EFI_DEVICE_ERROR;\r
}\r
\r
- FileSystemInfoBuffer = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
- FileSystemInfoBuffer->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
- FileSystemInfoBuffer->ReadOnly = FALSE;\r
+ FileSystemInfoBuffer = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
+ FileSystemInfoBuffer->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
+ FileSystemInfoBuffer->ReadOnly = FALSE;\r
\r
//\r
// Succeeded\r
//\r
- FileSystemInfoBuffer->VolumeSize = MultU64x32 (buf.f_blocks, buf.f_bsize);\r
- FileSystemInfoBuffer->FreeSpace = MultU64x32 (buf.f_bavail, buf.f_bsize);\r
- FileSystemInfoBuffer->BlockSize = buf.f_bsize;\r
-\r
+ FileSystemInfoBuffer->VolumeSize = MultU64x32 (buf.f_blocks, buf.f_bsize);\r
+ FileSystemInfoBuffer->FreeSpace = MultU64x32 (buf.f_bavail, buf.f_bsize);\r
+ FileSystemInfoBuffer->BlockSize = buf.f_bsize;\r
\r
StrCpyS (\r
- (CHAR16 *) FileSystemInfoBuffer->VolumeLabel,\r
+ (CHAR16 *)FileSystemInfoBuffer->VolumeLabel,\r
(*BufferSize - SIZE_OF_EFI_FILE_SYSTEM_INFO) / sizeof (CHAR16),\r
PrivateRoot->VolumeLabel\r
);\r
*BufferSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
-\r
} else if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
if (*BufferSize < StrSize (PrivateRoot->VolumeLabel)) {\r
*BufferSize = StrSize (PrivateRoot->VolumeLabel);\r
}\r
\r
StrCpyS (\r
- (CHAR16 *) Buffer,\r
+ (CHAR16 *)Buffer,\r
*BufferSize / sizeof (CHAR16),\r
PrivateRoot->VolumeLabel\r
);\r
*BufferSize = StrSize (PrivateRoot->VolumeLabel);\r
-\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Set information about a file\r
\r
**/\r
EFI_STATUS\r
PosixFileSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_FILE_INFO *OldFileInfo;\r
- EFI_FILE_INFO *NewFileInfo;\r
- EFI_STATUS Status;\r
- UINTN OldInfoSize;\r
- mode_t NewAttr;\r
- struct stat OldAttr;\r
- CHAR8 *OldFileName;\r
- CHAR8 *NewFileName;\r
- CHAR8 *CharPointer;\r
- BOOLEAN AttrChangeFlag;\r
- BOOLEAN NameChangeFlag;\r
- BOOLEAN SizeChangeFlag;\r
- BOOLEAN TimeChangeFlag;\r
- struct tm NewLastAccessSystemTime;\r
- struct tm NewLastWriteSystemTime;\r
- EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
- CHAR8 *AsciiFilePtr;\r
- CHAR16 *UnicodeFilePtr;\r
- int UnixStatus;\r
- struct utimbuf Utime;\r
- UINTN Size;\r
-\r
- PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
- PrivateRoot = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
- errno = 0;\r
- Status = EFI_UNSUPPORTED;\r
- OldFileInfo = NewFileInfo = NULL;\r
- OldFileName = NewFileName = NULL;\r
+ EMU_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_FILE_INFO *OldFileInfo;\r
+ EFI_FILE_INFO *NewFileInfo;\r
+ EFI_STATUS Status;\r
+ UINTN OldInfoSize;\r
+ mode_t NewAttr;\r
+ struct stat OldAttr;\r
+ CHAR8 *OldFileName;\r
+ CHAR8 *NewFileName;\r
+ CHAR8 *CharPointer;\r
+ BOOLEAN AttrChangeFlag;\r
+ BOOLEAN NameChangeFlag;\r
+ BOOLEAN SizeChangeFlag;\r
+ BOOLEAN TimeChangeFlag;\r
+ struct tm NewLastAccessSystemTime;\r
+ struct tm NewLastWriteSystemTime;\r
+ EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
+ CHAR8 *AsciiFilePtr;\r
+ CHAR16 *UnicodeFilePtr;\r
+ int UnixStatus;\r
+ struct utimbuf Utime;\r
+ UINTN Size;\r
+\r
+ PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateRoot = EMU_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
+ errno = 0;\r
+ Status = EFI_UNSUPPORTED;\r
+ OldFileInfo = NewFileInfo = NULL;\r
+ OldFileName = NewFileName = NULL;\r
AttrChangeFlag = NameChangeFlag = SizeChangeFlag = TimeChangeFlag = FALSE;\r
\r
//\r
goto Done;\r
}\r
\r
- NewFileSystemInfo = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
+ NewFileSystemInfo = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
\r
free (PrivateRoot->VolumeLabel);\r
\r
StrCpyS (\r
PrivateRoot->VolumeLabel,\r
StrSize (PrivateRoot->VolumeLabel) / sizeof (CHAR16),\r
- (CHAR16 *) Buffer\r
+ (CHAR16 *)Buffer\r
);\r
\r
Status = EFI_SUCCESS;\r
//\r
// Check for invalid set file information parameters.\r
//\r
- NewFileInfo = (EFI_FILE_INFO *) Buffer;\r
- if (NewFileInfo->Size <= sizeof (EFI_FILE_INFO) ||\r
+ NewFileInfo = (EFI_FILE_INFO *)Buffer;\r
+ if ((NewFileInfo->Size <= sizeof (EFI_FILE_INFO)) ||\r
(NewFileInfo->Attribute &~(EFI_FILE_VALID_ATTR)) ||\r
- (sizeof (UINTN) == 4 && NewFileInfo->Size > 0xFFFFFFFF)\r
- ) {\r
+ ((sizeof (UINTN) == 4) && (NewFileInfo->Size > 0xFFFFFFFF))\r
+ )\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
goto Done;\r
}\r
// of change request this is.\r
//\r
OldInfoSize = 0;\r
- Status = UnixSimpleFileSystemFileInfo (PrivateFile, NULL, &OldInfoSize, NULL);\r
+ Status = UnixSimpleFileSystemFileInfo (PrivateFile, NULL, &OldInfoSize, NULL);\r
if (Status != EFI_BUFFER_TOO_SMALL) {\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
// Make full pathname from new filename and rootpath.\r
//\r
if (NewFileInfo->FileName[0] == '\\') {\r
- Size = AsciiStrLen (PrivateRoot->FilePath) + 1 + StrLen (NewFileInfo->FileName) + 1;\r
+ Size = AsciiStrLen (PrivateRoot->FilePath) + 1 + StrLen (NewFileInfo->FileName) + 1;\r
NewFileName = malloc (Size);\r
if (NewFileName == NULL) {\r
goto Done;\r
}\r
\r
AsciiStrCpyS (NewFileName, Size, PrivateRoot->FilePath);\r
- AsciiFilePtr = NewFileName + AsciiStrLen(NewFileName);\r
- UnicodeFilePtr = NewFileInfo->FileName + 1;\r
- *AsciiFilePtr++ ='/';\r
+ AsciiFilePtr = NewFileName + AsciiStrLen (NewFileName);\r
+ UnicodeFilePtr = NewFileInfo->FileName + 1;\r
+ *AsciiFilePtr++ = '/';\r
} else {\r
- Size = AsciiStrLen (PrivateFile->FileName) + 2 + StrLen (NewFileInfo->FileName) + 1;\r
+ Size = AsciiStrLen (PrivateFile->FileName) + 2 + StrLen (NewFileInfo->FileName) + 1;\r
NewFileName = malloc (Size);\r
if (NewFileName == NULL) {\r
goto Done;\r
}\r
\r
AsciiStrCpyS (NewFileName, Size, PrivateRoot->FilePath);\r
- AsciiFilePtr = NewFileName + AsciiStrLen(NewFileName);\r
+ AsciiFilePtr = NewFileName + AsciiStrLen (NewFileName);\r
if ((AsciiFilePtr[-1] != '/') && (NewFileInfo->FileName[0] != '/')) {\r
// make sure there is a / between Root FilePath and NewFileInfo Filename\r
AsciiFilePtr[0] = '/';\r
AsciiFilePtr[1] = '\0';\r
AsciiFilePtr++;\r
}\r
+\r
UnicodeFilePtr = NewFileInfo->FileName;\r
}\r
+\r
// Convert to ascii.\r
while (*UnicodeFilePtr) {\r
*AsciiFilePtr++ = *UnicodeFilePtr++;\r
}\r
+\r
*AsciiFilePtr = 0;\r
\r
//\r
//\r
if (!IsZero (&NewFileInfo->CreateTime, sizeof (EFI_TIME)) &&\r
CompareMem (&NewFileInfo->CreateTime, &OldFileInfo->CreateTime, sizeof (EFI_TIME))\r
- ) {\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
} else if (!IsZero (&NewFileInfo->LastAccessTime, sizeof (EFI_TIME)) &&\r
CompareMem (&NewFileInfo->LastAccessTime, &OldFileInfo->LastAccessTime, sizeof (EFI_TIME))\r
- ) {\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
} else if (!IsZero (&NewFileInfo->ModificationTime, sizeof (EFI_TIME)) &&\r
CompareMem (&NewFileInfo->ModificationTime, &OldFileInfo->ModificationTime, sizeof (EFI_TIME))\r
- ) {\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
}\r
\r
NewFileName\r
);\r
} else {\r
- Status = EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
goto Done;\r
}\r
}\r
Status = ErrnoToEfiStatus ();\r
goto Done;\r
}\r
-\r
}\r
\r
//\r
// Time change\r
//\r
if (TimeChangeFlag) {\r
- NewLastAccessSystemTime.tm_year = NewFileInfo->LastAccessTime.Year;\r
- NewLastAccessSystemTime.tm_mon = NewFileInfo->LastAccessTime.Month;\r
- NewLastAccessSystemTime.tm_mday = NewFileInfo->LastAccessTime.Day;\r
- NewLastAccessSystemTime.tm_hour = NewFileInfo->LastAccessTime.Hour;\r
- NewLastAccessSystemTime.tm_min = NewFileInfo->LastAccessTime.Minute;\r
- NewLastAccessSystemTime.tm_sec = NewFileInfo->LastAccessTime.Second;\r
- NewLastAccessSystemTime.tm_isdst = 0;\r
+ NewLastAccessSystemTime.tm_year = NewFileInfo->LastAccessTime.Year;\r
+ NewLastAccessSystemTime.tm_mon = NewFileInfo->LastAccessTime.Month;\r
+ NewLastAccessSystemTime.tm_mday = NewFileInfo->LastAccessTime.Day;\r
+ NewLastAccessSystemTime.tm_hour = NewFileInfo->LastAccessTime.Hour;\r
+ NewLastAccessSystemTime.tm_min = NewFileInfo->LastAccessTime.Minute;\r
+ NewLastAccessSystemTime.tm_sec = NewFileInfo->LastAccessTime.Second;\r
+ NewLastAccessSystemTime.tm_isdst = 0;\r
\r
Utime.actime = mktime (&NewLastAccessSystemTime);\r
\r
- NewLastWriteSystemTime.tm_year = NewFileInfo->ModificationTime.Year;\r
- NewLastWriteSystemTime.tm_mon = NewFileInfo->ModificationTime.Month;\r
- NewLastWriteSystemTime.tm_mday = NewFileInfo->ModificationTime.Day;\r
- NewLastWriteSystemTime.tm_hour = NewFileInfo->ModificationTime.Hour;\r
- NewLastWriteSystemTime.tm_min = NewFileInfo->ModificationTime.Minute;\r
- NewLastWriteSystemTime.tm_sec = NewFileInfo->ModificationTime.Second;\r
- NewLastWriteSystemTime.tm_isdst = 0;\r
+ NewLastWriteSystemTime.tm_year = NewFileInfo->ModificationTime.Year;\r
+ NewLastWriteSystemTime.tm_mon = NewFileInfo->ModificationTime.Month;\r
+ NewLastWriteSystemTime.tm_mday = NewFileInfo->ModificationTime.Day;\r
+ NewLastWriteSystemTime.tm_hour = NewFileInfo->ModificationTime.Hour;\r
+ NewLastWriteSystemTime.tm_min = NewFileInfo->ModificationTime.Minute;\r
+ NewLastWriteSystemTime.tm_sec = NewFileInfo->ModificationTime.Second;\r
+ NewLastWriteSystemTime.tm_isdst = 0;\r
\r
Utime.modtime = mktime (&NewLastWriteSystemTime);\r
\r
- if (Utime.actime == (time_t)-1 || Utime.modtime == (time_t)-1) {\r
+ if ((Utime.actime == (time_t)-1) || (Utime.modtime == (time_t)-1)) {\r
goto Done;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Flush data back for the file handle.\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EMU_EFI_FILE_PRIVATE *PrivateFile;\r
-\r
+ EMU_EFI_FILE_PRIVATE *PrivateFile;\r
\r
PrivateFile = EMU_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
PosixFileSystmeThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
for (i = 0; This->ConfigString[i] != 0; i++) {\r
Private->FilePath[i] = This->ConfigString[i];\r
}\r
- Private->FilePath[i] = 0;\r
\r
+ Private->FilePath[i] = 0;\r
\r
Private->VolumeLabel = malloc (StrSize (L"EFI_EMULATED"));\r
if (Private->VolumeLabel == NULL) {\r
free (Private);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
StrCpyS (\r
Private->VolumeLabel,\r
StrSize (L"EFI_EMULATED") / sizeof (CHAR16),\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
PosixFileSystmeThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
EMU_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
if (Private->VolumeLabel != NULL) {\r
free (Private->VolumeLabel);\r
}\r
+\r
free (This->Private);\r
This->Private = NULL;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EMU_IO_THUNK_PROTOCOL gPosixFileSystemThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gPosixFileSystemThunkIo = {\r
&gEfiSimpleFileSystemProtocolGuid,\r
NULL,\r
NULL,\r
GasketPosixFileSystmeThunkClose,\r
NULL\r
};\r
-\r
-\r
#include "Host.h"\r
#include <pthread.h>\r
\r
-\r
UINTN\r
EFIAPI\r
PthreadMutexLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
)\r
{\r
return (UINTN)pthread_mutex_lock ((pthread_mutex_t *)Mutex);\r
}\r
\r
-\r
-\r
UINTN\r
EFIAPI\r
PthreadMutexUnLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
)\r
{\r
return (UINTN)pthread_mutex_unlock ((pthread_mutex_t *)Mutex);\r
}\r
\r
-\r
UINTN\r
EFIAPI\r
PthreadMutexTryLock (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
)\r
{\r
return (UINTN)pthread_mutex_trylock ((pthread_mutex_t *)Mutex);\r
}\r
\r
-\r
VOID *\r
PthreadMutexInit (\r
IN VOID\r
)\r
{\r
- pthread_mutex_t *Mutex;\r
- int err;\r
+ pthread_mutex_t *Mutex;\r
+ int err;\r
\r
Mutex = malloc (sizeof (pthread_mutex_t));\r
- err = pthread_mutex_init (Mutex, NULL);\r
+ err = pthread_mutex_init (Mutex, NULL);\r
if (err == 0) {\r
return Mutex;\r
}\r
return NULL;\r
}\r
\r
-\r
UINTN\r
PthreadMutexDestroy (\r
- IN VOID *Mutex\r
+ IN VOID *Mutex\r
)\r
{\r
if (Mutex != NULL) {\r
\r
// Can't store this data on PthreadCreate stack so we need a global\r
typedef struct {\r
- pthread_mutex_t Mutex;\r
- THREAD_THUNK_THREAD_ENTRY Start;\r
+ pthread_mutex_t Mutex;\r
+ THREAD_THUNK_THREAD_ENTRY Start;\r
} THREAD_MANGLE;\r
\r
-THREAD_MANGLE mThreadMangle = {\r
+THREAD_MANGLE mThreadMangle = {\r
PTHREAD_MUTEX_INITIALIZER,\r
NULL\r
};\r
VOID *Context\r
)\r
{\r
- THREAD_THUNK_THREAD_ENTRY Start;\r
- sigset_t SigMask;\r
+ THREAD_THUNK_THREAD_ENTRY Start;\r
+ sigset_t SigMask;\r
\r
// Save global on the stack before we unlock\r
- Start = mThreadMangle.Start;\r
+ Start = mThreadMangle.Start;\r
pthread_mutex_unlock (&mThreadMangle.Mutex);\r
\r
// Mask all signals to the APs\r
// This is a great example of how all problems in computer\r
// science can be solved by adding another level of indirection\r
//\r
- return (VOID *)ReverseGasketUint64 ((UINTN)Start, (UINTN)Context);\r
+ return (VOID *)ReverseGasketUint64 ((UINTN)Start, (UINTN)Context);\r
}\r
\r
UINTN\r
PthreadCreate (\r
- IN VOID *Thread,\r
- IN VOID *Attribute,\r
- IN THREAD_THUNK_THREAD_ENTRY Start,\r
- IN VOID *Context\r
+ IN VOID *Thread,\r
+ IN VOID *Attribute,\r
+ IN THREAD_THUNK_THREAD_ENTRY Start,\r
+ IN VOID *Context\r
)\r
{\r
- int err;\r
- BOOLEAN EnabledOnEntry;\r
+ int err;\r
+ BOOLEAN EnabledOnEntry;\r
\r
//\r
// Threads inherit interrupt state so disable interrupts before we start thread\r
\r
// Acquire lock for global, SecFakePthreadStart runs in a different thread.\r
pthread_mutex_lock (&mThreadMangle.Mutex);\r
- mThreadMangle.Start = Start;\r
+ mThreadMangle.Start = Start;\r
\r
err = pthread_create (Thread, Attribute, SecFakePthreadStart, Context);\r
if (err != 0) {\r
return err;\r
}\r
\r
-\r
VOID\r
PthreadExit (\r
- IN VOID *ValuePtr\r
+ IN VOID *ValuePtr\r
)\r
{\r
pthread_exit (ValuePtr);\r
return;\r
}\r
\r
-\r
UINTN\r
PthreadSelf (\r
VOID\r
return (UINTN)pthread_self ();\r
}\r
\r
-\r
-EMU_THREAD_THUNK_PROTOCOL gPthreadThunk = {\r
+EMU_THREAD_THUNK_PROTOCOL gPthreadThunk = {\r
GasketPthreadMutexLock,\r
GasketPthreadMutexUnLock,\r
GasketPthreadMutexTryLock,\r
GasketPthreadSelf\r
};\r
\r
-\r
EFI_STATUS\r
PthreadOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
if (This->Instance != 0) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
PthreadClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EMU_IO_THUNK_PROTOCOL gPthreadThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gPthreadThunkIo = {\r
&gEmuThreadThunkProtocolGuid,\r
NULL,\r
NULL,\r
GasketPthreadClose,\r
NULL\r
};\r
-\r
-\r
#define KEYSYM_LOWER 0\r
#define KEYSYM_UPPER 1\r
\r
-\r
struct uga_drv_shift_mask {\r
- unsigned char shift;\r
- unsigned char size;\r
- unsigned char csize;\r
+ unsigned char shift;\r
+ unsigned char size;\r
+ unsigned char csize;\r
};\r
\r
-#define NBR_KEYS 32\r
+#define NBR_KEYS 32\r
typedef struct {\r
- EMU_GRAPHICS_WINDOW_PROTOCOL GraphicsIo;\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL GraphicsIo;\r
\r
- Display *display;\r
- int screen; // values for window_size in main\r
- Window win;\r
- GC gc;\r
- Visual *visual;\r
+ Display *display;\r
+ int screen; // values for window_size in main\r
+ Window win;\r
+ GC gc;\r
+ Visual *visual;\r
\r
- int depth;\r
- unsigned int width;\r
- unsigned int height;\r
- unsigned int line_bytes;\r
- unsigned int pixel_shift;\r
- unsigned char *image_data;\r
+ int depth;\r
+ unsigned int width;\r
+ unsigned int height;\r
+ unsigned int line_bytes;\r
+ unsigned int pixel_shift;\r
+ unsigned char *image_data;\r
\r
- struct uga_drv_shift_mask r, g, b;\r
+ struct uga_drv_shift_mask r, g, b;\r
\r
- int use_shm;\r
- XShmSegmentInfo xshm_info;\r
- XImage *image;\r
- char *Title;\r
+ int use_shm;\r
+ XShmSegmentInfo xshm_info;\r
+ XImage *image;\r
+ char *Title;\r
\r
- unsigned int key_rd;\r
- unsigned int key_wr;\r
- unsigned int key_count;\r
- EFI_KEY_DATA keys[NBR_KEYS];\r
+ unsigned int key_rd;\r
+ unsigned int key_wr;\r
+ unsigned int key_count;\r
+ EFI_KEY_DATA keys[NBR_KEYS];\r
\r
- EFI_KEY_STATE KeyState;\r
+ EFI_KEY_STATE KeyState;\r
\r
EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeRegisterdKeyCallback;\r
EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakRegisterdKeyCallback;\r
VOID *RegisterdKeyCallbackContext;\r
\r
- int previous_x;\r
- int previous_y;\r
- EFI_SIMPLE_POINTER_STATE pointer_state;\r
- int pointer_state_changed;\r
+ int previous_x;\r
+ int previous_y;\r
+ EFI_SIMPLE_POINTER_STATE pointer_state;\r
+ int pointer_state_changed;\r
} GRAPHICS_IO_PRIVATE;\r
\r
void\r
-HandleEvents(\r
- IN GRAPHICS_IO_PRIVATE *Drv\r
+HandleEvents (\r
+ IN GRAPHICS_IO_PRIVATE *Drv\r
);\r
\r
void\r
fill_shift_mask (\r
- IN struct uga_drv_shift_mask *sm,\r
- IN unsigned long mask\r
+ IN struct uga_drv_shift_mask *sm,\r
+ IN unsigned long mask\r
)\r
{\r
sm->shift = 0;\r
- sm->size = 0;\r
+ sm->size = 0;\r
while ((mask & 1) == 0) {\r
mask >>= 1;\r
sm->shift++;\r
}\r
+\r
while (mask & 1) {\r
sm->size++;\r
mask >>= 1;\r
}\r
+\r
sm->csize = 8 - sm->size;\r
}\r
\r
int\r
TryCreateShmImage (\r
- IN GRAPHICS_IO_PRIVATE *Drv\r
+ IN GRAPHICS_IO_PRIVATE *Drv\r
)\r
{\r
Drv->image = XShmCreateImage (\r
- Drv->display, Drv->visual,\r
- Drv->depth, ZPixmap, NULL, &Drv->xshm_info,\r
- Drv->width, Drv->height\r
+ Drv->display,\r
+ Drv->visual,\r
+ Drv->depth,\r
+ ZPixmap,\r
+ NULL,\r
+ &Drv->xshm_info,\r
+ Drv->width,\r
+ Drv->height\r
);\r
if (Drv->image == NULL) {\r
return 0;\r
}\r
\r
switch (Drv->image->bitmap_unit) {\r
- case 32:\r
- Drv->pixel_shift = 2;\r
- break;\r
- case 16:\r
- Drv->pixel_shift = 1;\r
- break;\r
- case 8:\r
- Drv->pixel_shift = 0;\r
- break;\r
+ case 32:\r
+ Drv->pixel_shift = 2;\r
+ break;\r
+ case 16:\r
+ Drv->pixel_shift = 1;\r
+ break;\r
+ case 8:\r
+ Drv->pixel_shift = 0;\r
+ break;\r
}\r
\r
Drv->xshm_info.shmid = shmget (\r
- IPC_PRIVATE, Drv->image->bytes_per_line * Drv->image->height,\r
- IPC_CREAT | 0777\r
- );\r
+ IPC_PRIVATE,\r
+ Drv->image->bytes_per_line * Drv->image->height,\r
+ IPC_CREAT | 0777\r
+ );\r
if (Drv->xshm_info.shmid < 0) {\r
- XDestroyImage(Drv->image);\r
+ XDestroyImage (Drv->image);\r
return 0;\r
}\r
\r
Drv->image_data = shmat (Drv->xshm_info.shmid, NULL, 0);\r
- if(!Drv->image_data) {\r
+ if (!Drv->image_data) {\r
shmctl (Drv->xshm_info.shmid, IPC_RMID, NULL);\r
- XDestroyImage(Drv->image);\r
+ XDestroyImage (Drv->image);\r
return 0;\r
}\r
\r
-#ifndef __APPLE__\r
+ #ifndef __APPLE__\r
//\r
// This closes shared memory in real time on OS X. Only closes after folks quit using\r
// it on Linux.\r
//\r
shmctl (Drv->xshm_info.shmid, IPC_RMID, NULL);\r
-#endif\r
+ #endif\r
\r
- Drv->xshm_info.shmaddr = (char*)Drv->image_data;\r
- Drv->image->data = (char*)Drv->image_data;\r
+ Drv->xshm_info.shmaddr = (char *)Drv->image_data;\r
+ Drv->image->data = (char *)Drv->image_data;\r
\r
if (!XShmAttach (Drv->display, &Drv->xshm_info)) {\r
shmdt (Drv->image_data);\r
- XDestroyImage(Drv->image);\r
+ XDestroyImage (Drv->image);\r
return 0;\r
}\r
+\r
return 1;\r
}\r
\r
-\r
EFI_STATUS\r
X11Size (\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
IN UINT32 Height\r
)\r
{\r
- GRAPHICS_IO_PRIVATE *Drv;\r
- XSizeHints size_hints;\r
+ GRAPHICS_IO_PRIVATE *Drv;\r
+ XSizeHints size_hints;\r
\r
// Destroy current buffer if created.\r
Drv = (GRAPHICS_IO_PRIVATE *)GraphicsIo;\r
}\r
\r
Drv->image_data = NULL;\r
- Drv->image = NULL;\r
+ Drv->image = NULL;\r
}\r
\r
- Drv->width = Width;\r
+ Drv->width = Width;\r
Drv->height = Height;\r
XResizeWindow (Drv->display, Drv->win, Width, Height);\r
\r
// Allocate image.\r
- if (XShmQueryExtension(Drv->display) && TryCreateShmImage(Drv)) {\r
+ if (XShmQueryExtension (Drv->display) && TryCreateShmImage (Drv)) {\r
Drv->use_shm = 1;\r
} else {\r
Drv->use_shm = 0;\r
}\r
\r
Drv->image_data = malloc ((Drv->width * Drv->height) << Drv->pixel_shift);\r
- Drv->image = XCreateImage (\r
- Drv->display, Drv->visual, Drv->depth,\r
- ZPixmap, 0, (char *)Drv->image_data,\r
- Drv->width, Drv->height,\r
- 8 << Drv->pixel_shift, 0\r
- );\r
+ Drv->image = XCreateImage (\r
+ Drv->display,\r
+ Drv->visual,\r
+ Drv->depth,\r
+ ZPixmap,\r
+ 0,\r
+ (char *)Drv->image_data,\r
+ Drv->width,\r
+ Drv->height,\r
+ 8 << Drv->pixel_shift,\r
+ 0\r
+ );\r
}\r
\r
Drv->line_bytes = Drv->image->bytes_per_line;\r
fill_shift_mask (&Drv->b, Drv->image->blue_mask);\r
\r
// Set WM hints.\r
- size_hints.flags = PSize | PMinSize | PMaxSize;\r
- size_hints.min_width = size_hints.max_width = size_hints.base_width = Width;\r
+ size_hints.flags = PSize | PMinSize | PMaxSize;\r
+ size_hints.min_width = size_hints.max_width = size_hints.base_width = Width;\r
size_hints.min_height = size_hints.max_height = size_hints.base_height = Height;\r
XSetWMNormalHints (Drv->display, Drv->win, &size_hints);\r
\r
\r
void\r
handleKeyEvent (\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN XEvent *ev,\r
- IN BOOLEAN Make\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN XEvent *ev,\r
+ IN BOOLEAN Make\r
)\r
{\r
KeySym *KeySym;\r
//\r
KeySym = XGetKeyboardMapping (Drv->display, ev->xkey.keycode, 1, &KeySymArraySize);\r
\r
- KeyData.Key.ScanCode = 0;\r
- KeyData.Key.UnicodeChar = 0;\r
+ KeyData.Key.ScanCode = 0;\r
+ KeyData.Key.UnicodeChar = 0;\r
KeyData.KeyState.KeyShiftState = 0;\r
\r
//\r
// Skipping EFI_MENU_KEY_PRESSED and EFI_SYS_REQ_PRESSED\r
\r
switch (*KeySym) {\r
- case XK_Control_R:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_RIGHT_CONTROL_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_CONTROL_PRESSED;\r
- }\r
- break;\r
- case XK_Control_L:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_LEFT_CONTROL_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_LEFT_CONTROL_PRESSED;\r
- }\r
- break;\r
-\r
- case XK_Shift_R:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_RIGHT_SHIFT_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_SHIFT_PRESSED;\r
- }\r
- break;\r
- case XK_Shift_L:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_LEFT_SHIFT_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_LEFT_SHIFT_PRESSED;\r
- }\r
- break;\r
-\r
- case XK_Mode_switch:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_LEFT_ALT_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_LEFT_ALT_PRESSED;\r
- }\r
- break;\r
-\r
- case XK_Meta_R:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_RIGHT_LOGO_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_LOGO_PRESSED;\r
- }\r
- break;\r
- case XK_Meta_L:\r
- if (Make) {\r
- Drv->KeyState.KeyShiftState |= EFI_LEFT_LOGO_PRESSED;\r
- } else {\r
- Drv->KeyState.KeyShiftState &= ~EFI_LEFT_LOGO_PRESSED;\r
- }\r
- break;\r
-\r
- case XK_KP_Home:\r
- case XK_Home: KeyData.Key.ScanCode = SCAN_HOME; break;\r
-\r
- case XK_KP_End:\r
- case XK_End: KeyData.Key.ScanCode = SCAN_END; break;\r
-\r
- case XK_KP_Left:\r
- case XK_Left: KeyData.Key.ScanCode = SCAN_LEFT; break;\r
-\r
- case XK_KP_Right:\r
- case XK_Right: KeyData.Key.ScanCode = SCAN_RIGHT; break;\r
-\r
- case XK_KP_Up:\r
- case XK_Up: KeyData.Key.ScanCode = SCAN_UP; break;\r
-\r
- case XK_KP_Down:\r
- case XK_Down: KeyData.Key.ScanCode = SCAN_DOWN; break;\r
-\r
- case XK_KP_Delete:\r
- case XK_Delete: KeyData.Key.ScanCode = SCAN_DELETE; break;\r
-\r
- case XK_KP_Insert:\r
- case XK_Insert: KeyData.Key.ScanCode = SCAN_INSERT; break;\r
-\r
- case XK_KP_Page_Up:\r
- case XK_Page_Up: KeyData.Key.ScanCode = SCAN_PAGE_UP; break;\r
-\r
- case XK_KP_Page_Down:\r
- case XK_Page_Down: KeyData.Key.ScanCode = SCAN_PAGE_DOWN; break;\r
-\r
- case XK_Escape: KeyData.Key.ScanCode = SCAN_ESC; break;\r
-\r
- case XK_Pause: KeyData.Key.ScanCode = SCAN_PAUSE; break;\r
-\r
- case XK_KP_F1:\r
- case XK_F1: KeyData.Key.ScanCode = SCAN_F1; break;\r
-\r
- case XK_KP_F2:\r
- case XK_F2: KeyData.Key.ScanCode = SCAN_F2; break;\r
-\r
- case XK_KP_F3:\r
- case XK_F3: KeyData.Key.ScanCode = SCAN_F3; break;\r
-\r
- case XK_KP_F4:\r
- case XK_F4: KeyData.Key.ScanCode = SCAN_F4; break;\r
+ case XK_Control_R:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_RIGHT_CONTROL_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_CONTROL_PRESSED;\r
+ }\r
\r
- case XK_F5: KeyData.Key.ScanCode = SCAN_F5; break;\r
- case XK_F6: KeyData.Key.ScanCode = SCAN_F6; break;\r
- case XK_F7: KeyData.Key.ScanCode = SCAN_F7; break;\r
+ break;\r
+ case XK_Control_L:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_LEFT_CONTROL_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_LEFT_CONTROL_PRESSED;\r
+ }\r
\r
- // Don't map into X11 by default on a Mac\r
- // System Preferences->Keyboard->Keyboard Shortcuts can be configured\r
- // to not use higher function keys as shortcuts and the will show up\r
- // in X11.\r
- case XK_F8: KeyData.Key.ScanCode = SCAN_F8; break;\r
- case XK_F9: KeyData.Key.ScanCode = SCAN_F9; break;\r
- case XK_F10: KeyData.Key.ScanCode = SCAN_F10; break;\r
+ break;\r
\r
- case XK_F11: KeyData.Key.ScanCode = SCAN_F11; break;\r
- case XK_F12: KeyData.Key.ScanCode = SCAN_F12; break;\r
+ case XK_Shift_R:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_RIGHT_SHIFT_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_SHIFT_PRESSED;\r
+ }\r
\r
- case XK_F13: KeyData.Key.ScanCode = SCAN_F13; break;\r
- case XK_F14: KeyData.Key.ScanCode = SCAN_F14; break;\r
- case XK_F15: KeyData.Key.ScanCode = SCAN_F15; break;\r
- case XK_F16: KeyData.Key.ScanCode = SCAN_F16; break;\r
- case XK_F17: KeyData.Key.ScanCode = SCAN_F17; break;\r
- case XK_F18: KeyData.Key.ScanCode = SCAN_F18; break;\r
- case XK_F19: KeyData.Key.ScanCode = SCAN_F19; break;\r
- case XK_F20: KeyData.Key.ScanCode = SCAN_F20; break;\r
- case XK_F21: KeyData.Key.ScanCode = SCAN_F21; break;\r
- case XK_F22: KeyData.Key.ScanCode = SCAN_F22; break;\r
- case XK_F23: KeyData.Key.ScanCode = SCAN_F23; break;\r
- case XK_F24: KeyData.Key.ScanCode = SCAN_F24; break;\r
+ break;\r
+ case XK_Shift_L:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_LEFT_SHIFT_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_LEFT_SHIFT_PRESSED;\r
+ }\r
\r
- // No mapping in X11\r
- //case XK_: KeyData.Key.ScanCode = SCAN_MUTE; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_VOLUME_UP; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_VOLUME_DOWN; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_BRIGHTNESS_UP; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_BRIGHTNESS_DOWN; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_SUSPEND; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_HIBERNATE; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_TOGGLE_DISPLAY; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_RECOVERY; break;\r
- //case XK_: KeyData.Key.ScanCode = SCAN_EJECT; break;\r
+ break;\r
\r
- case XK_BackSpace: KeyData.Key.UnicodeChar = 0x0008; break;\r
+ case XK_Mode_switch:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_LEFT_ALT_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_LEFT_ALT_PRESSED;\r
+ }\r
\r
- case XK_KP_Tab:\r
- case XK_Tab: KeyData.Key.UnicodeChar = 0x0009; break;\r
+ break;\r
\r
- case XK_Linefeed: KeyData.Key.UnicodeChar = 0x000a; break;\r
+ case XK_Meta_R:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_RIGHT_LOGO_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_RIGHT_LOGO_PRESSED;\r
+ }\r
\r
- case XK_KP_Enter:\r
- case XK_Return: KeyData.Key.UnicodeChar = 0x000d; break;\r
+ break;\r
+ case XK_Meta_L:\r
+ if (Make) {\r
+ Drv->KeyState.KeyShiftState |= EFI_LEFT_LOGO_PRESSED;\r
+ } else {\r
+ Drv->KeyState.KeyShiftState &= ~EFI_LEFT_LOGO_PRESSED;\r
+ }\r
\r
- case XK_KP_Equal : KeyData.Key.UnicodeChar = L'='; break;\r
- case XK_KP_Multiply : KeyData.Key.UnicodeChar = L'*'; break;\r
- case XK_KP_Add : KeyData.Key.UnicodeChar = L'+'; break;\r
- case XK_KP_Separator : KeyData.Key.UnicodeChar = L'~'; break;\r
- case XK_KP_Subtract : KeyData.Key.UnicodeChar = L'-'; break;\r
- case XK_KP_Decimal : KeyData.Key.UnicodeChar = L'.'; break;\r
- case XK_KP_Divide : KeyData.Key.UnicodeChar = L'/'; break;\r
-\r
- case XK_KP_0 : KeyData.Key.UnicodeChar = L'0'; break;\r
- case XK_KP_1 : KeyData.Key.UnicodeChar = L'1'; break;\r
- case XK_KP_2 : KeyData.Key.UnicodeChar = L'2'; break;\r
- case XK_KP_3 : KeyData.Key.UnicodeChar = L'3'; break;\r
- case XK_KP_4 : KeyData.Key.UnicodeChar = L'4'; break;\r
- case XK_KP_5 : KeyData.Key.UnicodeChar = L'5'; break;\r
- case XK_KP_6 : KeyData.Key.UnicodeChar = L'6'; break;\r
- case XK_KP_7 : KeyData.Key.UnicodeChar = L'7'; break;\r
- case XK_KP_8 : KeyData.Key.UnicodeChar = L'8'; break;\r
- case XK_KP_9 : KeyData.Key.UnicodeChar = L'9'; break;\r
-\r
- default:\r
- ;\r
+ break;\r
+\r
+ case XK_KP_Home:\r
+ case XK_Home: KeyData.Key.ScanCode = SCAN_HOME;\r
+ break;\r
+\r
+ case XK_KP_End:\r
+ case XK_End: KeyData.Key.ScanCode = SCAN_END;\r
+ break;\r
+\r
+ case XK_KP_Left:\r
+ case XK_Left: KeyData.Key.ScanCode = SCAN_LEFT;\r
+ break;\r
+\r
+ case XK_KP_Right:\r
+ case XK_Right: KeyData.Key.ScanCode = SCAN_RIGHT;\r
+ break;\r
+\r
+ case XK_KP_Up:\r
+ case XK_Up: KeyData.Key.ScanCode = SCAN_UP;\r
+ break;\r
+\r
+ case XK_KP_Down:\r
+ case XK_Down: KeyData.Key.ScanCode = SCAN_DOWN;\r
+ break;\r
+\r
+ case XK_KP_Delete:\r
+ case XK_Delete: KeyData.Key.ScanCode = SCAN_DELETE;\r
+ break;\r
+\r
+ case XK_KP_Insert:\r
+ case XK_Insert: KeyData.Key.ScanCode = SCAN_INSERT;\r
+ break;\r
+\r
+ case XK_KP_Page_Up:\r
+ case XK_Page_Up: KeyData.Key.ScanCode = SCAN_PAGE_UP;\r
+ break;\r
+\r
+ case XK_KP_Page_Down:\r
+ case XK_Page_Down: KeyData.Key.ScanCode = SCAN_PAGE_DOWN;\r
+ break;\r
+\r
+ case XK_Escape: KeyData.Key.ScanCode = SCAN_ESC;\r
+ break;\r
+\r
+ case XK_Pause: KeyData.Key.ScanCode = SCAN_PAUSE;\r
+ break;\r
+\r
+ case XK_KP_F1:\r
+ case XK_F1: KeyData.Key.ScanCode = SCAN_F1;\r
+ break;\r
+\r
+ case XK_KP_F2:\r
+ case XK_F2: KeyData.Key.ScanCode = SCAN_F2;\r
+ break;\r
+\r
+ case XK_KP_F3:\r
+ case XK_F3: KeyData.Key.ScanCode = SCAN_F3;\r
+ break;\r
+\r
+ case XK_KP_F4:\r
+ case XK_F4: KeyData.Key.ScanCode = SCAN_F4;\r
+ break;\r
+\r
+ case XK_F5: KeyData.Key.ScanCode = SCAN_F5;\r
+ break;\r
+ case XK_F6: KeyData.Key.ScanCode = SCAN_F6;\r
+ break;\r
+ case XK_F7: KeyData.Key.ScanCode = SCAN_F7;\r
+ break;\r
+\r
+ // Don't map into X11 by default on a Mac\r
+ // System Preferences->Keyboard->Keyboard Shortcuts can be configured\r
+ // to not use higher function keys as shortcuts and the will show up\r
+ // in X11.\r
+ case XK_F8: KeyData.Key.ScanCode = SCAN_F8;\r
+ break;\r
+ case XK_F9: KeyData.Key.ScanCode = SCAN_F9;\r
+ break;\r
+ case XK_F10: KeyData.Key.ScanCode = SCAN_F10;\r
+ break;\r
+\r
+ case XK_F11: KeyData.Key.ScanCode = SCAN_F11;\r
+ break;\r
+ case XK_F12: KeyData.Key.ScanCode = SCAN_F12;\r
+ break;\r
+\r
+ case XK_F13: KeyData.Key.ScanCode = SCAN_F13;\r
+ break;\r
+ case XK_F14: KeyData.Key.ScanCode = SCAN_F14;\r
+ break;\r
+ case XK_F15: KeyData.Key.ScanCode = SCAN_F15;\r
+ break;\r
+ case XK_F16: KeyData.Key.ScanCode = SCAN_F16;\r
+ break;\r
+ case XK_F17: KeyData.Key.ScanCode = SCAN_F17;\r
+ break;\r
+ case XK_F18: KeyData.Key.ScanCode = SCAN_F18;\r
+ break;\r
+ case XK_F19: KeyData.Key.ScanCode = SCAN_F19;\r
+ break;\r
+ case XK_F20: KeyData.Key.ScanCode = SCAN_F20;\r
+ break;\r
+ case XK_F21: KeyData.Key.ScanCode = SCAN_F21;\r
+ break;\r
+ case XK_F22: KeyData.Key.ScanCode = SCAN_F22;\r
+ break;\r
+ case XK_F23: KeyData.Key.ScanCode = SCAN_F23;\r
+ break;\r
+ case XK_F24: KeyData.Key.ScanCode = SCAN_F24;\r
+ break;\r
+\r
+ // No mapping in X11\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_MUTE; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_VOLUME_UP; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_VOLUME_DOWN; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_BRIGHTNESS_UP; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_BRIGHTNESS_DOWN; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_SUSPEND; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_HIBERNATE; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_TOGGLE_DISPLAY; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_RECOVERY; break;\r
+ // case XK_: KeyData.Key.ScanCode = SCAN_EJECT; break;\r
+\r
+ case XK_BackSpace: KeyData.Key.UnicodeChar = 0x0008;\r
+ break;\r
+\r
+ case XK_KP_Tab:\r
+ case XK_Tab: KeyData.Key.UnicodeChar = 0x0009;\r
+ break;\r
+\r
+ case XK_Linefeed: KeyData.Key.UnicodeChar = 0x000a;\r
+ break;\r
+\r
+ case XK_KP_Enter:\r
+ case XK_Return: KeyData.Key.UnicodeChar = 0x000d;\r
+ break;\r
+\r
+ case XK_KP_Equal: KeyData.Key.UnicodeChar = L'=';\r
+ break;\r
+ case XK_KP_Multiply: KeyData.Key.UnicodeChar = L'*';\r
+ break;\r
+ case XK_KP_Add: KeyData.Key.UnicodeChar = L'+';\r
+ break;\r
+ case XK_KP_Separator: KeyData.Key.UnicodeChar = L'~';\r
+ break;\r
+ case XK_KP_Subtract: KeyData.Key.UnicodeChar = L'-';\r
+ break;\r
+ case XK_KP_Decimal: KeyData.Key.UnicodeChar = L'.';\r
+ break;\r
+ case XK_KP_Divide: KeyData.Key.UnicodeChar = L'/';\r
+ break;\r
+\r
+ case XK_KP_0: KeyData.Key.UnicodeChar = L'0';\r
+ break;\r
+ case XK_KP_1: KeyData.Key.UnicodeChar = L'1';\r
+ break;\r
+ case XK_KP_2: KeyData.Key.UnicodeChar = L'2';\r
+ break;\r
+ case XK_KP_3: KeyData.Key.UnicodeChar = L'3';\r
+ break;\r
+ case XK_KP_4: KeyData.Key.UnicodeChar = L'4';\r
+ break;\r
+ case XK_KP_5: KeyData.Key.UnicodeChar = L'5';\r
+ break;\r
+ case XK_KP_6: KeyData.Key.UnicodeChar = L'6';\r
+ break;\r
+ case XK_KP_7: KeyData.Key.UnicodeChar = L'7';\r
+ break;\r
+ case XK_KP_8: KeyData.Key.UnicodeChar = L'8';\r
+ break;\r
+ case XK_KP_9: KeyData.Key.UnicodeChar = L'9';\r
+ break;\r
+\r
+ default:\r
+ ;\r
}\r
\r
// The global state is our state\r
- KeyData.KeyState.KeyShiftState = Drv->KeyState.KeyShiftState;\r
+ KeyData.KeyState.KeyShiftState = Drv->KeyState.KeyShiftState;\r
KeyData.KeyState.KeyToggleState = Drv->KeyState.KeyToggleState;\r
\r
if (*KeySym < XK_BackSpace) {\r
if (((Drv->KeyState.KeyShiftState & (EFI_LEFT_SHIFT_PRESSED | EFI_RIGHT_SHIFT_PRESSED)) != 0) ||\r
- ((Drv->KeyState.KeyToggleState & EFI_CAPS_LOCK_ACTIVE) != 0) ) {\r
-\r
+ ((Drv->KeyState.KeyToggleState & EFI_CAPS_LOCK_ACTIVE) != 0))\r
+ {\r
KeyData.Key.UnicodeChar = (CHAR16)KeySym[KEYSYM_UPPER];\r
\r
// Per UEFI spec since we converted the Unicode clear the shift bits we pass up\r
}\r
} else {\r
// XK_BackSpace is the start of XK_MISCELLANY. These are the XK_? keys we process in this file\r
- ;\r
}\r
\r
if (Make) {\r
Drv->key_wr = (Drv->key_wr + 1) % NBR_KEYS;\r
Drv->key_count++;\r
if (Drv->MakeRegisterdKeyCallback != NULL) {\r
- ReverseGasketUint64Uint64 (Drv->MakeRegisterdKeyCallback ,Drv->RegisterdKeyCallbackContext, &KeyData);\r
+ ReverseGasketUint64Uint64 (Drv->MakeRegisterdKeyCallback, Drv->RegisterdKeyCallbackContext, &KeyData);\r
}\r
} else {\r
if (Drv->BreakRegisterdKeyCallback != NULL) {\r
- ReverseGasketUint64Uint64 (Drv->BreakRegisterdKeyCallback ,Drv->RegisterdKeyCallbackContext, &KeyData);\r
+ ReverseGasketUint64Uint64 (Drv->BreakRegisterdKeyCallback, Drv->RegisterdKeyCallbackContext, &KeyData);\r
}\r
}\r
}\r
\r
-\r
void\r
-handleMouseMoved(\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN XEvent *ev\r
+handleMouseMoved (\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN XEvent *ev\r
)\r
{\r
if (ev->xmotion.x != Drv->previous_x) {\r
- Drv->pointer_state.RelativeMovementX += ( ev->xmotion.x - Drv->previous_x );\r
- Drv->previous_x = ev->xmotion.x;\r
- Drv->pointer_state_changed = 1;\r
+ Drv->pointer_state.RelativeMovementX += (ev->xmotion.x - Drv->previous_x);\r
+ Drv->previous_x = ev->xmotion.x;\r
+ Drv->pointer_state_changed = 1;\r
}\r
\r
if (ev->xmotion.y != Drv->previous_y) {\r
- Drv->pointer_state.RelativeMovementY += ( ev->xmotion.y - Drv->previous_y );\r
- Drv->previous_y = ev->xmotion.y;\r
- Drv->pointer_state_changed = 1;\r
+ Drv->pointer_state.RelativeMovementY += (ev->xmotion.y - Drv->previous_y);\r
+ Drv->previous_y = ev->xmotion.y;\r
+ Drv->pointer_state_changed = 1;\r
}\r
\r
Drv->pointer_state.RelativeMovementZ = 0;\r
\r
void\r
handleMouseDown (\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN XEvent *ev,\r
- IN BOOLEAN Pressed\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN XEvent *ev,\r
+ IN BOOLEAN Pressed\r
)\r
{\r
if (ev->xbutton.button == Button1) {\r
- Drv->pointer_state_changed = (Drv->pointer_state.LeftButton != Pressed);\r
+ Drv->pointer_state_changed = (Drv->pointer_state.LeftButton != Pressed);\r
Drv->pointer_state.LeftButton = Pressed;\r
}\r
+\r
if ( ev->xbutton.button == Button2 ) {\r
- Drv->pointer_state_changed = (Drv->pointer_state.RightButton != Pressed);\r
+ Drv->pointer_state_changed = (Drv->pointer_state.RightButton != Pressed);\r
Drv->pointer_state.RightButton = Pressed;\r
}\r
}\r
\r
void\r
Redraw (\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN UINTN X,\r
- IN UINTN Y,\r
- IN UINTN Width,\r
- IN UINTN Height\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN UINTN X,\r
+ IN UINTN Y,\r
+ IN UINTN Width,\r
+ IN UINTN Height\r
)\r
{\r
if (Drv->use_shm) {\r
XShmPutImage (\r
- Drv->display, Drv->win, Drv->gc, Drv->image, X, Y, X, Y, Width, Height, False\r
+ Drv->display,\r
+ Drv->win,\r
+ Drv->gc,\r
+ Drv->image,\r
+ X,\r
+ Y,\r
+ X,\r
+ Y,\r
+ Width,\r
+ Height,\r
+ False\r
);\r
} else {\r
XPutImage (\r
- Drv->display, Drv->win, Drv->gc, Drv->image, X, Y, X, Y, Width, Height\r
+ Drv->display,\r
+ Drv->win,\r
+ Drv->gc,\r
+ Drv->image,\r
+ X,\r
+ Y,\r
+ X,\r
+ Y,\r
+ Width,\r
+ Height\r
);\r
}\r
- XFlush(Drv->display);\r
+\r
+ XFlush (Drv->display);\r
}\r
\r
void\r
-HandleEvent(GRAPHICS_IO_PRIVATE *Drv, XEvent *ev)\r
+HandleEvent (\r
+ GRAPHICS_IO_PRIVATE *Drv,\r
+ XEvent *ev\r
+ )\r
{\r
switch (ev->type) {\r
- case Expose:\r
- Redraw (Drv, ev->xexpose.x, ev->xexpose.y,\r
- ev->xexpose.width, ev->xexpose.height);\r
- break;\r
- case GraphicsExpose:\r
- Redraw (Drv, ev->xgraphicsexpose.x, ev->xgraphicsexpose.y,\r
- ev->xgraphicsexpose.width, ev->xgraphicsexpose.height);\r
- break;\r
- case KeyPress:\r
- handleKeyEvent (Drv, ev, TRUE);\r
- break;\r
- case KeyRelease:\r
- handleKeyEvent (Drv, ev, FALSE);\r
- break;\r
- case MappingNotify:\r
- XRefreshKeyboardMapping (&ev->xmapping);\r
- break;\r
- case MotionNotify:\r
- handleMouseMoved (Drv, ev);\r
- break;\r
- case ButtonPress:\r
- handleMouseDown (Drv, ev, TRUE);\r
- break;\r
- case ButtonRelease:\r
- handleMouseDown (Drv, ev, FALSE);\r
- break;\r
-#if 0\r
- case DestroyNotify:\r
- XCloseDisplay (Drv->display);\r
- exit (1);\r
- break;\r
-#endif\r
- case NoExpose:\r
- default:\r
- break;\r
+ case Expose:\r
+ Redraw (\r
+ Drv,\r
+ ev->xexpose.x,\r
+ ev->xexpose.y,\r
+ ev->xexpose.width,\r
+ ev->xexpose.height\r
+ );\r
+ break;\r
+ case GraphicsExpose:\r
+ Redraw (\r
+ Drv,\r
+ ev->xgraphicsexpose.x,\r
+ ev->xgraphicsexpose.y,\r
+ ev->xgraphicsexpose.width,\r
+ ev->xgraphicsexpose.height\r
+ );\r
+ break;\r
+ case KeyPress:\r
+ handleKeyEvent (Drv, ev, TRUE);\r
+ break;\r
+ case KeyRelease:\r
+ handleKeyEvent (Drv, ev, FALSE);\r
+ break;\r
+ case MappingNotify:\r
+ XRefreshKeyboardMapping (&ev->xmapping);\r
+ break;\r
+ case MotionNotify:\r
+ handleMouseMoved (Drv, ev);\r
+ break;\r
+ case ButtonPress:\r
+ handleMouseDown (Drv, ev, TRUE);\r
+ break;\r
+ case ButtonRelease:\r
+ handleMouseDown (Drv, ev, FALSE);\r
+ break;\r
+ #if 0\r
+ case DestroyNotify:\r
+ XCloseDisplay (Drv->display);\r
+ exit (1);\r
+ break;\r
+ #endif\r
+ case NoExpose:\r
+ default:\r
+ break;\r
}\r
}\r
\r
void\r
HandleEvents (\r
- IN GRAPHICS_IO_PRIVATE *Drv\r
+ IN GRAPHICS_IO_PRIVATE *Drv\r
)\r
{\r
- XEvent ev;\r
+ XEvent ev;\r
\r
while (XPending (Drv->display) != 0) {\r
XNextEvent (Drv->display, &ev);\r
\r
unsigned long\r
X11PixelToColor (\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN EFI_UGA_PIXEL pixel\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN EFI_UGA_PIXEL pixel\r
)\r
{\r
return ((pixel.Red >> Drv->r.csize) << Drv->r.shift)\r
- | ((pixel.Green >> Drv->g.csize) << Drv->g.shift)\r
- | ((pixel.Blue >> Drv->b.csize) << Drv->b.shift);\r
+ | ((pixel.Green >> Drv->g.csize) << Drv->g.shift)\r
+ | ((pixel.Blue >> Drv->b.csize) << Drv->b.shift);\r
}\r
\r
EFI_UGA_PIXEL\r
X11ColorToPixel (\r
- IN GRAPHICS_IO_PRIVATE *Drv,\r
- IN unsigned long val\r
+ IN GRAPHICS_IO_PRIVATE *Drv,\r
+ IN unsigned long val\r
)\r
{\r
- EFI_UGA_PIXEL Pixel;\r
+ EFI_UGA_PIXEL Pixel;\r
\r
memset (&Pixel, 0, sizeof (EFI_UGA_PIXEL));\r
\r
// Truncation not an issue since X11 and EFI are both using 8 bits per color\r
- Pixel.Red = (val >> Drv->r.shift) << Drv->r.csize;\r
+ Pixel.Red = (val >> Drv->r.shift) << Drv->r.csize;\r
Pixel.Green = (val >> Drv->g.shift) << Drv->g.csize;\r
- Pixel.Blue = (val >> Drv->b.shift) << Drv->b.csize;\r
+ Pixel.Blue = (val >> Drv->b.shift) << Drv->b.csize;\r
\r
return Pixel;\r
}\r
\r
-\r
EFI_STATUS\r
X11CheckKey (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
)\r
{\r
GRAPHICS_IO_PRIVATE *Drv;\r
IN EFI_KEY_DATA *KeyData\r
)\r
{\r
- EFI_STATUS EfiStatus;\r
- GRAPHICS_IO_PRIVATE *Drv;\r
+ EFI_STATUS EfiStatus;\r
+ GRAPHICS_IO_PRIVATE *Drv;\r
\r
Drv = (GRAPHICS_IO_PRIVATE *)GraphicsIo;\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
X11KeySetState (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
)\r
{\r
GRAPHICS_IO_PRIVATE *Drv;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
X11RegisterKeyNotify (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
- IN VOID *Context\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
+ IN VOID *Context\r
)\r
{\r
GRAPHICS_IO_PRIVATE *Drv;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
X11Blt (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
- IN EFI_UGA_BLT_OPERATION BltOperation,\r
- IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
+ IN EFI_UGA_BLT_OPERATION BltOperation,\r
+ IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
)\r
{\r
- GRAPHICS_IO_PRIVATE *Private;\r
- UINTN DstY;\r
- UINTN SrcY;\r
- UINTN DstX;\r
- UINTN SrcX;\r
- UINTN Index;\r
- EFI_UGA_PIXEL *Blt;\r
- UINT8 *Dst;\r
- UINT8 *Src;\r
- UINTN Nbr;\r
- unsigned long Color;\r
- XEvent ev;\r
+ GRAPHICS_IO_PRIVATE *Private;\r
+ UINTN DstY;\r
+ UINTN SrcY;\r
+ UINTN DstX;\r
+ UINTN SrcX;\r
+ UINTN Index;\r
+ EFI_UGA_PIXEL *Blt;\r
+ UINT8 *Dst;\r
+ UINT8 *Src;\r
+ UINTN Nbr;\r
+ unsigned long Color;\r
+ XEvent ev;\r
\r
Private = (GRAPHICS_IO_PRIVATE *)GraphicsIo;\r
\r
-\r
//\r
// Check bounds\r
//\r
- if (BltOperation == EfiUgaVideoToBltBuffer\r
- || BltOperation == EfiUgaVideoToVideo) {\r
+ if ( (BltOperation == EfiUgaVideoToBltBuffer)\r
+ || (BltOperation == EfiUgaVideoToVideo))\r
+ {\r
//\r
// Source is Video.\r
//\r
}\r
}\r
\r
- if (BltOperation == EfiUgaBltBufferToVideo\r
- || BltOperation == EfiUgaVideoToVideo\r
- || BltOperation == EfiUgaVideoFill) {\r
+ if ( (BltOperation == EfiUgaBltBufferToVideo)\r
+ || (BltOperation == EfiUgaVideoToVideo)\r
+ || (BltOperation == EfiUgaVideoFill))\r
+ {\r
//\r
// Destination is Video\r
//\r
}\r
\r
switch (BltOperation) {\r
- case EfiUgaVideoToBltBuffer:\r
- Blt = (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->DestinationY * Args->Delta) + Args->DestinationX * sizeof (EFI_UGA_PIXEL));\r
- Args->Delta -= Args->Width * sizeof (EFI_UGA_PIXEL);\r
- for (SrcY = Args->SourceY; SrcY < (Args->Height + Args->SourceY); SrcY++) {\r
- for (SrcX = Args->SourceX; SrcX < (Args->Width + Args->SourceX); SrcX++) {\r
- *Blt++ = X11ColorToPixel (Private, XGetPixel (Private->image, SrcX, SrcY));\r
+ case EfiUgaVideoToBltBuffer:\r
+ Blt = (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->DestinationY * Args->Delta) + Args->DestinationX * sizeof (EFI_UGA_PIXEL));\r
+ Args->Delta -= Args->Width * sizeof (EFI_UGA_PIXEL);\r
+ for (SrcY = Args->SourceY; SrcY < (Args->Height + Args->SourceY); SrcY++) {\r
+ for (SrcX = Args->SourceX; SrcX < (Args->Width + Args->SourceX); SrcX++) {\r
+ *Blt++ = X11ColorToPixel (Private, XGetPixel (Private->image, SrcX, SrcY));\r
+ }\r
+\r
+ Blt = (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta);\r
}\r
- Blt = (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta);\r
- }\r
- break;\r
- case EfiUgaBltBufferToVideo:\r
- Blt = (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->SourceY * Args->Delta) + Args->SourceX * sizeof (EFI_UGA_PIXEL));\r
- Args->Delta -= Args->Width * sizeof (EFI_UGA_PIXEL);\r
- for (DstY = Args->DestinationY; DstY < (Args->Height + Args->DestinationY); DstY++) {\r
- for (DstX = Args->DestinationX; DstX < (Args->Width + Args->DestinationX); DstX++) {\r
- XPutPixel(Private->image, DstX, DstY, X11PixelToColor(Private, *Blt));\r
- Blt++;\r
- }\r
- Blt = (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta);\r
- }\r
- break;\r
- case EfiUgaVideoToVideo:\r
- Dst = Private->image_data + (Args->DestinationX << Private->pixel_shift)\r
- + Args->DestinationY * Private->line_bytes;\r
- Src = Private->image_data + (Args->SourceX << Private->pixel_shift)\r
- + Args->SourceY * Private->line_bytes;\r
- Nbr = Args->Width << Private->pixel_shift;\r
- if (Args->DestinationY < Args->SourceY) {\r
- for (Index = 0; Index < Args->Height; Index++) {\r
- memcpy (Dst, Src, Nbr);\r
- Dst += Private->line_bytes;\r
- Src += Private->line_bytes;\r
+\r
+ break;\r
+ case EfiUgaBltBufferToVideo:\r
+ Blt = (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->SourceY * Args->Delta) + Args->SourceX * sizeof (EFI_UGA_PIXEL));\r
+ Args->Delta -= Args->Width * sizeof (EFI_UGA_PIXEL);\r
+ for (DstY = Args->DestinationY; DstY < (Args->Height + Args->DestinationY); DstY++) {\r
+ for (DstX = Args->DestinationX; DstX < (Args->Width + Args->DestinationX); DstX++) {\r
+ XPutPixel (Private->image, DstX, DstY, X11PixelToColor (Private, *Blt));\r
+ Blt++;\r
+ }\r
+\r
+ Blt = (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta);\r
}\r
- } else {\r
- Dst += (Args->Height - 1) * Private->line_bytes;\r
- Src += (Args->Height - 1) * Private->line_bytes;\r
- for (Index = 0; Index < Args->Height; Index++) {\r
- //\r
- // Source and Destination Y may be equal, therefore Dst and Src may\r
- // overlap.\r
- //\r
- memmove (Dst, Src, Nbr);\r
- Dst -= Private->line_bytes;\r
- Src -= Private->line_bytes;\r
+\r
+ break;\r
+ case EfiUgaVideoToVideo:\r
+ Dst = Private->image_data + (Args->DestinationX << Private->pixel_shift)\r
+ + Args->DestinationY * Private->line_bytes;\r
+ Src = Private->image_data + (Args->SourceX << Private->pixel_shift)\r
+ + Args->SourceY * Private->line_bytes;\r
+ Nbr = Args->Width << Private->pixel_shift;\r
+ if (Args->DestinationY < Args->SourceY) {\r
+ for (Index = 0; Index < Args->Height; Index++) {\r
+ memcpy (Dst, Src, Nbr);\r
+ Dst += Private->line_bytes;\r
+ Src += Private->line_bytes;\r
+ }\r
+ } else {\r
+ Dst += (Args->Height - 1) * Private->line_bytes;\r
+ Src += (Args->Height - 1) * Private->line_bytes;\r
+ for (Index = 0; Index < Args->Height; Index++) {\r
+ //\r
+ // Source and Destination Y may be equal, therefore Dst and Src may\r
+ // overlap.\r
+ //\r
+ memmove (Dst, Src, Nbr);\r
+ Dst -= Private->line_bytes;\r
+ Src -= Private->line_bytes;\r
+ }\r
}\r
- }\r
- break;\r
- case EfiUgaVideoFill:\r
- Color = X11PixelToColor(Private, *BltBuffer);\r
- for (DstY = Args->DestinationY; DstY < (Args->Height + Args->DestinationY); DstY++) {\r
- for (DstX = Args->DestinationX; DstX < (Args->Width + Args->DestinationX); DstX++) {\r
- XPutPixel(Private->image, DstX, DstY, Color);\r
+\r
+ break;\r
+ case EfiUgaVideoFill:\r
+ Color = X11PixelToColor (Private, *BltBuffer);\r
+ for (DstY = Args->DestinationY; DstY < (Args->Height + Args->DestinationY); DstY++) {\r
+ for (DstX = Args->DestinationX; DstX < (Args->Width + Args->DestinationX); DstX++) {\r
+ XPutPixel (Private->image, DstX, DstY, Color);\r
+ }\r
}\r
- }\r
- break;\r
- default:\r
- return EFI_INVALID_PARAMETER;\r
+\r
+ break;\r
+ default:\r
+ return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// Refresh screen.\r
//\r
switch (BltOperation) {\r
- case EfiUgaVideoToVideo:\r
- XCopyArea(\r
- Private->display, Private->win, Private->win, Private->gc,\r
- Args->SourceX, Args->SourceY, Args->Width, Args->Height,\r
- Args->DestinationX, Args->DestinationY\r
- );\r
-\r
- while (1) {\r
- XNextEvent (Private->display, &ev);\r
- HandleEvent (Private, &ev);\r
- if (ev.type == NoExpose || ev.type == GraphicsExpose) {\r
- break;\r
+ case EfiUgaVideoToVideo:\r
+ XCopyArea (\r
+ Private->display,\r
+ Private->win,\r
+ Private->win,\r
+ Private->gc,\r
+ Args->SourceX,\r
+ Args->SourceY,\r
+ Args->Width,\r
+ Args->Height,\r
+ Args->DestinationX,\r
+ Args->DestinationY\r
+ );\r
+\r
+ while (1) {\r
+ XNextEvent (Private->display, &ev);\r
+ HandleEvent (Private, &ev);\r
+ if ((ev.type == NoExpose) || (ev.type == GraphicsExpose)) {\r
+ break;\r
+ }\r
}\r
- }\r
- break;\r
- case EfiUgaVideoFill:\r
- Color = X11PixelToColor (Private, *BltBuffer);\r
- XSetForeground (Private->display, Private->gc, Color);\r
- XFillRectangle (\r
- Private->display, Private->win, Private->gc,\r
- Args->DestinationX, Args->DestinationY, Args->Width, Args->Height\r
- );\r
- XFlush (Private->display);\r
- break;\r
- case EfiUgaBltBufferToVideo:\r
- Redraw (Private, Args->DestinationX, Args->DestinationY, Args->Width, Args->Height);\r
- break;\r
- default:\r
- break;\r
+\r
+ break;\r
+ case EfiUgaVideoFill:\r
+ Color = X11PixelToColor (Private, *BltBuffer);\r
+ XSetForeground (Private->display, Private->gc, Color);\r
+ XFillRectangle (\r
+ Private->display,\r
+ Private->win,\r
+ Private->gc,\r
+ Args->DestinationX,\r
+ Args->DestinationY,\r
+ Args->Width,\r
+ Args->Height\r
+ );\r
+ XFlush (Private->display);\r
+ break;\r
+ case EfiUgaBltBufferToVideo:\r
+ Redraw (Private, Args->DestinationX, Args->DestinationY, Args->Width, Args->Height);\r
+ break;\r
+ default:\r
+ break;\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
X11CheckPointer (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
)\r
{\r
GRAPHICS_IO_PRIVATE *Drv;\r
return EFI_NOT_READY;\r
}\r
\r
-\r
EFI_STATUS\r
X11GetPointerState (\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
IN EFI_SIMPLE_POINTER_STATE *State\r
)\r
{\r
- EFI_STATUS EfiStatus;\r
- GRAPHICS_IO_PRIVATE *Drv;\r
+ EFI_STATUS EfiStatus;\r
+ GRAPHICS_IO_PRIVATE *Drv;\r
\r
Drv = (GRAPHICS_IO_PRIVATE *)GraphicsIo;\r
\r
Drv->pointer_state.RelativeMovementX = 0;\r
Drv->pointer_state.RelativeMovementY = 0;\r
Drv->pointer_state.RelativeMovementZ = 0;\r
- Drv->pointer_state_changed = 0;\r
+ Drv->pointer_state_changed = 0;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
X11GraphicsWindowOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
- GRAPHICS_IO_PRIVATE *Drv;\r
- unsigned int border_width = 0;\r
- char *display_name = NULL;\r
+ GRAPHICS_IO_PRIVATE *Drv;\r
+ unsigned int border_width = 0;\r
+ char *display_name = NULL;\r
\r
Drv = (GRAPHICS_IO_PRIVATE *)calloc (1, sizeof (GRAPHICS_IO_PRIVATE));\r
if (Drv == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- Drv->GraphicsIo.Size = GasketX11Size;\r
- Drv->GraphicsIo.CheckKey = GasketX11CheckKey;\r
- Drv->GraphicsIo.GetKey = GasketX11GetKey;\r
- Drv->GraphicsIo.KeySetState = GasketX11KeySetState;\r
- Drv->GraphicsIo.RegisterKeyNotify = GasketX11RegisterKeyNotify;\r
- Drv->GraphicsIo.Blt = GasketX11Blt;\r
- Drv->GraphicsIo.CheckPointer = GasketX11CheckPointer;\r
- Drv->GraphicsIo.GetPointerState = GasketX11GetPointerState;\r
-\r
-\r
- Drv->key_count = 0;\r
- Drv->key_rd = 0;\r
- Drv->key_wr = 0;\r
+ Drv->GraphicsIo.Size = GasketX11Size;\r
+ Drv->GraphicsIo.CheckKey = GasketX11CheckKey;\r
+ Drv->GraphicsIo.GetKey = GasketX11GetKey;\r
+ Drv->GraphicsIo.KeySetState = GasketX11KeySetState;\r
+ Drv->GraphicsIo.RegisterKeyNotify = GasketX11RegisterKeyNotify;\r
+ Drv->GraphicsIo.Blt = GasketX11Blt;\r
+ Drv->GraphicsIo.CheckPointer = GasketX11CheckPointer;\r
+ Drv->GraphicsIo.GetPointerState = GasketX11GetPointerState;\r
+\r
+ Drv->key_count = 0;\r
+ Drv->key_rd = 0;\r
+ Drv->key_wr = 0;\r
Drv->KeyState.KeyShiftState = EFI_SHIFT_STATE_VALID;\r
Drv->KeyState.KeyToggleState = EFI_TOGGLE_STATE_VALID;\r
Drv->MakeRegisterdKeyCallback = NULL;\r
Drv->BreakRegisterdKeyCallback = NULL;\r
Drv->RegisterdKeyCallbackContext = NULL;\r
\r
-\r
Drv->display = XOpenDisplay (display_name);\r
if (Drv->display == NULL) {\r
fprintf (stderr, "uga: cannot connect to X server %s\n", XDisplayName (display_name));\r
free (Drv);\r
return EFI_DEVICE_ERROR;\r
}\r
+\r
Drv->screen = DefaultScreen (Drv->display);\r
Drv->visual = DefaultVisual (Drv->display, Drv->screen);\r
- Drv->win = XCreateSimpleWindow (\r
- Drv->display, RootWindow (Drv->display, Drv->screen),\r
- 0, 0, 4, 4, border_width,\r
- WhitePixel (Drv->display, Drv->screen),\r
- BlackPixel (Drv->display, Drv->screen)\r
- );\r
+ Drv->win = XCreateSimpleWindow (\r
+ Drv->display,\r
+ RootWindow (Drv->display, Drv->screen),\r
+ 0,\r
+ 0,\r
+ 4,\r
+ 4,\r
+ border_width,\r
+ WhitePixel (Drv->display, Drv->screen),\r
+ BlackPixel (Drv->display, Drv->screen)\r
+ );\r
\r
Drv->depth = DefaultDepth (Drv->display, Drv->screen);\r
XDefineCursor (Drv->display, Drv->win, XCreateFontCursor (Drv->display, XC_pirate));\r
UnicodeStrToAsciiStrS (This->ConfigString, Drv->Title, StrSize (This->ConfigString));\r
XStoreName (Drv->display, Drv->win, Drv->Title);\r
\r
-// XAutoRepeatOff (Drv->display);\r
+ // XAutoRepeatOff (Drv->display);\r
XSelectInput (\r
- Drv->display, Drv->win,\r
+ Drv->display,\r
+ Drv->win,\r
ExposureMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask\r
);\r
Drv->gc = DefaultGC (Drv->display, Drv->screen);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
X11GraphicsWindowClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
- GRAPHICS_IO_PRIVATE *Drv;\r
+ GRAPHICS_IO_PRIVATE *Drv;\r
\r
Drv = (GRAPHICS_IO_PRIVATE *)This->Private;\r
\r
}\r
\r
if (Drv->image != NULL) {\r
- XDestroyImage(Drv->image);\r
+ XDestroyImage (Drv->image);\r
\r
if (Drv->use_shm) {\r
shmdt (Drv->image_data);\r
}\r
\r
Drv->image_data = NULL;\r
- Drv->image = NULL;\r
+ Drv->image = NULL;\r
}\r
+\r
XDestroyWindow (Drv->display, Drv->win);\r
XCloseDisplay (Drv->display);\r
\r
-#ifdef __APPLE__\r
+ #ifdef __APPLE__\r
// Free up the shared memory\r
shmctl (Drv->xshm_info.shmid, IPC_RMID, NULL);\r
-#endif\r
+ #endif\r
\r
free (Drv);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EMU_IO_THUNK_PROTOCOL gX11ThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL gX11ThunkIo = {\r
&gEmuGraphicsWindowProtocolGuid,\r
NULL,\r
NULL,\r
GasketX11GraphicsWindowClose,\r
NULL\r
};\r
-\r
-\r
\r
#include "WinHost.h"\r
\r
-#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'b', 'k')\r
+#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'b', 'k')\r
typedef struct {\r
- UINTN Signature;\r
+ UINTN Signature;\r
\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
\r
- CHAR16 *FileName;\r
- BOOLEAN Removable;\r
- BOOLEAN Readonly;\r
+ CHAR16 *FileName;\r
+ BOOLEAN Removable;\r
+ BOOLEAN Readonly;\r
\r
- HANDLE NtHandle;\r
- UINT32 BlockSize;\r
+ HANDLE NtHandle;\r
+ UINT32 BlockSize;\r
\r
- EFI_BLOCK_IO_MEDIA *Media;\r
- EMU_BLOCK_IO_PROTOCOL EmuBlockIo;\r
+ EFI_BLOCK_IO_MEDIA *Media;\r
+ EMU_BLOCK_IO_PROTOCOL EmuBlockIo;\r
} WIN_NT_BLOCK_IO_PRIVATE;\r
\r
#define WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, WIN_NT_BLOCK_IO_PRIVATE, EmuBlockIo, WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE)\r
\r
-\r
EFI_STATUS\r
WinNtBlockIoReset (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
);\r
\r
-\r
-\r
-\r
EFI_STATUS\r
SetFilePointer64 (\r
- IN WIN_NT_BLOCK_IO_PRIVATE *Private,\r
- IN INT64 DistanceToMove,\r
- OUT UINT64 *NewFilePointer,\r
- IN DWORD MoveMethod\r
-)\r
+ IN WIN_NT_BLOCK_IO_PRIVATE *Private,\r
+ IN INT64 DistanceToMove,\r
+ OUT UINT64 *NewFilePointer,\r
+ IN DWORD MoveMethod\r
+ )\r
+\r
/*++\r
\r
This function extends the capability of SetFilePointer to accept 64 bit parameters\r
\r
--*/\r
{\r
- EFI_STATUS Status;\r
- LARGE_INTEGER LargeInt;\r
+ EFI_STATUS Status;\r
+ LARGE_INTEGER LargeInt;\r
\r
LargeInt.QuadPart = DistanceToMove;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
LargeInt.LowPart = SetFilePointer (\r
- Private->NtHandle,\r
- LargeInt.LowPart,\r
- &LargeInt.HighPart,\r
- MoveMethod\r
- );\r
+ Private->NtHandle,\r
+ LargeInt.LowPart,\r
+ &LargeInt.HighPart,\r
+ MoveMethod\r
+ );\r
\r
- if (LargeInt.LowPart == -1 && GetLastError () != NO_ERROR) {\r
+ if ((LargeInt.LowPart == -1) && (GetLastError () != NO_ERROR)) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
\r
return Status;\r
}\r
\r
-\r
-\r
EFI_STATUS\r
WinNtBlockIoOpenDevice (\r
- IN WIN_NT_BLOCK_IO_PRIVATE *Private,\r
- IN EFI_BLOCK_IO_MEDIA *Media\r
+ IN WIN_NT_BLOCK_IO_PRIVATE *Private,\r
+ IN EFI_BLOCK_IO_MEDIA *Media\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT64 FileSize;\r
+ EFI_STATUS Status;\r
+ UINT64 FileSize;\r
\r
//\r
// If the device is already opened, close it\r
// Open the device\r
//\r
Private->NtHandle = CreateFile (\r
- Private->FileName,\r
- GENERIC_READ | (Private->Readonly ? 0 : GENERIC_WRITE),\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_ALWAYS, // Create if it doesn't exist\r
- 0,\r
- NULL\r
- );\r
+ Private->FileName,\r
+ GENERIC_READ | (Private->Readonly ? 0 : GENERIC_WRITE),\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_ALWAYS, // Create if it doesn't exist\r
+ 0,\r
+ NULL\r
+ );\r
\r
if (Private->NtHandle == INVALID_HANDLE_VALUE) {\r
DEBUG ((DEBUG_INFO, "OpenBlock: Could not open %S, %x\n", Private->FileName, GetLastError ()));\r
Media->MediaPresent = FALSE;\r
- Status = EFI_NO_MEDIA;\r
+ Status = EFI_NO_MEDIA;\r
goto Done;\r
}\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
WinNtBlockIoCreateMapping (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN EFI_BLOCK_IO_MEDIA *Media\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN EFI_BLOCK_IO_MEDIA *Media\r
)\r
{\r
- WIN_NT_BLOCK_IO_PRIVATE *Private;\r
+ WIN_NT_BLOCK_IO_PRIVATE *Private;\r
\r
Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
Media->LowestAlignedLba = 0;\r
Media->LogicalBlocksPerPhysicalBlock = 0;\r
\r
-\r
// EFI_BLOCK_IO_PROTOCOL_REVISION3\r
Media->OptimalTransferLengthGranularity = 0;\r
\r
return WinNtBlockIoOpenDevice (Private, Media);\r
}\r
\r
-\r
-\r
EFI_STATUS\r
WinNtBlockIoError (\r
- IN WIN_NT_BLOCK_IO_PRIVATE *Private\r
-)\r
+ IN WIN_NT_BLOCK_IO_PRIVATE *Private\r
+ )\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- EFI_BLOCK_IO_MEDIA *Media;\r
- EFI_STATUS Status;\r
+ EFI_BLOCK_IO_MEDIA *Media;\r
+ EFI_STATUS Status;\r
\r
Media = Private->Media;\r
\r
switch (GetLastError ()) {\r
-\r
- case ERROR_NOT_READY:\r
- Media->ReadOnly = FALSE;\r
- Media->MediaPresent = FALSE;\r
- Status = EFI_NO_MEDIA;\r
- break;\r
-\r
- case ERROR_WRONG_DISK:\r
- Media->ReadOnly = FALSE;\r
- Media->MediaPresent = TRUE;\r
- Media->MediaId++;\r
- Status = EFI_MEDIA_CHANGED;\r
- break;\r
-\r
- case ERROR_WRITE_PROTECT:\r
- Media->ReadOnly = TRUE;\r
- Status = EFI_WRITE_PROTECTED;\r
- break;\r
-\r
- default:\r
- Status = EFI_DEVICE_ERROR;\r
- break;\r
+ case ERROR_NOT_READY:\r
+ Media->ReadOnly = FALSE;\r
+ Media->MediaPresent = FALSE;\r
+ Status = EFI_NO_MEDIA;\r
+ break;\r
+\r
+ case ERROR_WRONG_DISK:\r
+ Media->ReadOnly = FALSE;\r
+ Media->MediaPresent = TRUE;\r
+ Media->MediaId++;\r
+ Status = EFI_MEDIA_CHANGED;\r
+ break;\r
+\r
+ case ERROR_WRITE_PROTECT:\r
+ Media->ReadOnly = TRUE;\r
+ Status = EFI_WRITE_PROTECTED;\r
+ break;\r
+\r
+ default:\r
+ Status = EFI_DEVICE_ERROR;\r
+ break;\r
}\r
\r
- if (Status == EFI_NO_MEDIA || Status == EFI_MEDIA_CHANGED) {\r
+ if ((Status == EFI_NO_MEDIA) || (Status == EFI_MEDIA_CHANGED)) {\r
WinNtBlockIoReset (&Private->EmuBlockIo, FALSE);\r
}\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
WinNtSignalToken (\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
- IN EFI_STATUS Status\r
-)\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
+ IN EFI_STATUS Status\r
+ )\r
{\r
if (Token != NULL) {\r
if (Token->Event != NULL) {\r
return EFI_SUCCESS;\r
}\r
}\r
+\r
return Status;\r
}\r
\r
IN EFI_LBA Lba,\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token,\r
IN UINTN BufferSize,\r
- OUT VOID *Buffer\r
+ OUT VOID *Buffer\r
)\r
{\r
- WIN_NT_BLOCK_IO_PRIVATE *Private;\r
- BOOL Flag;\r
- EFI_STATUS Status;\r
- DWORD BytesRead;\r
- UINT64 DistanceToMove;\r
- UINT64 DistanceMoved;\r
+ WIN_NT_BLOCK_IO_PRIVATE *Private;\r
+ BOOL Flag;\r
+ EFI_STATUS Status;\r
+ DWORD BytesRead;\r
+ UINT64 DistanceToMove;\r
+ UINT64 DistanceMoved;\r
\r
Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
// Seek to proper position\r
//\r
DistanceToMove = MultU64x32 (Lba, (UINT32)Private->BlockSize);\r
- Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
+ Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
\r
if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {\r
DEBUG ((DEBUG_INIT, "ReadBlocks: SetFilePointer failed\n"));\r
return WinNtSignalToken (Token, EFI_SUCCESS);\r
}\r
\r
-\r
/**\r
Write BufferSize bytes from Lba into Buffer.\r
\r
IN VOID *Buffer\r
)\r
{\r
- WIN_NT_BLOCK_IO_PRIVATE *Private;\r
- UINTN BytesWritten;\r
- BOOL Success;\r
- EFI_STATUS Status;\r
- UINT64 DistanceToMove;\r
- UINT64 DistanceMoved;\r
+ WIN_NT_BLOCK_IO_PRIVATE *Private;\r
+ UINTN BytesWritten;\r
+ BOOL Success;\r
+ EFI_STATUS Status;\r
+ UINT64 DistanceToMove;\r
+ UINT64 DistanceMoved;\r
\r
Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
// Seek to proper position\r
//\r
DistanceToMove = MultU64x32 (Lba, (UINT32)Private->BlockSize);\r
- Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
+ Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
\r
if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {\r
DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
**/\r
EFI_STATUS\r
WinNtBlockIoFlushBlocks (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
)\r
{\r
return WinNtSignalToken (Token, EFI_SUCCESS);\r
}\r
\r
-\r
/**\r
Reset the block device hardware.\r
\r
**/\r
EFI_STATUS\r
WinNtBlockIoReset (\r
- IN EMU_BLOCK_IO_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_BLOCK_IO_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- WIN_NT_BLOCK_IO_PRIVATE *Private;\r
+ WIN_NT_BLOCK_IO_PRIVATE *Private;\r
\r
Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);\r
\r
return EFI_SUCCESS;\r
}\r
\r
-EMU_BLOCK_IO_PROTOCOL gEmuBlockIoProtocol = {\r
+EMU_BLOCK_IO_PROTOCOL gEmuBlockIoProtocol = {\r
WinNtBlockIoReset,\r
WinNtBlockIoReadBlocks,\r
WinNtBlockIoWriteBlocks,\r
EFI_STATUS\r
EFIAPI\r
WinNtBlockIoThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_BLOCK_IO_PRIVATE *Private;\r
Private->Thunk = This;\r
CopyMem (&Private->EmuBlockIo, &gEmuBlockIoProtocol, sizeof (gEmuBlockIoProtocol));\r
Private->BlockSize = 512;\r
- Private->NtHandle = INVALID_HANDLE_VALUE;\r
+ Private->NtHandle = INVALID_HANDLE_VALUE;\r
\r
Private->FileName = AllocateCopyPool (StrSize (This->ConfigString), This->ConfigString);\r
if (Private->FileName == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
//\r
// Parse ConfigString\r
// <ConfigString> := <FileName> ':' [RF][OW] ':' <BlockSize>\r
Private->Readonly = FALSE;\r
} else {\r
for (*Str++ = L'\0'; *Str != L'\0'; Str++) {\r
- if (*Str == 'R' || *Str == 'F') {\r
- Private->Removable = (BOOLEAN) (*Str == L'R');\r
+ if ((*Str == 'R') || (*Str == 'F')) {\r
+ Private->Removable = (BOOLEAN)(*Str == L'R');\r
}\r
- if (*Str == 'O' || *Str == 'W') {\r
- Private->Readonly = (BOOLEAN) (*Str == L'O');\r
+\r
+ if ((*Str == 'O') || (*Str == 'W')) {\r
+ Private->Readonly = (BOOLEAN)(*Str == L'O');\r
}\r
+\r
if (*Str == ':') {\r
Private->BlockSize = wcstol (++Str, NULL, 0);\r
break;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
WinNtBlockIoThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_BLOCK_IO_PRIVATE *Private;\r
if (Private->FileName != NULL) {\r
FreePool (Private->FileName);\r
}\r
+\r
FreePool (Private);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
-EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo = {\r
&gEmuBlockIoProtocolGuid,\r
NULL,\r
NULL,\r
\r
#include "WinHost.h"\r
\r
-\r
-#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'f', 's')\r
+#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'f', 's')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
- CHAR16 *FilePath;\r
- CHAR16 *VolumeLabel;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFileSystem;\r
+ CHAR16 *FilePath;\r
+ CHAR16 *VolumeLabel;\r
} WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE;\r
\r
#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS(a) \\r
WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \\r
)\r
\r
-\r
-#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')\r
+#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
- EFI_FILE_PROTOCOL EfiFile;\r
- HANDLE LHandle;\r
- HANDLE DirHandle;\r
- BOOLEAN IsRootDirectory;\r
- BOOLEAN IsDirectoryPath;\r
- BOOLEAN IsOpenedByRead;\r
- CHAR16 *FilePath;\r
- WCHAR *FileName;\r
- BOOLEAN IsValidFindBuf;\r
- WIN32_FIND_DATA FindBuf;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
+ EFI_FILE_PROTOCOL EfiFile;\r
+ HANDLE LHandle;\r
+ HANDLE DirHandle;\r
+ BOOLEAN IsRootDirectory;\r
+ BOOLEAN IsDirectoryPath;\r
+ BOOLEAN IsOpenedByRead;\r
+ CHAR16 *FilePath;\r
+ WCHAR *FileName;\r
+ BOOLEAN IsValidFindBuf;\r
+ WIN32_FIND_DATA FindBuf;\r
} WIN_NT_EFI_FILE_PRIVATE;\r
\r
#define WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS(a) \\r
WIN_NT_EFI_FILE_PRIVATE_SIGNATURE \\r
)\r
\r
-extern EFI_FILE_PROTOCOL gWinNtFileProtocol;\r
-extern EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gWinNtFileSystemProtocol;\r
+extern EFI_FILE_PROTOCOL gWinNtFileProtocol;\r
+extern EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gWinNtFileSystemProtocol;\r
\r
EFI_STATUS\r
WinNtFileGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
);\r
\r
EFI_STATUS\r
WinNtFileSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
);\r
\r
-\r
-\r
CHAR16 *\r
EfiStrChr (\r
- IN CHAR16 *Str,\r
- IN CHAR16 Chr\r
-)\r
+ IN CHAR16 *Str,\r
+ IN CHAR16 Chr\r
+ )\r
+\r
/*++\r
\r
Routine Description:\r
return (*Str == Chr) ? Str : NULL;\r
}\r
\r
-\r
-\r
BOOLEAN\r
IsZero (\r
IN VOID *Buffer,\r
IN UINTN Length\r
)\r
{\r
- if (Buffer == NULL || Length == 0) {\r
+ if ((Buffer == NULL) || (Length == 0)) {\r
return FALSE;\r
}\r
\r
- if (*(UINT8 *) Buffer != 0) {\r
+ if (*(UINT8 *)Buffer != 0) {\r
return FALSE;\r
}\r
\r
if (Length > 1) {\r
- if (!CompareMem (Buffer, (UINT8 *) Buffer + 1, Length - 1)) {\r
+ if (!CompareMem (Buffer, (UINT8 *)Buffer + 1, Length - 1)) {\r
return FALSE;\r
}\r
}\r
}\r
\r
if (Count != 0) {\r
- for (Pointer = Str; *(Pointer + Count); Pointer++) {\r
- *Pointer = *(Pointer + Count);\r
- }\r
+ for (Pointer = Str; *(Pointer + Count); Pointer++) {\r
+ *Pointer = *(Pointer + Count);\r
+ }\r
\r
- *Pointer = *(Pointer + Count);\r
+ *Pointer = *(Pointer + Count);\r
}\r
}\r
+\r
/**\r
Open the root directory on a volume.\r
\r
**/\r
EFI_STATUS\r
WinNtOpenVolume (\r
- IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **Root\r
+ IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **Root\r
)\r
{\r
- EFI_STATUS Status;\r
- WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- CHAR16 *TempFileName;\r
- UINTN Size;\r
+ EFI_STATUS Status;\r
+ WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ CHAR16 *TempFileName;\r
+ UINTN Size;\r
\r
- if (This == NULL || Root == NULL) {\r
+ if ((This == NULL) || (Root == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
goto Done;\r
}\r
\r
- StrCpyS (PrivateFile->FilePath,\r
+ StrCpyS (\r
+ PrivateFile->FilePath,\r
StrSize (Private->FilePath) / sizeof (CHAR16),\r
Private->FilePath\r
);\r
- StrCpyS (PrivateFile->FileName,\r
+ StrCpyS (\r
+ PrivateFile->FileName,\r
StrSize (Private->FilePath) / sizeof (CHAR16),\r
PrivateFile->FilePath\r
);\r
- PrivateFile->Signature = WIN_NT_EFI_FILE_PRIVATE_SIGNATURE;\r
- PrivateFile->Thunk = Private->Thunk;\r
+ PrivateFile->Signature = WIN_NT_EFI_FILE_PRIVATE_SIGNATURE;\r
+ PrivateFile->Thunk = Private->Thunk;\r
PrivateFile->SimpleFileSystem = This;\r
- PrivateFile->IsRootDirectory = TRUE;\r
- PrivateFile->IsDirectoryPath = TRUE;\r
- PrivateFile->IsOpenedByRead = TRUE;\r
+ PrivateFile->IsRootDirectory = TRUE;\r
+ PrivateFile->IsDirectoryPath = TRUE;\r
+ PrivateFile->IsOpenedByRead = TRUE;\r
CopyMem (&PrivateFile->EfiFile, &gWinNtFileProtocol, sizeof (gWinNtFileProtocol));\r
PrivateFile->IsValidFindBuf = FALSE;\r
\r
// Set DirHandle\r
//\r
PrivateFile->DirHandle = CreateFile (\r
- PrivateFile->FilePath,\r
- GENERIC_READ,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- FILE_FLAG_BACKUP_SEMANTICS,\r
- NULL\r
- );\r
+ PrivateFile->FilePath,\r
+ GENERIC_READ,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ FILE_FLAG_BACKUP_SEMANTICS,\r
+ NULL\r
+ );\r
\r
if (PrivateFile->DirHandle == INVALID_HANDLE_VALUE) {\r
Status = EFI_NOT_FOUND;\r
//\r
// Find the first file under it\r
//\r
- Size = StrSize (PrivateFile->FilePath);\r
- Size += StrSize (L"\\*");\r
+ Size = StrSize (PrivateFile->FilePath);\r
+ Size += StrSize (L"\\*");\r
TempFileName = AllocatePool (Size);\r
if (TempFileName == NULL) {\r
goto Done;\r
}\r
+\r
StrCpyS (TempFileName, Size / sizeof (CHAR16), PrivateFile->FilePath);\r
StrCatS (TempFileName, Size / sizeof (CHAR16), L"\\*");\r
\r
} else {\r
PrivateFile->IsValidFindBuf = TRUE;\r
}\r
+\r
*Root = &PrivateFile->EfiFile;\r
\r
Status = EFI_SUCCESS;\r
**/\r
UINTN\r
CountLeadingDots (\r
- IN CONST CHAR16 * FileNameToken\r
-)\r
+ IN CONST CHAR16 *FileNameToken\r
+ )\r
{\r
- UINTN Num;\r
+ UINTN Num;\r
\r
Num = 0;\r
while (*FileNameToken == L'.') {\r
return Num;\r
}\r
\r
-\r
BOOLEAN\r
IsFileNameTokenValid (\r
- IN CONST CHAR16 * FileNameToken\r
-)\r
+ IN CONST CHAR16 *FileNameToken\r
+ )\r
{\r
- UINTN Num;\r
+ UINTN Num;\r
+\r
if (StrStr (FileNameToken, L"/") != NULL) {\r
//\r
// No L'/' in file name.\r
return TRUE;\r
}\r
\r
-\r
/**\r
Return the first string token found in the indirect pointer a String named by FileName.\r
\r
**/\r
CHAR16 *\r
GetNextFileNameToken (\r
- IN OUT CONST CHAR16 ** FileName\r
-)\r
+ IN OUT CONST CHAR16 **FileName\r
+ )\r
{\r
- CHAR16 *SlashPos;\r
- CHAR16 *Token;\r
- UINTN Offset;\r
+ CHAR16 *SlashPos;\r
+ CHAR16 *Token;\r
+ UINTN Offset;\r
+\r
ASSERT (**FileName != L'\\');\r
ASSERT (**FileName != L'\0');\r
\r
SlashPos = StrStr (*FileName, L"\\");\r
if (SlashPos == NULL) {\r
- Token = AllocateCopyPool (StrSize (*FileName), *FileName);\r
+ Token = AllocateCopyPool (StrSize (*FileName), *FileName);\r
*FileName = NULL;\r
} else {\r
Offset = SlashPos - *FileName;\r
- Token = AllocateZeroPool ((Offset + 1) * sizeof (CHAR16));\r
+ Token = AllocateZeroPool ((Offset + 1) * sizeof (CHAR16));\r
StrnCpyS (Token, Offset + 1, *FileName, Offset);\r
//\r
// Point *FileName to the next character after L'\'.\r
return Token;\r
}\r
\r
-\r
/**\r
Check if a FileName contains only Valid Characters.\r
\r
@return FALSE FileName contains at least one invalid character.\r
\r
**/\r
-\r
BOOLEAN\r
IsFileNameValid (\r
- IN CONST CHAR16 *FileName\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- CHAR16 *Token;\r
- BOOLEAN Valid;\r
+ CHAR16 *Token;\r
+ BOOLEAN Valid;\r
\r
//\r
// If FileName is just L'\', then it is a valid pathname.\r
if (StrCmp (FileName, L"\\") == 0) {\r
return TRUE;\r
}\r
+\r
//\r
// We don't support two or more adjacent L'\'.\r
//\r
//\r
// Is FileName has a leading L"\", skip to next character.\r
//\r
- if (FileName [0] == L'\\') {\r
+ if (FileName[0] == L'\\') {\r
FileName++;\r
}\r
\r
Valid = IsFileNameTokenValid (Token);\r
FreePool (Token);\r
\r
- if (!Valid)\r
+ if (!Valid) {\r
return FALSE;\r
+ }\r
} while (FileName != NULL);\r
\r
return TRUE;\r
}\r
\r
-\r
/**\r
Opens a new file relative to the source file's location.\r
\r
**/\r
EFI_STATUS\r
WinNtFileOpen (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **NewHandle,\r
- IN CHAR16 *FileName,\r
- IN UINT64 OpenMode,\r
- IN UINT64 Attributes\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
+ IN CHAR16 *FileName,\r
+ IN UINT64 OpenMode,\r
+ IN UINT64 Attributes\r
)\r
{\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- WIN_NT_EFI_FILE_PRIVATE *NewPrivateFile;\r
- WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
- EFI_STATUS Status;\r
- CHAR16 *RealFileName;\r
- CHAR16 *TempFileName;\r
- CHAR16 *ParseFileName;\r
- CHAR16 *GuardPointer;\r
- CHAR16 TempChar;\r
- DWORD LastError;\r
- UINTN Count;\r
- BOOLEAN LoopFinish;\r
- UINTN InfoSize;\r
- EFI_FILE_INFO *Info;\r
- UINTN Size;\r
-\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ WIN_NT_EFI_FILE_PRIVATE *NewPrivateFile;\r
+ WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ EFI_STATUS Status;\r
+ CHAR16 *RealFileName;\r
+ CHAR16 *TempFileName;\r
+ CHAR16 *ParseFileName;\r
+ CHAR16 *GuardPointer;\r
+ CHAR16 TempChar;\r
+ DWORD LastError;\r
+ UINTN Count;\r
+ BOOLEAN LoopFinish;\r
+ UINTN InfoSize;\r
+ EFI_FILE_INFO *Info;\r
+ UINTN Size;\r
\r
//\r
// Init local variables\r
//\r
- PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
- PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
+ PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
+ PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
NewPrivateFile = NULL;\r
\r
//\r
if (TempFileName == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
StrCpyS (TempFileName, StrSize (FileName) / sizeof (CHAR16), FileName);\r
FileName = TempFileName;\r
\r
// If file name does not equal to "." or ".." and not trailed with "\..",\r
// then we trim the leading/trailing blanks and trailing dots\r
//\r
- if (StrCmp (FileName, L".") != 0 && StrCmp (FileName, L"..") != 0 &&\r
- ((StrLen (FileName) >= 3) ? (StrCmp (&FileName[StrLen (FileName) - 3], L"\\..") != 0) : TRUE)) {\r
+ if ((StrCmp (FileName, L".") != 0) && (StrCmp (FileName, L"..") != 0) &&\r
+ ((StrLen (FileName) >= 3) ? (StrCmp (&FileName[StrLen (FileName) - 3], L"\\..") != 0) : TRUE))\r
+ {\r
//\r
// Trim leading blanks\r
//\r
Count = 0;\r
for (TempFileName = FileName;\r
- *TempFileName != 0 && *TempFileName == L' ';\r
- TempFileName++) {\r
+ *TempFileName != 0 && *TempFileName == L' ';\r
+ TempFileName++)\r
+ {\r
Count++;\r
}\r
+\r
CutPrefix (FileName, Count);\r
//\r
// Trim trailing blanks\r
//\r
for (TempFileName = FileName + StrLen (FileName) - 1;\r
- TempFileName >= FileName && (*TempFileName == L' ');\r
- TempFileName--) {\r
- ;\r
+ TempFileName >= FileName && (*TempFileName == L' ');\r
+ TempFileName--)\r
+ {\r
}\r
+\r
*(TempFileName + 1) = 0;\r
}\r
\r
);\r
}\r
\r
- Size = StrSize (NewPrivateFile->FilePath);\r
- Size += StrSize (L"\\");\r
- Size += StrSize (FileName);\r
+ Size = StrSize (NewPrivateFile->FilePath);\r
+ Size += StrSize (L"\\");\r
+ Size += StrSize (FileName);\r
NewPrivateFile->FileName = AllocatePool (Size);\r
if (NewPrivateFile->FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
LoopFinish = FALSE;\r
\r
while (!LoopFinish) {\r
-\r
LoopFinish = TRUE;\r
\r
for (ParseFileName = GuardPointer; *ParseFileName; ParseFileName++) {\r
- if (*ParseFileName == L'.' &&\r
- (*(ParseFileName + 1) == 0 || *(ParseFileName + 1) == L'\\') &&\r
- *(ParseFileName - 1) == L'\\'\r
- ) {\r
-\r
+ if ((*ParseFileName == L'.') &&\r
+ ((*(ParseFileName + 1) == 0) || (*(ParseFileName + 1) == L'\\')) &&\r
+ (*(ParseFileName - 1) == L'\\')\r
+ )\r
+ {\r
//\r
// cut \.\r
//\r
break;\r
}\r
\r
- if (*ParseFileName == L'.' &&\r
- *(ParseFileName + 1) == L'.' &&\r
- (*(ParseFileName + 2) == 0 || *(ParseFileName + 2) == L'\\') &&\r
- *(ParseFileName - 1) == L'\\'\r
- ) {\r
-\r
+ if ((*ParseFileName == L'.') &&\r
+ (*(ParseFileName + 1) == L'.') &&\r
+ ((*(ParseFileName + 2) == 0) || (*(ParseFileName + 2) == L'\\')) &&\r
+ (*(ParseFileName - 1) == L'\\')\r
+ )\r
+ {\r
ParseFileName--;\r
Count = 3;\r
\r
\r
TempChar = 0;\r
if (RealFileName != NewPrivateFile->FileName) {\r
- TempChar = *(RealFileName - 1);\r
+ TempChar = *(RealFileName - 1);\r
*(RealFileName - 1) = 0;\r
}\r
\r
}\r
} else {\r
NewPrivateFile->LHandle = CreateFile (\r
- NewPrivateFile->FileName,\r
- GENERIC_READ,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ NewPrivateFile->FileName,\r
+ GENERIC_READ,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->LHandle != INVALID_HANDLE_VALUE) {\r
NewPrivateFile->IsDirectoryPath = FALSE;\r
// deal with directory\r
//\r
if (NewPrivateFile->IsDirectoryPath) {\r
-\r
- Size = StrSize (NewPrivateFile->FileName);\r
- Size += StrSize (L"\\*");\r
+ Size = StrSize (NewPrivateFile->FileName);\r
+ Size += StrSize (L"\\*");\r
TempFileName = AllocatePool (Size);\r
if (TempFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
// Create a directory\r
//\r
if (!CreateDirectory (TempFileName, NULL)) {\r
-\r
LastError = GetLastError ();\r
if (LastError != ERROR_ALREADY_EXISTS) {\r
FreePool (TempFileName);\r
}\r
\r
NewPrivateFile->DirHandle = CreateFile (\r
- TempFileName,\r
- NewPrivateFile->IsOpenedByRead ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE),\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- FILE_FLAG_BACKUP_SEMANTICS,\r
- NULL\r
- );\r
+ TempFileName,\r
+ NewPrivateFile->IsOpenedByRead ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE),\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ FILE_FLAG_BACKUP_SEMANTICS,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->DirHandle == INVALID_HANDLE_VALUE) {\r
-\r
NewPrivateFile->DirHandle = CreateFile (\r
- TempFileName,\r
- GENERIC_READ,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- FILE_FLAG_BACKUP_SEMANTICS,\r
- NULL\r
- );\r
+ TempFileName,\r
+ GENERIC_READ,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ FILE_FLAG_BACKUP_SEMANTICS,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->DirHandle != INVALID_HANDLE_VALUE) {\r
CloseHandle (NewPrivateFile->DirHandle);\r
NewPrivateFile->DirHandle = INVALID_HANDLE_VALUE;\r
- Status = EFI_ACCESS_DENIED;\r
+ Status = EFI_ACCESS_DENIED;\r
} else {\r
Status = EFI_NOT_FOUND;\r
}\r
//\r
if (!NewPrivateFile->IsOpenedByRead) {\r
NewPrivateFile->LHandle = CreateFile (\r
- NewPrivateFile->FileName,\r
- GENERIC_READ | GENERIC_WRITE,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- (OpenMode & EFI_FILE_MODE_CREATE) ? OPEN_ALWAYS : OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ NewPrivateFile->FileName,\r
+ GENERIC_READ | GENERIC_WRITE,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ (OpenMode & EFI_FILE_MODE_CREATE) ? OPEN_ALWAYS : OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
NewPrivateFile->LHandle = CreateFile (\r
- NewPrivateFile->FileName,\r
- GENERIC_READ,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ NewPrivateFile->FileName,\r
+ GENERIC_READ,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
Status = EFI_NOT_FOUND;\r
}\r
} else {\r
NewPrivateFile->LHandle = CreateFile (\r
- NewPrivateFile->FileName,\r
- GENERIC_READ,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ NewPrivateFile->FileName,\r
+ GENERIC_READ,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
\r
if (NewPrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if ((OpenMode & EFI_FILE_MODE_CREATE) && Status == EFI_SUCCESS) {\r
+ if ((OpenMode & EFI_FILE_MODE_CREATE) && (Status == EFI_SUCCESS)) {\r
//\r
// Set the attribute\r
//\r
InfoSize = 0;\r
- Info = NULL;\r
+ Info = NULL;\r
\r
Status = WinNtFileGetInfo (&NewPrivateFile->EfiFile, &gEfiFileInfoGuid, &InfoSize, Info);\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Close the file handle\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
PrivateFile->LHandle = INVALID_HANDLE_VALUE;\r
}\r
\r
- if (PrivateFile->IsDirectoryPath && PrivateFile->DirHandle != INVALID_HANDLE_VALUE) {\r
+ if (PrivateFile->IsDirectoryPath && (PrivateFile->DirHandle != INVALID_HANDLE_VALUE)) {\r
CloseHandle (PrivateFile->DirHandle);\r
PrivateFile->DirHandle = INVALID_HANDLE_VALUE;\r
}\r
FreePool (PrivateFile);\r
\r
return EFI_SUCCESS;\r
-\r
}\r
\r
-\r
/**\r
Close and delete the file handle.\r
\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN SYSTEMTIME *SystemTime,\r
IN TIME_ZONE_INFORMATION *TimeZone,\r
OUT EFI_TIME *Time\r
-)\r
+ )\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- Time->Year = (UINT16)SystemTime->wYear;\r
- Time->Month = (UINT8)SystemTime->wMonth;\r
- Time->Day = (UINT8)SystemTime->wDay;\r
- Time->Hour = (UINT8)SystemTime->wHour;\r
- Time->Minute = (UINT8)SystemTime->wMinute;\r
- Time->Second = (UINT8)SystemTime->wSecond;\r
+ Time->Year = (UINT16)SystemTime->wYear;\r
+ Time->Month = (UINT8)SystemTime->wMonth;\r
+ Time->Day = (UINT8)SystemTime->wDay;\r
+ Time->Hour = (UINT8)SystemTime->wHour;\r
+ Time->Minute = (UINT8)SystemTime->wMinute;\r
+ Time->Second = (UINT8)SystemTime->wSecond;\r
Time->Nanosecond = (UINT32)SystemTime->wMilliseconds * 1000000;\r
- Time->TimeZone = (INT16)TimeZone->Bias;\r
+ Time->TimeZone = (INT16)TimeZone->Bias;\r
\r
if (TimeZone->StandardDate.wMonth) {\r
Time->Daylight = EFI_TIME_ADJUST_DAYLIGHT;\r
**/\r
VOID\r
WinNtFileTimeToEfiTime (\r
- IN CONST WIN_NT_EFI_FILE_PRIVATE *PrivateFile,\r
- IN TIME_ZONE_INFORMATION *TimeZone,\r
- IN CONST FILETIME *FileTime,\r
- OUT EFI_TIME *EfiTime\r
-)\r
+ IN CONST WIN_NT_EFI_FILE_PRIVATE *PrivateFile,\r
+ IN TIME_ZONE_INFORMATION *TimeZone,\r
+ IN CONST FILETIME *FileTime,\r
+ OUT EFI_TIME *EfiTime\r
+ )\r
{\r
- FILETIME TempFileTime;\r
- SYSTEMTIME SystemTime;\r
+ FILETIME TempFileTime;\r
+ SYSTEMTIME SystemTime;\r
\r
FileTimeToLocalFileTime (FileTime, &TempFileTime);\r
FileTimeToSystemTime (&TempFileTime, &SystemTime);\r
WinNtSystemTimeToEfiTime (&SystemTime, TimeZone, EfiTime);\r
}\r
\r
-\r
/**\r
Read data from the file.\r
\r
**/\r
EFI_STATUS\r
WinNtFileRead (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_STATUS Status;\r
- UINTN Size;\r
- UINTN NameSize;\r
- UINTN ResultSize;\r
- UINTN Index;\r
- EFI_FILE_INFO *Info;\r
- WCHAR *pw;\r
- TIME_ZONE_INFORMATION TimeZone;\r
- EFI_FILE_INFO *FileInfo;\r
- UINT64 Pos;\r
- UINT64 FileSize;\r
- UINTN FileInfoSize;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ UINTN Size;\r
+ UINTN NameSize;\r
+ UINTN ResultSize;\r
+ UINTN Index;\r
+ EFI_FILE_INFO *Info;\r
+ WCHAR *pw;\r
+ TIME_ZONE_INFORMATION TimeZone;\r
+ EFI_FILE_INFO *FileInfo;\r
+ UINT64 Pos;\r
+ UINT64 FileSize;\r
+ UINTN FileInfoSize;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
}\r
\r
if (!PrivateFile->IsDirectoryPath) {\r
-\r
if (This->GetPosition (This, &Pos) != EFI_SUCCESS) {\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
}\r
\r
FileInfoSize = SIZE_OF_EFI_FILE_SYSTEM_INFO;\r
- FileInfo = AllocatePool (FileInfoSize);\r
+ FileInfo = AllocatePool (FileInfoSize);\r
\r
Status = This->GetInfo (\r
- This,\r
- &gEfiFileInfoGuid,\r
- &FileInfoSize,\r
- FileInfo\r
- );\r
+ This,\r
+ &gEfiFileInfoGuid,\r
+ &FileInfoSize,\r
+ FileInfo\r
+ );\r
\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
FreePool (FileInfo);\r
FileInfo = AllocatePool (FileInfoSize);\r
- Status = This->GetInfo (\r
- This,\r
- &gEfiFileInfoGuid,\r
- &FileInfoSize,\r
- FileInfo\r
- );\r
+ Status = This->GetInfo (\r
+ This,\r
+ &gEfiFileInfoGuid,\r
+ &FileInfoSize,\r
+ FileInfo\r
+ );\r
}\r
\r
if (EFI_ERROR (Status)) {\r
}\r
\r
Status = ReadFile (\r
- PrivateFile->LHandle,\r
- Buffer,\r
- (DWORD)*BufferSize,\r
- (LPDWORD)BufferSize,\r
- NULL\r
- ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ PrivateFile->LHandle,\r
+ Buffer,\r
+ (DWORD)*BufferSize,\r
+ (LPDWORD)BufferSize,\r
+ NULL\r
+ ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
goto Done;\r
}\r
\r
//\r
if (!PrivateFile->IsValidFindBuf) {\r
*BufferSize = 0;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
goto Done;\r
}\r
\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Write data to a file.\r
\r
**/\r
EFI_STATUS\r
WinNtFileWrite (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_STATUS Status;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
}\r
\r
Status = WriteFile (\r
- PrivateFile->LHandle,\r
- Buffer,\r
- (DWORD)*BufferSize,\r
- (LPDWORD)BufferSize,\r
- NULL\r
- ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ PrivateFile->LHandle,\r
+ Buffer,\r
+ (DWORD)*BufferSize,\r
+ (LPDWORD)BufferSize,\r
+ NULL\r
+ ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
\r
Done:\r
return Status;\r
//\r
}\r
\r
-\r
-\r
/**\r
Set a files current position\r
\r
**/\r
EFI_STATUS\r
WinNtFileSetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN UINT64 Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN UINT64 Position\r
)\r
{\r
- EFI_STATUS Status;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- UINT32 PosLow;\r
- UINT32 PosHigh;\r
- CHAR16 *FileName;\r
- UINTN Size;\r
+ EFI_STATUS Status;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ UINT32 PosLow;\r
+ UINT32 PosHigh;\r
+ CHAR16 *FileName;\r
+ UINTN Size;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
goto Done;\r
}\r
\r
- Size = StrSize (PrivateFile->FileName);\r
- Size += StrSize (L"\\*");\r
+ Size = StrSize (PrivateFile->FileName);\r
+ Size += StrSize (L"\\*");\r
FileName = AllocatePool (Size);\r
if (FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
return Status;\r
}\r
\r
-\r
-\r
/**\r
Get a file's current position\r
\r
**/\r
EFI_STATUS\r
WinNtFileGetPossition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT UINT64 *Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT UINT64 *Position\r
)\r
{\r
- EFI_STATUS Status;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- INT32 PositionHigh;\r
- UINT64 PosHigh64;\r
+ EFI_STATUS Status;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ INT32 PositionHigh;\r
+ UINT64 PosHigh64;\r
\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
PositionHigh = 0;\r
- PosHigh64 = 0;\r
+ PosHigh64 = 0;\r
\r
if (PrivateFile->IsDirectoryPath) {\r
-\r
Status = EFI_UNSUPPORTED;\r
goto Done;\r
-\r
} else {\r
-\r
PositionHigh = 0;\r
- *Position = SetFilePointer (\r
- PrivateFile->LHandle,\r
- 0,\r
- (PLONG)&PositionHigh,\r
- FILE_CURRENT\r
- );\r
+ *Position = SetFilePointer (\r
+ PrivateFile->LHandle,\r
+ 0,\r
+ (PLONG)&PositionHigh,\r
+ FILE_CURRENT\r
+ );\r
\r
Status = *Position == 0xffffffff ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
\r
- PosHigh64 = PositionHigh;\r
+ PosHigh64 = PositionHigh;\r
*Position += LShiftU64 (PosHigh64, 32);\r
}\r
\r
return Status;\r
}\r
\r
-\r
EFI_STATUS\r
WinNtSimpleFileSystemFileInfo (\r
IN WIN_NT_EFI_FILE_PRIVATE *PrivateFile,\r
IN OUT UINTN *BufferSize,\r
OUT VOID *Buffer\r
-)\r
+ )\r
+\r
/*++\r
\r
Routine Description:\r
Size = SIZE_OF_EFI_FILE_INFO;\r
\r
RealFileName = PrivateFile->FileName;\r
- TempPointer = RealFileName;\r
+ TempPointer = RealFileName;\r
while (*TempPointer) {\r
if (*TempPointer == '\\') {\r
RealFileName = TempPointer + 1;\r
\r
TempPointer++;\r
}\r
+\r
NameSize = StrSize (RealFileName);\r
\r
ResultSize = Size + NameSize;\r
GetFileInformationByHandle (\r
PrivateFile->IsDirectoryPath ? PrivateFile->DirHandle : PrivateFile->LHandle,\r
&FileInfo\r
- );\r
- Info->FileSize = FileInfo.nFileSizeLow;\r
+ );\r
+ Info->FileSize = FileInfo.nFileSizeLow;\r
Info->PhysicalSize = Info->FileSize;\r
\r
GetTimeZoneInformation (&TimeZone);\r
**/\r
EFI_STATUS\r
WinNtFileGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_FILE_SYSTEM_INFO *FileSystemInfoBuffer;\r
- UINT32 SectorsPerCluster;\r
- UINT32 BytesPerSector;\r
- UINT32 FreeClusters;\r
- UINT32 TotalClusters;\r
- UINT32 BytesPerCluster;\r
- CHAR16 *DriveName;\r
- BOOLEAN DriveNameFound;\r
- BOOL NtStatus;\r
- UINTN Index;\r
- WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
-\r
- if (This == NULL || InformationType == NULL || BufferSize == NULL) {\r
+ EFI_STATUS Status;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_FILE_SYSTEM_INFO *FileSystemInfoBuffer;\r
+ UINT32 SectorsPerCluster;\r
+ UINT32 BytesPerSector;\r
+ UINT32 FreeClusters;\r
+ UINT32 TotalClusters;\r
+ UINT32 BytesPerCluster;\r
+ CHAR16 *DriveName;\r
+ BOOLEAN DriveNameFound;\r
+ BOOL NtStatus;\r
+ UINTN Index;\r
+ WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+\r
+ if ((This == NULL) || (InformationType == NULL) || (BufferSize == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
if (*BufferSize < SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel)) {\r
*BufferSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
- Status = EFI_BUFFER_TOO_SMALL;\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
goto Done;\r
}\r
\r
- FileSystemInfoBuffer = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
- FileSystemInfoBuffer->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
+ FileSystemInfoBuffer = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
+ FileSystemInfoBuffer->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
FileSystemInfoBuffer->ReadOnly = FALSE;\r
\r
//\r
// Try to get the drive name\r
//\r
DriveNameFound = FALSE;\r
- DriveName = AllocatePool (StrSize (PrivateFile->FilePath) + 1);\r
+ DriveName = AllocatePool (StrSize (PrivateFile->FilePath) + 1);\r
if (DriveName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
PrivateFile->FilePath\r
);\r
for (Index = 0; DriveName[Index] != 0 && DriveName[Index] != ':'; Index++) {\r
- ;\r
}\r
\r
if (DriveName[Index] == ':') {\r
DriveName[Index + 1] = '\\';\r
DriveName[Index + 2] = 0;\r
- DriveNameFound = TRUE;\r
- } else if (DriveName[0] == '\\' && DriveName[1] == '\\') {\r
+ DriveNameFound = TRUE;\r
+ } else if ((DriveName[0] == '\\') && (DriveName[1] == '\\')) {\r
for (Index = 2; DriveName[Index] != 0 && DriveName[Index] != '\\'; Index++) {\r
- ;\r
}\r
\r
if (DriveName[Index] == '\\') {\r
DriveNameFound = TRUE;\r
for (Index++; DriveName[Index] != 0 && DriveName[Index] != '\\'; Index++) {\r
- ;\r
}\r
\r
- DriveName[Index] = '\\';\r
+ DriveName[Index] = '\\';\r
DriveName[Index + 1] = 0;\r
}\r
}\r
// Try GetDiskFreeSpace first\r
//\r
NtStatus = GetDiskFreeSpace (\r
- DriveNameFound ? DriveName : NULL,\r
- (LPDWORD)&SectorsPerCluster,\r
- (LPDWORD)&BytesPerSector,\r
- (LPDWORD)&FreeClusters,\r
- (LPDWORD)&TotalClusters\r
- );\r
+ DriveNameFound ? DriveName : NULL,\r
+ (LPDWORD)&SectorsPerCluster,\r
+ (LPDWORD)&BytesPerSector,\r
+ (LPDWORD)&FreeClusters,\r
+ (LPDWORD)&TotalClusters\r
+ );\r
if (DriveName) {\r
FreePool (DriveName);\r
}\r
//\r
// Succeeded\r
//\r
- BytesPerCluster = BytesPerSector * SectorsPerCluster;\r
+ BytesPerCluster = BytesPerSector * SectorsPerCluster;\r
FileSystemInfoBuffer->VolumeSize = MultU64x32 (TotalClusters, BytesPerCluster);\r
- FileSystemInfoBuffer->FreeSpace = MultU64x32 (FreeClusters, BytesPerCluster);\r
- FileSystemInfoBuffer->BlockSize = BytesPerCluster;\r
-\r
+ FileSystemInfoBuffer->FreeSpace = MultU64x32 (FreeClusters, BytesPerCluster);\r
+ FileSystemInfoBuffer->BlockSize = BytesPerCluster;\r
} else {\r
//\r
// try GetDiskFreeSpaceEx then\r
//\r
FileSystemInfoBuffer->BlockSize = 0;\r
- NtStatus = GetDiskFreeSpaceEx (\r
- PrivateFile->FilePath,\r
- (PULARGE_INTEGER)(&FileSystemInfoBuffer->FreeSpace),\r
- (PULARGE_INTEGER)(&FileSystemInfoBuffer->VolumeSize),\r
- NULL\r
- );\r
+ NtStatus = GetDiskFreeSpaceEx (\r
+ PrivateFile->FilePath,\r
+ (PULARGE_INTEGER)(&FileSystemInfoBuffer->FreeSpace),\r
+ (PULARGE_INTEGER)(&FileSystemInfoBuffer->VolumeSize),\r
+ NULL\r
+ );\r
if (!NtStatus) {\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
PrivateRoot->VolumeLabel\r
);\r
*BufferSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
}\r
\r
if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
if (*BufferSize < StrSize (PrivateRoot->VolumeLabel)) {\r
*BufferSize = StrSize (PrivateRoot->VolumeLabel);\r
- Status = EFI_BUFFER_TOO_SMALL;\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
goto Done;\r
}\r
\r
PrivateRoot->VolumeLabel\r
);\r
*BufferSize = StrSize (PrivateRoot->VolumeLabel);\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
}\r
\r
Done:\r
return Status;\r
}\r
\r
-\r
/**\r
Set information about a file\r
\r
**/\r
EFI_STATUS\r
WinNtFileSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
- WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
- EFI_FILE_INFO *OldFileInfo;\r
- EFI_FILE_INFO *NewFileInfo;\r
- EFI_STATUS Status;\r
- UINTN OldInfoSize;\r
- INTN NtStatus;\r
- UINT32 NewAttr;\r
- UINT32 OldAttr;\r
- CHAR16 *OldFileName;\r
- CHAR16 *NewFileName;\r
- CHAR16 *TempFileName;\r
- CHAR16 *CharPointer;\r
- BOOLEAN AttrChangeFlag;\r
- BOOLEAN NameChangeFlag;\r
- BOOLEAN SizeChangeFlag;\r
- BOOLEAN TimeChangeFlag;\r
- UINT64 CurPos;\r
- SYSTEMTIME NewCreationSystemTime;\r
- SYSTEMTIME NewLastAccessSystemTime;\r
- SYSTEMTIME NewLastWriteSystemTime;\r
- FILETIME NewCreationFileTime;\r
- FILETIME NewLastAccessFileTime;\r
- FILETIME NewLastWriteFileTime;\r
- WIN32_FIND_DATA FindBuf;\r
- EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
- UINTN Size;\r
+ WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_FILE_INFO *OldFileInfo;\r
+ EFI_FILE_INFO *NewFileInfo;\r
+ EFI_STATUS Status;\r
+ UINTN OldInfoSize;\r
+ INTN NtStatus;\r
+ UINT32 NewAttr;\r
+ UINT32 OldAttr;\r
+ CHAR16 *OldFileName;\r
+ CHAR16 *NewFileName;\r
+ CHAR16 *TempFileName;\r
+ CHAR16 *CharPointer;\r
+ BOOLEAN AttrChangeFlag;\r
+ BOOLEAN NameChangeFlag;\r
+ BOOLEAN SizeChangeFlag;\r
+ BOOLEAN TimeChangeFlag;\r
+ UINT64 CurPos;\r
+ SYSTEMTIME NewCreationSystemTime;\r
+ SYSTEMTIME NewLastAccessSystemTime;\r
+ SYSTEMTIME NewLastWriteSystemTime;\r
+ FILETIME NewCreationFileTime;\r
+ FILETIME NewLastAccessFileTime;\r
+ FILETIME NewLastWriteFileTime;\r
+ WIN32_FIND_DATA FindBuf;\r
+ EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
+ UINTN Size;\r
\r
//\r
// Initialise locals.\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
\r
- Status = EFI_UNSUPPORTED;\r
- OldFileInfo = NewFileInfo = NULL;\r
- OldFileName = NewFileName = NULL;\r
+ Status = EFI_UNSUPPORTED;\r
+ OldFileInfo = NewFileInfo = NULL;\r
+ OldFileName = NewFileName = NULL;\r
AttrChangeFlag = NameChangeFlag = SizeChangeFlag = TimeChangeFlag = FALSE;\r
\r
//\r
goto Done;\r
}\r
\r
-\r
FreePool (PrivateRoot->VolumeLabel);\r
PrivateRoot->VolumeLabel = AllocatePool (StrSize (NewFileSystemInfo->VolumeLabel));\r
if (PrivateRoot->VolumeLabel == NULL) {\r
NewFileInfo = (EFI_FILE_INFO *)Buffer;\r
\r
if ((NewFileInfo->Size <= SIZE_OF_EFI_FILE_INFO) ||\r
- (NewFileInfo->Attribute &~(EFI_FILE_VALID_ATTR)) ||\r
- (sizeof (UINTN) == 4 && NewFileInfo->Size > 0xFFFFFFFF)\r
- ) {\r
+ (NewFileInfo->Attribute &~(EFI_FILE_VALID_ATTR)) ||\r
+ ((sizeof (UINTN) == 4) && (NewFileInfo->Size > 0xFFFFFFFF))\r
+ )\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
goto Done;\r
}\r
// of change request this is.\r
//\r
OldInfoSize = 0;\r
- Status = WinNtSimpleFileSystemFileInfo (PrivateFile, &OldInfoSize, NULL);\r
+ Status = WinNtSimpleFileSystemFileInfo (PrivateFile, &OldInfoSize, NULL);\r
\r
if (Status != EFI_BUFFER_TOO_SMALL) {\r
Status = EFI_DEVICE_ERROR;\r
// Make full pathname from new filename and rootpath.\r
//\r
if (NewFileInfo->FileName[0] == '\\') {\r
- Size = StrSize (PrivateRoot->FilePath);\r
- Size += StrSize (L"\\");\r
- Size += StrSize (NewFileInfo->FileName);\r
+ Size = StrSize (PrivateRoot->FilePath);\r
+ Size += StrSize (L"\\");\r
+ Size += StrSize (NewFileInfo->FileName);\r
NewFileName = AllocatePool (Size);\r
if (NewFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
StrCatS (NewFileName, Size / sizeof (CHAR16), L"\\");\r
StrCatS (NewFileName, Size / sizeof (CHAR16), NewFileInfo->FileName + 1);\r
} else {\r
- Size = StrSize (PrivateFile->FilePath);\r
- Size += StrSize (L"\\");\r
- Size += StrSize (NewFileInfo->FileName);\r
+ Size = StrSize (PrivateFile->FilePath);\r
+ Size += StrSize (L"\\");\r
+ Size += StrSize (NewFileInfo->FileName);\r
NewFileName = AllocatePool (Size);\r
if (NewFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
// Is there a time stamp change request?\r
//\r
if (!IsZero (&NewFileInfo->CreateTime, sizeof (EFI_TIME)) &&\r
- CompareMem (&NewFileInfo->CreateTime, &OldFileInfo->CreateTime, sizeof (EFI_TIME))\r
- ) {\r
+ CompareMem (&NewFileInfo->CreateTime, &OldFileInfo->CreateTime, sizeof (EFI_TIME))\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
} else if (!IsZero (&NewFileInfo->LastAccessTime, sizeof (EFI_TIME)) &&\r
- CompareMem (&NewFileInfo->LastAccessTime, &OldFileInfo->LastAccessTime, sizeof (EFI_TIME))\r
- ) {\r
+ CompareMem (&NewFileInfo->LastAccessTime, &OldFileInfo->LastAccessTime, sizeof (EFI_TIME))\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
} else if (!IsZero (&NewFileInfo->ModificationTime, sizeof (EFI_TIME)) &&\r
- CompareMem (&NewFileInfo->ModificationTime, &OldFileInfo->ModificationTime, sizeof (EFI_TIME))\r
- ) {\r
+ CompareMem (&NewFileInfo->ModificationTime, &OldFileInfo->ModificationTime, sizeof (EFI_TIME))\r
+ )\r
+ {\r
TimeChangeFlag = TRUE;\r
}\r
\r
}\r
}\r
\r
- if (PrivateFile->IsDirectoryPath && PrivateFile->DirHandle != INVALID_HANDLE_VALUE) {\r
+ if (PrivateFile->IsDirectoryPath && (PrivateFile->DirHandle != INVALID_HANDLE_VALUE)) {\r
CloseHandle (PrivateFile->DirHandle);\r
PrivateFile->DirHandle = INVALID_HANDLE_VALUE;\r
}\r
\r
StrCpyS (PrivateFile->FileName, StrSize (NewFileName) / sizeof (CHAR16), NewFileName);\r
\r
- Size = StrSize (NewFileName);\r
- Size += StrSize (L"\\*");\r
+ Size = StrSize (NewFileName);\r
+ Size += StrSize (L"\\*");\r
TempFileName = AllocatePool (Size);\r
\r
StrCpyS (TempFileName, Size / sizeof (CHAR16), NewFileName);\r
\r
if (!PrivateFile->IsDirectoryPath) {\r
PrivateFile->LHandle = CreateFile (\r
- TempFileName,\r
- PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ TempFileName,\r
+ PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
\r
FreePool (TempFileName);\r
\r
}\r
} else {\r
PrivateFile->DirHandle = CreateFile (\r
- TempFileName,\r
- PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- FILE_FLAG_BACKUP_SEMANTICS,\r
- NULL\r
- );\r
+ TempFileName,\r
+ PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ FILE_FLAG_BACKUP_SEMANTICS,\r
+ NULL\r
+ );\r
\r
StrCatS (TempFileName, Size / sizeof (CHAR16), L"\\*");\r
PrivateFile->LHandle = FindFirstFile (TempFileName, &FindBuf);\r
}\r
} else {\r
Status = EFI_ACCESS_DENIED;\r
- Reopen:;\r
+Reopen:;\r
\r
NtStatus = SetFileAttributes (OldFileName, OldAttr);\r
\r
goto Done;\r
}\r
\r
- Size = StrSize (OldFileName);\r
- Size += StrSize (L"\\*");\r
+ Size = StrSize (OldFileName);\r
+ Size += StrSize (L"\\*");\r
TempFileName = AllocatePool (Size);\r
\r
StrCpyS (TempFileName, Size / sizeof (CHAR16), OldFileName);\r
\r
if (!PrivateFile->IsDirectoryPath) {\r
PrivateFile->LHandle = CreateFile (\r
- TempFileName,\r
- PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- 0,\r
- NULL\r
- );\r
+ TempFileName,\r
+ PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ 0,\r
+ NULL\r
+ );\r
} else {\r
PrivateFile->DirHandle = CreateFile (\r
- TempFileName,\r
- PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
- FILE_SHARE_READ | FILE_SHARE_WRITE,\r
- NULL,\r
- OPEN_EXISTING,\r
- FILE_FLAG_BACKUP_SEMANTICS,\r
- NULL\r
- );\r
+ TempFileName,\r
+ PrivateFile->IsOpenedByRead ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,\r
+ FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+ NULL,\r
+ OPEN_EXISTING,\r
+ FILE_FLAG_BACKUP_SEMANTICS,\r
+ NULL\r
+ );\r
\r
StrCatS (TempFileName, Size / sizeof (CHAR16), L"\\*");\r
PrivateFile->LHandle = FindFirstFile (TempFileName, &FindBuf);\r
FreePool (TempFileName);\r
\r
goto Done;\r
-\r
}\r
}\r
\r
// Time change\r
//\r
if (TimeChangeFlag) {\r
-\r
- NewCreationSystemTime.wYear = NewFileInfo->CreateTime.Year;\r
- NewCreationSystemTime.wMonth = NewFileInfo->CreateTime.Month;\r
- NewCreationSystemTime.wDay = NewFileInfo->CreateTime.Day;\r
- NewCreationSystemTime.wHour = NewFileInfo->CreateTime.Hour;\r
- NewCreationSystemTime.wMinute = NewFileInfo->CreateTime.Minute;\r
- NewCreationSystemTime.wSecond = NewFileInfo->CreateTime.Second;\r
+ NewCreationSystemTime.wYear = NewFileInfo->CreateTime.Year;\r
+ NewCreationSystemTime.wMonth = NewFileInfo->CreateTime.Month;\r
+ NewCreationSystemTime.wDay = NewFileInfo->CreateTime.Day;\r
+ NewCreationSystemTime.wHour = NewFileInfo->CreateTime.Hour;\r
+ NewCreationSystemTime.wMinute = NewFileInfo->CreateTime.Minute;\r
+ NewCreationSystemTime.wSecond = NewFileInfo->CreateTime.Second;\r
NewCreationSystemTime.wMilliseconds = 0;\r
\r
if (!SystemTimeToFileTime (\r
- &NewCreationSystemTime,\r
- &NewCreationFileTime\r
- )) {\r
+ &NewCreationSystemTime,\r
+ &NewCreationFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
if (!LocalFileTimeToFileTime (\r
- &NewCreationFileTime,\r
- &NewCreationFileTime\r
- )) {\r
+ &NewCreationFileTime,\r
+ &NewCreationFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
- NewLastAccessSystemTime.wYear = NewFileInfo->LastAccessTime.Year;\r
- NewLastAccessSystemTime.wMonth = NewFileInfo->LastAccessTime.Month;\r
- NewLastAccessSystemTime.wDay = NewFileInfo->LastAccessTime.Day;\r
- NewLastAccessSystemTime.wHour = NewFileInfo->LastAccessTime.Hour;\r
- NewLastAccessSystemTime.wMinute = NewFileInfo->LastAccessTime.Minute;\r
- NewLastAccessSystemTime.wSecond = NewFileInfo->LastAccessTime.Second;\r
+ NewLastAccessSystemTime.wYear = NewFileInfo->LastAccessTime.Year;\r
+ NewLastAccessSystemTime.wMonth = NewFileInfo->LastAccessTime.Month;\r
+ NewLastAccessSystemTime.wDay = NewFileInfo->LastAccessTime.Day;\r
+ NewLastAccessSystemTime.wHour = NewFileInfo->LastAccessTime.Hour;\r
+ NewLastAccessSystemTime.wMinute = NewFileInfo->LastAccessTime.Minute;\r
+ NewLastAccessSystemTime.wSecond = NewFileInfo->LastAccessTime.Second;\r
NewLastAccessSystemTime.wMilliseconds = 0;\r
\r
if (!SystemTimeToFileTime (\r
- &NewLastAccessSystemTime,\r
- &NewLastAccessFileTime\r
- )) {\r
+ &NewLastAccessSystemTime,\r
+ &NewLastAccessFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
if (!LocalFileTimeToFileTime (\r
- &NewLastAccessFileTime,\r
- &NewLastAccessFileTime\r
- )) {\r
+ &NewLastAccessFileTime,\r
+ &NewLastAccessFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
- NewLastWriteSystemTime.wYear = NewFileInfo->ModificationTime.Year;\r
- NewLastWriteSystemTime.wMonth = NewFileInfo->ModificationTime.Month;\r
- NewLastWriteSystemTime.wDay = NewFileInfo->ModificationTime.Day;\r
- NewLastWriteSystemTime.wHour = NewFileInfo->ModificationTime.Hour;\r
- NewLastWriteSystemTime.wMinute = NewFileInfo->ModificationTime.Minute;\r
- NewLastWriteSystemTime.wSecond = NewFileInfo->ModificationTime.Second;\r
+ NewLastWriteSystemTime.wYear = NewFileInfo->ModificationTime.Year;\r
+ NewLastWriteSystemTime.wMonth = NewFileInfo->ModificationTime.Month;\r
+ NewLastWriteSystemTime.wDay = NewFileInfo->ModificationTime.Day;\r
+ NewLastWriteSystemTime.wHour = NewFileInfo->ModificationTime.Hour;\r
+ NewLastWriteSystemTime.wMinute = NewFileInfo->ModificationTime.Minute;\r
+ NewLastWriteSystemTime.wSecond = NewFileInfo->ModificationTime.Second;\r
NewLastWriteSystemTime.wMilliseconds = 0;\r
\r
if (!SystemTimeToFileTime (\r
- &NewLastWriteSystemTime,\r
- &NewLastWriteFileTime\r
- )) {\r
+ &NewLastWriteSystemTime,\r
+ &NewLastWriteFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
if (!LocalFileTimeToFileTime (\r
- &NewLastWriteFileTime,\r
- &NewLastWriteFileTime\r
- )) {\r
+ &NewLastWriteFileTime,\r
+ &NewLastWriteFileTime\r
+ ))\r
+ {\r
goto Done;\r
}\r
\r
if (!SetFileTime (\r
- PrivateFile->IsDirectoryPath ? PrivateFile->DirHandle : PrivateFile->LHandle,\r
- &NewCreationFileTime,\r
- &NewLastAccessFileTime,\r
- &NewLastWriteFileTime\r
- )) {\r
+ PrivateFile->IsDirectoryPath ? PrivateFile->DirHandle : PrivateFile->LHandle,\r
+ &NewCreationFileTime,\r
+ &NewLastAccessFileTime,\r
+ &NewLastWriteFileTime\r
+ ))\r
+ {\r
Status = EFI_DEVICE_ERROR;\r
goto Done;\r
}\r
-\r
}\r
\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
Flush data back for the file handle.\r
\r
//\r
// bugbug: - Use Windows error reporting.\r
//\r
-\r
}\r
\r
-\r
-\r
EFI_STATUS\r
WinNtFileSystmeThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
WinNtFileSystmeThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
if (Private->VolumeLabel != NULL) {\r
FreePool (Private->VolumeLabel);\r
}\r
+\r
if (Private->FilePath != NULL) {\r
FreePool (Private->FilePath);\r
}\r
+\r
FreePool (Private);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EFI_FILE_PROTOCOL gWinNtFileProtocol = {\r
+EFI_FILE_PROTOCOL gWinNtFileProtocol = {\r
EFI_FILE_REVISION,\r
WinNtFileOpen,\r
WinNtFileClose,\r
WinNtFileFlush\r
};\r
\r
-EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gWinNtFileSystemProtocol = {\r
+EFI_SIMPLE_FILE_SYSTEM_PROTOCOL gWinNtFileSystemProtocol = {\r
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION,\r
WinNtOpenVolume\r
};\r
\r
-\r
-EMU_IO_THUNK_PROTOCOL mWinNtFileSystemThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL mWinNtFileSystemThunkIo = {\r
&gEfiSimpleFileSystemProtocolGuid,\r
NULL,\r
NULL,\r
WinNtFileSystmeThunkClose,\r
NULL\r
};\r
-\r
-\r
#ifndef _WIN_GOP_H_\r
#define _WIN_GOP_H_\r
\r
-\r
#include "WinHost.h"\r
\r
#include <Protocol/EmuIoThunk.h>\r
// The value is 1 if the ALT key is down while the key is pressed/released;\r
// it is 0 if the WM_SYSKEYDOWN message is posted to the active window\r
// because no window has the keyboard focus.\r
-#define GOP_EXTENDED_KEY (0x1 << 24)\r
-#define GOP_ALT_KEY_PRESSED (0x1 << 29)\r
+#define GOP_EXTENDED_KEY (0x1 << 24)\r
+#define GOP_ALT_KEY_PRESSED (0x1 << 29)\r
\r
-#define KEYBOARD_TIMER_INTERVAL 200000 // 0.02s\r
+#define KEYBOARD_TIMER_INTERVAL 200000 // 0.02s\r
\r
-#define MAX_Q 256\r
+#define MAX_Q 256\r
\r
typedef struct {\r
- UINTN Front;\r
- UINTN Rear;\r
- EFI_KEY_DATA Q[MAX_Q];\r
- CRITICAL_SECTION Cs;\r
+ UINTN Front;\r
+ UINTN Rear;\r
+ EFI_KEY_DATA Q[MAX_Q];\r
+ CRITICAL_SECTION Cs;\r
} GOP_QUEUE_FIXED;\r
\r
-#define WIN_NT_GOP_CLASS_NAME L"WinNtGopWindow"\r
-\r
+#define WIN_NT_GOP_CLASS_NAME L"WinNtGopWindow"\r
\r
typedef struct {\r
- UINT64 Signature;\r
- EMU_GRAPHICS_WINDOW_PROTOCOL GraphicsWindowIo;\r
+ UINT64 Signature;\r
+ EMU_GRAPHICS_WINDOW_PROTOCOL GraphicsWindowIo;\r
\r
//\r
// GOP Private Data knowing when to start hardware\r
//\r
- BOOLEAN HardwareNeedsStarting;\r
+ BOOLEAN HardwareNeedsStarting;\r
\r
- CHAR16 *WindowName;\r
- CHAR16 Buffer[160];\r
+ CHAR16 *WindowName;\r
+ CHAR16 Buffer[160];\r
\r
- HANDLE ThreadInited; // Semaphore\r
- HANDLE ThreadHandle; // Thread\r
- DWORD ThreadId;\r
+ HANDLE ThreadInited; // Semaphore\r
+ HANDLE ThreadHandle; // Thread\r
+ DWORD ThreadId;\r
\r
- HWND WindowHandle;\r
- WNDCLASSEX WindowsClass;\r
+ HWND WindowHandle;\r
+ WNDCLASSEX WindowsClass;\r
\r
- UINT32 Width;\r
- UINT32 Height;\r
+ UINT32 Width;\r
+ UINT32 Height;\r
//\r
// This screen is used to redraw the screen when windows events happen. It's\r
// updated in the main thread and displayed in the windows thread.\r
//\r
- BITMAPV4HEADER *VirtualScreenInfo;\r
+ BITMAPV4HEADER *VirtualScreenInfo;\r
\r
- FRAME_BUFFER_CONFIGURE *FrameBufferConfigure;\r
+ FRAME_BUFFER_CONFIGURE *FrameBufferConfigure;\r
\r
//\r
// Keyboard Queue used by Simple Text In.\r
// QueueForRead: WinProc thread adds, and main thread removes.\r
//\r
- GOP_QUEUE_FIXED QueueForRead;\r
+ GOP_QUEUE_FIXED QueueForRead;\r
\r
EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeRegisterdKeyCallback;\r
EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakRegisterdKeyCallback;\r
VOID *RegisterdKeyCallbackContext;\r
\r
- EFI_KEY_STATE KeyState;\r
- BOOLEAN LeftShift;\r
- BOOLEAN RightShift;\r
- BOOLEAN LeftAlt;\r
- BOOLEAN RightAlt;\r
- BOOLEAN LeftCtrl;\r
- BOOLEAN RightCtrl;\r
- BOOLEAN LeftLogo;\r
- BOOLEAN RightLogo;\r
- BOOLEAN Menu;\r
- BOOLEAN SysReq;\r
- BOOLEAN NumLock;\r
- BOOLEAN ScrollLock;\r
- BOOLEAN CapsLock;\r
- BOOLEAN IsPartialKeySupport;\r
- INT32 PointerPreviousX;\r
- INT32 PointerPreviousY;\r
- BOOLEAN PointerStateChanged;\r
- EFI_SIMPLE_POINTER_STATE PointerState;\r
+ EFI_KEY_STATE KeyState;\r
+ BOOLEAN LeftShift;\r
+ BOOLEAN RightShift;\r
+ BOOLEAN LeftAlt;\r
+ BOOLEAN RightAlt;\r
+ BOOLEAN LeftCtrl;\r
+ BOOLEAN RightCtrl;\r
+ BOOLEAN LeftLogo;\r
+ BOOLEAN RightLogo;\r
+ BOOLEAN Menu;\r
+ BOOLEAN SysReq;\r
+ BOOLEAN NumLock;\r
+ BOOLEAN ScrollLock;\r
+ BOOLEAN CapsLock;\r
+ BOOLEAN IsPartialKeySupport;\r
+ INT32 PointerPreviousX;\r
+ INT32 PointerPreviousY;\r
+ BOOLEAN PointerStateChanged;\r
+ EFI_SIMPLE_POINTER_STATE PointerState;\r
} GRAPHICS_PRIVATE_DATA;\r
#define GRAPHICS_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('g', 'f', 'x', 'd')\r
#define GRAPHICS_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, GRAPHICS_PRIVATE_DATA, GraphicsWindowIo, GRAPHICS_PRIVATE_DATA_SIGNATURE)\r
\r
-\r
//\r
// Gop Hardware abstraction internal worker functions\r
//\r
**/\r
EFI_STATUS\r
GopPrivateAddKey (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN EFI_INPUT_KEY Key\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN EFI_INPUT_KEY Key\r
);\r
\r
EFI_STATUS\r
EFI_STATUS\r
EFIAPI\r
WinNtWndCheckKey (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtWndKeySetState (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtWndRegisterKeyNotify (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
- IN VOID *Context\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
+ IN VOID *Context\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtWndCheckPointer (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
);\r
\r
EFI_STATUS\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
IN EFI_SIMPLE_POINTER_STATE *State\r
);\r
+\r
EFI_STATUS\r
GopPrivateCreateQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue\r
);\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateDestroyQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue\r
);\r
-#endif\r
\r
+#endif\r
\r
**/\r
\r
-\r
#include "WinGop.h"\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateCreateQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue\r
)\r
{\r
InitializeCriticalSection (&Queue->Cs);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateDestroyQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue\r
)\r
{\r
Queue->Front = 0;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateAddQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue,\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
EnterCriticalSection (&Queue->Cs);\r
}\r
\r
CopyMem (&Queue->Q[Queue->Rear], KeyData, sizeof (EFI_KEY_DATA));\r
- Queue->Rear = (Queue->Rear + 1) % MAX_Q;\r
+ Queue->Rear = (Queue->Rear + 1) % MAX_Q;\r
\r
LeaveCriticalSection (&Queue->Cs);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateDeleteQ (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN GOP_QUEUE_FIXED *Queue,\r
- OUT EFI_KEY_DATA *Key\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN GOP_QUEUE_FIXED *Queue,\r
+ OUT EFI_KEY_DATA *Key\r
)\r
{\r
EnterCriticalSection (&Queue->Cs);\r
}\r
\r
CopyMem (Key, &Queue->Q[Queue->Front], sizeof (EFI_KEY_DATA));\r
- Queue->Front = (Queue->Front + 1) % MAX_Q;\r
+ Queue->Front = (Queue->Front + 1) % MAX_Q;\r
\r
- if (Key->Key.ScanCode == SCAN_NULL && Key->Key.UnicodeChar == CHAR_NULL) {\r
+ if ((Key->Key.ScanCode == SCAN_NULL) && (Key->Key.UnicodeChar == CHAR_NULL)) {\r
if (!Private->IsPartialKeySupport) {\r
//\r
// If partial keystrok is not enabled, don't return the partial keystroke.\r
return EFI_NOT_READY;\r
}\r
}\r
+\r
LeaveCriticalSection (&Queue->Cs);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
TODO: Add function description\r
\r
**/\r
EFI_STATUS\r
GopPrivateCheckQ (\r
- IN GOP_QUEUE_FIXED *Queue\r
+ IN GOP_QUEUE_FIXED *Queue\r
)\r
{\r
if (Queue->Front == Queue->Rear) {\r
**/\r
VOID\r
InitializeKeyState (\r
- IN GRAPHICS_PRIVATE_DATA *Private,\r
- IN EFI_KEY_STATE *KeyState\r
+ IN GRAPHICS_PRIVATE_DATA *Private,\r
+ IN EFI_KEY_STATE *KeyState\r
)\r
{\r
KeyState->KeyShiftState = EFI_SHIFT_STATE_VALID;\r
// Record Key shift state and toggle state\r
//\r
if (Private->LeftCtrl) {\r
- KeyState->KeyShiftState |= EFI_LEFT_CONTROL_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_LEFT_CONTROL_PRESSED;\r
}\r
+\r
if (Private->RightCtrl) {\r
- KeyState->KeyShiftState |= EFI_RIGHT_CONTROL_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_RIGHT_CONTROL_PRESSED;\r
}\r
+\r
if (Private->LeftAlt) {\r
- KeyState->KeyShiftState |= EFI_LEFT_ALT_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_LEFT_ALT_PRESSED;\r
}\r
+\r
if (Private->RightAlt) {\r
- KeyState->KeyShiftState |= EFI_RIGHT_ALT_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_RIGHT_ALT_PRESSED;\r
}\r
+\r
if (Private->LeftShift) {\r
- KeyState->KeyShiftState |= EFI_LEFT_SHIFT_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_LEFT_SHIFT_PRESSED;\r
}\r
+\r
if (Private->RightShift) {\r
- KeyState->KeyShiftState |= EFI_RIGHT_SHIFT_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_RIGHT_SHIFT_PRESSED;\r
}\r
+\r
if (Private->LeftLogo) {\r
- KeyState->KeyShiftState |= EFI_LEFT_LOGO_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_LEFT_LOGO_PRESSED;\r
}\r
+\r
if (Private->RightLogo) {\r
- KeyState->KeyShiftState |= EFI_RIGHT_LOGO_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_RIGHT_LOGO_PRESSED;\r
}\r
+\r
if (Private->Menu) {\r
- KeyState->KeyShiftState |= EFI_MENU_KEY_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_MENU_KEY_PRESSED;\r
}\r
+\r
if (Private->SysReq) {\r
- KeyState->KeyShiftState |= EFI_SYS_REQ_PRESSED;\r
+ KeyState->KeyShiftState |= EFI_SYS_REQ_PRESSED;\r
}\r
+\r
if (Private->CapsLock) {\r
KeyState->KeyToggleState |= EFI_CAPS_LOCK_ACTIVE;\r
}\r
+\r
if (Private->NumLock) {\r
KeyState->KeyToggleState |= EFI_NUM_LOCK_ACTIVE;\r
}\r
+\r
if (Private->ScrollLock) {\r
KeyState->KeyToggleState |= EFI_SCROLL_LOCK_ACTIVE;\r
}\r
+\r
if (Private->IsPartialKeySupport) {\r
KeyState->KeyToggleState |= EFI_KEY_STATE_EXPOSED;\r
}\r
IN EFI_INPUT_KEY Key\r
)\r
{\r
- EFI_KEY_DATA KeyData;\r
+ EFI_KEY_DATA KeyData;\r
\r
KeyData.Key = Key;\r
InitializeKeyState (Private, &KeyData.KeyState);\r
//\r
if ((Private->LeftCtrl || Private->RightCtrl) &&\r
(KeyData.Key.UnicodeChar >= 1) && (KeyData.Key.UnicodeChar <= 26)\r
- ) {\r
+ )\r
+ {\r
if ((Private->LeftShift || Private->RightShift) == Private->CapsLock) {\r
KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'a' - 1);\r
} else {\r
//\r
if (((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) ||\r
((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z'))\r
- ) {\r
+ )\r
+ {\r
KeyData.KeyState.KeyShiftState &= ~(EFI_LEFT_SHIFT_PRESSED | EFI_RIGHT_SHIFT_PRESSED);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
WinNtWndCheckKey (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
return GopPrivateCheckQ (&Private->QueueForRead);\r
-\r
}\r
+\r
EFI_STATUS\r
EFIAPI\r
WinNtWndGetKey (\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
IN EFI_KEY_DATA *KeyData\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- EFI_STATUS Status;\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ EFI_STATUS Status;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
ZeroMem (&KeyData->Key, sizeof (KeyData->Key));\r
InitializeKeyState (Private, &KeyData->KeyState);\r
\r
- Status = GopPrivateCheckQ (&Private->QueueForRead);\r
+ Status = GopPrivateCheckQ (&Private->QueueForRead);\r
if (!EFI_ERROR (Status)) {\r
//\r
// If a Key press exists try and read it.\r
// EFI_NOT_READY.\r
//\r
if (!Private->IsPartialKeySupport) {\r
- if (KeyData->Key.ScanCode == SCAN_NULL && KeyData->Key.UnicodeChar == CHAR_NULL) {\r
+ if ((KeyData->Key.ScanCode == SCAN_NULL) && (KeyData->Key.UnicodeChar == CHAR_NULL)) {\r
Status = EFI_NOT_READY;\r
}\r
}\r
}\r
\r
return Status;\r
-\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtWndKeySetState (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
- Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
- Private->ScrollLock = FALSE;\r
- Private->NumLock = FALSE;\r
- Private->CapsLock = FALSE;\r
+ Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
+ Private->ScrollLock = FALSE;\r
+ Private->NumLock = FALSE;\r
+ Private->CapsLock = FALSE;\r
Private->IsPartialKeySupport = FALSE;\r
\r
if ((*KeyToggleState & EFI_SCROLL_LOCK_ACTIVE) == EFI_SCROLL_LOCK_ACTIVE) {\r
Private->ScrollLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_NUM_LOCK_ACTIVE) == EFI_NUM_LOCK_ACTIVE) {\r
Private->NumLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_CAPS_LOCK_ACTIVE) == EFI_CAPS_LOCK_ACTIVE) {\r
Private->CapsLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_KEY_STATE_EXPOSED) == EFI_KEY_STATE_EXPOSED) {\r
Private->IsPartialKeySupport = TRUE;\r
}\r
+\r
Private->KeyState.KeyToggleState = *KeyToggleState;\r
return EFI_SUCCESS;\r
}\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
WinNtWndRegisterKeyNotify (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
- IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
- IN VOID *Context\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK MakeCallBack,\r
+ IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK BreakCallBack,\r
+ IN VOID *Context\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtWndCheckPointer (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
IN EFI_SIMPLE_POINTER_STATE *State\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
\r
#include "WinGop.h"\r
\r
-DWORD mTlsIndex = TLS_OUT_OF_INDEXES;\r
-DWORD mTlsIndexUseCount = 0; // lets us know when we can free mTlsIndex.\r
+DWORD mTlsIndex = TLS_OUT_OF_INDEXES;\r
+DWORD mTlsIndexUseCount = 0; // lets us know when we can free mTlsIndex.\r
\r
BOOLEAN\r
WinNtGopConvertParamToEfiKeyShiftState (\r
)\r
{\r
switch (*wParam) {\r
- //\r
- // BUGBUG: Only GetAsyncKeyState() and GetKeyState() can distinguish\r
- // left and right Ctrl, and Shift key.\r
- // Neither of the two is defined in EFI_WIN_NT_THUNK_PROTOCOL.\r
- // Therefor, we can not set the correct Shift state here.\r
- //\r
- case VK_SHIFT:\r
- if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
+ //\r
+ // BUGBUG: Only GetAsyncKeyState() and GetKeyState() can distinguish\r
+ // left and right Ctrl, and Shift key.\r
+ // Neither of the two is defined in EFI_WIN_NT_THUNK_PROTOCOL.\r
+ // Therefor, we can not set the correct Shift state here.\r
+ //\r
+ case VK_SHIFT:\r
+ if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
Private->RightShift = Flag;\r
} else {\r
Private->LeftShift = Flag;\r
}\r
- return TRUE;\r
\r
- case VK_LSHIFT:\r
- Private->LeftShift = Flag;\r
- return TRUE;\r
+ return TRUE;\r
\r
- case VK_RSHIFT:\r
- Private->RightShift = Flag;\r
- return TRUE;\r
+ case VK_LSHIFT:\r
+ Private->LeftShift = Flag;\r
+ return TRUE;\r
\r
- case VK_CONTROL:\r
- if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
- Private->RightCtrl= Flag;\r
+ case VK_RSHIFT:\r
+ Private->RightShift = Flag;\r
+ return TRUE;\r
+\r
+ case VK_CONTROL:\r
+ if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
+ Private->RightCtrl = Flag;\r
} else {\r
Private->LeftCtrl = Flag;\r
}\r
- return TRUE;\r
\r
- case VK_LCONTROL:\r
- Private->LeftCtrl = Flag;\r
- return TRUE;\r
+ return TRUE;\r
\r
- case VK_RCONTROL:\r
- Private->RightCtrl = Flag;\r
- return TRUE;\r
+ case VK_LCONTROL:\r
+ Private->LeftCtrl = Flag;\r
+ return TRUE;\r
\r
- case VK_LWIN:\r
- Private->LeftLogo = Flag;\r
- return TRUE;\r
+ case VK_RCONTROL:\r
+ Private->RightCtrl = Flag;\r
+ return TRUE;\r
\r
- case VK_RWIN:\r
- Private->RightLogo = Flag;\r
- return TRUE;\r
+ case VK_LWIN:\r
+ Private->LeftLogo = Flag;\r
+ return TRUE;\r
\r
- case VK_APPS:\r
- Private->Menu = Flag;\r
- return TRUE;\r
- //\r
- // BUGBUG: PrintScreen/SysRq can not trigger WM_KEYDOWN message,\r
- // so SySReq shift state is not supported here.\r
- //\r
- case VK_PRINT:\r
- Private->SysReq = Flag;\r
- return TRUE;\r
- //\r
- // For Alt Keystroke.\r
- //\r
- case VK_MENU:\r
- if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
+ case VK_RWIN:\r
+ Private->RightLogo = Flag;\r
+ return TRUE;\r
+\r
+ case VK_APPS:\r
+ Private->Menu = Flag;\r
+ return TRUE;\r
+ //\r
+ // BUGBUG: PrintScreen/SysRq can not trigger WM_KEYDOWN message,\r
+ // so SySReq shift state is not supported here.\r
+ //\r
+ case VK_PRINT:\r
+ Private->SysReq = Flag;\r
+ return TRUE;\r
+ //\r
+ // For Alt Keystroke.\r
+ //\r
+ case VK_MENU:\r
+ if ((*lParam & GOP_EXTENDED_KEY) == GOP_EXTENDED_KEY) {\r
Private->RightAlt = Flag;\r
} else {\r
Private->LeftAlt = Flag;\r
}\r
- return TRUE;\r
\r
- default:\r
- return FALSE;\r
+ return TRUE;\r
+\r
+ default:\r
+ return FALSE;\r
}\r
}\r
\r
IN EFI_INPUT_KEY *Key\r
)\r
{\r
- BOOLEAN Flag;\r
+ BOOLEAN Flag;\r
+\r
Flag = FALSE;\r
switch (*wParam) {\r
- case VK_HOME: Key->ScanCode = SCAN_HOME; Flag = TRUE; break;\r
- case VK_END: Key->ScanCode = SCAN_END; Flag = TRUE; break;\r
- case VK_LEFT: Key->ScanCode = SCAN_LEFT; Flag = TRUE; break;\r
- case VK_RIGHT: Key->ScanCode = SCAN_RIGHT; Flag = TRUE; break;\r
- case VK_UP: Key->ScanCode = SCAN_UP; Flag = TRUE; break;\r
- case VK_DOWN: Key->ScanCode = SCAN_DOWN; Flag = TRUE; break;\r
- case VK_DELETE: Key->ScanCode = SCAN_DELETE; Flag = TRUE; break;\r
- case VK_INSERT: Key->ScanCode = SCAN_INSERT; Flag = TRUE; break;\r
- case VK_PRIOR: Key->ScanCode = SCAN_PAGE_UP; Flag = TRUE; break;\r
- case VK_NEXT: Key->ScanCode = SCAN_PAGE_DOWN; Flag = TRUE; break;\r
- case VK_ESCAPE: Key->ScanCode = SCAN_ESC; Flag = TRUE; break;\r
-\r
- case VK_F1: Key->ScanCode = SCAN_F1; Flag = TRUE; break;\r
- case VK_F2: Key->ScanCode = SCAN_F2; Flag = TRUE; break;\r
- case VK_F3: Key->ScanCode = SCAN_F3; Flag = TRUE; break;\r
- case VK_F4: Key->ScanCode = SCAN_F4; Flag = TRUE; break;\r
- case VK_F5: Key->ScanCode = SCAN_F5; Flag = TRUE; break;\r
- case VK_F6: Key->ScanCode = SCAN_F6; Flag = TRUE; break;\r
- case VK_F7: Key->ScanCode = SCAN_F7; Flag = TRUE; break;\r
- case VK_F8: Key->ScanCode = SCAN_F8; Flag = TRUE; break;\r
- case VK_F9: Key->ScanCode = SCAN_F9; Flag = TRUE; break;\r
- case VK_F11: Key->ScanCode = SCAN_F11; Flag = TRUE; break;\r
- case VK_F12: Key->ScanCode = SCAN_F12; Flag = TRUE; break;\r
-\r
- case VK_F13: Key->ScanCode = SCAN_F13; Flag = TRUE; break;\r
- case VK_F14: Key->ScanCode = SCAN_F14; Flag = TRUE; break;\r
- case VK_F15: Key->ScanCode = SCAN_F15; Flag = TRUE; break;\r
- case VK_F16: Key->ScanCode = SCAN_F16; Flag = TRUE; break;\r
- case VK_F17: Key->ScanCode = SCAN_F17; Flag = TRUE; break;\r
- case VK_F18: Key->ScanCode = SCAN_F18; Flag = TRUE; break;\r
- case VK_F19: Key->ScanCode = SCAN_F19; Flag = TRUE; break;\r
- case VK_F20: Key->ScanCode = SCAN_F20; Flag = TRUE; break;\r
- case VK_F21: Key->ScanCode = SCAN_F21; Flag = TRUE; break;\r
- case VK_F22: Key->ScanCode = SCAN_F22; Flag = TRUE; break;\r
- case VK_F23: Key->ScanCode = SCAN_F23; Flag = TRUE; break;\r
- case VK_F24: Key->ScanCode = SCAN_F24; Flag = TRUE; break;\r
- case VK_PAUSE: Key->ScanCode = SCAN_PAUSE; Flag = TRUE; break;\r
-\r
- //\r
- // Set toggle state\r
- //\r
- case VK_NUMLOCK:\r
- Private->NumLock = (BOOLEAN)(!Private->NumLock);\r
- Flag = TRUE;\r
- break;\r
- case VK_SCROLL:\r
- Private->ScrollLock = (BOOLEAN)(!Private->ScrollLock);\r
- Flag = TRUE;\r
- break;\r
- case VK_CAPITAL:\r
- Private->CapsLock = (BOOLEAN)(!Private->CapsLock);\r
- Flag = TRUE;\r
- break;\r
+ case VK_HOME: Key->ScanCode = SCAN_HOME;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_END: Key->ScanCode = SCAN_END;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_LEFT: Key->ScanCode = SCAN_LEFT;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_RIGHT: Key->ScanCode = SCAN_RIGHT;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_UP: Key->ScanCode = SCAN_UP;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_DOWN: Key->ScanCode = SCAN_DOWN;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_DELETE: Key->ScanCode = SCAN_DELETE;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_INSERT: Key->ScanCode = SCAN_INSERT;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_PRIOR: Key->ScanCode = SCAN_PAGE_UP;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_NEXT: Key->ScanCode = SCAN_PAGE_DOWN;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_ESCAPE: Key->ScanCode = SCAN_ESC;\r
+ Flag = TRUE;\r
+ break;\r
+\r
+ case VK_F1: Key->ScanCode = SCAN_F1;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F2: Key->ScanCode = SCAN_F2;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F3: Key->ScanCode = SCAN_F3;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F4: Key->ScanCode = SCAN_F4;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F5: Key->ScanCode = SCAN_F5;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F6: Key->ScanCode = SCAN_F6;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F7: Key->ScanCode = SCAN_F7;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F8: Key->ScanCode = SCAN_F8;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F9: Key->ScanCode = SCAN_F9;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F11: Key->ScanCode = SCAN_F11;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F12: Key->ScanCode = SCAN_F12;\r
+ Flag = TRUE;\r
+ break;\r
+\r
+ case VK_F13: Key->ScanCode = SCAN_F13;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F14: Key->ScanCode = SCAN_F14;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F15: Key->ScanCode = SCAN_F15;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F16: Key->ScanCode = SCAN_F16;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F17: Key->ScanCode = SCAN_F17;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F18: Key->ScanCode = SCAN_F18;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F19: Key->ScanCode = SCAN_F19;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F20: Key->ScanCode = SCAN_F20;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F21: Key->ScanCode = SCAN_F21;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F22: Key->ScanCode = SCAN_F22;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F23: Key->ScanCode = SCAN_F23;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_F24: Key->ScanCode = SCAN_F24;\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_PAUSE: Key->ScanCode = SCAN_PAUSE;\r
+ Flag = TRUE;\r
+ break;\r
+\r
+ //\r
+ // Set toggle state\r
+ //\r
+ case VK_NUMLOCK:\r
+ Private->NumLock = (BOOLEAN)(!Private->NumLock);\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_SCROLL:\r
+ Private->ScrollLock = (BOOLEAN)(!Private->ScrollLock);\r
+ Flag = TRUE;\r
+ break;\r
+ case VK_CAPITAL:\r
+ Private->CapsLock = (BOOLEAN)(!Private->CapsLock);\r
+ Flag = TRUE;\r
+ break;\r
}\r
\r
return (WinNtGopConvertParamToEfiKeyShiftState (Private, wParam, lParam, TRUE)) == TRUE ? TRUE : Flag;\r
}\r
\r
-\r
//\r
// GOP Protocol Member Functions\r
//\r
IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
IN UINT32 Width,\r
IN UINT32 Height\r
-)\r
+ )\r
{\r
- RETURN_STATUS RStatus;\r
- EFI_GRAPHICS_OUTPUT_MODE_INFORMATION Info;\r
- GRAPHICS_PRIVATE_DATA *Private;\r
- RECT Rect;\r
- BITMAPV4HEADER *VirtualScreenInfo;\r
- FRAME_BUFFER_CONFIGURE *FrameBufferConfigure;\r
- UINTN FrameBufferConfigureSize;\r
+ RETURN_STATUS RStatus;\r
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION Info;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
+ RECT Rect;\r
+ BITMAPV4HEADER *VirtualScreenInfo;\r
+ FRAME_BUFFER_CONFIGURE *FrameBufferConfigure;\r
+ UINTN FrameBufferConfigureSize;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
\r
// This buffer is the virtual screen/frame buffer.\r
//\r
VirtualScreenInfo = HeapAlloc (\r
- GetProcessHeap (),\r
- HEAP_ZERO_MEMORY,\r
- Width * Height * sizeof (RGBQUAD) + sizeof (BITMAPV4HEADER)\r
- );\r
+ GetProcessHeap (),\r
+ HEAP_ZERO_MEMORY,\r
+ Width * Height * sizeof (RGBQUAD) + sizeof (BITMAPV4HEADER)\r
+ );\r
if (VirtualScreenInfo == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
// Update the virtual screen info data structure\r
// Use negative Height to make sure screen/buffer are using the same coordinate.\r
//\r
- VirtualScreenInfo->bV4Size = sizeof (BITMAPV4HEADER);\r
- VirtualScreenInfo->bV4Width = Width;\r
- VirtualScreenInfo->bV4Height = -(LONG)Height;\r
- VirtualScreenInfo->bV4Planes = 1;\r
+ VirtualScreenInfo->bV4Size = sizeof (BITMAPV4HEADER);\r
+ VirtualScreenInfo->bV4Width = Width;\r
+ VirtualScreenInfo->bV4Height = -(LONG)Height;\r
+ VirtualScreenInfo->bV4Planes = 1;\r
VirtualScreenInfo->bV4BitCount = 32;\r
//\r
// uncompressed\r
Info.PixelFormat = PixelBlueGreenRedReserved8BitPerColor;\r
Info.PixelsPerScanLine = Width;\r
FrameBufferConfigureSize = 0;\r
- RStatus = FrameBufferBltConfigure (VirtualScreenInfo + 1, &Info, NULL, &FrameBufferConfigureSize);\r
+ RStatus = FrameBufferBltConfigure (VirtualScreenInfo + 1, &Info, NULL, &FrameBufferConfigureSize);\r
ASSERT (RStatus == EFI_BUFFER_TOO_SMALL);\r
FrameBufferConfigure = AllocatePool (FrameBufferConfigureSize);\r
if (FrameBufferConfigure == NULL) {\r
HeapFree (GetProcessHeap (), 0, VirtualScreenInfo);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
RStatus = FrameBufferBltConfigure (VirtualScreenInfo + 1, &Info, FrameBufferConfigure, &FrameBufferConfigureSize);\r
ASSERT_RETURN_ERROR (RStatus);\r
\r
-\r
if (Private->FrameBufferConfigure != NULL) {\r
FreePool (Private->FrameBufferConfigure);\r
}\r
+\r
Private->FrameBufferConfigure = FrameBufferConfigure;\r
\r
//\r
if (Private->VirtualScreenInfo != NULL) {\r
HeapFree (GetProcessHeap (), 0, Private->VirtualScreenInfo);\r
}\r
+\r
Private->VirtualScreenInfo = VirtualScreenInfo;\r
\r
Private->Width = Width;\r
// TODO: Delta - add argument and description to function comment\r
EFI_STATUS\r
WinNtWndBlt (\r
- IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
- IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
- IN EFI_UGA_BLT_OPERATION BltOperation,\r
- IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
-)\r
+ IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo,\r
+ IN EFI_UGA_PIXEL *BltBuffer OPTIONAL,\r
+ IN EFI_UGA_BLT_OPERATION BltOperation,\r
+ IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args\r
+ )\r
{\r
- RETURN_STATUS RStatus;\r
- GRAPHICS_PRIVATE_DATA *Private;\r
- RECT Rect;\r
+ RETURN_STATUS RStatus;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
+ RECT Rect;\r
\r
Private = GRAPHICS_PRIVATE_DATA_FROM_THIS (GraphicsIo);\r
RStatus = FrameBufferBlt (\r
Private->FrameBufferConfigure,\r
BltBuffer,\r
BltOperation,\r
- Args->SourceX, Args->SourceY,\r
- Args->DestinationX, Args->DestinationY,\r
- Args->Width, Args->Height,\r
+ Args->SourceX,\r
+ Args->SourceY,\r
+ Args->DestinationX,\r
+ Args->DestinationY,\r
+ Args->Width,\r
+ Args->Height,\r
Args->Delta\r
);\r
if (RETURN_ERROR (RStatus)) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-\r
/**\r
Win32 Windows event handler.\r
\r
IN LPARAM lParam\r
)\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
- HDC Handle;\r
- PAINTSTRUCT PaintStruct;\r
- LPARAM Index;\r
- EFI_INPUT_KEY Key;\r
- BOOLEAN AltIsPress;\r
- INT32 PosX;\r
- INT32 PosY;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
+ HDC Handle;\r
+ PAINTSTRUCT PaintStruct;\r
+ LPARAM Index;\r
+ EFI_INPUT_KEY Key;\r
+ BOOLEAN AltIsPress;\r
+ INT32 PosX;\r
+ INT32 PosY;\r
\r
//\r
// Use mTlsIndex global to get a Thread Local Storage version of Private.\r
// a unique thread.\r
//\r
AltIsPress = FALSE;\r
- Private = TlsGetValue (mTlsIndex);\r
+ Private = TlsGetValue (mTlsIndex);\r
ASSERT (NULL != Private);\r
\r
switch (iMsg) {\r
- case WM_PAINT:\r
- Handle = BeginPaint (hwnd, &PaintStruct);\r
-\r
- SetDIBitsToDevice (\r
- Handle, // Destination Device Context\r
- 0, // Destination X - 0\r
- 0, // Destination Y - 0\r
- Private->Width, // Width\r
- Private->Height, // Height\r
- 0, // Source X\r
- 0, // Source Y\r
- 0, // DIB Start Scan Line\r
- Private->Height, // Number of scan lines\r
- Private->VirtualScreenInfo + 1, // Address of array of DIB bits\r
- (BITMAPINFO *) Private->VirtualScreenInfo, // Address of structure with bitmap info\r
- DIB_RGB_COLORS // RGB or palette indexes\r
- );\r
-\r
- EndPaint (hwnd, &PaintStruct);\r
- return 0;\r
-\r
- //\r
- // F10 and the ALT key do not create a WM_KEYDOWN message, thus this special case\r
- // WM_SYSKEYDOWN is posted when F10 is pressed or\r
- // holds down ALT key and then presses another key.\r
- //\r
- case WM_SYSKEYDOWN:\r
-\r
- Key.ScanCode = 0;\r
- Key.UnicodeChar = CHAR_NULL;\r
- switch (wParam) {\r
- case VK_F10:\r
- Key.ScanCode = SCAN_F10;\r
- Key.UnicodeChar = CHAR_NULL;\r
- GopPrivateAddKey (Private, Key);\r
+ case WM_PAINT:\r
+ Handle = BeginPaint (hwnd, &PaintStruct);\r
+\r
+ SetDIBitsToDevice (\r
+ Handle, // Destination Device Context\r
+ 0, // Destination X - 0\r
+ 0, // Destination Y - 0\r
+ Private->Width, // Width\r
+ Private->Height, // Height\r
+ 0, // Source X\r
+ 0, // Source Y\r
+ 0, // DIB Start Scan Line\r
+ Private->Height, // Number of scan lines\r
+ Private->VirtualScreenInfo + 1, // Address of array of DIB bits\r
+ (BITMAPINFO *)Private->VirtualScreenInfo, // Address of structure with bitmap info\r
+ DIB_RGB_COLORS // RGB or palette indexes\r
+ );\r
+\r
+ EndPaint (hwnd, &PaintStruct);\r
return 0;\r
- }\r
\r
//\r
- // If ALT or ALT + modifier key is pressed.\r
+ // F10 and the ALT key do not create a WM_KEYDOWN message, thus this special case\r
+ // WM_SYSKEYDOWN is posted when F10 is pressed or\r
+ // holds down ALT key and then presses another key.\r
//\r
- if (WinNtGopConvertParamToEfiKey (Private, &wParam, &lParam, &Key)) {\r
- if (Key.ScanCode != 0){\r
+ case WM_SYSKEYDOWN:\r
+\r
+ Key.ScanCode = 0;\r
+ Key.UnicodeChar = CHAR_NULL;\r
+ switch (wParam) {\r
+ case VK_F10:\r
+ Key.ScanCode = SCAN_F10;\r
+ Key.UnicodeChar = CHAR_NULL;\r
+ GopPrivateAddKey (Private, Key);\r
+ return 0;\r
+ }\r
+\r
+ //\r
+ // If ALT or ALT + modifier key is pressed.\r
+ //\r
+ if (WinNtGopConvertParamToEfiKey (Private, &wParam, &lParam, &Key)) {\r
+ if (Key.ScanCode != 0) {\r
+ //\r
+ // If ALT is pressed with other ScanCode.\r
+ // Always revers the left Alt for simple.\r
+ //\r
+ Private->LeftAlt = TRUE;\r
+ }\r
+\r
+ GopPrivateAddKey (Private, Key);\r
//\r
- // If ALT is pressed with other ScanCode.\r
- // Always revers the left Alt for simple.\r
+ // When Alt is released there is no windoes message, so\r
+ // clean it after using it.\r
//\r
- Private->LeftAlt = TRUE;\r
+ Private->RightAlt = FALSE;\r
+ Private->LeftAlt = FALSE;\r
+ return 0;\r
}\r
- GopPrivateAddKey (Private, Key);\r
+\r
+ AltIsPress = TRUE;\r
+\r
+ case WM_CHAR:\r
//\r
- // When Alt is released there is no windoes message, so\r
- // clean it after using it.\r
+ // The ESC key also generate WM_CHAR.\r
//\r
- Private->RightAlt = FALSE;\r
- Private->LeftAlt = FALSE;\r
+ if (wParam == 0x1B) {\r
+ return 0;\r
+ }\r
+\r
+ if (AltIsPress == TRUE) {\r
+ //\r
+ // If AltIsPress is true that means the Alt key is pressed.\r
+ //\r
+ Private->LeftAlt = TRUE;\r
+ }\r
+\r
+ for (Index = 0; Index < (lParam & 0xffff); Index++) {\r
+ if (wParam != 0) {\r
+ Key.UnicodeChar = (CHAR16)wParam;\r
+ Key.ScanCode = SCAN_NULL;\r
+ GopPrivateAddKey (Private, Key);\r
+ }\r
+ }\r
+\r
+ if (AltIsPress == TRUE) {\r
+ //\r
+ // When Alt is released there is no windoes message, so\r
+ // clean it after using it.\r
+ //\r
+ Private->LeftAlt = FALSE;\r
+ Private->RightAlt = FALSE;\r
+ }\r
+\r
return 0;\r
- }\r
- AltIsPress = TRUE;\r
\r
- case WM_CHAR:\r
- //\r
- // The ESC key also generate WM_CHAR.\r
- //\r
- if (wParam == 0x1B) {\r
+ case WM_SYSKEYUP:\r
+ //\r
+ // ALT is pressed with another key released\r
+ //\r
+ WinNtGopConvertParamToEfiKeyShiftState (Private, &wParam, &lParam, FALSE);\r
return 0;\r
- }\r
\r
- if (AltIsPress == TRUE) {\r
+ case WM_KEYDOWN:\r
+ Key.ScanCode = SCAN_NULL;\r
+ Key.UnicodeChar = CHAR_NULL;\r
//\r
- // If AltIsPress is true that means the Alt key is pressed.\r
+ // A value key press will cause a WM_KEYDOWN first, then cause a WM_CHAR\r
+ // So if there is no modifier key updated, skip the WM_KEYDOWN even.\r
//\r
- Private->LeftAlt = TRUE;\r
- }\r
- for (Index = 0; Index < (lParam & 0xffff); Index++) {\r
- if (wParam != 0) {\r
- Key.UnicodeChar = (CHAR16) wParam;\r
- Key.ScanCode = SCAN_NULL;\r
+ if (WinNtGopConvertParamToEfiKey (Private, &wParam, &lParam, &Key)) {\r
+ //\r
+ // Support the partial keystroke, add all keydown event into the queue.\r
+ //\r
GopPrivateAddKey (Private, Key);\r
}\r
- }\r
- if (AltIsPress == TRUE) {\r
- //\r
- // When Alt is released there is no windoes message, so\r
- // clean it after using it.\r
- //\r
- Private->LeftAlt = FALSE;\r
- Private->RightAlt = FALSE;\r
- }\r
- return 0;\r
\r
- case WM_SYSKEYUP:\r
- //\r
- // ALT is pressed with another key released\r
- //\r
- WinNtGopConvertParamToEfiKeyShiftState (Private, &wParam, &lParam, FALSE);\r
- return 0;\r
+ return 0;\r
\r
- case WM_KEYDOWN:\r
- Key.ScanCode = SCAN_NULL;\r
- Key.UnicodeChar = CHAR_NULL;\r
- //\r
- // A value key press will cause a WM_KEYDOWN first, then cause a WM_CHAR\r
- // So if there is no modifier key updated, skip the WM_KEYDOWN even.\r
- //\r
- if (WinNtGopConvertParamToEfiKey (Private, &wParam, &lParam, &Key)) {\r
+ case WM_KEYUP:\r
+ WinNtGopConvertParamToEfiKeyShiftState (Private, &wParam, &lParam, FALSE);\r
+ return 0;\r
+\r
+ case WM_MOUSEMOVE:\r
+ PosX = GET_X_LPARAM (lParam);\r
+ PosY = GET_Y_LPARAM (lParam);\r
+\r
+ if (Private->PointerPreviousX != PosX) {\r
+ Private->PointerState.RelativeMovementX += (PosX - Private->PointerPreviousX);\r
+ Private->PointerPreviousX = PosX;\r
+ Private->PointerStateChanged = TRUE;\r
+ }\r
+\r
+ if (Private->PointerPreviousY != PosY) {\r
+ Private->PointerState.RelativeMovementY += (PosY - Private->PointerPreviousY);\r
+ Private->PointerPreviousY = PosY;\r
+ Private->PointerStateChanged = TRUE;\r
+ }\r
+\r
+ Private->PointerState.RelativeMovementZ = 0;\r
+ return 0;\r
+\r
+ case WM_LBUTTONDOWN:\r
+ Private->PointerState.LeftButton = TRUE;\r
+ Private->PointerStateChanged = TRUE;\r
+ return 0;\r
+\r
+ case WM_LBUTTONUP:\r
+ Private->PointerState.LeftButton = FALSE;\r
+ Private->PointerStateChanged = TRUE;\r
+ return 0;\r
+\r
+ case WM_RBUTTONDOWN:\r
+ Private->PointerState.RightButton = TRUE;\r
+ Private->PointerStateChanged = TRUE;\r
+ return 0;\r
+\r
+ case WM_RBUTTONUP:\r
+ Private->PointerState.RightButton = FALSE;\r
+ Private->PointerStateChanged = TRUE;\r
+ return 0;\r
+\r
+ case WM_CLOSE:\r
//\r
- // Support the partial keystroke, add all keydown event into the queue.\r
+ // This close message is issued by user, core is not aware of this,\r
+ // so don't release the window display resource, just hide the window.\r
//\r
- GopPrivateAddKey (Private, Key);\r
- }\r
- return 0;\r
-\r
- case WM_KEYUP:\r
- WinNtGopConvertParamToEfiKeyShiftState (Private, &wParam, &lParam, FALSE);\r
- return 0;\r
-\r
- case WM_MOUSEMOVE:\r
- PosX = GET_X_LPARAM (lParam);\r
- PosY = GET_Y_LPARAM (lParam);\r
-\r
- if (Private->PointerPreviousX != PosX) {\r
- Private->PointerState.RelativeMovementX += (PosX - Private->PointerPreviousX);\r
- Private->PointerPreviousX = PosX;\r
- Private->PointerStateChanged = TRUE;\r
- }\r
-\r
- if (Private->PointerPreviousY != PosY) {\r
- Private->PointerState.RelativeMovementY += (PosY - Private->PointerPreviousY);\r
- Private->PointerPreviousY = PosY;\r
- Private->PointerStateChanged = TRUE;\r
- }\r
-\r
- Private->PointerState.RelativeMovementZ = 0;\r
- return 0;\r
-\r
- case WM_LBUTTONDOWN:\r
- Private->PointerState.LeftButton = TRUE;\r
- Private->PointerStateChanged = TRUE;\r
- return 0;\r
-\r
- case WM_LBUTTONUP:\r
- Private->PointerState.LeftButton = FALSE;\r
- Private->PointerStateChanged = TRUE;\r
- return 0;\r
-\r
- case WM_RBUTTONDOWN:\r
- Private->PointerState.RightButton = TRUE;\r
- Private->PointerStateChanged = TRUE;\r
- return 0;\r
-\r
- case WM_RBUTTONUP:\r
- Private->PointerState.RightButton = FALSE;\r
- Private->PointerStateChanged = TRUE;\r
- return 0;\r
-\r
- case WM_CLOSE:\r
- //\r
- // This close message is issued by user, core is not aware of this,\r
- // so don't release the window display resource, just hide the window.\r
- //\r
- ShowWindow (Private->WindowHandle, SW_HIDE);\r
- return 0;\r
+ ShowWindow (Private->WindowHandle, SW_HIDE);\r
+ return 0;\r
\r
- case WM_DESTROY:\r
- DestroyWindow (hwnd);\r
- PostQuitMessage (0);\r
+ case WM_DESTROY:\r
+ DestroyWindow (hwnd);\r
+ PostQuitMessage (0);\r
\r
- HeapFree (GetProcessHeap (), 0, Private->VirtualScreenInfo);\r
+ HeapFree (GetProcessHeap (), 0, Private->VirtualScreenInfo);\r
\r
- ExitThread (0);\r
+ ExitThread (0);\r
\r
- default:\r
- break;\r
- };\r
+ default:\r
+ break;\r
+ }\r
\r
return DefWindowProc (hwnd, iMsg, wParam, lParam);\r
}\r
\r
-\r
/**\r
This thread simulates the end of WinMain () application. Each Window needs\r
to process its events. The messages are dispatched to\r
DWORD\r
WINAPI\r
WinNtGopThreadWinMain (\r
- LPVOID lpParameter\r
+ LPVOID lpParameter\r
)\r
{\r
MSG Message;\r
GRAPHICS_PRIVATE_DATA *Private;\r
RECT Rect;\r
\r
- Private = (GRAPHICS_PRIVATE_DATA *) lpParameter;\r
+ Private = (GRAPHICS_PRIVATE_DATA *)lpParameter;\r
ASSERT (NULL != Private);\r
\r
//\r
//\r
TlsSetValue (mTlsIndex, Private);\r
\r
- Private->ThreadId = GetCurrentThreadId ();\r
+ Private->ThreadId = GetCurrentThreadId ();\r
\r
Private->WindowsClass.cbSize = sizeof (WNDCLASSEX);\r
Private->WindowsClass.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;\r
Private->Width = 100;\r
Private->Height = 100;\r
\r
-\r
//\r
// This call will fail after the first time, but thats O.K. since we only need\r
// WIN_NT_GOP_CLASS_NAME to exist to create the window.\r
return (DWORD)Message.wParam;\r
}\r
\r
-\r
/**\r
TODO: Add function description\r
\r
EFI_STATUS\r
EFIAPI\r
WinNtGraphicsWindowOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
- DWORD NewThreadId;\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ DWORD NewThreadId;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = AllocateZeroPool (sizeof (*Private));\r
\r
NULL,\r
0,\r
WinNtGopThreadWinMain,\r
- (VOID *) Private,\r
+ (VOID *)Private,\r
0,\r
&NewThreadId\r
);\r
WaitForSingleObject (Private->ThreadInited, INFINITE);\r
CloseHandle (Private->ThreadInited);\r
\r
- This->Private = Private;\r
+ This->Private = Private;\r
This->Interface = &Private->GraphicsWindowIo;\r
\r
return EFI_SUCCESS;\r
EFI_STATUS\r
EFIAPI\r
WinNtGraphicsWindowClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
-)\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
+ )\r
{\r
- GRAPHICS_PRIVATE_DATA *Private;\r
+ GRAPHICS_PRIVATE_DATA *Private;\r
\r
Private = (GRAPHICS_PRIVATE_DATA *)This->Private;\r
\r
UnregisterClass (\r
Private->WindowsClass.lpszClassName,\r
Private->WindowsClass.hInstance\r
- );\r
+ );\r
}\r
\r
-\r
GopPrivateDestroyQ (Private, &Private->QueueForRead);\r
return EFI_SUCCESS;\r
}\r
\r
-\r
-EMU_IO_THUNK_PROTOCOL mWinNtWndThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL mWinNtWndThunkIo = {\r
&gEmuGraphicsWindowProtocolGuid,\r
NULL,\r
NULL,\r
#include "WinHost.h"\r
\r
#ifndef SE_TIME_ZONE_NAME\r
-#define SE_TIME_ZONE_NAME TEXT("SeTimeZonePrivilege")\r
+#define SE_TIME_ZONE_NAME TEXT("SeTimeZonePrivilege")\r
#endif\r
\r
//\r
// The growth size for array of module handle entries\r
//\r
-#define MAX_PDB_NAME_TO_MOD_HANDLE_ARRAY_SIZE 0x100\r
+#define MAX_PDB_NAME_TO_MOD_HANDLE_ARRAY_SIZE 0x100\r
\r
//\r
// Module handle entry structure\r
//\r
typedef struct {\r
- CHAR8 *PdbPointer;\r
- VOID *ModHandle;\r
+ CHAR8 *PdbPointer;\r
+ VOID *ModHandle;\r
} PDB_NAME_TO_MOD_HANDLE;\r
\r
//\r
// An Array to hold the module handles\r
//\r
-PDB_NAME_TO_MOD_HANDLE *mPdbNameModHandleArray = NULL;\r
+PDB_NAME_TO_MOD_HANDLE *mPdbNameModHandleArray = NULL;\r
UINTN mPdbNameModHandleArraySize = 0;\r
\r
//\r
// The number of array elements is allocated base on parsing\r
// PcdWinNtFirmwareVolume and the memory is never freed.\r
//\r
-UINTN gFdInfoCount = 0;\r
-NT_FD_INFO *gFdInfo;\r
+UINTN gFdInfoCount = 0;\r
+NT_FD_INFO *gFdInfo;\r
\r
//\r
// Array that supports separate memory ranges.\r
// The number of array elements is allocated base on parsing\r
// PcdWinNtMemorySizeForSecMain value and the memory is never freed.\r
//\r
-UINTN gSystemMemoryCount = 0;\r
-NT_SYSTEM_MEMORY *gSystemMemory;\r
+UINTN gSystemMemoryCount = 0;\r
+NT_SYSTEM_MEMORY *gSystemMemory;\r
\r
/*++\r
\r
//\r
// Allocate enough memory space for emulator\r
//\r
- gSystemMemory[Index].Memory = (EFI_PHYSICAL_ADDRESS) (UINTN) VirtualAlloc (NULL, (SIZE_T) (gSystemMemory[Index].Size), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
+ gSystemMemory[Index].Memory = (EFI_PHYSICAL_ADDRESS)(UINTN)VirtualAlloc (NULL, (SIZE_T)(gSystemMemory[Index].Size), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
if (gSystemMemory[Index].Memory == 0) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
return EFI_UNSUPPORTED;\r
}\r
\r
-\r
*FdBase = (EFI_PHYSICAL_ADDRESS)(UINTN)gFdInfo[Index].Address;\r
*FdSize = (UINT64)gFdInfo[Index].Size;\r
*FixUp = 0;\r
\r
- if (*FdBase == 0 && *FdSize == 0) {\r
+ if ((*FdBase == 0) && (*FdSize == 0)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
return &gEmuThunkProtocol;\r
}\r
\r
-\r
-EMU_THUNK_PPI mSecEmuThunkPpi = {\r
+EMU_THUNK_PPI mSecEmuThunkPpi = {\r
WinPeiAutoScan,\r
WinFdAddress,\r
WinThunk\r
**/\r
BOOLEAN\r
EfiSystemMemoryRange (\r
- IN VOID *MemoryAddress\r
+ IN VOID *MemoryAddress\r
)\r
{\r
UINTN Index;\r
MemoryBase = (EFI_PHYSICAL_ADDRESS)(UINTN)MemoryAddress;\r
for (Index = 0; Index < gSystemMemoryCount; Index++) {\r
if ((MemoryBase >= gSystemMemory[Index].Memory) &&\r
- (MemoryBase < (gSystemMemory[Index].Memory + gSystemMemory[Index].Size)) ) {\r
+ (MemoryBase < (gSystemMemory[Index].Memory + gSystemMemory[Index].Size)))\r
+ {\r
return TRUE;\r
}\r
}\r
return FALSE;\r
}\r
\r
-\r
EFI_STATUS\r
WinNtOpenFile (\r
- IN CHAR16 *FileName OPTIONAL,\r
- IN UINT32 MapSize,\r
- IN DWORD CreationDisposition,\r
- IN OUT VOID **BaseAddress,\r
- OUT UINTN *Length\r
+ IN CHAR16 *FileName OPTIONAL,\r
+ IN UINT32 MapSize,\r
+ IN DWORD CreationDisposition,\r
+ IN OUT VOID **BaseAddress,\r
+ OUT UINTN *Length\r
)\r
+\r
/*++\r
\r
Routine Description:\r
return EFI_NOT_FOUND;\r
}\r
}\r
+\r
//\r
// Map the open file into a memory range\r
//\r
if (NtMapHandle == NULL) {\r
return EFI_DEVICE_ERROR;\r
}\r
+\r
//\r
// Get the virtual address (address in the emulator) of the mapped file\r
//\r
VirtualAddress = MapViewOfFileEx (\r
- NtMapHandle,\r
- FILE_MAP_EXECUTE | FILE_MAP_ALL_ACCESS,\r
- 0,\r
- 0,\r
- MapSize,\r
- *BaseAddress\r
- );\r
+ NtMapHandle,\r
+ FILE_MAP_EXECUTE | FILE_MAP_ALL_ACCESS,\r
+ 0,\r
+ 0,\r
+ MapSize,\r
+ *BaseAddress\r
+ );\r
if (VirtualAddress == NULL) {\r
return EFI_DEVICE_ERROR;\r
}\r
// Seek to the end of the file to figure out the true file size.\r
//\r
FileSize = SetFilePointer (\r
- NtFileHandle,\r
- 0,\r
- NULL,\r
- FILE_END\r
- );\r
+ NtFileHandle,\r
+ 0,\r
+ NULL,\r
+ FILE_END\r
+ );\r
if (FileSize == -1) {\r
return EFI_DEVICE_ERROR;\r
}\r
INTN\r
EFIAPI\r
main (\r
- IN INT Argc,\r
- IN CHAR8 **Argv,\r
- IN CHAR8 **Envp\r
+ IN INT Argc,\r
+ IN CHAR8 **Argv,\r
+ IN CHAR8 **Envp\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- EFI_STATUS Status;\r
- HANDLE Token;\r
- TOKEN_PRIVILEGES TokenPrivileges;\r
- VOID *TemporaryRam;\r
- UINT32 TemporaryRamSize;\r
- VOID *EmuMagicPage;\r
- UINTN Index;\r
- UINTN Index1;\r
- CHAR16 *FileName;\r
- CHAR16 *FileNamePtr;\r
- BOOLEAN Done;\r
- EFI_PEI_FILE_HANDLE FileHandle;\r
- VOID *SecFile;\r
- CHAR16 *MemorySizeStr;\r
- CHAR16 *FirmwareVolumesStr;\r
- UINTN ProcessAffinityMask;\r
- UINTN SystemAffinityMask;\r
- INT32 LowBit;\r
+ EFI_STATUS Status;\r
+ HANDLE Token;\r
+ TOKEN_PRIVILEGES TokenPrivileges;\r
+ VOID *TemporaryRam;\r
+ UINT32 TemporaryRamSize;\r
+ VOID *EmuMagicPage;\r
+ UINTN Index;\r
+ UINTN Index1;\r
+ CHAR16 *FileName;\r
+ CHAR16 *FileNamePtr;\r
+ BOOLEAN Done;\r
+ EFI_PEI_FILE_HANDLE FileHandle;\r
+ VOID *SecFile;\r
+ CHAR16 *MemorySizeStr;\r
+ CHAR16 *FirmwareVolumesStr;\r
+ UINTN ProcessAffinityMask;\r
+ UINTN SystemAffinityMask;\r
+ INT32 LowBit;\r
\r
//\r
// Enable the privilege so that RTC driver can successfully run SetTime()\r
//\r
- OpenProcessToken (GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &Token);\r
- if (LookupPrivilegeValue(NULL, SE_TIME_ZONE_NAME, &TokenPrivileges.Privileges[0].Luid)) {\r
- TokenPrivileges.PrivilegeCount = 1;\r
+ OpenProcessToken (GetCurrentProcess (), TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &Token);\r
+ if (LookupPrivilegeValue (NULL, SE_TIME_ZONE_NAME, &TokenPrivileges.Privileges[0].Luid)) {\r
+ TokenPrivileges.PrivilegeCount = 1;\r
TokenPrivileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;\r
- AdjustTokenPrivileges(Token, FALSE, &TokenPrivileges, 0, (PTOKEN_PRIVILEGES) NULL, 0);\r
+ AdjustTokenPrivileges (Token, FALSE, &TokenPrivileges, 0, (PTOKEN_PRIVILEGES)NULL, 0);\r
}\r
\r
- MemorySizeStr = (CHAR16 *) PcdGetPtr (PcdEmuMemorySize);\r
- FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume);\r
+ MemorySizeStr = (CHAR16 *)PcdGetPtr (PcdEmuMemorySize);\r
+ FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdEmuFirmwareVolume);\r
\r
SecPrint ("\n\rEDK II WIN Host Emulation Environment from http://www.tianocore.org/edk2/\n\r");\r
\r
//\r
// Allocate space for gSystemMemory Array\r
//\r
- gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1;\r
- gSystemMemory = calloc (gSystemMemoryCount, sizeof (NT_SYSTEM_MEMORY));\r
+ gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1;\r
+ gSystemMemory = calloc (gSystemMemoryCount, sizeof (NT_SYSTEM_MEMORY));\r
if (gSystemMemory == NULL) {\r
SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n\r", MemorySizeStr);\r
exit (1);\r
//\r
// Allocate space for gSystemMemory Array\r
//\r
- gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;\r
- gFdInfo = calloc (gFdInfoCount, sizeof (NT_FD_INFO));\r
+ gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;\r
+ gFdInfo = calloc (gFdInfoCount, sizeof (NT_FD_INFO));\r
if (gFdInfo == NULL) {\r
SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n\r", FirmwareVolumesStr);\r
exit (1);\r
}\r
+\r
//\r
// Setup Boot Mode.\r
//\r
// Set TemporaryRam to zero so WinNtOpenFile will allocate a new mapping\r
//\r
TemporaryRamSize = TEMPORARY_RAM_SIZE;\r
- TemporaryRam = VirtualAlloc (NULL, (SIZE_T) (TemporaryRamSize), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
+ TemporaryRam = VirtualAlloc (NULL, (SIZE_T)(TemporaryRamSize), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
if (TemporaryRam == NULL) {\r
SecPrint ("ERROR : Can not allocate enough space for SecStack\n\r");\r
exit (1);\r
}\r
+\r
SetMem32 (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));\r
\r
- SecPrint (" OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n\r",\r
+ SecPrint (\r
+ " OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n\r",\r
TemporaryRamSize / SIZE_1KB,\r
TemporaryRam\r
);\r
if (EmuMagicPage != NULL) {\r
UINT64 Size;\r
Status = WinNtOpenFile (\r
- NULL,\r
- SIZE_4KB,\r
- 0,\r
- &EmuMagicPage,\r
- &Size\r
- );\r
+ NULL,\r
+ SIZE_4KB,\r
+ 0,\r
+ &EmuMagicPage,\r
+ &Size\r
+ );\r
if (EFI_ERROR (Status)) {\r
SecPrint ("ERROR : Could not allocate PeiServicesTablePage @ %p\n\r", EmuMagicPage);\r
return EFI_DEVICE_ERROR;\r
\r
for (Done = FALSE, Index = 0, SecFile = NULL; !Done; Index++) {\r
FileName = FileNamePtr;\r
- for (Index1 = 0; (FileNamePtr[Index1] != '!') && (FileNamePtr[Index1] != 0); Index1++)\r
- ;\r
+ for (Index1 = 0; (FileNamePtr[Index1] != '!') && (FileNamePtr[Index1] != 0); Index1++) {\r
+ }\r
+\r
if (FileNamePtr[Index1] == 0) {\r
Done = TRUE;\r
} else {\r
- FileNamePtr[Index1] = '\0';\r
- FileNamePtr = &FileNamePtr[Index1 + 1];\r
+ FileNamePtr[Index1] = '\0';\r
+ FileNamePtr = &FileNamePtr[Index1 + 1];\r
}\r
\r
//\r
// Open the FD and remember where it got mapped into our processes address space\r
//\r
Status = WinNtOpenFile (\r
- FileName,\r
- 0,\r
- OPEN_EXISTING,\r
- &gFdInfo[Index].Address,\r
- &gFdInfo[Index].Size\r
- );\r
+ FileName,\r
+ 0,\r
+ OPEN_EXISTING,\r
+ &gFdInfo[Index].Address,\r
+ &gFdInfo[Index].Size\r
+ );\r
if (EFI_ERROR (Status)) {\r
SecPrint ("ERROR : Can not open Firmware Device File %S (0x%X). Exiting.\n\r", FileName, Status);\r
exit (1);\r
// Load the first one we find.\r
//\r
FileHandle = NULL;\r
- Status = PeiServicesFfsFindNextFile (\r
- EFI_FV_FILETYPE_SECURITY_CORE,\r
- (EFI_PEI_FV_HANDLE)gFdInfo[Index].Address,\r
- &FileHandle\r
- );\r
+ Status = PeiServicesFfsFindNextFile (\r
+ EFI_FV_FILETYPE_SECURITY_CORE,\r
+ (EFI_PEI_FV_HANDLE)gFdInfo[Index].Address,\r
+ &FileHandle\r
+ );\r
if (!EFI_ERROR (Status)) {\r
Status = PeiServicesFfsFindSectionData (EFI_SECTION_PE32, FileHandle, &SecFile);\r
if (!EFI_ERROR (Status)) {\r
\r
SecPrint ("\n\r");\r
}\r
+\r
//\r
// Calculate memory regions and store the information in the gSystemMemory\r
// global for later use. The autosizing code will use this data to\r
//\r
// Find the next region\r
//\r
- for (Index1 = 0; MemorySizeStr[Index1] != '!' && MemorySizeStr[Index1] != 0; Index1++)\r
- ;\r
+ for (Index1 = 0; MemorySizeStr[Index1] != '!' && MemorySizeStr[Index1] != 0; Index1++) {\r
+ }\r
+\r
if (MemorySizeStr[Index1] == 0) {\r
Done = TRUE;\r
}\r
\r
VOID\r
SecLoadSecCore (\r
- IN UINTN TemporaryRam,\r
- IN UINTN TemporaryRamSize,\r
- IN VOID *BootFirmwareVolumeBase,\r
- IN UINTN BootFirmwareVolumeSize,\r
- IN VOID *SecCorePe32File\r
+ IN UINTN TemporaryRam,\r
+ IN UINTN TemporaryRamSize,\r
+ IN VOID *BootFirmwareVolumeBase,\r
+ IN UINTN BootFirmwareVolumeSize,\r
+ IN VOID *SecCorePe32File\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- EFI_STATUS Status;\r
- VOID *TopOfStack;\r
- VOID *SecCoreEntryPoint;\r
- EFI_SEC_PEI_HAND_OFF *SecCoreData;\r
- UINTN SecStackSize;\r
+ EFI_STATUS Status;\r
+ VOID *TopOfStack;\r
+ VOID *SecCoreEntryPoint;\r
+ EFI_SEC_PEI_HAND_OFF *SecCoreData;\r
+ UINTN SecStackSize;\r
\r
//\r
// Compute Top Of Memory for Stack and PEI Core Allocations\r
// | Stack |\r
// |-----------| <---- TemporaryRamBase\r
//\r
- TopOfStack = (VOID *)(TemporaryRam + SecStackSize);\r
+ TopOfStack = (VOID *)(TemporaryRam + SecStackSize);\r
\r
//\r
// Reservet space for storing PeiCore's parament in stack.\r
//\r
- TopOfStack = (VOID *)((UINTN)TopOfStack - sizeof (EFI_SEC_PEI_HAND_OFF) - CPU_STACK_ALIGNMENT);\r
- TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
+ TopOfStack = (VOID *)((UINTN)TopOfStack - sizeof (EFI_SEC_PEI_HAND_OFF) - CPU_STACK_ALIGNMENT);\r
+ TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
\r
//\r
// Bind this information into the SEC hand-off state\r
//\r
- SecCoreData = (EFI_SEC_PEI_HAND_OFF*)(UINTN)TopOfStack;\r
+ SecCoreData = (EFI_SEC_PEI_HAND_OFF *)(UINTN)TopOfStack;\r
SecCoreData->DataSize = sizeof (EFI_SEC_PEI_HAND_OFF);\r
SecCoreData->BootFirmwareVolumeBase = BootFirmwareVolumeBase;\r
SecCoreData->BootFirmwareVolumeSize = BootFirmwareVolumeSize;\r
- SecCoreData->TemporaryRamBase = (VOID*)TemporaryRam;\r
+ SecCoreData->TemporaryRamBase = (VOID *)TemporaryRam;\r
SecCoreData->TemporaryRamSize = TemporaryRamSize;\r
SecCoreData->StackBase = SecCoreData->TemporaryRamBase;\r
SecCoreData->StackSize = SecStackSize;\r
- SecCoreData->PeiTemporaryRamBase = (VOID*) ((UINTN) SecCoreData->TemporaryRamBase + SecStackSize);\r
+ SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->TemporaryRamBase + SecStackSize);\r
SecCoreData->PeiTemporaryRamSize = TemporaryRamSize - SecStackSize;\r
\r
//\r
// Load the PEI Core from a Firmware Volume\r
//\r
Status = SecPeCoffGetEntryPoint (\r
- SecCorePe32File,\r
- &SecCoreEntryPoint\r
- );\r
+ SecCorePe32File,\r
+ &SecCoreEntryPoint\r
+ );\r
if (EFI_ERROR (Status)) {\r
- return ;\r
+ return;\r
}\r
\r
//\r
//\r
// If we get here, then the SEC Core returned. This is an error\r
//\r
- return ;\r
+ return;\r
}\r
\r
RETURN_STATUS\r
IN OUT VOID **EntryPoint\r
)\r
{\r
- EFI_STATUS Status;\r
- PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;\r
+ EFI_STATUS Status;\r
+ PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;\r
\r
ZeroMem (&ImageContext, sizeof (ImageContext));\r
- ImageContext.Handle = Pe32Data;\r
+ ImageContext.Handle = Pe32Data;\r
\r
- ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) SecImageRead;\r
+ ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE)SecImageRead;\r
\r
- Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
+ Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
//\r
// Allocate space in NT (not emulator) memory with ReadWrite and Execute attribute.\r
// Extra space is for alignment\r
//\r
- ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) VirtualAlloc (NULL, (SIZE_T) (ImageContext.ImageSize + (ImageContext.SectionAlignment * 2)), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
+ ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)VirtualAlloc (NULL, (SIZE_T)(ImageContext.ImageSize + (ImageContext.SectionAlignment * 2)), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
if (ImageContext.ImageAddress == 0) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
//\r
// Align buffer on section boundary\r
//\r
return Status;\r
}\r
\r
- *EntryPoint = (VOID *)(UINTN)ImageContext.EntryPoint;\r
+ *EntryPoint = (VOID *)(UINTN)ImageContext.EntryPoint;\r
\r
return EFI_SUCCESS;\r
}\r
EFI_STATUS\r
EFIAPI\r
SecImageRead (\r
- IN VOID *FileHandle,\r
- IN UINTN FileOffset,\r
- IN OUT UINTN *ReadSize,\r
- OUT VOID *Buffer\r
+ IN VOID *FileHandle,\r
+ IN UINTN FileOffset,\r
+ IN OUT UINTN *ReadSize,\r
+ OUT VOID *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- CHAR8 *Destination8;\r
- CHAR8 *Source8;\r
- UINTN Length;\r
+ CHAR8 *Destination8;\r
+ CHAR8 *Source8;\r
+ UINTN Length;\r
\r
- Destination8 = Buffer;\r
- Source8 = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
- Length = *ReadSize;\r
+ Destination8 = Buffer;\r
+ Source8 = (CHAR8 *)((UINTN)FileHandle + FileOffset);\r
+ Length = *ReadSize;\r
while (Length--) {\r
*(Destination8++) = *(Source8++);\r
}\r
\r
CHAR16 *\r
AsciiToUnicode (\r
- IN CHAR8 *Ascii,\r
- IN UINTN *StrLen OPTIONAL\r
+ IN CHAR8 *Ascii,\r
+ IN UINTN *StrLen OPTIONAL\r
)\r
+\r
/*++\r
\r
Routine Description:\r
//\r
// Allocate a buffer for unicode string\r
//\r
- for (Index = 0; Ascii[Index] != '\0'; Index++)\r
- ;\r
+ for (Index = 0; Ascii[Index] != '\0'; Index++) {\r
+ }\r
+\r
Unicode = malloc ((Index + 1) * sizeof (CHAR16));\r
if (Unicode == NULL) {\r
return NULL;\r
}\r
\r
for (Index = 0; Ascii[Index] != '\0'; Index++) {\r
- Unicode[Index] = (CHAR16) Ascii[Index];\r
+ Unicode[Index] = (CHAR16)Ascii[Index];\r
}\r
\r
Unicode[Index] = '\0';\r
\r
UINTN\r
CountSeparatorsInString (\r
- IN CONST CHAR16 *String,\r
- IN CHAR16 Separator\r
+ IN CONST CHAR16 *String,\r
+ IN CHAR16 Separator\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
--*/\r
{\r
- UINTN Count;\r
+ UINTN Count;\r
\r
for (Count = 0; *String != '\0'; String++) {\r
if (*String == Separator) {\r
--*/\r
EFI_STATUS\r
AddModHandle (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
- IN VOID *ModHandle\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,\r
+ IN VOID *ModHandle\r
)\r
\r
{\r
//\r
Array = mPdbNameModHandleArray;\r
for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {\r
- if (Array->PdbPointer != NULL && Array->ModHandle == ModHandle) {\r
+ if ((Array->PdbPointer != NULL) && (Array->ModHandle == ModHandle)) {\r
return EFI_ALREADY_STARTED;\r
}\r
}\r
//\r
// Make a copy of the stirng and store the ModHandle\r
//\r
- Handle = GetProcessHeap ();\r
- Size = AsciiStrLen (ImageContext->PdbPointer) + 1;\r
- Array->PdbPointer = HeapAlloc ( Handle, HEAP_ZERO_MEMORY, Size);\r
+ Handle = GetProcessHeap ();\r
+ Size = AsciiStrLen (ImageContext->PdbPointer) + 1;\r
+ Array->PdbPointer = HeapAlloc (Handle, HEAP_ZERO_MEMORY, Size);\r
ASSERT (Array->PdbPointer != NULL);\r
\r
AsciiStrCpyS (Array->PdbPointer, Size, ImageContext->PdbPointer);\r
// No free space in mPdbNameModHandleArray so grow it by\r
// MAX_PDB_NAME_TO_MOD_HANDLE_ARRAY_SIZE entires.\r
//\r
- PreviousSize = mPdbNameModHandleArraySize * sizeof (PDB_NAME_TO_MOD_HANDLE);\r
+ PreviousSize = mPdbNameModHandleArraySize * sizeof (PDB_NAME_TO_MOD_HANDLE);\r
mPdbNameModHandleArraySize += MAX_PDB_NAME_TO_MOD_HANDLE_ARRAY_SIZE;\r
//\r
// re-allocate a new buffer and copy the old values to the new locaiton.\r
//\r
- TempArray = HeapAlloc (GetProcessHeap (),\r
- HEAP_ZERO_MEMORY,\r
- mPdbNameModHandleArraySize * sizeof (PDB_NAME_TO_MOD_HANDLE)\r
- );\r
+ TempArray = HeapAlloc (\r
+ GetProcessHeap (),\r
+ HEAP_ZERO_MEMORY,\r
+ mPdbNameModHandleArraySize * sizeof (PDB_NAME_TO_MOD_HANDLE)\r
+ );\r
\r
- CopyMem ((VOID *) (UINTN) TempArray, (VOID *) (UINTN)mPdbNameModHandleArray, PreviousSize);\r
+ CopyMem ((VOID *)(UINTN)TempArray, (VOID *)(UINTN)mPdbNameModHandleArray, PreviousSize);\r
\r
HeapFree (GetProcessHeap (), 0, mPdbNameModHandleArray);\r
\r
**/\r
VOID *\r
RemoveModHandle (\r
- IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
UINTN Index;\r
\r
Array = mPdbNameModHandleArray;\r
for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {\r
- if ((Array->PdbPointer != NULL) && (AsciiStrCmp(Array->PdbPointer, ImageContext->PdbPointer) == 0)) {\r
+ if ((Array->PdbPointer != NULL) && (AsciiStrCmp (Array->PdbPointer, ImageContext->PdbPointer) == 0)) {\r
//\r
// If you find a match return it and delete the entry\r
//\r
VOID\r
EFIAPI\r
PeCoffLoaderRelocateImageExtraAction (\r
- IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
+ IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
)\r
{\r
- EFI_STATUS Status;\r
- VOID *DllEntryPoint;\r
- CHAR16 *DllFileName;\r
- HMODULE Library;\r
- UINTN Index;\r
+ EFI_STATUS Status;\r
+ VOID *DllEntryPoint;\r
+ CHAR16 *DllFileName;\r
+ HMODULE Library;\r
+ UINTN Index;\r
\r
ASSERT (ImageContext != NULL);\r
//\r
// Load the DLL if it's not an EBC image.\r
//\r
if ((ImageContext->PdbPointer != NULL) &&\r
- (ImageContext->Machine != EFI_IMAGE_MACHINE_EBC)) {\r
+ (ImageContext->Machine != EFI_IMAGE_MACHINE_EBC))\r
+ {\r
//\r
// Convert filename from ASCII to Unicode\r
//\r
//\r
// Check that we have a valid filename\r
//\r
- if (Index < 5 || DllFileName[Index - 4] != '.') {\r
+ if ((Index < 5) || (DllFileName[Index - 4] != '.')) {\r
free (DllFileName);\r
\r
//\r
//\r
return;\r
}\r
+\r
//\r
// Replace .PDB with .DLL on the filename\r
//\r
- DllFileName[Index - 3] = 'D';\r
- DllFileName[Index - 2] = 'L';\r
- DllFileName[Index - 1] = 'L';\r
+ DllFileName[Index - 3] = 'D';\r
+ DllFileName[Index - 2] = 'L';\r
+ DllFileName[Index - 1] = 'L';\r
\r
//\r
// Load the .DLL file into the user process's address space for source\r
// checking as the we can point to the PE32 image loaded by Tiano. This\r
// step is only needed for source level debugging\r
//\r
- DllEntryPoint = (VOID *) (UINTN) GetProcAddress (Library, "InitializeDriver");\r
-\r
+ DllEntryPoint = (VOID *)(UINTN)GetProcAddress (Library, "InitializeDriver");\r
}\r
\r
if ((Library != NULL) && (DllEntryPoint != NULL)) {\r
//\r
// This DLL is not already loaded, so source level debugging is supported.\r
//\r
- ImageContext->EntryPoint = (EFI_PHYSICAL_ADDRESS) (UINTN) DllEntryPoint;\r
+ ImageContext->EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)DllEntryPoint;\r
SecPrint ("LoadLibraryEx (\n\r %S,\n\r NULL, DONT_RESOLVE_DLL_REFERENCES)\n\r", DllFileName);\r
}\r
} else {\r
EFIAPI\r
PeCoffLoaderUnloadImageExtraAction (\r
IN PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext\r
-)\r
+ )\r
{\r
VOID *ModHandle;\r
\r
Include file for Windows Host\r
\r
**/\r
+\r
#ifndef _HOST_H_\r
#define _HOST_H_\r
\r
#include <Library/PeCoffExtraActionLib.h>\r
#include <Library/NetLib.h>\r
\r
-\r
-#define TEMPORARY_RAM_SIZE 0x20000\r
+#define TEMPORARY_RAM_SIZE 0x20000\r
\r
typedef struct {\r
- VOID *Address;\r
- UINTN Size;\r
+ VOID *Address;\r
+ UINTN Size;\r
} NT_FD_INFO;\r
\r
typedef struct {\r
- EFI_PHYSICAL_ADDRESS Memory;\r
- UINT64 Size;\r
+ EFI_PHYSICAL_ADDRESS Memory;\r
+ UINT64 Size;\r
} NT_SYSTEM_MEMORY;\r
\r
RETURN_STATUS\r
SecPeCoffGetEntryPoint (\r
IN VOID *Pe32Data,\r
IN OUT VOID **EntryPoint\r
-);\r
+ );\r
\r
VOID\r
SecLoadSecCore (\r
- IN UINTN TemporaryRam,\r
- IN UINTN TemporaryRamSize,\r
- IN VOID *BootFirmwareVolumeBase,\r
- IN UINTN BootFirmwareVolumeSize,\r
- IN VOID *SecCorePe32File\r
-)\r
+ IN UINTN TemporaryRam,\r
+ IN UINTN TemporaryRamSize,\r
+ IN VOID *BootFirmwareVolumeBase,\r
+ IN UINTN BootFirmwareVolumeSize,\r
+ IN VOID *SecCorePe32File\r
+ )\r
+\r
/*++\r
\r
Routine Description:\r
IN OUT EFI_PHYSICAL_ADDRESS *FdBase,\r
IN OUT UINT64 *FdSize\r
)\r
+\r
/*++\r
\r
Routine Description:\r
--*/\r
;\r
\r
-\r
EFI_STATUS\r
EFIAPI\r
SecImageRead (\r
- IN VOID *FileHandle,\r
- IN UINTN FileOffset,\r
- IN OUT UINTN *ReadSize,\r
- OUT VOID *Buffer\r
+ IN VOID *FileHandle,\r
+ IN UINTN FileOffset,\r
+ IN OUT UINTN *ReadSize,\r
+ OUT VOID *Buffer\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
CHAR16 *\r
AsciiToUnicode (\r
- IN CHAR8 *Ascii,\r
- IN UINTN *StrLen OPTIONAL\r
+ IN CHAR8 *Ascii,\r
+ IN UINTN *StrLen OPTIONAL\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
UINTN\r
CountSeparatorsInString (\r
- IN CONST CHAR16 *String,\r
- IN CHAR16 Separator\r
+ IN CONST CHAR16 *String,\r
+ IN CHAR16 Separator\r
)\r
+\r
/*++\r
\r
Routine Description:\r
\r
BOOLEAN\r
EfiSystemMemoryRange (\r
- IN VOID *MemoryAddress\r
+ IN VOID *MemoryAddress\r
);\r
+\r
VOID\r
SecInitializeThunk (\r
VOID\r
-);\r
-extern EMU_THUNK_PROTOCOL gEmuThunkProtocol;\r
-extern EMU_IO_THUNK_PROTOCOL mWinNtWndThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL mWinNtFileSystemThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo;\r
-extern EMU_IO_THUNK_PROTOCOL mWinNtSnpThunkIo;\r
+ );\r
+\r
+extern EMU_THUNK_PROTOCOL gEmuThunkProtocol;\r
+extern EMU_IO_THUNK_PROTOCOL mWinNtWndThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL mWinNtFileSystemThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo;\r
+extern EMU_IO_THUNK_PROTOCOL mWinNtSnpThunkIo;\r
\r
#endif\r
#pragma warning(disable : 4028)\r
#pragma warning(disable : 4133)\r
\r
-#define GUID _WINNT_DUP_GUID_____\r
+#define GUID _WINNT_DUP_GUID_____\r
#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD\r
#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY\r
#if defined (MDE_CPU_IA32) && (_MSC_VER < 1800)\r
-#define InterlockedIncrement _WINNT_DUP_InterlockedIncrement\r
-#define InterlockedDecrement _WINNT_DUP_InterlockedDecrement\r
-#define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64\r
+#define InterlockedIncrement _WINNT_DUP_InterlockedIncrement\r
+#define InterlockedDecrement _WINNT_DUP_InterlockedDecrement\r
+#define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64\r
#endif\r
#undef UNALIGNED\r
#undef CONST\r
// It should be removed after the root cause why\r
// size_t is undefined when go into the line below is found.\r
#if defined (MDE_CPU_IA32)\r
-typedef UINT32 size_t ;\r
+typedef UINT32 size_t;\r
#endif\r
\r
#include "windows.h"\r
#undef InterlockedCompareExchangePointer\r
#undef CreateEventEx\r
\r
-#define VOID void\r
+#define VOID void\r
\r
//\r
// Prevent collisions with Windows API name macros that deal with Unicode/Not issues\r
#pragma warning(default : 4115)\r
#pragma warning(default : 4201)\r
\r
-\r
#endif\r
IN UINTN AllocationSize\r
)\r
{\r
- return (VOID*) malloc (AllocationSize);\r
+ return (VOID *)malloc (AllocationSize);\r
}\r
\r
-\r
/**\r
Allocates and zeros a buffer of type EfiBootServicesData.\r
\r
IN UINTN AllocationSize\r
)\r
{\r
- VOID *Buffer;\r
+ VOID *Buffer;\r
\r
Buffer = AllocatePool (AllocationSize);\r
if (Buffer == NULL) {\r
return Buffer;\r
}\r
\r
-\r
/**\r
Reallocates a buffer of type EfiBootServicesData.\r
\r
IN VOID *OldBuffer OPTIONAL\r
)\r
{\r
- VOID *NewBuffer;\r
+ VOID *NewBuffer;\r
\r
NewBuffer = AllocatePool (NewSize);\r
if (NewBuffer == NULL) {\r
if (Memory != NULL) {\r
Memory = CopyMem (Memory, Buffer, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
-\r
/**\r
Frees a buffer that was previously allocated with one of the pool allocation functions in the\r
Memory Allocation Library.\r
VOID\r
EFIAPI\r
FreePool (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- free ((void *) Buffer);\r
+ free ((void *)Buffer);\r
}\r
-\r
\r
#pragma pack(1)\r
typedef struct _NT_NET_INTERFACE_INFO {\r
- UINT32 InterfaceIndex;\r
- EFI_MAC_ADDRESS MacAddr;\r
+ UINT32 InterfaceIndex;\r
+ EFI_MAC_ADDRESS MacAddr;\r
} NT_NET_INTERFACE_INFO;\r
#pragma pack()\r
\r
-#define NET_ETHER_HEADER_SIZE 14\r
-#define MAX_INTERFACE_INFO_NUMBER 16\r
-#define SNP_MAX_TX_BUFFER_NUM 65536\r
-#define SNP_TX_BUFFER_INCREASEMENT 32\r
-#define DEFAULT_SELECTED_NIC_INDEX 0\r
+#define NET_ETHER_HEADER_SIZE 14\r
+#define MAX_INTERFACE_INFO_NUMBER 16\r
+#define SNP_MAX_TX_BUFFER_NUM 65536\r
+#define SNP_TX_BUFFER_INCREASEMENT 32\r
+#define DEFAULT_SELECTED_NIC_INDEX 0\r
\r
//\r
// Functions in Net Library\r
typedef\r
INT32\r
(*NT_NET_INITIALIZE) (\r
- IN OUT UINT32 *InterfaceCount,\r
- IN OUT NT_NET_INTERFACE_INFO * InterfaceInfoBuffer\r
+ IN OUT UINT32 *InterfaceCount,\r
+ IN OUT NT_NET_INTERFACE_INFO *InterfaceInfoBuffer\r
);\r
\r
typedef\r
typedef\r
INT32\r
(*NT_NET_SET_RECEIVE_FILTER) (\r
- IN UINT32 Index,\r
- IN UINT32 EnableFilter,\r
- IN UINT32 MCastFilterCnt,\r
- IN EFI_MAC_ADDRESS * MCastFilter\r
+ IN UINT32 Index,\r
+ IN UINT32 EnableFilter,\r
+ IN UINT32 MCastFilterCnt,\r
+ IN EFI_MAC_ADDRESS *MCastFilter\r
);\r
\r
typedef\r
INT32\r
(*NT_NET_RECEIVE) (\r
- IN UINT32 Index,\r
- IN OUT UINT32 *BufferSize,\r
- OUT VOID *Buffer\r
+ IN UINT32 Index,\r
+ IN OUT UINT32 *BufferSize,\r
+ OUT VOID *Buffer\r
);\r
\r
typedef\r
INT32\r
(*NT_NET_TRANSMIT) (\r
- IN UINT32 Index,\r
- IN UINT32 HeaderSize,\r
- IN UINT32 BufferSize,\r
- IN VOID *Buffer,\r
- IN EFI_MAC_ADDRESS * SrcAddr,\r
- IN EFI_MAC_ADDRESS * DestAddr,\r
- IN UINT16 *Protocol\r
+ IN UINT32 Index,\r
+ IN UINT32 HeaderSize,\r
+ IN UINT32 BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr,\r
+ IN EFI_MAC_ADDRESS *DestAddr,\r
+ IN UINT16 *Protocol\r
);\r
\r
typedef struct _NT_NET_UTILITY_TABLE {\r
- NT_NET_INITIALIZE Initialize;\r
- NT_NET_FINALIZE Finalize;\r
- NT_NET_SET_RECEIVE_FILTER SetReceiveFilter;\r
- NT_NET_RECEIVE Receive;\r
- NT_NET_TRANSMIT Transmit;\r
+ NT_NET_INITIALIZE Initialize;\r
+ NT_NET_FINALIZE Finalize;\r
+ NT_NET_SET_RECEIVE_FILTER SetReceiveFilter;\r
+ NT_NET_RECEIVE Receive;\r
+ NT_NET_TRANSMIT Transmit;\r
} NT_NET_UTILITY_TABLE;\r
\r
//\r
// Instance data for each fake SNP instance\r
//\r
-#define WIN_NT_INSTANCE_SIGNATURE SIGNATURE_32 ('N', 'T', 'I', 'S')\r
+#define WIN_NT_INSTANCE_SIGNATURE SIGNATURE_32 ('N', 'T', 'I', 'S')\r
\r
typedef struct {\r
- UINT32 Signature;\r
+ UINT32 Signature;\r
\r
//\r
// Array of the recycled transmit buffer address.\r
//\r
- UINT64 *RecycledTxBuf;\r
+ UINT64 *RecycledTxBuf;\r
\r
//\r
// Current number of recycled buffer pointers in RecycledTxBuf.\r
//\r
- UINT32 RecycledTxBufCount;\r
+ UINT32 RecycledTxBufCount;\r
\r
//\r
// The maximum number of recycled buffer pointers in RecycledTxBuf.\r
//\r
- UINT32 MaxRecycledTxBuf;\r
- EFI_SIMPLE_NETWORK_MODE Mode;\r
- NT_NET_INTERFACE_INFO InterfaceInfo;\r
+ UINT32 MaxRecycledTxBuf;\r
+ EFI_SIMPLE_NETWORK_MODE Mode;\r
+ NT_NET_INTERFACE_INFO InterfaceInfo;\r
} WIN_NT_INSTANCE_DATA;\r
\r
//\r
// Instance data for each SNP private instance\r
//\r
-#define WIN_NT_SIMPLE_NETWORK_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 's', 'n')\r
+#define WIN_NT_SIMPLE_NETWORK_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 's', 'n')\r
\r
typedef struct {\r
- UINTN Signature;\r
- EMU_IO_THUNK_PROTOCOL *Thunk;\r
- EMU_SNP_PROTOCOL EmuSnp;\r
- EFI_SIMPLE_NETWORK_MODE *Mode;\r
- HMODULE NetworkLibraryHandle;\r
- NT_NET_UTILITY_TABLE NtNetUtilityTable;\r
- WIN_NT_INSTANCE_DATA Instance;\r
+ UINTN Signature;\r
+ EMU_IO_THUNK_PROTOCOL *Thunk;\r
+ EMU_SNP_PROTOCOL EmuSnp;\r
+ EFI_SIMPLE_NETWORK_MODE *Mode;\r
+ HMODULE NetworkLibraryHandle;\r
+ NT_NET_UTILITY_TABLE NtNetUtilityTable;\r
+ WIN_NT_INSTANCE_DATA Instance;\r
} WIN_NT_SNP_PRIVATE;\r
\r
#define WIN_NT_SNP_PRIVATE_DATA_FROM_THIS(a) \\r
CR(a, WIN_NT_SNP_PRIVATE, EmuSnp, WIN_NT_SIMPLE_NETWORK_PRIVATE_SIGNATURE)\r
\r
-\r
/**\r
Register storage for SNP Mode.\r
\r
IN EFI_SIMPLE_NETWORK_MODE *Mode\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
WinNtSnpInitialize (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN ExtraRxBufferSize OPTIONAL,\r
- IN UINTN ExtraTxBufferSize OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN ExtraRxBufferSize OPTIONAL,\r
+ IN UINTN ExtraTxBufferSize OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
break;\r
}\r
\r
- Private->Mode->MCastFilterCount = 0;\r
+ Private->Mode->MCastFilterCount = 0;\r
Private->Mode->ReceiveFilterSetting = 0;\r
ZeroMem (Private->Mode->MCastFilter, sizeof (Private->Mode->MCastFilter));\r
\r
**/\r
EFI_STATUS\r
WinNtSnpReset (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ExtendedVerification\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ExtendedVerification\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
IN EMU_SNP_PROTOCOL *This\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
Private->Mode->State = EfiSimpleNetworkStarted;\r
\r
Private->Mode->ReceiveFilterSetting = 0;\r
- Private->Mode->MCastFilterCount = 0;\r
+ Private->Mode->MCastFilterCount = 0;\r
ZeroMem (Private->Mode->MCastFilter, sizeof (Private->Mode->MCastFilter));\r
\r
return EFI_SUCCESS;\r
**/\r
EFI_STATUS\r
WinNtSnpReceiveFilters (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINT32 Enable,\r
- IN UINT32 Disable,\r
- IN BOOLEAN ResetMCastFilter,\r
- IN UINTN MCastFilterCnt OPTIONAL,\r
- IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINT32 Enable,\r
+ IN UINT32 Disable,\r
+ IN BOOLEAN ResetMCastFilter,\r
+ IN UINTN MCastFilterCnt OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
- INT32 ReturnValue;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
+ INT32 ReturnValue;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
ReturnValue = Private->NtNetUtilityTable.SetReceiveFilter (\r
- Private->Instance.InterfaceInfo.InterfaceIndex,\r
- Enable,\r
- (UINT32)MCastFilterCnt,\r
- MCastFilter\r
- );\r
+ Private->Instance.InterfaceInfo.InterfaceIndex,\r
+ Enable,\r
+ (UINT32)MCastFilterCnt,\r
+ MCastFilter\r
+ );\r
\r
if (ReturnValue <= 0) {\r
return EFI_DEVICE_ERROR;\r
**/\r
EFI_STATUS\r
WinNtSnpStationAddress (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN EFI_MAC_ADDRESS *New OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN EFI_MAC_ADDRESS *New OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
WinNtSnpStatistics (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN Reset,\r
- IN OUT UINTN *StatisticsSize OPTIONAL,\r
- OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN Reset,\r
+ IN OUT UINTN *StatisticsSize OPTIONAL,\r
+ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
WinNtSnpMCastIpToMac (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN IPv6,\r
- IN EFI_IP_ADDRESS *IP,\r
- OUT EFI_MAC_ADDRESS *MAC\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN IPv6,\r
+ IN EFI_IP_ADDRESS *IP,\r
+ OUT EFI_MAC_ADDRESS *MAC\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
WinNtSnpNvData (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN BOOLEAN ReadWrite,\r
- IN UINTN Offset,\r
- IN UINTN BufferSize,\r
- IN OUT VOID *Buffer\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN BOOLEAN ReadWrite,\r
+ IN UINTN Offset,\r
+ IN UINTN BufferSize,\r
+ IN OUT VOID *Buffer\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
**/\r
EFI_STATUS\r
WinNtSnpGetStatus (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINT32 *InterruptStatus OPTIONAL,\r
- OUT VOID **TxBuf OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINT32 *InterruptStatus OPTIONAL,\r
+ OUT VOID **TxBuf OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (TxBuf != NULL) {\r
if (Private->Instance.RecycledTxBufCount != 0) {\r
- Private->Instance.RecycledTxBufCount --;\r
- *((UINT8 **) TxBuf) = (UINT8 *) (UINTN)Private->Instance.RecycledTxBuf[Private->Instance.RecycledTxBufCount];\r
+ Private->Instance.RecycledTxBufCount--;\r
+ *((UINT8 **)TxBuf) = (UINT8 *)(UINTN)Private->Instance.RecycledTxBuf[Private->Instance.RecycledTxBufCount];\r
} else {\r
- *((UINT8 **) TxBuf) = NULL;\r
+ *((UINT8 **)TxBuf) = NULL;\r
}\r
}\r
\r
**/\r
EFI_STATUS\r
WinNtSnpTransmit (\r
- IN EMU_SNP_PROTOCOL *This,\r
- IN UINTN HeaderSize,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer,\r
- IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- IN UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ IN UINTN HeaderSize,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer,\r
+ IN EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ IN EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ IN UINT16 *Protocol OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
- INT32 ReturnValue;\r
- UINT64 *Tmp;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
+ INT32 ReturnValue;\r
+ UINT64 *Tmp;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
}\r
\r
ReturnValue = Private->NtNetUtilityTable.Transmit (\r
- Private->Instance.InterfaceInfo.InterfaceIndex,\r
- (UINT32)HeaderSize,\r
- (UINT32)BufferSize,\r
- Buffer,\r
- SrcAddr,\r
- DestAddr,\r
- Protocol\r
- );\r
+ Private->Instance.InterfaceInfo.InterfaceIndex,\r
+ (UINT32)HeaderSize,\r
+ (UINT32)BufferSize,\r
+ Buffer,\r
+ SrcAddr,\r
+ DestAddr,\r
+ Protocol\r
+ );\r
\r
if (ReturnValue < 0) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r
if (Private->Instance.RecycledTxBufCount < Private->Instance.MaxRecycledTxBuf) {\r
- Private->Instance.RecycledTxBuf[Private->Instance.RecycledTxBufCount] = (UINT64) Buffer;\r
- Private->Instance.RecycledTxBufCount ++;\r
+ Private->Instance.RecycledTxBuf[Private->Instance.RecycledTxBufCount] = (UINT64)Buffer;\r
+ Private->Instance.RecycledTxBufCount++;\r
} else {\r
Tmp = malloc (sizeof (UINT64) * (Private->Instance.MaxRecycledTxBuf + SNP_TX_BUFFER_INCREASEMENT));\r
if (Tmp == NULL) {\r
return EFI_DEVICE_ERROR;\r
}\r
+\r
CopyMem (Tmp, Private->Instance.RecycledTxBuf, sizeof (UINT64) * Private->Instance.RecycledTxBufCount);\r
free (Private->Instance.RecycledTxBuf);\r
- Private->Instance.RecycledTxBuf = Tmp;\r
+ Private->Instance.RecycledTxBuf = Tmp;\r
Private->Instance.MaxRecycledTxBuf += SNP_TX_BUFFER_INCREASEMENT;\r
}\r
}\r
**/\r
EFI_STATUS\r
WinNtSnpReceive (\r
- IN EMU_SNP_PROTOCOL *This,\r
- OUT UINTN *HeaderSize OPTIONAL,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer,\r
- OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
- OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
- OUT UINT16 *Protocol OPTIONAL\r
+ IN EMU_SNP_PROTOCOL *This,\r
+ OUT UINTN *HeaderSize OPTIONAL,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer,\r
+ OUT EFI_MAC_ADDRESS *SrcAddr OPTIONAL,\r
+ OUT EFI_MAC_ADDRESS *DestAddr OPTIONAL,\r
+ OUT UINT16 *Protocol OPTIONAL\r
)\r
{\r
- WIN_NT_SNP_PRIVATE *Private;\r
- INT32 ReturnValue;\r
- UINTN BufSize;\r
+ WIN_NT_SNP_PRIVATE *Private;\r
+ INT32 ReturnValue;\r
+ UINTN BufSize;\r
\r
Private = WIN_NT_SNP_PRIVATE_DATA_FROM_THIS (This);\r
\r
- BufSize = *BufferSize;\r
+ BufSize = *BufferSize;\r
\r
ASSERT (Private->NtNetUtilityTable.Receive != NULL);\r
\r
ReturnValue = Private->NtNetUtilityTable.Receive (\r
- Private->Instance.InterfaceInfo.InterfaceIndex,\r
- BufferSize,\r
- Buffer\r
- );\r
+ Private->Instance.InterfaceInfo.InterfaceIndex,\r
+ BufferSize,\r
+ Buffer\r
+ );\r
\r
if (ReturnValue < 0) {\r
if (ReturnValue == -100) {\r
\r
if (SrcAddr != NULL) {\r
ZeroMem (SrcAddr, sizeof (EFI_MAC_ADDRESS));\r
- CopyMem (SrcAddr, ((UINT8 *) Buffer) + 6, 6);\r
+ CopyMem (SrcAddr, ((UINT8 *)Buffer) + 6, 6);\r
}\r
\r
if (DestAddr != NULL) {\r
ZeroMem (DestAddr, sizeof (EFI_MAC_ADDRESS));\r
- CopyMem (DestAddr, ((UINT8 *) Buffer), 6);\r
+ CopyMem (DestAddr, ((UINT8 *)Buffer), 6);\r
}\r
\r
if (Protocol != NULL) {\r
- *Protocol = NTOHS (*((UINT16 *) (((UINT8 *) Buffer) + 12)));\r
+ *Protocol = NTOHS (*((UINT16 *)(((UINT8 *)Buffer) + 12)));\r
}\r
\r
return (*BufferSize <= BufSize) ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL;\r
**/\r
EFI_STATUS\r
WinNtInitializeInstanceData (\r
- IN OUT WIN_NT_INSTANCE_DATA *Instance,\r
- IN NT_NET_INTERFACE_INFO *NetInfo\r
+ IN OUT WIN_NT_INSTANCE_DATA *Instance,\r
+ IN NT_NET_INTERFACE_INFO *NetInfo\r
)\r
{\r
- if (Instance == NULL || NetInfo == NULL) {\r
+ if ((Instance == NULL) || (NetInfo == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
ZeroMem (Instance, sizeof (WIN_NT_INSTANCE_DATA));\r
\r
- Instance->Signature = WIN_NT_INSTANCE_SIGNATURE;\r
- Instance->RecycledTxBufCount = 0;\r
- Instance->MaxRecycledTxBuf = 32;\r
- Instance->Mode.State = EfiSimpleNetworkInitialized;\r
- Instance->Mode.HwAddressSize = NET_ETHER_ADDR_LEN;\r
- Instance->Mode.MediaHeaderSize = NET_ETHER_HEADER_SIZE;\r
- Instance->Mode.MaxPacketSize = 1500;\r
- Instance->Mode.MaxMCastFilterCount = MAX_MCAST_FILTER_CNT;\r
- Instance->Mode.IfType = NET_IFTYPE_ETHERNET;\r
+ Instance->Signature = WIN_NT_INSTANCE_SIGNATURE;\r
+ Instance->RecycledTxBufCount = 0;\r
+ Instance->MaxRecycledTxBuf = 32;\r
+ Instance->Mode.State = EfiSimpleNetworkInitialized;\r
+ Instance->Mode.HwAddressSize = NET_ETHER_ADDR_LEN;\r
+ Instance->Mode.MediaHeaderSize = NET_ETHER_HEADER_SIZE;\r
+ Instance->Mode.MaxPacketSize = 1500;\r
+ Instance->Mode.MaxMCastFilterCount = MAX_MCAST_FILTER_CNT;\r
+ Instance->Mode.IfType = NET_IFTYPE_ETHERNET;\r
Instance->Mode.MediaPresentSupported = TRUE;\r
- Instance->Mode.MediaPresent = TRUE;\r
+ Instance->Mode.MediaPresent = TRUE;\r
\r
//\r
// Allocate the RecycledTxBuf.\r
//\r
CopyMem (&Instance->InterfaceInfo, NetInfo, sizeof (Instance->InterfaceInfo));\r
\r
-\r
//\r
// Set broadcast address\r
//\r
//\r
// Copy Current/PermanentAddress MAC address\r
//\r
- CopyMem (&Instance->Mode.CurrentAddress, &Instance->InterfaceInfo.MacAddr, sizeof(Instance->Mode.CurrentAddress));\r
- CopyMem (&Instance->Mode.PermanentAddress, &Instance->InterfaceInfo.MacAddr, sizeof(Instance->Mode.PermanentAddress));\r
+ CopyMem (&Instance->Mode.CurrentAddress, &Instance->InterfaceInfo.MacAddr, sizeof (Instance->Mode.CurrentAddress));\r
+ CopyMem (&Instance->Mode.PermanentAddress, &Instance->InterfaceInfo.MacAddr, sizeof (Instance->Mode.PermanentAddress));\r
\r
//\r
// Since the fake SNP is based on a real NIC, to avoid conflict with the host\r
**/\r
EFI_STATUS\r
WintNtInitializeNetUtilityData (\r
- IN OUT WIN_NT_SNP_PRIVATE *Private,\r
+ IN OUT WIN_NT_SNP_PRIVATE *Private,\r
IN UINT8 ActiveInstance\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR16 *DllFileNameU;\r
- INT32 ReturnValue;\r
- BOOLEAN NetUtilityLibInitDone;\r
- NT_NET_INTERFACE_INFO NetInterfaceInfoBuffer[MAX_INTERFACE_INFO_NUMBER];\r
- UINT32 InterfaceCount;\r
- UINT8 ActiveInterfaceIndex;\r
+ EFI_STATUS Status;\r
+ CHAR16 *DllFileNameU;\r
+ INT32 ReturnValue;\r
+ BOOLEAN NetUtilityLibInitDone;\r
+ NT_NET_INTERFACE_INFO NetInterfaceInfoBuffer[MAX_INTERFACE_INFO_NUMBER];\r
+ UINT32 InterfaceCount;\r
+ UINT8 ActiveInterfaceIndex;\r
\r
if (Private == NULL) {\r
- return EFI_INVALID_PARAMETER;\r
+ return EFI_INVALID_PARAMETER;\r
}\r
\r
NetUtilityLibInitDone = FALSE;\r
return EFI_NOT_FOUND;\r
}\r
\r
- Private->NtNetUtilityTable.Initialize = (NT_NET_INITIALIZE) GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_INITIALIZE);\r
+ Private->NtNetUtilityTable.Initialize = (NT_NET_INITIALIZE)GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_INITIALIZE);\r
if (NULL == Private->NtNetUtilityTable.Initialize) {\r
Status = EFI_NOT_FOUND;\r
goto ErrorReturn;\r
}\r
\r
- Private->NtNetUtilityTable.Finalize = (NT_NET_FINALIZE) GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_FINALIZE);\r
+ Private->NtNetUtilityTable.Finalize = (NT_NET_FINALIZE)GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_FINALIZE);\r
if (NULL == Private->NtNetUtilityTable.Finalize) {\r
Status = EFI_NOT_FOUND;\r
goto ErrorReturn;\r
}\r
\r
- Private->NtNetUtilityTable.SetReceiveFilter = (NT_NET_SET_RECEIVE_FILTER) GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_SET_RCV_FILTER);\r
+ Private->NtNetUtilityTable.SetReceiveFilter = (NT_NET_SET_RECEIVE_FILTER)GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_SET_RCV_FILTER);\r
if (NULL == Private->NtNetUtilityTable.SetReceiveFilter) {\r
Status = EFI_NOT_FOUND;\r
goto ErrorReturn;\r
}\r
\r
- Private->NtNetUtilityTable.Receive = (NT_NET_RECEIVE) GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_RECEIVE);\r
+ Private->NtNetUtilityTable.Receive = (NT_NET_RECEIVE)GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_RECEIVE);\r
if (NULL == Private->NtNetUtilityTable.Receive) {\r
Status = EFI_NOT_FOUND;\r
goto ErrorReturn;\r
}\r
\r
- Private->NtNetUtilityTable.Transmit = (NT_NET_TRANSMIT) GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_TRANSMIT);\r
+ Private->NtNetUtilityTable.Transmit = (NT_NET_TRANSMIT)GetProcAddress (Private->NetworkLibraryHandle, NETWORK_LIBRARY_TRANSMIT);\r
if (NULL == Private->NtNetUtilityTable.Transmit) {\r
Status = EFI_NOT_FOUND;\r
goto ErrorReturn;\r
//\r
Status = WinNtInitializeInstanceData (&Private->Instance, &NetInterfaceInfoBuffer[ActiveInterfaceIndex]);\r
if (EFI_ERROR (Status)) {\r
- goto ErrorReturn;\r
+ goto ErrorReturn;\r
}\r
\r
return EFI_SUCCESS;\r
ErrorReturn:\r
\r
if (Private->Instance.RecycledTxBuf != NULL) {\r
- free (Private->Instance.RecycledTxBuf);\r
+ free (Private->Instance.RecycledTxBuf);\r
}\r
\r
if (NetUtilityLibInitDone) {\r
**/\r
EFI_STATUS\r
WintNtReleaseNetUtilityData (\r
- IN OUT WIN_NT_SNP_PRIVATE *Private\r
+ IN OUT WIN_NT_SNP_PRIVATE *Private\r
)\r
{\r
if (Private == NULL) {\r
}\r
\r
if (Private->Instance.RecycledTxBuf != NULL) {\r
- free (Private->Instance.RecycledTxBuf);\r
+ free (Private->Instance.RecycledTxBuf);\r
}\r
\r
if (Private->NtNetUtilityTable.Finalize != NULL) {\r
return EFI_SUCCESS;\r
}\r
\r
-EMU_SNP_PROTOCOL mWinNtSnpProtocol = {\r
+EMU_SNP_PROTOCOL mWinNtSnpProtocol = {\r
WinNtSnpCreateMapping,\r
WinNtSnpStart,\r
WinNtSnpStop,\r
**/\r
EFI_STATUS\r
WinNtSnpThunkOpen (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_SNP_PRIVATE *Private;\r
This->Interface = &Private->EmuSnp;\r
This->Private = Private;\r
\r
- if (This->ConfigString != NULL && This->ConfigString[0] != '\0') {\r
+ if ((This->ConfigString != NULL) && (This->ConfigString[0] != '\0')) {\r
HostInterfaceIndex = (UINT8)StrDecimalToUintn (This->ConfigString);\r
}\r
\r
**/\r
EFI_STATUS\r
WinNtSnpThunkClose (\r
- IN EMU_IO_THUNK_PROTOCOL *This\r
+ IN EMU_IO_THUNK_PROTOCOL *This\r
)\r
{\r
WIN_NT_SNP_PRIVATE *Private;\r
return EFI_SUCCESS;\r
}\r
\r
-EMU_IO_THUNK_PROTOCOL mWinNtSnpThunkIo = {\r
+EMU_IO_THUNK_PROTOCOL mWinNtSnpThunkIo = {\r
&gEmuSnpProtocolGuid,\r
NULL,\r
NULL,\r
\r
UINTN\r
SecWriteStdErr (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- BOOL Success;\r
- DWORD CharCount;\r
+ BOOL Success;\r
+ DWORD CharCount;\r
\r
CharCount = (DWORD)NumberOfBytes;\r
- Success = WriteFile (\r
- GetStdHandle (STD_ERROR_HANDLE),\r
- Buffer,\r
- CharCount,\r
- &CharCount,\r
- NULL\r
- );\r
+ Success = WriteFile (\r
+ GetStdHandle (STD_ERROR_HANDLE),\r
+ Buffer,\r
+ CharCount,\r
+ &CharCount,\r
+ NULL\r
+ );\r
\r
return Success ? CharCount : 0;\r
}\r
\r
-\r
EFI_STATUS\r
SecConfigStdIn (\r
VOID\r
)\r
{\r
- BOOL Success;\r
- DWORD Mode;\r
+ BOOL Success;\r
+ DWORD Mode;\r
\r
Success = GetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), &Mode);\r
if (Success) {\r
//\r
Mode &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT);\r
\r
-#if defined(NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)\r
+ #if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)\r
//\r
// Enable virtual terminal input for Win10 above TH2\r
//\r
Mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;\r
-#endif\r
+ #endif\r
\r
Success = SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), Mode);\r
}\r
\r
-#if defined(NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)\r
+ #if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)\r
//\r
// Enable terminal mode for Win10 above TH2\r
//\r
Success = GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), &Mode);\r
if (Success) {\r
Success = SetConsoleMode (\r
- GetStdHandle (STD_OUTPUT_HANDLE),\r
- Mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN\r
- );\r
+ GetStdHandle (STD_OUTPUT_HANDLE),\r
+ Mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN\r
+ );\r
}\r
}\r
-#endif\r
+\r
+ #endif\r
return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
}\r
\r
UINTN\r
SecWriteStdOut (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- BOOL Success;\r
- DWORD CharCount;\r
+ BOOL Success;\r
+ DWORD CharCount;\r
\r
CharCount = (DWORD)NumberOfBytes;\r
- Success = WriteFile (\r
- GetStdHandle (STD_OUTPUT_HANDLE),\r
- Buffer,\r
- CharCount,\r
- &CharCount,\r
- NULL\r
- );\r
+ Success = WriteFile (\r
+ GetStdHandle (STD_OUTPUT_HANDLE),\r
+ Buffer,\r
+ CharCount,\r
+ &CharCount,\r
+ NULL\r
+ );\r
\r
return Success ? CharCount : 0;\r
}\r
VOID\r
)\r
{\r
- BOOL Success;\r
- INPUT_RECORD Record;\r
- DWORD RecordNum;\r
+ BOOL Success;\r
+ INPUT_RECORD Record;\r
+ DWORD RecordNum;\r
\r
do {\r
Success = GetNumberOfConsoleInputEvents (GetStdHandle (STD_INPUT_HANDLE), &RecordNum);\r
if (!Success || (RecordNum == 0)) {\r
break;\r
}\r
+\r
Success = PeekConsoleInput (\r
- GetStdHandle (STD_INPUT_HANDLE),\r
- &Record,\r
- 1,\r
- &RecordNum\r
- );\r
+ GetStdHandle (STD_INPUT_HANDLE),\r
+ &Record,\r
+ 1,\r
+ &RecordNum\r
+ );\r
if (Success && (RecordNum == 1)) {\r
- if (Record.EventType == KEY_EVENT && Record.Event.KeyEvent.bKeyDown) {\r
+ if ((Record.EventType == KEY_EVENT) && Record.Event.KeyEvent.bKeyDown) {\r
return TRUE;\r
} else {\r
//\r
// Consume the non-key event.\r
//\r
Success = ReadConsoleInput (\r
- GetStdHandle (STD_INPUT_HANDLE),\r
- &Record,\r
- 1,\r
- &RecordNum\r
- );\r
+ GetStdHandle (STD_INPUT_HANDLE),\r
+ &Record,\r
+ 1,\r
+ &RecordNum\r
+ );\r
}\r
}\r
} while (Success);\r
\r
UINTN\r
SecReadStdIn (\r
- IN UINT8 *Buffer,\r
- IN UINTN NumberOfBytes\r
+ IN UINT8 *Buffer,\r
+ IN UINTN NumberOfBytes\r
)\r
{\r
- BOOL Success;\r
- INPUT_RECORD Record;\r
- DWORD RecordNum;\r
- UINTN BytesReturn;\r
+ BOOL Success;\r
+ INPUT_RECORD Record;\r
+ DWORD RecordNum;\r
+ UINTN BytesReturn;\r
\r
if (!SecPollStdIn ()) {\r
return 0;\r
}\r
+\r
Success = ReadConsoleInput (\r
- GetStdHandle (STD_INPUT_HANDLE),\r
- &Record,\r
- 1,\r
- &RecordNum\r
- );\r
+ GetStdHandle (STD_INPUT_HANDLE),\r
+ &Record,\r
+ 1,\r
+ &RecordNum\r
+ );\r
ASSERT (Success && (RecordNum == 1) && (Record.EventType == KEY_EVENT) && (Record.Event.KeyEvent.bKeyDown));\r
NumberOfBytes = MIN (Record.Event.KeyEvent.wRepeatCount, NumberOfBytes);\r
BytesReturn = NumberOfBytes;\r
while (NumberOfBytes-- != 0) {\r
Buffer[NumberOfBytes] = Record.Event.KeyEvent.uChar.AsciiChar;\r
}\r
+\r
return BytesReturn;\r
}\r
\r
-\r
VOID *\r
SecAlloc (\r
- IN UINTN Size\r
+ IN UINTN Size\r
)\r
{\r
return malloc ((size_t)Size);\r
\r
BOOLEAN\r
SecFree (\r
- IN VOID *Ptr\r
+ IN VOID *Ptr\r
)\r
{\r
if (EfiSystemMemoryRange (Ptr)) {\r
return TRUE;\r
}\r
\r
-\r
-\r
//\r
// Define a global that we can use to shut down the NT timer thread when\r
// the timer is canceled.\r
//\r
-BOOLEAN mCancelTimerThread = FALSE;\r
+BOOLEAN mCancelTimerThread = FALSE;\r
\r
//\r
// The notification function to call on every timer interrupt\r
//\r
// The thread handle for this driver\r
//\r
-HANDLE mNtMainThreadHandle;\r
+HANDLE mNtMainThreadHandle;\r
\r
//\r
// The timer value from the last timer interrupt\r
//\r
-UINT32 mNtLastTick;\r
+UINT32 mNtLastTick;\r
\r
//\r
// Critical section used to update varibles shared between the main thread and\r
// the timer interrupt thread.\r
//\r
-CRITICAL_SECTION mNtCriticalSection;\r
+CRITICAL_SECTION mNtCriticalSection;\r
\r
//\r
// Worker Functions\r
//\r
-UINT mMMTimerThreadID = 0;\r
+UINT mMMTimerThreadID = 0;\r
\r
-volatile BOOLEAN mInterruptEnabled = FALSE;\r
+volatile BOOLEAN mInterruptEnabled = FALSE;\r
\r
VOID\r
CALLBACK\r
MMTimerThread (\r
- UINT wTimerID,\r
- UINT msg,\r
- DWORD dwUser,\r
- DWORD dw1,\r
- DWORD dw2\r
-)\r
+ UINT wTimerID,\r
+ UINT msg,\r
+ DWORD dwUser,\r
+ DWORD dw1,\r
+ DWORD dw2\r
+ )\r
{\r
- UINT32 CurrentTick;\r
- UINT32 Delta;\r
+ UINT32 CurrentTick;\r
+ UINT32 Delta;\r
\r
if (!mCancelTimerThread) {\r
-\r
//\r
// Suspend the main thread until we are done.\r
// Enter the critical section before suspending\r
// Get the current system tick\r
//\r
CurrentTick = GetTickCount ();\r
- Delta = CurrentTick - mNtLastTick;\r
+ Delta = CurrentTick - mNtLastTick;\r
mNtLastTick = CurrentTick;\r
\r
//\r
// If delay was more then 1 second, ignore it (probably debugging case)\r
//\r
if (Delta < 1000) {\r
-\r
//\r
// Only invoke the callback function if a Non-NULL handler has been\r
// registered. Assume all other handlers are legal.\r
timeKillEvent (wTimerID);\r
mMMTimerThreadID = 0;\r
}\r
-\r
}\r
\r
VOID\r
SecSetTimer (\r
IN UINT64 TimerPeriod,\r
IN EMU_SET_TIMER_CALLBACK Callback\r
-)\r
+ )\r
{\r
//\r
-// If TimerPeriod is 0, then the timer thread should be canceled\r
-//\r
+ // If TimerPeriod is 0, then the timer thread should be canceled\r
+ //\r
if (TimerPeriod == 0) {\r
//\r
// Cancel the timer thread\r
SetThreadPriority (\r
GetCurrentThread (),\r
THREAD_PRIORITY_HIGHEST\r
- );\r
+ );\r
\r
mMMTimerThreadID = timeSetEvent (\r
- (UINT)TimerPeriod,\r
- 0,\r
- MMTimerThread,\r
- (DWORD_PTR)NULL,\r
- TIME_PERIODIC | TIME_KILL_SYNCHRONOUS | TIME_CALLBACK_FUNCTION\r
- );\r
+ (UINT)TimerPeriod,\r
+ 0,\r
+ MMTimerThread,\r
+ (DWORD_PTR)NULL,\r
+ TIME_PERIODIC | TIME_KILL_SYNCHRONOUS | TIME_CALLBACK_FUNCTION\r
+ );\r
}\r
+\r
mTimerNotifyFunction = Callback;\r
}\r
\r
VOID\r
SecInitializeThunk (\r
VOID\r
-)\r
+ )\r
{\r
InitializeCriticalSection (&mNtCriticalSection);\r
\r
0,\r
FALSE,\r
DUPLICATE_SAME_ACCESS\r
- );\r
+ );\r
}\r
\r
VOID\r
mInterruptEnabled = TRUE;\r
}\r
\r
-\r
VOID\r
SecDisableInterrupt (\r
VOID\r
mInterruptEnabled = FALSE;\r
}\r
\r
-\r
UINT64\r
SecQueryPerformanceFrequency (\r
VOID\r
return 0;\r
}\r
\r
-\r
-\r
VOID\r
SecSleep (\r
- IN UINT64 Nanoseconds\r
+ IN UINT64 Nanoseconds\r
)\r
{\r
Sleep ((DWORD)DivU64x32 (Nanoseconds, 1000000));\r
}\r
\r
-\r
VOID\r
SecCpuSleep (\r
VOID\r
Sleep (1);\r
}\r
\r
-\r
VOID\r
SecExit (\r
- UINTN Status\r
+ UINTN Status\r
)\r
{\r
exit ((int)Status);\r
}\r
\r
-\r
VOID\r
SecGetTime (\r
- OUT EFI_TIME *Time,\r
- OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
+ OUT EFI_TIME *Time,\r
+ OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL\r
)\r
{\r
- SYSTEMTIME SystemTime;\r
- TIME_ZONE_INFORMATION TimeZone;\r
+ SYSTEMTIME SystemTime;\r
+ TIME_ZONE_INFORMATION TimeZone;\r
\r
GetLocalTime (&SystemTime);\r
GetTimeZoneInformation (&TimeZone);\r
\r
- Time->Year = (UINT16)SystemTime.wYear;\r
- Time->Month = (UINT8)SystemTime.wMonth;\r
- Time->Day = (UINT8)SystemTime.wDay;\r
- Time->Hour = (UINT8)SystemTime.wHour;\r
- Time->Minute = (UINT8)SystemTime.wMinute;\r
- Time->Second = (UINT8)SystemTime.wSecond;\r
+ Time->Year = (UINT16)SystemTime.wYear;\r
+ Time->Month = (UINT8)SystemTime.wMonth;\r
+ Time->Day = (UINT8)SystemTime.wDay;\r
+ Time->Hour = (UINT8)SystemTime.wHour;\r
+ Time->Minute = (UINT8)SystemTime.wMinute;\r
+ Time->Second = (UINT8)SystemTime.wSecond;\r
Time->Nanosecond = (UINT32)(SystemTime.wMilliseconds * 1000000);\r
- Time->TimeZone = (INT16)TimeZone.Bias;\r
+ Time->TimeZone = (INT16)TimeZone.Bias;\r
\r
if (Capabilities != NULL) {\r
Capabilities->Resolution = 1;\r
- Capabilities->Accuracy = 50000000;\r
+ Capabilities->Accuracy = 50000000;\r
Capabilities->SetsToZero = FALSE;\r
}\r
\r
\r
EFI_STATUS\r
SecSetTime (\r
- IN EFI_TIME *Time\r
+ IN EFI_TIME *Time\r
)\r
{\r
- TIME_ZONE_INFORMATION TimeZone;\r
- SYSTEMTIME SystemTime;\r
- BOOL Flag;\r
+ TIME_ZONE_INFORMATION TimeZone;\r
+ SYSTEMTIME SystemTime;\r
+ BOOL Flag;\r
\r
//\r
// Set Daylight savings time information and Time Zone\r
//\r
GetTimeZoneInformation (&TimeZone);\r
TimeZone.StandardDate.wMonth = Time->Daylight;\r
- TimeZone.Bias = Time->TimeZone;\r
- Flag = SetTimeZoneInformation (&TimeZone);\r
+ TimeZone.Bias = Time->TimeZone;\r
+ Flag = SetTimeZoneInformation (&TimeZone);\r
if (!Flag) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r
- SystemTime.wYear = Time->Year;\r
- SystemTime.wMonth = Time->Month;\r
- SystemTime.wDay = Time->Day;\r
- SystemTime.wHour = Time->Hour;\r
- SystemTime.wMinute = Time->Minute;\r
- SystemTime.wSecond = Time->Second;\r
+ SystemTime.wYear = Time->Year;\r
+ SystemTime.wMonth = Time->Month;\r
+ SystemTime.wDay = Time->Day;\r
+ SystemTime.wHour = Time->Hour;\r
+ SystemTime.wMinute = Time->Minute;\r
+ SystemTime.wSecond = Time->Second;\r
SystemTime.wMilliseconds = (INT16)(Time->Nanosecond / 1000000);\r
\r
Flag = SetLocalTime (&SystemTime);\r
}\r
}\r
\r
-EMU_THUNK_PROTOCOL gEmuThunkProtocol = {\r
+EMU_THUNK_PROTOCOL gEmuThunkProtocol = {\r
SecWriteStdErr,\r
SecConfigStdIn,\r
SecWriteStdOut,\r
GetNextThunkProtocol\r
};\r
\r
-\r
#pragma warning(default : 4996)\r
#pragma warning(default : 4232)\r
-\r
projects / mirror_edk2.git / commitdiff