git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5636
6f19259b-4bc3-4df7-8a09-
765794883524
24 files changed:
EDK_RELEASE_VERSION = 0x00020000\r
EFI_SPECIFICATION_VERSION = 0x00020000\r
CUSTOM_MAKEFILE = Makefile\r
EDK_RELEASE_VERSION = 0x00020000\r
EFI_SPECIFICATION_VERSION = 0x00020000\r
CUSTOM_MAKEFILE = Makefile\r
[Packages]\r
MdePkg/MdePkg.dec\r
DuetPkg/DuetPkg.dec\r
\r
[Sources]\r
[Packages]\r
MdePkg/MdePkg.dec\r
DuetPkg/DuetPkg.dec\r
\r
[Sources]\r
- bootsect.asm\r
- bs16.asm\r
- bs32.asm\r
- Gpt.asm\r
- Mbr.asm\r
- Start.asm\r
- Start16.asm\r
- Start32.asm\r
- Efi32.asm\r
+ bootsect.asm | INTEL\r
+ bs16.asm | INTEL\r
+ bs32.asm | INTEL\r
+ Gpt.asm | INTEL\r
+ Mbr.asm | INTEL\r
+ start.asm | INTEL\r
+ start16.asm | INTEL\r
+ start32.asm | INTEL\r
+ efi32.asm | INTEL\r
UefiBootServicesTableLib\r
\r
[Sources.IA32]\r
UefiBootServicesTableLib\r
\r
[Sources.IA32]\r
- IA32/CpuInterrupt.asm\r
+ Ia32/CpuInterrupt.asm | INTEL\r
+ X64/CpuInterrupt.asm | INTEL\r
\r
[Sources.common]\r
Cpu.c\r
\r
[Sources.common]\r
Cpu.c\r
#define _CPU_IO_ACCESS_H\r
\r
\r
#define _CPU_IO_ACCESS_H\r
\r
\r
-#define IA32API __cdecl\r
-\r
CpuIoRead8 (\r
IN UINT16 Port\r
)\r
CpuIoRead8 (\r
IN UINT16 Port\r
)\r
Return read 8 bit value \r
--*/\r
UINT16\r
Return read 8 bit value \r
--*/\r
UINT16\r
CpuIoRead16 (\r
IN UINT16 Port\r
)\r
CpuIoRead16 (\r
IN UINT16 Port\r
)\r
Return read 16 bit value \r
--*/\r
UINT32\r
Return read 16 bit value \r
--*/\r
UINT32\r
CpuIoRead32 (\r
IN UINT16 Port\r
)\r
CpuIoRead32 (\r
IN UINT16 Port\r
)\r
Return read 32 bit value \r
--*/\r
VOID\r
Return read 32 bit value \r
--*/\r
VOID\r
CpuIoWrite8 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite8 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite16 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite16 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite32 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite32 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
#include "CpuIoAccess.h"\r
\r
UINT8\r
#include "CpuIoAccess.h"\r
\r
UINT8\r
CpuIoRead8 (\r
IN UINT16 Port\r
)\r
CpuIoRead8 (\r
IN UINT16 Port\r
)\r
CpuIoRead16 (\r
IN UINT16 Port\r
)\r
CpuIoRead16 (\r
IN UINT16 Port\r
)\r
CpuIoRead32 (\r
IN UINT16 Port\r
)\r
CpuIoRead32 (\r
IN UINT16 Port\r
)\r
CpuIoWrite8 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite8 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite16 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite16 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite32 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
CpuIoWrite32 (\r
IN UINT16 Port,\r
IN UINT32 Data\r
#define _DATA_HUB_GEN_H_\r
\r
#include <FrameworkDxe.h>\r
#define _DATA_HUB_GEN_H_\r
\r
#include <FrameworkDxe.h>\r
-#include <IndustryStandard/Smbios.h>\r
+#include <IndustryStandard/SmBios.h>\r
\r
#include <Guid/HobList.h>\r
\r
#include <Guid/HobList.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
#include <Guid/DataHubProducer.h>\r
#include <Guid/DataHubRecords.h>\r
\r
#include <Guid/DataHubProducer.h>\r
#include <Guid/DataHubRecords.h>\r
\r
-#include <Protocol/Datahub.h>\r
+#include <Protocol/DataHub.h>\r
#include <Protocol/FrameworkHii.h>\r
#include <Protocol/HiiDatabase.h>\r
\r
#include <Protocol/FrameworkHii.h>\r
#include <Protocol/HiiDatabase.h>\r
\r
#include <Guid/PeiPeCoffLoader.h>\r
#include <Guid/MemoryAllocationHob.h>\r
#include <Guid/Acpi.h>\r
#include <Guid/PeiPeCoffLoader.h>\r
#include <Guid/MemoryAllocationHob.h>\r
#include <Guid/Acpi.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
#include <Guid/Mps.h>\r
#include <Guid/FlashMapHob.h>\r
#include <Guid/SystemNvDataGuid.h>\r
#include <Guid/Mps.h>\r
#include <Guid/FlashMapHob.h>\r
#include <Guid/SystemNvDataGuid.h>\r
// According to UEFI Spec, we should make sure Smbios table, \r
// ACPI table and Mps tables kept in memory of specified type\r
//\r
// According to UEFI Spec, we should make sure Smbios table, \r
// ACPI table and Mps tables kept in memory of specified type\r
//\r
- ConvertSystemTable(TableGuidArray[Index], &Table);\r
+ ConvertSystemTable(TableGuidArray[Index], (VOID**)&Table);\r
gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table);\r
}\r
}\r
gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table);\r
}\r
}\r
}\r
\r
#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \\r
}\r
\r
#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \\r
- { 0x7701d7e5, 0x7d1d, 0x4432, 0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }\r
+ { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }}\r
\r
EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;\r
\r
\r
EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;\r
\r
if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) {\r
continue;\r
}\r
if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) {\r
continue;\r
}\r
- if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000) {\r
+ if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000ULL) {\r
continue;\r
}\r
if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) ||\r
continue;\r
}\r
if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) ||\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
// Add all the child handles as possible Console Device\r
//\r
for (Index = 0; Index < GopHandleCount; Index++) {\r
// Add all the child handles as possible Console Device\r
//\r
for (Index = 0; Index < GopHandleCount; Index++) {\r
- Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, &TempDevicePath);\r
+ Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath);\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
Status = gBS->HandleProtocol (\r
DeviceHandle,\r
&gEfiDevicePathProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
}\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
- Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, &PciIo);\r
+ Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID*)&PciIo);\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
\r
#include <IndustryStandard/Pci.h>\r
#include <IndustryStandard/Acpi.h>\r
\r
#include <IndustryStandard/Pci.h>\r
#include <IndustryStandard/Acpi.h>\r
-#include <IndustryStandard/Smbios.h>\r
+#include <IndustryStandard/SmBios.h>\r
#include <IndustryStandard/LegacyBiosMpTable.h>\r
\r
#include <Library/DebugLib.h>\r
#include <IndustryStandard/LegacyBiosMpTable.h>\r
\r
#include <Library/DebugLib.h>\r
\r
#include <Guid/Bmp.h>\r
#include <Guid/Acpi.h>\r
\r
#include <Guid/Bmp.h>\r
#include <Guid/Acpi.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
#include <Guid/Mps.h>\r
#include <Guid/HobList.h>\r
#include <Guid/PciExpressBaseAddress.h>\r
#include <Guid/Mps.h>\r
#include <Guid/HobList.h>\r
#include <Guid/PciExpressBaseAddress.h>\r
[Packages]\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
[Packages]\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
DuetPkg/DuetPkg.dec\r
\r
[LibraryClasses]\r
DuetPkg/DuetPkg.dec\r
\r
[LibraryClasses]\r
extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding;\r
\r
extern BOOLEAN gFullEnumeration;\r
extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding;\r
\r
extern BOOLEAN gFullEnumeration;\r
-static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFF;\r
+static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFFULL;\r
static UINT64 gAllZero = 0;\r
\r
#include "PciIo.h"\r
static UINT64 gAllZero = 0;\r
\r
#include "PciIo.h"\r
\r
//\r
// This device structure is serviced as a header.\r
\r
//\r
// This device structure is serviced as a header.\r
\r
EFI_STATUS\r
PciEnumerator (\r
\r
EFI_STATUS\r
PciEnumerator (\r
-#endif
\ No newline at end of file
\r
EFI_STATUS \r
InitializePPB (\r
\r
EFI_STATUS \r
InitializePPB (\r
\r
//\r
// PCI I/O Support Function Prototypes\r
\r
//\r
// PCI I/O Support Function Prototypes\r
-#endif
\ No newline at end of file
-#endif
\ No newline at end of file
ResetPowerManagementFeature (\r
IN PCI_IO_DEVICE *PciIoDevice\r
)\r
ResetPowerManagementFeature (\r
IN PCI_IO_DEVICE *PciIoDevice\r
)\r
-#endif
\ No newline at end of file
\r
typedef struct {\r
EFI_HANDLE ImageHandle;\r
\r
typedef struct {\r
EFI_HANDLE ImageHandle;\r
Status = gBS->AllocatePool(\r
EfiBootServicesData,\r
((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR),\r
Status = gBS->AllocatePool(\r
EfiBootServicesData,\r
((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR),\r
- &TempPciOptionRomDescriptors\r
+ (VOID*)&TempPciOptionRomDescriptors\r
);\r
if (mPciOptionRomTable.PciOptionRomCount > 0) {\r
CopyMem(\r
);\r
if (mPciOptionRomTable.PciOptionRomCount > 0) {\r
CopyMem(\r
DeviceIo.c\r
\r
[Sources.ia32]\r
DeviceIo.c\r
\r
[Sources.ia32]\r
\r
[Protocols]\r
gEfiPciRootBridgeIoProtocolGuid\r
\r
[Protocols]\r
gEfiPciRootBridgeIoProtocolGuid\r