summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-28 16:47:23 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-28 16:47:23 +0000
commitbb89ec1a7ec2f8d35033df9e47b3604925da3bd3 (patch)
tree32d38e02ccab98dbac4c3014a12ac365775e8eb3
parentd3e0289ccf641481f2cbdcbb0d5868c393b7edbb (diff)
downloadedk2-platforms-bb89ec1a7ec2f8d35033df9e47b3604925da3bd3.tar.xz
InOsEmuPkg: Rename package to EmulatorPkg & Sec to Host
* Rename InOsEmuPkg to EmulatorPkg * Rename Unix/Sec to Unix/Host Signed-off-by: jljusten Reviewed-by: andrewfish Reviewed-by: geekboy15a git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11918 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--EmulatorPkg/AutoScanPei/AutoScanPei.c (renamed from InOsEmuPkg/AutoScanPei/AutoScanPei.c)0
-rw-r--r--EmulatorPkg/AutoScanPei/AutoScanPei.inf (renamed from InOsEmuPkg/AutoScanPei/AutoScanPei.inf)2
-rw-r--r--EmulatorPkg/BootModePei/BootModePei.c (renamed from InOsEmuPkg/BootModePei/BootModePei.c)0
-rw-r--r--EmulatorPkg/BootModePei/BootModePei.inf (renamed from InOsEmuPkg/BootModePei/BootModePei.inf)4
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/Cpu.c (renamed from InOsEmuPkg/CpuRuntimeDxe/Cpu.c)0
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/Cpu.inf (renamed from InOsEmuPkg/CpuRuntimeDxe/Cpu.inf)4
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/CpuDriver.h (renamed from InOsEmuPkg/CpuRuntimeDxe/CpuDriver.h)0
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/CpuIo.c (renamed from InOsEmuPkg/CpuRuntimeDxe/CpuIo.c)0
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/MpService.c (renamed from InOsEmuPkg/CpuRuntimeDxe/MpService.c)0
-rw-r--r--EmulatorPkg/CpuRuntimeDxe/Strings.uni (renamed from InOsEmuPkg/CpuRuntimeDxe/Strings.uni)bin2184 -> 2144 bytes
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/ComponentName.c (renamed from InOsEmuPkg/EmuBlockIoDxe/ComponentName.c)0
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/DriverConfiguration.c (renamed from InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c)0
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/DriverDiagnostics.c (renamed from InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c)0
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.c (renamed from InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c)0
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.h (renamed from InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h)0
-rw-r--r--EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf (renamed from InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf)2
-rw-r--r--EmulatorPkg/EmuBusDriverDxe/ComponentName.c (renamed from InOsEmuPkg/EmuBusDriverDxe/ComponentName.c)0
-rw-r--r--EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.c (renamed from InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c)4
-rw-r--r--EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.h (renamed from InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.h)0
-rw-r--r--EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf (renamed from InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf)2
-rw-r--r--EmulatorPkg/EmuGopDxe/ComponentName.c (renamed from InOsEmuPkg/EmuGopDxe/ComponentName.c)2
-rw-r--r--EmulatorPkg/EmuGopDxe/EmuGopDxe.inf (renamed from InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf)2
-rw-r--r--EmulatorPkg/EmuGopDxe/Gop.h (renamed from InOsEmuPkg/EmuGopDxe/Gop.h)0
-rw-r--r--EmulatorPkg/EmuGopDxe/GopDriver.c (renamed from InOsEmuPkg/EmuGopDxe/GopDriver.c)0
-rw-r--r--EmulatorPkg/EmuGopDxe/GopInput.c (renamed from InOsEmuPkg/EmuGopDxe/GopInput.c)0
-rw-r--r--EmulatorPkg/EmuGopDxe/GopScreen.c (renamed from InOsEmuPkg/EmuGopDxe/GopScreen.c)0
-rw-r--r--EmulatorPkg/EmuSimpleFileSystemDxe/ComponentName.c (renamed from InOsEmuPkg/EmuSimpleFileSystemDxe/ComponentName.c)0
-rw-r--r--EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c (renamed from InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c)0
-rw-r--r--EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h (renamed from InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h)0
-rw-r--r--EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf (renamed from InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf)2
-rw-r--r--EmulatorPkg/EmuSnpDxe/ComponentName.c (renamed from InOsEmuPkg/EmuSnpDxe/ComponentName.c)0
-rw-r--r--EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c (renamed from InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c)0
-rw-r--r--EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h (renamed from InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.h)0
-rw-r--r--EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf (renamed from InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf)2
-rw-r--r--EmulatorPkg/EmuThunkDxe/EmuThunk.c (renamed from InOsEmuPkg/EmuThunkDxe/EmuThunk.c)0
-rw-r--r--EmulatorPkg/EmuThunkDxe/EmuThunk.inf (renamed from InOsEmuPkg/EmuThunkDxe/EmuThunk.inf)2
-rw-r--r--EmulatorPkg/EmulatorPkg.dec (renamed from InOsEmuPkg/InOsEmuPkg.dec)56
-rw-r--r--EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c (renamed from InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.c)0
-rw-r--r--EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf (renamed from InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf)6
-rw-r--r--EmulatorPkg/FlashMapPei/FlashMapPei.c (renamed from InOsEmuPkg/FlashMapPei/FlashMapPei.c)2
-rw-r--r--EmulatorPkg/FlashMapPei/FlashMapPei.inf (renamed from InOsEmuPkg/FlashMapPei/FlashMapPei.inf)8
-rw-r--r--EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c (renamed from InOsEmuPkg/FvbServicesRuntimeDxe/FWBlockService.c)0
-rw-r--r--EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c (renamed from InOsEmuPkg/FvbServicesRuntimeDxe/FvbInfo.c)0
-rw-r--r--EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf (renamed from InOsEmuPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf)14
-rw-r--r--EmulatorPkg/FvbServicesRuntimeDxe/FwBlockService.h (renamed from InOsEmuPkg/FvbServicesRuntimeDxe/FwBlockService.h)0
-rw-r--r--EmulatorPkg/Include/Guid/EmuPhysicalDisk.h (renamed from InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h)0
-rw-r--r--EmulatorPkg/Include/Guid/EmuSystemConfig.h (renamed from InOsEmuPkg/Include/Guid/EmuSystemConfig.h)0
-rw-r--r--EmulatorPkg/Include/Guid/EmuVirtualDisk.h (renamed from InOsEmuPkg/Include/Guid/EmuVirtualDisk.h)0
-rw-r--r--EmulatorPkg/Include/Library/EmuMagicPageLib.h (renamed from InOsEmuPkg/Include/Library/EmuMagicPageLib.h)2
-rw-r--r--EmulatorPkg/Include/Library/EmuThunkLib.h (renamed from InOsEmuPkg/Include/Library/EmuThunkLib.h)0
-rw-r--r--EmulatorPkg/Include/Library/KeyMapLib.h (renamed from InOsEmuPkg/Include/Library/KeyMapLib.h)0
-rw-r--r--EmulatorPkg/Include/Library/PpiListLib.h (renamed from InOsEmuPkg/Include/Library/PpiListLib.h)0
-rw-r--r--EmulatorPkg/Include/Library/ThunkPpiList.h (renamed from InOsEmuPkg/Include/Library/ThunkPpiList.h)0
-rw-r--r--EmulatorPkg/Include/Library/ThunkProtocolList.h (renamed from InOsEmuPkg/Include/Library/ThunkProtocolList.h)0
-rw-r--r--EmulatorPkg/Include/Ppi/EmuThunk.h (renamed from InOsEmuPkg/Include/Ppi/EmuThunk.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuBlockIo.h (renamed from InOsEmuPkg/Include/Protocol/EmuBlockIo.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuFileSystem.h (renamed from InOsEmuPkg/Include/Protocol/EmuFileSystem.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h (renamed from InOsEmuPkg/Include/Protocol/EmuGraphicsWindow.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuIoThunk.h (renamed from InOsEmuPkg/Include/Protocol/EmuIoThunk.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuSnp.h (renamed from InOsEmuPkg/Include/Protocol/EmuSnp.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuThread.h (renamed from InOsEmuPkg/Include/Protocol/EmuThread.h)0
-rw-r--r--EmulatorPkg/Include/Protocol/EmuThunk.h (renamed from InOsEmuPkg/Include/Protocol/EmuThunk.h)0
-rw-r--r--EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.c (renamed from InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.c)0
-rw-r--r--EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf (renamed from InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c (renamed from InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf (renamed from InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.c (renamed from InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf (renamed from InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c (renamed from InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf (renamed from InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c (renamed from InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf (renamed from InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c (renamed from InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf (renamed from InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf)2
-rw-r--r--EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c (renamed from InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.c)0
-rw-r--r--EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf (renamed from InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.inf)2
-rw-r--r--EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c (renamed from InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.c)0
-rw-r--r--EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h (renamed from InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.h)0
-rw-r--r--EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf (renamed from InOsEmuPkg/Library/EmuBdsLib/EmuBdsLib.inf)2
-rw-r--r--EmulatorPkg/Library/EmuBdsLib/PlatformData.c (renamed from InOsEmuPkg/Library/EmuBdsLib/PlatformData.c)0
-rw-r--r--EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf (renamed from InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf)2
-rw-r--r--EmulatorPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c (renamed from InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c)0
-rw-r--r--EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.c (renamed from InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.c)0
-rw-r--r--EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf (renamed from InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.inf)2
-rw-r--r--EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf (renamed from InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf)2
-rw-r--r--EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c (renamed from InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c)0
-rw-r--r--EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c (renamed from InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c)0
-rw-r--r--EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf (renamed from InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf)4
-rw-r--r--EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c (renamed from InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c)0
-rw-r--r--EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf (renamed from InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf)2
-rw-r--r--EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c (renamed from InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c)0
-rw-r--r--EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf (renamed from InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf)2
-rw-r--r--EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c (renamed from InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c)0
-rw-r--r--EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf (renamed from InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf)2
-rw-r--r--EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c (renamed from InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c)2
-rw-r--r--EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf (renamed from InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf)8
-rw-r--r--EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c (renamed from InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.c)0
-rw-r--r--EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf (renamed from InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.inf)2
-rw-r--r--EmulatorPkg/Library/SecPeiServicesLib/FwVol.c (renamed from InOsEmuPkg/Library/SecPeiServicesLib/FwVol.c)0
-rw-r--r--EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c (renamed from InOsEmuPkg/Library/SecPeiServicesLib/PeiServicesLib.c)0
-rw-r--r--EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf (renamed from InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf)4
-rw-r--r--EmulatorPkg/Library/SecPpiListLib/PpiListLib.c (renamed from InOsEmuPkg/Library/SecPpiListLib/PpiListLib.c)0
-rw-r--r--EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf (renamed from InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf)2
-rw-r--r--EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.c (renamed from InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.c)0
-rw-r--r--EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf (renamed from InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.inf)2
-rw-r--r--EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.c (renamed from InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.c)0
-rw-r--r--EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf (renamed from InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.inf)2
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni)bin2214 -> 2214 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni)bin1588 -> 1588 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni)bin1774 -> 1774 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscDevicePath.h (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscDevicePath.h)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscOemString.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemString.uni)bin1312 -> 1312 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni)bin8914 -> 8914 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf)4
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni)bin2004 -> 2004 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni)bin1314 -> 1314 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni)bin1772 -> 1772 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni)bin1308 -> 1308 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni)bin1322 -> 1322 bytes
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c)0
-rw-r--r--EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c (renamed from InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c)0
-rw-r--r--EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.c (renamed from InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.c)0
-rw-r--r--EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf (renamed from InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf)2
-rw-r--r--EmulatorPkg/ResetRuntimeDxe/Reset.c (renamed from InOsEmuPkg/ResetRuntimeDxe/Reset.c)0
-rw-r--r--EmulatorPkg/ResetRuntimeDxe/Reset.inf (renamed from InOsEmuPkg/ResetRuntimeDxe/Reset.inf)2
-rw-r--r--EmulatorPkg/Sec/Ia32/SwitchRam.S (renamed from InOsEmuPkg/Sec/Ia32/SwitchRam.S)0
-rw-r--r--EmulatorPkg/Sec/Ia32/TempRam.c (renamed from InOsEmuPkg/Sec/Ia32/TempRam.c)0
-rw-r--r--EmulatorPkg/Sec/Sec.c (renamed from InOsEmuPkg/Sec/Sec.c)0
-rw-r--r--EmulatorPkg/Sec/Sec.h (renamed from InOsEmuPkg/Sec/Sec.h)0
-rw-r--r--EmulatorPkg/Sec/Sec.inf (renamed from InOsEmuPkg/Sec/Sec.inf)4
-rw-r--r--EmulatorPkg/Sec/X64/SwitchRam.S (renamed from InOsEmuPkg/Sec/X64/SwitchRam.S)0
-rw-r--r--EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c (renamed from InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c)0
-rw-r--r--EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf (renamed from InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf)2
-rw-r--r--EmulatorPkg/TimerDxe/Timer.c (renamed from InOsEmuPkg/TimerDxe/Timer.c)0
-rw-r--r--EmulatorPkg/TimerDxe/Timer.h (renamed from InOsEmuPkg/TimerDxe/Timer.h)0
-rw-r--r--EmulatorPkg/TimerDxe/Timer.inf (renamed from InOsEmuPkg/TimerDxe/Timer.inf)2
-rw-r--r--EmulatorPkg/Unix/.gdbinit (renamed from InOsEmuPkg/Unix/.gdbinit)0
-rw-r--r--EmulatorPkg/Unix/GdbRun (renamed from InOsEmuPkg/Unix/GdbRun)0
-rw-r--r--EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c (renamed from InOsEmuPkg/Unix/Sec/BerkeleyPacketFilter.c)0
-rw-r--r--EmulatorPkg/Unix/Host/BlockIo.c (renamed from InOsEmuPkg/Unix/Sec/BlockIo.c)0
-rw-r--r--EmulatorPkg/Unix/Host/EmuThunk.c (renamed from InOsEmuPkg/Unix/Sec/EmuThunk.c)0
-rw-r--r--EmulatorPkg/Unix/Host/Gasket.h (renamed from InOsEmuPkg/Unix/Sec/Gasket.h)0
-rw-r--r--EmulatorPkg/Unix/Host/Ia32/Gasket.S (renamed from InOsEmuPkg/Unix/Sec/Ia32/Gasket.S)0
-rw-r--r--EmulatorPkg/Unix/Host/Ia32/SwitchStack.c (renamed from InOsEmuPkg/Unix/Sec/Ia32/SwitchStack.c)0
-rw-r--r--EmulatorPkg/Unix/Host/LinuxPacketFilter.c (renamed from InOsEmuPkg/Unix/Sec/LinuxPacketFilter.c)0
-rw-r--r--EmulatorPkg/Unix/Host/MemoryAllocationLib.c (renamed from InOsEmuPkg/Unix/Sec/MemoryAllocationLib.c)0
-rw-r--r--EmulatorPkg/Unix/Host/PosixFileSystem.c (renamed from InOsEmuPkg/Unix/Sec/PosixFileSystem.c)0
-rw-r--r--EmulatorPkg/Unix/Host/Pthreads.c (renamed from InOsEmuPkg/Unix/Sec/Pthreads.c)0
-rw-r--r--EmulatorPkg/Unix/Host/SecMain.c (renamed from InOsEmuPkg/Unix/Sec/SecMain.c)0
-rw-r--r--EmulatorPkg/Unix/Host/SecMain.h (renamed from InOsEmuPkg/Unix/Sec/SecMain.h)0
-rw-r--r--EmulatorPkg/Unix/Host/SecMain.inf (renamed from InOsEmuPkg/Unix/Sec/SecMain.inf)46
-rw-r--r--EmulatorPkg/Unix/Host/X11GraphicsWindow.c (renamed from InOsEmuPkg/Unix/Sec/X11GraphicsWindow.c)0
-rw-r--r--EmulatorPkg/Unix/Host/X64/Gasket.S (renamed from InOsEmuPkg/Unix/Sec/X64/Gasket.S)0
-rw-r--r--EmulatorPkg/Unix/Host/X64/SwitchStack.S (renamed from InOsEmuPkg/Unix/Sec/X64/SwitchStack.S)0
-rw-r--r--EmulatorPkg/Unix/UnixX64.dsc (renamed from InOsEmuPkg/Unix/UnixX64.dsc)122
-rw-r--r--EmulatorPkg/Unix/UnixX64.fdf (renamed from InOsEmuPkg/Unix/UnixX64.fdf)52
-rwxr-xr-xEmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh (renamed from InOsEmuPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh)0
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser (renamed from InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser)2
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj (renamed from InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj)0
-rwxr-xr-xEmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh (renamed from InOsEmuPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh)0
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser (renamed from InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser)2
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj (renamed from InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj)0
-rwxr-xr-xEmulatorPkg/Unix/build.sh (renamed from InOsEmuPkg/Unix/build.sh)18
-rwxr-xr-xEmulatorPkg/Unix/build64.sh (renamed from InOsEmuPkg/Unix/build64.sh)18
-rwxr-xr-xEmulatorPkg/build.sh (renamed from InOsEmuPkg/build.sh)0
-rwxr-xr-xEmulatorPkg/build64.sh (renamed from InOsEmuPkg/build64.sh)0
191 files changed, 223 insertions, 223 deletions
diff --git a/InOsEmuPkg/AutoScanPei/AutoScanPei.c b/EmulatorPkg/AutoScanPei/AutoScanPei.c
index 78cdd34965..78cdd34965 100644
--- a/InOsEmuPkg/AutoScanPei/AutoScanPei.c
+++ b/EmulatorPkg/AutoScanPei/AutoScanPei.c
diff --git a/InOsEmuPkg/AutoScanPei/AutoScanPei.inf b/EmulatorPkg/AutoScanPei/AutoScanPei.inf
index b8692ca3d9..9fd4a7d434 100644
--- a/InOsEmuPkg/AutoScanPei/AutoScanPei.inf
+++ b/EmulatorPkg/AutoScanPei/AutoScanPei.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
# MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
PeiServicesTablePointerLib
diff --git a/InOsEmuPkg/BootModePei/BootModePei.c b/EmulatorPkg/BootModePei/BootModePei.c
index e26e929f07..e26e929f07 100644
--- a/InOsEmuPkg/BootModePei/BootModePei.c
+++ b/EmulatorPkg/BootModePei/BootModePei.c
diff --git a/InOsEmuPkg/BootModePei/BootModePei.inf b/EmulatorPkg/BootModePei/BootModePei.inf
index d162552eb1..34172bb4a8 100644
--- a/InOsEmuPkg/BootModePei/BootModePei.inf
+++ b/EmulatorPkg/BootModePei/BootModePei.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
@@ -52,7 +52,7 @@
gEfiPeiBootInRecoveryModePpiGuid # PPI SOMETIMES_PRODUCED
[FixedPcd]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode
+ gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode
[Depex]
TRUE
diff --git a/InOsEmuPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index 5ec315bea2..5ec315bea2 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
diff --git a/InOsEmuPkg/CpuRuntimeDxe/Cpu.inf b/EmulatorPkg/CpuRuntimeDxe/Cpu.inf
index d548c8a41a..ed8237f916 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/Cpu.inf
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.inf
@@ -42,7 +42,7 @@
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
@@ -70,7 +70,7 @@
gIdleLoopEventGuid ## CONSUMES ## GUID
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval
[Depex]
gEfiSmbiosProtocolGuid
diff --git a/InOsEmuPkg/CpuRuntimeDxe/CpuDriver.h b/EmulatorPkg/CpuRuntimeDxe/CpuDriver.h
index 69505ff0e4..69505ff0e4 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/CpuDriver.h
+++ b/EmulatorPkg/CpuRuntimeDxe/CpuDriver.h
diff --git a/InOsEmuPkg/CpuRuntimeDxe/CpuIo.c b/EmulatorPkg/CpuRuntimeDxe/CpuIo.c
index 6f63375f4f..6f63375f4f 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/CpuIo.c
+++ b/EmulatorPkg/CpuRuntimeDxe/CpuIo.c
diff --git a/InOsEmuPkg/CpuRuntimeDxe/MpService.c b/EmulatorPkg/CpuRuntimeDxe/MpService.c
index 7f3b1995f2..7f3b1995f2 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/MpService.c
+++ b/EmulatorPkg/CpuRuntimeDxe/MpService.c
diff --git a/InOsEmuPkg/CpuRuntimeDxe/Strings.uni b/EmulatorPkg/CpuRuntimeDxe/Strings.uni
index 4f8d41e798..c8a226e038 100644
--- a/InOsEmuPkg/CpuRuntimeDxe/Strings.uni
+++ b/EmulatorPkg/CpuRuntimeDxe/Strings.uni
Binary files differ
diff --git a/InOsEmuPkg/EmuBlockIoDxe/ComponentName.c b/EmulatorPkg/EmuBlockIoDxe/ComponentName.c
index 2cad6ca836..2cad6ca836 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/ComponentName.c
+++ b/EmulatorPkg/EmuBlockIoDxe/ComponentName.c
diff --git a/InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c b/EmulatorPkg/EmuBlockIoDxe/DriverConfiguration.c
index 44a3cc33e3..44a3cc33e3 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c
+++ b/EmulatorPkg/EmuBlockIoDxe/DriverConfiguration.c
diff --git a/InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c b/EmulatorPkg/EmuBlockIoDxe/DriverDiagnostics.c
index ebb730bf06..ebb730bf06 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c
+++ b/EmulatorPkg/EmuBlockIoDxe/DriverDiagnostics.c
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.c
index b679d8f72a..b679d8f72a 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c
+++ b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.c
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.h
index b11f305720..b11f305720 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h
+++ b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIo.h
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
index 82460e40ec..0e07822e3f 100644
--- a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
+++ b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
@@ -45,7 +45,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
UefiBootServicesTableLib
diff --git a/InOsEmuPkg/EmuBusDriverDxe/ComponentName.c b/EmulatorPkg/EmuBusDriverDxe/ComponentName.c
index e8be214b3c..e8be214b3c 100644
--- a/InOsEmuPkg/EmuBusDriverDxe/ComponentName.c
+++ b/EmulatorPkg/EmuBusDriverDxe/ComponentName.c
diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
index b590ed2552..0430ec3dd2 100644
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
+++ b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
@@ -191,14 +191,14 @@ EmuBusDriverBindingStart (
"eng",
gEmuBusDriverComponentName.SupportedLanguages,
&EmuBusDevice->ControllerNameTable,
- L"InOsEmu Bus Controller",
+ L"Emulator Bus Controller",
TRUE
);
AddUnicodeString2 (
"en",
gEmuBusDriverComponentName2.SupportedLanguages,
&EmuBusDevice->ControllerNameTable,
- L"InOsEmu Bus Controller",
+ L"Emulator Bus Controller",
FALSE
);
diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.h b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.h
index e5eee56254..e5eee56254 100644
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.h
+++ b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.h
diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
index 88c2764beb..44f2af0cfa 100644
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
+++ b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
@@ -39,7 +39,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/EmuGopDxe/ComponentName.c b/EmulatorPkg/EmuGopDxe/ComponentName.c
index 9360fa1738..e10f607cec 100644
--- a/InOsEmuPkg/EmuGopDxe/ComponentName.c
+++ b/EmulatorPkg/EmuGopDxe/ComponentName.c
@@ -61,7 +61,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2
EFI_UNICODE_STRING_TABLE mEmuGopDriverNameTable[] = {
- { "eng", L"InOsEmu GOP Driver" },
+ { "eng", L"Emulator GOP Driver" },
{ NULL , NULL }
};
diff --git a/InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf b/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
index 2a988c9e5b..19c7b2e679 100644
--- a/InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf
+++ b/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
@@ -42,7 +42,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/EmuGopDxe/Gop.h b/EmulatorPkg/EmuGopDxe/Gop.h
index 03e33ea636..03e33ea636 100644
--- a/InOsEmuPkg/EmuGopDxe/Gop.h
+++ b/EmulatorPkg/EmuGopDxe/Gop.h
diff --git a/InOsEmuPkg/EmuGopDxe/GopDriver.c b/EmulatorPkg/EmuGopDxe/GopDriver.c
index 8ddaa86cfa..8ddaa86cfa 100644
--- a/InOsEmuPkg/EmuGopDxe/GopDriver.c
+++ b/EmulatorPkg/EmuGopDxe/GopDriver.c
diff --git a/InOsEmuPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopInput.c
index 0bc2eb5a02..0bc2eb5a02 100644
--- a/InOsEmuPkg/EmuGopDxe/GopInput.c
+++ b/EmulatorPkg/EmuGopDxe/GopInput.c
diff --git a/InOsEmuPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index 7f4333d169..7f4333d169 100644
--- a/InOsEmuPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/ComponentName.c b/EmulatorPkg/EmuSimpleFileSystemDxe/ComponentName.c
index fa6404a81a..fa6404a81a 100644
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/ComponentName.c
+++ b/EmulatorPkg/EmuSimpleFileSystemDxe/ComponentName.c
diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
index 551b54332c..551b54332c 100644
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
+++ b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h
index 5a1182c2ad..5a1182c2ad 100644
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h
+++ b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.h
diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
index f05f156dc1..63bafa870d 100644
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
+++ b/EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
@@ -30,7 +30,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/EmuSnpDxe/ComponentName.c b/EmulatorPkg/EmuSnpDxe/ComponentName.c
index a7c5124cff..a7c5124cff 100644
--- a/InOsEmuPkg/EmuSnpDxe/ComponentName.c
+++ b/EmulatorPkg/EmuSnpDxe/ComponentName.c
diff --git a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c
index 4432218b51..4432218b51 100644
--- a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c
+++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c
diff --git a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.h b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h
index 21bfc42c14..21bfc42c14 100644
--- a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.h
+++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h
diff --git a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
index a9e92308f3..5360e2463c 100644
--- a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf
+++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
@@ -37,7 +37,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DevicePathLib
diff --git a/InOsEmuPkg/EmuThunkDxe/EmuThunk.c b/EmulatorPkg/EmuThunkDxe/EmuThunk.c
index a0661c8726..a0661c8726 100644
--- a/InOsEmuPkg/EmuThunkDxe/EmuThunk.c
+++ b/EmulatorPkg/EmuThunkDxe/EmuThunk.c
diff --git a/InOsEmuPkg/EmuThunkDxe/EmuThunk.inf b/EmulatorPkg/EmuThunkDxe/EmuThunk.inf
index 314a6f38ef..394d280912 100644
--- a/InOsEmuPkg/EmuThunkDxe/EmuThunk.inf
+++ b/EmulatorPkg/EmuThunkDxe/EmuThunk.inf
@@ -35,7 +35,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/InOsEmuPkg.dec b/EmulatorPkg/EmulatorPkg.dec
index f18ee28991..b5f719227a 100644
--- a/InOsEmuPkg/InOsEmuPkg.dec
+++ b/EmulatorPkg/EmulatorPkg.dec
@@ -15,7 +15,7 @@
[Defines]
DEC_VERSION = 0x00010005
- PACKAGE_NAME = InOsEmuPkg
+ PACKAGE_NAME = EmulatorPkg
PACKAGE_GUID = 36E48BD7-7D92-5A47-A2CD-513F072E3300
PACKAGE_VERSION = 0.1
@@ -43,39 +43,39 @@
gEmuThunkPpiGuid = { 0xE113F896, 0x75CF, 0xF640, { 0x81, 0x7F, 0xC8, 0x5A, 0x79, 0xE8, 0xAE, 0x67 } }
[Guids]
- gInOsEmuPkgTokenSpaceGuid = { 0x4F792E68, 0xE8C8, 0x794E, { 0xB1, 0xD8, 0x37, 0x03, 0xF3, 0xF2, 0xD5, 0xA5 } }
+ gEmulatorPkgTokenSpaceGuid = { 0x4F792E68, 0xE8C8, 0x794E, { 0xB1, 0xD8, 0x37, 0x03, 0xF3, 0xF2, 0xD5, 0xA5 } }
gEmuSystemConfigGuid = { 0xF8626165, 0x6CEB, 0x924A, { 0xBA, 0xFC, 0xF1, 0x3A, 0xB9, 0xD6, 0x57, 0x28 } }
gEmuVirtualDisksGuid = { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
gEmuPhysicalDisksGuid = { 0xf2bdcc96, 0x8985, 0x11db, { 0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
[PcdsFixedAtBuild]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|0x0|UINT64|0x00001014
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|0x0|UINT64|0x00001015
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|0x0|UINT64|0x00001016
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFdBaseAddress|0x0|UINT64|0x00001017
-
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|0x0|UINT64|0x0000100e
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|0x0|UINT64|0x00001010
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize|0x0|UINT32|0x00001011
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x0|UINT32|0x00001012
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0|UINT32|0x00001013
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|0x0|UINT64|0x00001014
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|0x0|UINT64|0x00001015
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|0x0|UINT64|0x00001016
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFdBaseAddress|0x0|UINT64|0x00001017
+
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|0x0|UINT64|0x0000100e
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|0x0|UINT64|0x00001010
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize|0x0|UINT32|0x00001011
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x0|UINT32|0x00001012
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0|UINT32|0x00001013
## Number of Application Processors (APs) in the system 0 means Uniprocessor mode
- gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"0"|VOID*|0x00001019
+ gEmulatorPkgTokenSpaceGuid.PcdEmuApCount|L"0"|VOID*|0x00001019
## Magic page to implement PEI Services Table Pointer Lib
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1003000000|UINT64|0x0000101b
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1003000000|UINT64|0x0000101b
## Size of the packet filter
- gInOsEmuPkgTokenSpaceGuid.PcdNetworkPacketFilterSize|524288|UINT32|0x0000101c
+ gEmulatorPkgTokenSpaceGuid.PcdNetworkPacketFilterSize|524288|UINT32|0x0000101c
[PcdsFixedAtBuild, PcdsPatchableInModule]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode|1|UINT32|0x00001006
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"|VOID*|0x0000100c
+ gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode|1|UINT32|0x00001006
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"|VOID*|0x0000100c
#
# filename[:[R|F][O|W]][:BlockSize]
@@ -88,14 +88,14 @@
# the device and is not configurable.
# Device Size comes from file or device.
# On Mac OS X you can use Disk Utility to create .dmg files and mount them like disks
- gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001
+ gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001
- gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004
- gInOsEmuPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
- gInOsEmuPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d
-
- gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007
- gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"|VOID*|0x00001008
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval|0x100|UINT64|0x0000101a
+ gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004
+ gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
+ gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d
+
+ gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007
+ gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"|VOID*|0x00001008
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval|0x100|UINT64|0x0000101a
diff --git a/InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
index ec9fe5c0b7..ec9fe5c0b7 100644
--- a/InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.c
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
diff --git a/InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
index 02a4474c29..368f947d73 100644
--- a/InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
PeiServicesTablePointerLib
@@ -46,8 +46,8 @@
DebugLib
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
diff --git a/InOsEmuPkg/FlashMapPei/FlashMapPei.c b/EmulatorPkg/FlashMapPei/FlashMapPei.c
index 955c46227e..94c1874193 100644
--- a/InOsEmuPkg/FlashMapPei/FlashMapPei.c
+++ b/EmulatorPkg/FlashMapPei/FlashMapPei.c
@@ -54,7 +54,7 @@ Returns:
EFI_PHYSICAL_ADDRESS FdFixUp;
UINT64 FdSize;
- DEBUG ((EFI_D_ERROR, "InOsEmuPkg Flash Map PEIM Loaded\n"));
+ DEBUG ((EFI_D_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));
//
// Get the Fwh Information PPI
diff --git a/InOsEmuPkg/FlashMapPei/FlashMapPei.inf b/EmulatorPkg/FlashMapPei/FlashMapPei.inf
index ed5bc3baab..15a872a264 100644
--- a/InOsEmuPkg/FlashMapPei/FlashMapPei.inf
+++ b/EmulatorPkg/FlashMapPei/FlashMapPei.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
PcdLib
@@ -59,9 +59,9 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
[Depex]
gEmuThunkPpiGuid
diff --git a/InOsEmuPkg/FvbServicesRuntimeDxe/FWBlockService.c b/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c
index a95b180adb..a95b180adb 100644
--- a/InOsEmuPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c
diff --git a/InOsEmuPkg/FvbServicesRuntimeDxe/FvbInfo.c b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
index 34f2910643..34f2910643 100644
--- a/InOsEmuPkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
diff --git a/InOsEmuPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index d34386779b..c7c21abbbe 100644
--- a/InOsEmuPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -37,7 +37,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
UefiBootServicesTableLib
@@ -60,12 +60,12 @@
gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
[FixedPcd]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
diff --git a/InOsEmuPkg/FvbServicesRuntimeDxe/FwBlockService.h b/EmulatorPkg/FvbServicesRuntimeDxe/FwBlockService.h
index e4984515a4..e4984515a4 100644
--- a/InOsEmuPkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FwBlockService.h
diff --git a/InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h b/EmulatorPkg/Include/Guid/EmuPhysicalDisk.h
index 324dc0474f..324dc0474f 100644
--- a/InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h
+++ b/EmulatorPkg/Include/Guid/EmuPhysicalDisk.h
diff --git a/InOsEmuPkg/Include/Guid/EmuSystemConfig.h b/EmulatorPkg/Include/Guid/EmuSystemConfig.h
index b3a7d9b09f..b3a7d9b09f 100644
--- a/InOsEmuPkg/Include/Guid/EmuSystemConfig.h
+++ b/EmulatorPkg/Include/Guid/EmuSystemConfig.h
diff --git a/InOsEmuPkg/Include/Guid/EmuVirtualDisk.h b/EmulatorPkg/Include/Guid/EmuVirtualDisk.h
index 17b97dc72b..17b97dc72b 100644
--- a/InOsEmuPkg/Include/Guid/EmuVirtualDisk.h
+++ b/EmulatorPkg/Include/Guid/EmuVirtualDisk.h
diff --git a/InOsEmuPkg/Include/Library/EmuMagicPageLib.h b/EmulatorPkg/Include/Library/EmuMagicPageLib.h
index 03dfcacd7a..a701b763d3 100644
--- a/InOsEmuPkg/Include/Library/EmuMagicPageLib.h
+++ b/EmulatorPkg/Include/Library/EmuMagicPageLib.h
@@ -1,5 +1,5 @@
/*++ @file
-The PCD, gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage, points to a magic page
+The PCD, gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage, points to a magic page
of memory that is like SRAM on an embedded system. This file defines what goes
where in the magic page.
diff --git a/InOsEmuPkg/Include/Library/EmuThunkLib.h b/EmulatorPkg/Include/Library/EmuThunkLib.h
index 9d69d4f2eb..9d69d4f2eb 100644
--- a/InOsEmuPkg/Include/Library/EmuThunkLib.h
+++ b/EmulatorPkg/Include/Library/EmuThunkLib.h
diff --git a/InOsEmuPkg/Include/Library/KeyMapLib.h b/EmulatorPkg/Include/Library/KeyMapLib.h
index 7bd29a7230..7bd29a7230 100644
--- a/InOsEmuPkg/Include/Library/KeyMapLib.h
+++ b/EmulatorPkg/Include/Library/KeyMapLib.h
diff --git a/InOsEmuPkg/Include/Library/PpiListLib.h b/EmulatorPkg/Include/Library/PpiListLib.h
index 061cfca34e..061cfca34e 100644
--- a/InOsEmuPkg/Include/Library/PpiListLib.h
+++ b/EmulatorPkg/Include/Library/PpiListLib.h
diff --git a/InOsEmuPkg/Include/Library/ThunkPpiList.h b/EmulatorPkg/Include/Library/ThunkPpiList.h
index febc972e20..febc972e20 100644
--- a/InOsEmuPkg/Include/Library/ThunkPpiList.h
+++ b/EmulatorPkg/Include/Library/ThunkPpiList.h
diff --git a/InOsEmuPkg/Include/Library/ThunkProtocolList.h b/EmulatorPkg/Include/Library/ThunkProtocolList.h
index 5b25f9cc86..5b25f9cc86 100644
--- a/InOsEmuPkg/Include/Library/ThunkProtocolList.h
+++ b/EmulatorPkg/Include/Library/ThunkProtocolList.h
diff --git a/InOsEmuPkg/Include/Ppi/EmuThunk.h b/EmulatorPkg/Include/Ppi/EmuThunk.h
index 20cdc462f9..20cdc462f9 100644
--- a/InOsEmuPkg/Include/Ppi/EmuThunk.h
+++ b/EmulatorPkg/Include/Ppi/EmuThunk.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuBlockIo.h b/EmulatorPkg/Include/Protocol/EmuBlockIo.h
index 26d6bb8518..26d6bb8518 100644
--- a/InOsEmuPkg/Include/Protocol/EmuBlockIo.h
+++ b/EmulatorPkg/Include/Protocol/EmuBlockIo.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/Include/Protocol/EmuFileSystem.h
index 3713acfdc1..3713acfdc1 100644
--- a/InOsEmuPkg/Include/Protocol/EmuFileSystem.h
+++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuGraphicsWindow.h b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h
index e1afa0ef5a..e1afa0ef5a 100644
--- a/InOsEmuPkg/Include/Protocol/EmuGraphicsWindow.h
+++ b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuIoThunk.h b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
index af132bea7e..af132bea7e 100644
--- a/InOsEmuPkg/Include/Protocol/EmuIoThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuSnp.h b/EmulatorPkg/Include/Protocol/EmuSnp.h
index fc8e24cfde..fc8e24cfde 100644
--- a/InOsEmuPkg/Include/Protocol/EmuSnp.h
+++ b/EmulatorPkg/Include/Protocol/EmuSnp.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuThread.h b/EmulatorPkg/Include/Protocol/EmuThread.h
index e518bb1368..e518bb1368 100644
--- a/InOsEmuPkg/Include/Protocol/EmuThread.h
+++ b/EmulatorPkg/Include/Protocol/EmuThread.h
diff --git a/InOsEmuPkg/Include/Protocol/EmuThunk.h b/EmulatorPkg/Include/Protocol/EmuThunk.h
index 27921b123c..27921b123c 100644
--- a/InOsEmuPkg/Include/Protocol/EmuThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuThunk.h
diff --git a/InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.c b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.c
index ba625aea78..ba625aea78 100644
--- a/InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.c
+++ b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.c
diff --git a/InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
index 2895b3963b..f5726785e1 100644
--- a/InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
+++ b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
BaseLib
diff --git a/InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
index db3b313829..db3b313829 100644
--- a/InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
+++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
diff --git a/InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
index 52d8394368..12826edbaf 100644
--- a/InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
+++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
diff --git a/InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.c b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.c
index 2e42ea6151..2e42ea6151 100644
--- a/InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.c
+++ b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.c
diff --git a/InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.inf b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
index 0f7f0ddeca..731bddae9e 100644
--- a/InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.inf
+++ b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
HobLib
diff --git a/InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c b/EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c
index fdb8d5334d..fdb8d5334d 100644
--- a/InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c
+++ b/EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.c
diff --git a/InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf b/EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
index 7c1b4ca8e0..b5961c5a5f 100644
--- a/InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
+++ b/EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
diff --git a/InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
index ccf4fa08eb..ccf4fa08eb 100644
--- a/InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
+++ b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
diff --git a/InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
index 0f928dd27f..a4734c558f 100644
--- a/InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
@@ -29,7 +29,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
EmuThunkLib
diff --git a/InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c
index b4ef86e128..b4ef86e128 100644
--- a/InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c
+++ b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.c
diff --git a/InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
index e1b403475d..5d791bca64 100644
--- a/InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
+++ b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
@@ -29,7 +29,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
EmuThunkLib
diff --git a/InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.c b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
index 14bb17f00e..14bb17f00e 100644
--- a/InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.c
+++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
diff --git a/InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.inf b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
index ba1e3e276b..51479373ff 100644
--- a/InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.inf
+++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
@@ -38,7 +38,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
BaseLib
diff --git a/InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.c b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c
index 8f47ef9125..8f47ef9125 100644
--- a/InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.c
+++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c
diff --git a/InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.h b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
index a76ec2e4bd..a76ec2e4bd 100644
--- a/InOsEmuPkg/Library/EmuBdsLib/BdsPlatform.h
+++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
diff --git a/InOsEmuPkg/Library/EmuBdsLib/EmuBdsLib.inf b/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
index 27f6337bb5..fecdbecbe6 100644
--- a/InOsEmuPkg/Library/EmuBdsLib/EmuBdsLib.inf
+++ b/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
@@ -38,7 +38,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/Library/EmuBdsLib/PlatformData.c b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
index e20099b9f0..e20099b9f0 100644
--- a/InOsEmuPkg/Library/EmuBdsLib/PlatformData.c
+++ b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
diff --git a/InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
index b37b58e1b6..3b008ccb56 100644
--- a/InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
+++ b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
diff --git a/InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c
index c457e7c213..c457e7c213 100644
--- a/InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/MemoryAllocationLib.c
diff --git a/InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.c b/EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.c
index 5a80870f0f..5a80870f0f 100644
--- a/InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.c
+++ b/EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.c
diff --git a/InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.inf b/EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf
index 46483df341..f009d8510c 100644
--- a/InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.inf
+++ b/EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf
@@ -30,7 +30,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
HobLib
diff --git a/InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
index 279e088dff..04be649b82 100644
--- a/InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
+++ b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
@@ -20,7 +20,7 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = InOsEmuPkgPeiCoreServicesTablePointerLib
+ BASE_NAME = EmulatorPkgPeiCoreServicesTablePointerLib
FILE_GUID = E9A22529-44FA-3E4A-A66B-1E918E7AB26A
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
diff --git a/InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c
index 9b02316af4..9b02316af4 100644
--- a/InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiServicesTablePointer.c
diff --git a/InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c b/EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c
index b398b53e51..b398b53e51 100644
--- a/InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c
+++ b/EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.c
diff --git a/InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf b/EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
index e4a3fa7df6..f05dfc1ab4 100644
--- a/InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
+++ b/EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
@@ -35,7 +35,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
BaseLib
@@ -46,4 +46,4 @@
gEmuThunkPpiGuid # PPI ALWAYS_CONSUMED
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
diff --git a/InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
index e229805cfe..e229805cfe 100644
--- a/InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
+++ b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
diff --git a/InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
index d09fd22df8..9cd1fbbfe4 100644
--- a/InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
+++ b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
index aa4e80cf01..aa4e80cf01 100644
--- a/InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
+++ b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
diff --git a/InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
index 911957ce3a..f45ce498c8 100644
--- a/InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
@@ -32,7 +32,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
PeiServicesLib
diff --git a/InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 3454660fec..3454660fec 100644
--- a/InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
diff --git a/InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index b5e9949e0f..07f323a393 100644
--- a/InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -20,7 +20,7 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = InOsEmuPkgPeiServicesTablePointerLib
+ BASE_NAME = EmulatorPkgPeiServicesTablePointerLib
FILE_GUID = 5FD8B4ED-D66F-C144-9953-AC557C649925
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
diff --git a/InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c
index 3f15403c72..4b4db5cafe 100644
--- a/InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c
@@ -1,7 +1,7 @@
/** @file
PEI Services Table Pointer Library.
- Store PEI Services Table pointer via gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage.
+ Store PEI Services Table pointer via gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage.
This emulates a platform SRAM. The PI mechaism does not work in the emulator due to
lack of privledge.
diff --git a/InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
index d16b845a8b..60c584e0e5 100644
--- a/InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
@@ -1,7 +1,7 @@
## @file
# PEI Services Table Pointer Library.
#
-# Store PEI Services Table pointer via gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage.
+# Store PEI Services Table pointer via gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage.
# This emulates a platform SRAM. The PI mechaism does not work in the emulator due to
# lack of privledge.
#
@@ -20,7 +20,7 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = InOsEmuPkgPeiServicesTablePointerLib
+ BASE_NAME = EmulatorPkgPeiServicesTablePointerLib
FILE_GUID = 7488FC06-370A-1C41-B05C-7395559A535A
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
@@ -35,10 +35,10 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
diff --git a/InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.c b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
index caf8a7c14a..caf8a7c14a 100644
--- a/InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.c
+++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
diff --git a/InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.inf b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
index c9f4858053..e473b52376 100644
--- a/InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.inf
+++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
@@ -37,7 +37,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
diff --git a/InOsEmuPkg/Library/SecPeiServicesLib/FwVol.c b/EmulatorPkg/Library/SecPeiServicesLib/FwVol.c
index ae4ebfbdb5..ae4ebfbdb5 100644
--- a/InOsEmuPkg/Library/SecPeiServicesLib/FwVol.c
+++ b/EmulatorPkg/Library/SecPeiServicesLib/FwVol.c
diff --git a/InOsEmuPkg/Library/SecPeiServicesLib/PeiServicesLib.c b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c
index bdbf6875c9..bdbf6875c9 100644
--- a/InOsEmuPkg/Library/SecPeiServicesLib/PeiServicesLib.c
+++ b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c
diff --git a/InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf b/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
index 3fc6271b08..fdf8acca61 100644
--- a/InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
+++ b/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
@@ -41,7 +41,7 @@
PpiListLib
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
diff --git a/InOsEmuPkg/Library/SecPpiListLib/PpiListLib.c b/EmulatorPkg/Library/SecPpiListLib/PpiListLib.c
index 42c0d97942..42c0d97942 100644
--- a/InOsEmuPkg/Library/SecPpiListLib/PpiListLib.c
+++ b/EmulatorPkg/Library/SecPpiListLib/PpiListLib.c
diff --git a/InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf b/EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
index 07c2c35836..e4b496755a 100644
--- a/InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf
+++ b/EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
@@ -27,5 +27,5 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
diff --git a/InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.c b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.c
index 3c2fd93e7f..3c2fd93e7f 100644
--- a/InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.c
+++ b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.c
diff --git a/InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.inf b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
index aa4bb5a48e..54f53ab313 100644
--- a/InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.inf
+++ b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
@@ -27,7 +27,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
BaseLib
diff --git a/InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.c b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.c
index 5aed594b6e..5aed594b6e 100644
--- a/InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.c
+++ b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.c
diff --git a/InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.inf b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
index 387a650fd7..06668835f3 100644
--- a/InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
+++ b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
@@ -26,7 +26,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
BaseLib
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
index 669654ece4..669654ece4 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
index 52d120429f..52d120429f 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
index 04f5a1edc5..04f5a1edc5 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
index dda02d2970..dda02d2970 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
index b9a8cede83..b9a8cede83 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
index 6d64ef4632..6d64ef4632 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
index 0b7c57a8a7..0b7c57a8a7 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
index 65c9792a93..65c9792a93 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
index 177ff38925..177ff38925 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
index 795658bac6..795658bac6 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
index fd1262b190..fd1262b190 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscDevicePath.h b/EmulatorPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
index b1a9acfafd..b1a9acfafd 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
index 88d9d0fb4b..88d9d0fb4b 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
index 9bd7f4da6a..9bd7f4da6a 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemString.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemString.uni
index 782a83bf89..782a83bf89 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemString.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemString.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
index 1d0781586f..1d0781586f 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
index 94fc71c231..94fc71c231 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
index 87c5a8112b..87c5a8112b 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
index 7d511e1912..7d511e1912 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
index 89c8815913..89c8815913 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
index f591a2e547..f591a2e547 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
index 8303c5a29b..8303c5a29b 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
index 7e5be7ea80..7e5be7ea80 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index aed93f5aea..dd759851d7 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -75,7 +75,7 @@
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DevicePathLib
@@ -96,7 +96,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMemorySize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize
[Depex]
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
index 7a4e8a2cbc..7a4e8a2cbc 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
index cb71f7db50..cb71f7db50 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 065ab6fef8..065ab6fef8 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
index 709c53a660..709c53a660 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
index 0dc706e659..0dc706e659 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
index 3e10c63caa..3e10c63caa 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
index 3ff890b83d..3ff890b83d 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
index 13befc45f6..13befc45f6 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
index 9d2a3cbdc1..9d2a3cbdc1 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
index abf2da762c..abf2da762c 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
index 581586b857..581586b857 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
index a910634f00..a910634f00 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
index 45e9ce3c00..45e9ce3c00 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
Binary files differ
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
index 11b2339331..11b2339331 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
diff --git a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
index 72c4137c6b..72c4137c6b 100644
--- a/InOsEmuPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
diff --git a/InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 05c34bdbb5..05c34bdbb5 100644
--- a/InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
diff --git a/InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index 8aa490353a..bee90cb5eb 100644
--- a/InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
UefiBootServicesTableLib
diff --git a/InOsEmuPkg/ResetRuntimeDxe/Reset.c b/EmulatorPkg/ResetRuntimeDxe/Reset.c
index 14594c7763..14594c7763 100644
--- a/InOsEmuPkg/ResetRuntimeDxe/Reset.c
+++ b/EmulatorPkg/ResetRuntimeDxe/Reset.c
diff --git a/InOsEmuPkg/ResetRuntimeDxe/Reset.inf b/EmulatorPkg/ResetRuntimeDxe/Reset.inf
index 93eb5ca51d..f95822b4bd 100644
--- a/InOsEmuPkg/ResetRuntimeDxe/Reset.inf
+++ b/EmulatorPkg/ResetRuntimeDxe/Reset.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
UefiBootServicesTableLib
diff --git a/InOsEmuPkg/Sec/Ia32/SwitchRam.S b/EmulatorPkg/Sec/Ia32/SwitchRam.S
index 81e478be82..81e478be82 100644
--- a/InOsEmuPkg/Sec/Ia32/SwitchRam.S
+++ b/EmulatorPkg/Sec/Ia32/SwitchRam.S
diff --git a/InOsEmuPkg/Sec/Ia32/TempRam.c b/EmulatorPkg/Sec/Ia32/TempRam.c
index 525fb95d48..525fb95d48 100644
--- a/InOsEmuPkg/Sec/Ia32/TempRam.c
+++ b/EmulatorPkg/Sec/Ia32/TempRam.c
diff --git a/InOsEmuPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c
index 4468d6f07b..4468d6f07b 100644
--- a/InOsEmuPkg/Sec/Sec.c
+++ b/EmulatorPkg/Sec/Sec.c
diff --git a/InOsEmuPkg/Sec/Sec.h b/EmulatorPkg/Sec/Sec.h
index 00760121b2..00760121b2 100644
--- a/InOsEmuPkg/Sec/Sec.h
+++ b/EmulatorPkg/Sec/Sec.h
diff --git a/InOsEmuPkg/Sec/Sec.inf b/EmulatorPkg/Sec/Sec.inf
index 8b9d604eec..b17caea0b5 100644
--- a/InOsEmuPkg/Sec/Sec.inf
+++ b/EmulatorPkg/Sec/Sec.inf
@@ -34,7 +34,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
@@ -47,4 +47,4 @@
gEfiTemporaryRamSupportPpiGuid
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
diff --git a/InOsEmuPkg/Sec/X64/SwitchRam.S b/EmulatorPkg/Sec/X64/SwitchRam.S
index a7219bf21f..a7219bf21f 100644
--- a/InOsEmuPkg/Sec/X64/SwitchRam.S
+++ b/EmulatorPkg/Sec/X64/SwitchRam.S
diff --git a/InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
index b2b7801109..b2b7801109 100644
--- a/InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
+++ b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
diff --git a/InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
index 470568f166..a3dece4c35 100644
--- a/InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
+++ b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
@@ -31,7 +31,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/TimerDxe/Timer.c b/EmulatorPkg/TimerDxe/Timer.c
index d19ced7dd9..d19ced7dd9 100644
--- a/InOsEmuPkg/TimerDxe/Timer.c
+++ b/EmulatorPkg/TimerDxe/Timer.c
diff --git a/InOsEmuPkg/TimerDxe/Timer.h b/EmulatorPkg/TimerDxe/Timer.h
index 27fc676b71..27fc676b71 100644
--- a/InOsEmuPkg/TimerDxe/Timer.h
+++ b/EmulatorPkg/TimerDxe/Timer.h
diff --git a/InOsEmuPkg/TimerDxe/Timer.inf b/EmulatorPkg/TimerDxe/Timer.inf
index 9282faed89..b18be56e28 100644
--- a/InOsEmuPkg/TimerDxe/Timer.inf
+++ b/EmulatorPkg/TimerDxe/Timer.inf
@@ -36,7 +36,7 @@
[Packages]
MdePkg/MdePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
diff --git a/InOsEmuPkg/Unix/.gdbinit b/EmulatorPkg/Unix/.gdbinit
index 173818c0e7..173818c0e7 100644
--- a/InOsEmuPkg/Unix/.gdbinit
+++ b/EmulatorPkg/Unix/.gdbinit
diff --git a/InOsEmuPkg/Unix/GdbRun b/EmulatorPkg/Unix/GdbRun
index 428e655631..428e655631 100644
--- a/InOsEmuPkg/Unix/GdbRun
+++ b/EmulatorPkg/Unix/GdbRun
diff --git a/InOsEmuPkg/Unix/Sec/BerkeleyPacketFilter.c b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c
index 519d394e37..519d394e37 100644
--- a/InOsEmuPkg/Unix/Sec/BerkeleyPacketFilter.c
+++ b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c
diff --git a/InOsEmuPkg/Unix/Sec/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c
index bb2da24d85..bb2da24d85 100644
--- a/InOsEmuPkg/Unix/Sec/BlockIo.c
+++ b/EmulatorPkg/Unix/Host/BlockIo.c
diff --git a/InOsEmuPkg/Unix/Sec/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c
index fe68603d3f..fe68603d3f 100644
--- a/InOsEmuPkg/Unix/Sec/EmuThunk.c
+++ b/EmulatorPkg/Unix/Host/EmuThunk.c
diff --git a/InOsEmuPkg/Unix/Sec/Gasket.h b/EmulatorPkg/Unix/Host/Gasket.h
index 2c59a562e6..2c59a562e6 100644
--- a/InOsEmuPkg/Unix/Sec/Gasket.h
+++ b/EmulatorPkg/Unix/Host/Gasket.h
diff --git a/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S b/EmulatorPkg/Unix/Host/Ia32/Gasket.S
index aa031ecece..aa031ecece 100644
--- a/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S
+++ b/EmulatorPkg/Unix/Host/Ia32/Gasket.S
diff --git a/InOsEmuPkg/Unix/Sec/Ia32/SwitchStack.c b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c
index c75073ac2e..c75073ac2e 100644
--- a/InOsEmuPkg/Unix/Sec/Ia32/SwitchStack.c
+++ b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c
diff --git a/InOsEmuPkg/Unix/Sec/LinuxPacketFilter.c b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c
index 20a08c9059..20a08c9059 100644
--- a/InOsEmuPkg/Unix/Sec/LinuxPacketFilter.c
+++ b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c
diff --git a/InOsEmuPkg/Unix/Sec/MemoryAllocationLib.c b/EmulatorPkg/Unix/Host/MemoryAllocationLib.c
index 76b7271872..76b7271872 100644
--- a/InOsEmuPkg/Unix/Sec/MemoryAllocationLib.c
+++ b/EmulatorPkg/Unix/Host/MemoryAllocationLib.c
diff --git a/InOsEmuPkg/Unix/Sec/PosixFileSystem.c b/EmulatorPkg/Unix/Host/PosixFileSystem.c
index 3141a3cf1a..3141a3cf1a 100644
--- a/InOsEmuPkg/Unix/Sec/PosixFileSystem.c
+++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c
diff --git a/InOsEmuPkg/Unix/Sec/Pthreads.c b/EmulatorPkg/Unix/Host/Pthreads.c
index b6b6ae8ef5..b6b6ae8ef5 100644
--- a/InOsEmuPkg/Unix/Sec/Pthreads.c
+++ b/EmulatorPkg/Unix/Host/Pthreads.c
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.c b/EmulatorPkg/Unix/Host/SecMain.c
index 2806347941..2806347941 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.c
+++ b/EmulatorPkg/Unix/Host/SecMain.c
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.h b/EmulatorPkg/Unix/Host/SecMain.h
index 5cd717818e..5cd717818e 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.h
+++ b/EmulatorPkg/Unix/Host/SecMain.h
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.inf b/EmulatorPkg/Unix/Host/SecMain.inf
index f5ed27d5ba..9bda6f8d31 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.inf
+++ b/EmulatorPkg/Unix/Host/SecMain.inf
@@ -51,7 +51,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- InOsEmuPkg/InOsEmuPkg.dec
+ EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
DebugLib
@@ -85,31 +85,31 @@
gEfiFileSystemInfoGuid # SOMETIMES_CONSUMED
[Pcd]
- gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareVolume
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMemorySize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFdBaseAddress
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount
- gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk
- gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem
- gInOsEmuPkgTokenSpaceGuid.PcdEmuSerialPort
- gInOsEmuPkgTokenSpaceGuid.PcdEmuNetworkInterface
- gInOsEmuPkgTokenSpaceGuid.PcdNetworkPacketFilterSize
-
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFdBaseAddress
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuApCount
+ gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk
+ gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem
+ gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort
+ gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface
+ gEmulatorPkgTokenSpaceGuid.PcdNetworkPacketFilterSize
+
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
- gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+ gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
[BuildOptions]
diff --git a/InOsEmuPkg/Unix/Sec/X11GraphicsWindow.c b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c
index ddcf1e7675..ddcf1e7675 100644
--- a/InOsEmuPkg/Unix/Sec/X11GraphicsWindow.c
+++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c
diff --git a/InOsEmuPkg/Unix/Sec/X64/Gasket.S b/EmulatorPkg/Unix/Host/X64/Gasket.S
index 7ea49bb422..7ea49bb422 100644
--- a/InOsEmuPkg/Unix/Sec/X64/Gasket.S
+++ b/EmulatorPkg/Unix/Host/X64/Gasket.S
diff --git a/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S b/EmulatorPkg/Unix/Host/X64/SwitchStack.S
index 8a57b781b5..8a57b781b5 100644
--- a/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S
+++ b/EmulatorPkg/Unix/Host/X64/SwitchStack.S
diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/EmulatorPkg/Unix/UnixX64.dsc
index 50ad39d59f..922df012fa 100644
--- a/InOsEmuPkg/Unix/UnixX64.dsc
+++ b/EmulatorPkg/Unix/UnixX64.dsc
@@ -36,7 +36,7 @@
SUPPORTED_ARCHITECTURES = X64|IA32
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
- FLASH_DEFINITION = InOsEmuPkg/Unix/UnixX64.fdf
+ FLASH_DEFINITION = EmulatorPkg/Unix/UnixX64.fdf
################################################################################
#
@@ -103,8 +103,8 @@
#
# Platform
#
- PlatformBdsLib|InOsEmuPkg/Library/EmuBdsLib/EmuBdsLib.inf
- KeyMapLib|InOsEmuPkg/Library/KeyMapLibNull/KeyMapLibNull.inf
+ PlatformBdsLib|EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
+ KeyMapLib|EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf
#
# Misc
@@ -112,43 +112,43 @@
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
- PeiServicesTablePointerLib|InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
+ PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
[LibraryClasses.common.SEC]
- PeiServicesLib|InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
+ PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- PeCoffGetEntryPointLib|InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
- PeCoffExtraActionLib|InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
- SerialPortLib|InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
- PpiListLib|InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf
+ PeCoffGetEntryPointLib|EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
+ PeCoffExtraActionLib|EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
+ SerialPortLib|EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
+ PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
- TimerLib|InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.inf
+ TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
[LibraryClasses.common.USER_DEFINED, LibraryClasses.common.BASE]
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- PpiListLib|InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf
- ThunkPpiList|InOsEmuPkg/Library/ThunkPpiList/ThunkPpiList.inf
- ThunkProtocolList|InOsEmuPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
+ PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
+ ThunkPpiList|EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
+ ThunkProtocolList|EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
- PpiListLib|InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf
- PeiServicesLib|InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
+ PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
+ PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
[LibraryClasses.common.PEIM, LibraryClasses.common.PEI_CORE]
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
- PeCoffGetEntryPointLib|InOsEmuPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
- PeCoffExtraActionLib|InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
+ PeCoffGetEntryPointLib|EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
+ PeCoffExtraActionLib|EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
- SerialPortLib|InOsEmuPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
+ SerialPortLib|EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
- TimerLib|InOsEmuPkg/Library/PeiTimerLib/PeiTimerLib.inf
+ TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
[LibraryClasses.common.PEI_CORE]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -160,21 +160,21 @@
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
- PeCoffExtraActionLib|InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
+ PeCoffExtraActionLib|EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- TimerLib|InOsEmuPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
- EmuThunkLib|InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.inf
+ TimerLib|EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
+ EmuThunkLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
- EmuThunkLib|InOsEmuPkg/Library/DxeEmuLib/DxeEmuLib.inf
- PeCoffExtraActionLib|InOsEmuPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
+ EmuThunkLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
+ PeCoffExtraActionLib|EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
- TimerLib|InOsEmuPkg/Library/DxeTimerLib/DxeTimerLib.inf
+ TimerLib|EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
[LibraryClasses.common.UEFI_DRIVER]
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -201,11 +201,11 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x002a0000
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0x10000
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"../FV/FV_RECOVERY.fd"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x002a0000
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0x10000
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"../FV/FV_RECOVERY.fd"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuMemorySizeForSecMain|L"64!64"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySizeForSecMain|L"64!64"
!if $(BUILD_NEW_SHELL)
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
@@ -226,19 +226,19 @@
#define BOOT_ON_S3_RESUME 0x11
#define BOOT_ON_FLASH_UPDATE 0x12
#define BOOT_IN_RECOVERY_MODE 0x20
- gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode|0
+ gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode|0
- gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"1"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuApCount|L"1"
# For a CD-ROM/DVD use L"diag.dmg:RO:2048"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"
- gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"
# 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1
@@ -296,14 +296,14 @@
##
# Emulator, OS POSIX application
##
- InOsEmuPkg/Unix/Sec/SecMain.inf
+ EmulatorPkg/Unix/Host/SecMain.inf
!endif
!ifndef $(SKIP_MAIN_BUILD)
#
# Generic SEC
#
- InOsEmuPkg/Sec/Sec.inf
+ EmulatorPkg/Sec/Sec.inf
##
# PEI Phase modules
@@ -317,12 +317,12 @@
MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
- InOsEmuPkg/BootModePei/BootModePei.inf
+ EmulatorPkg/BootModePei/BootModePei.inf
MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
- InOsEmuPkg/AutoScanPei/AutoScanPei.inf
- InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf
- InOsEmuPkg/FlashMapPei/FlashMapPei.inf
- InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
+ EmulatorPkg/AutoScanPei/AutoScanPei.inf
+ EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
+ EmulatorPkg/FlashMapPei/FlashMapPei.inf
+ EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
##
# DXE Phase modules
@@ -342,22 +342,22 @@
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf {
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
- SerialPortLib|InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
+ SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
}
MdeModulePkg/Universal/Metronome/Metronome.inf
- InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
- InOsEmuPkg/ResetRuntimeDxe/Reset.inf
+ EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+ EmulatorPkg/ResetRuntimeDxe/Reset.inf
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
- InOsEmuPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+ EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
- InOsEmuPkg/EmuThunkDxe/EmuThunk.inf
- InOsEmuPkg/CpuRuntimeDxe/Cpu.inf
+ EmulatorPkg/EmuThunkDxe/EmuThunk.inf
+ EmulatorPkg/CpuRuntimeDxe/Cpu.inf
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
- InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
- InOsEmuPkg/TimerDxe/Timer.inf
+ EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+ EmulatorPkg/TimerDxe/Timer.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -370,7 +370,7 @@
EmbeddedPkg/SerialDxe/SerialDxe.inf {
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
- SerialPortLib|InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
+ SerialPortLib|EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
}
MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -378,7 +378,7 @@
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
#{
# <LibraryClasses>
- # NULL|InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
+ # NULL|EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
#}
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
@@ -389,11 +389,11 @@
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
- InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
- InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf
- InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
- InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
- InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf
+ EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
+ EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
+ EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
+ EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
+ EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
MdeModulePkg/Application/HelloWorld/HelloWorld.inf
@@ -440,7 +440,7 @@
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
- MemoryAllocationLib|InOsEmuPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
+ MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/EmulatorPkg/Unix/UnixX64.fdf
index 4ded05fc6a..2977a9ff7b 100644
--- a/InOsEmuPkg/Unix/UnixX64.fdf
+++ b/EmulatorPkg/Unix/UnixX64.fdf
@@ -32,8 +32,8 @@
# buffer for the FD (0x41000000). If this address does not match the FV will get
# relocated in place (works, but not a great idea).
#
-BaseAddress = 0x102000000|gInOsEmuPkgTokenSpaceGuid.PcdEmuFdBaseAddress #The base address of the FLASH Device.
-Size = 0x005a0000|gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize #The size in bytes of the FLASH Device
+BaseAddress = 0x102000000|gEmulatorPkgTokenSpaceGuid.PcdEmuFdBaseAddress #The base address of the FLASH Device.
+Size = 0x005a0000|gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize #The size in bytes of the FLASH Device
ErasePolarity = 1
BlockSize = 0x10000
NumBlocks = 0x5a
@@ -54,11 +54,11 @@ NumBlocks = 0x5a
#
################################################################################
0x00000000|0x00580000
-gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
+gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
FV = FvRecovery
0x00580000|0x0000c000
-gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
#NV_VARIABLE_STORE
DATA = {
## This is the EFI_FIRMWARE_VOLUME_HEADER
@@ -93,10 +93,10 @@ DATA = {
0x0058c000|0x00002000
#NV_EVENT_LOG
-gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
0x0058e000|0x00002000
-gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
# EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid =
@@ -111,7 +111,7 @@ DATA = {
0x00590000|0x00010000
#NV_FTW_SPARE
-gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
################################################################################
#
@@ -167,16 +167,16 @@ APRIORI DXE {
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf
}
-INF InOsEmuPkg/Sec/Sec.inf
+INF EmulatorPkg/Sec/Sec.inf
INF MdeModulePkg/Core/Pei/PeiMain.inf
INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
-INF InOsEmuPkg/BootModePei/BootModePei.inf
-INF InOsEmuPkg/AutoScanPei/AutoScanPei.inf
-INF InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf
-INF InOsEmuPkg/FlashMapPei/FlashMapPei.inf
-INF InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
+INF EmulatorPkg/BootModePei/BootModePei.inf
+INF EmulatorPkg/AutoScanPei/AutoScanPei.inf
+INF EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
+INF EmulatorPkg/FlashMapPei/FlashMapPei.inf
+INF EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -188,18 +188,18 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf
-INF InOsEmuPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
-INF InOsEmuPkg/ResetRuntimeDxe/Reset.inf
+INF EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+INF EmulatorPkg/ResetRuntimeDxe/Reset.inf
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-INF InOsEmuPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+INF EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-INF InOsEmuPkg/EmuThunkDxe/EmuThunk.inf
-INF InOsEmuPkg/CpuRuntimeDxe/Cpu.inf
+INF EmulatorPkg/EmuThunkDxe/EmuThunk.inf
+INF EmulatorPkg/CpuRuntimeDxe/Cpu.inf
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-INF InOsEmuPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
-INF InOsEmuPkg/TimerDxe/Timer.inf
+INF EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+INF EmulatorPkg/TimerDxe/Timer.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
@@ -220,11 +220,11 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
INF IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-INF InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
-INF InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf
-INF InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
-INF InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
-INF InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf
+INF EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
+INF EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
+INF EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
+INF EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
+INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -237,7 +237,7 @@ INF MdeModulePkg/Application/HelloWorld/HelloWorld.inf
# Network stack drivers
#
!if $(NETWORK_SUPPORT)
-INF InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf
+INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
!endif
INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
index 09d1a280d9..09d1a280d9 100755
--- a/InOsEmuPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
index 5a2dfe8bc6..e2dfcb9f29 100644
--- a/InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
@@ -180,7 +180,7 @@
};
BA11A11E0FB10E2200D06FEC /* XCBreakpointCommandAction */ = {
isa = XCBreakpointCommandAction;
- command = "set gInXcode=1\nsource ../../../../InOsEmuPkg/Unix/GdbRun";
+ command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun";
fallbackIsa = XCBreakpointAction;
logCommand = 0;
useDebuggerSideImplementation = 1;
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj
index 8ff531ef6c..8ff531ef6c 100644
--- a/InOsEmuPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/project.pbxproj
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
index 634b1b025c..634b1b025c 100755
--- a/InOsEmuPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
index 1fe821f8de..55c869f9fd 100644
--- a/InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
@@ -180,7 +180,7 @@
};
BA11A11E0FB10E2200D06FEC /* XCBreakpointCommandAction */ = {
isa = XCBreakpointCommandAction;
- command = "set gInXcode=1\nsource ../../../../InOsEmuPkg/Unix/GdbRun";
+ command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun";
fallbackIsa = XCBreakpointAction;
logCommand = 0;
useDebuggerSideImplementation = 1;
diff --git a/InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj
index 9bd13bd63f..9bd13bd63f 100644
--- a/InOsEmuPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/project.pbxproj
diff --git a/InOsEmuPkg/Unix/build.sh b/EmulatorPkg/Unix/build.sh
index 1810a69ef7..b7dc0bb109 100755
--- a/InOsEmuPkg/Unix/build.sh
+++ b/EmulatorPkg/Unix/build.sh
@@ -98,25 +98,25 @@ do
# This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE
# images that get loaded in SecMain
#
- cp $WORKSPACE/InOsEmuPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
+ cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
;;
esac
- /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/InOsEmuPkg/Unix/GdbRun
+ /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun
exit
fi
if [[ $arg == cleanall ]]; then
make -C $WORKSPACE/BaseTools clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
exit $?
fi
if [[ $arg == clean ]]; then
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
exit $?
fi
@@ -127,10 +127,10 @@ done
# Build the edk2 UnixPkg
#
if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
else
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/SecMain $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
fi
exit $?
diff --git a/InOsEmuPkg/Unix/build64.sh b/EmulatorPkg/Unix/build64.sh
index eb0d80bff6..25d14dfc67 100755
--- a/InOsEmuPkg/Unix/build64.sh
+++ b/EmulatorPkg/Unix/build64.sh
@@ -99,25 +99,25 @@ do
# This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE
# images that get loaded in SecMain
#
- cp $WORKSPACE/InOsEmuPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
+ cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
;;
esac
- /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/InOsEmuPkg/Unix/GdbRun
+ /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun
exit
fi
if [[ $arg == cleanall ]]; then
make -C $WORKSPACE/BaseTools clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
exit $?
fi
if [[ $arg == clean ]]; then
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
exit $?
fi
@@ -128,10 +128,10 @@ done
# Build the edk2 UnixPkg
#
if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
else
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules
- build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules
+ build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
cp $WORKSPACE/Build/EmuUnixX64/DEBUG_"$TARGET_TOOLS"/X64/SecMain $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
fi
exit $?
diff --git a/InOsEmuPkg/build.sh b/EmulatorPkg/build.sh
index 28de82cc83..28de82cc83 100755
--- a/InOsEmuPkg/build.sh
+++ b/EmulatorPkg/build.sh
diff --git a/InOsEmuPkg/build64.sh b/EmulatorPkg/build64.sh
index a1d47b7292..a1d47b7292 100755
--- a/InOsEmuPkg/build64.sh
+++ b/EmulatorPkg/build64.sh