From 69b26c155a943267c38b0d770e8a83dfc82ef189 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Wed, 18 Jul 2007 14:24:10 +0000 Subject: [PATCH] Adjust directory structures. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3322 6f19259b-4bc3-4df7-8a09-765794883524 --- .../{IdeBus/Dxe => IdeBusDxe}/ComponentName.c | 0 .../{IdeBus/Dxe => IdeBusDxe}/ComponentName.h | 0 .../Dxe => IdeBusDxe}/DriverConfiguration.c | 0 .../Dxe => IdeBusDxe}/DriverDiagnostics.c | 0 .../idebus.inf => IdeBusDxe/IdebusDxe.inf} | 2 +- .../idebus.msa => IdeBusDxe/IdebusDxe.msa} | 0 .../Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ata.c | 0 .../Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/atapi.c | 0 .../Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ide.c | 0 .../Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ide.h | 0 .../Pci/{IdeBus/Dxe => IdeBusDxe}/idebus.c | 0 .../Pci/{IdeBus/Dxe => IdeBusDxe}/idebus.h | 0 .../Pci/{IdeBus/Dxe => IdeBusDxe}/idedata.h | 0 .../{PciBus/Dxe => PciBusDxe}/ComponentName.c | 0 .../{PciBus/Dxe => PciBusDxe}/ComponentName.h | 0 .../PciBus.inf => PciBusDxe/PciBusDxe.inf} | 2 +- .../PciBus.msa => PciBusDxe/PciBusDxe.msa} | 0 .../{PciBus/Dxe => PciBusDxe}/PciCommand.c | 0 .../{PciBus/Dxe => PciBusDxe}/PciCommand.h | 0 .../Dxe => PciBusDxe}/PciDeviceSupport.c | 0 .../Dxe => PciBusDxe}/PciDeviceSupport.h | 0 .../Dxe => PciBusDxe}/PciDriverOverride.c | 0 .../Dxe => PciBusDxe}/PciDriverOverride.h | 0 .../{PciBus/Dxe => PciBusDxe}/PciEnumerator.c | 0 .../{PciBus/Dxe => PciBusDxe}/PciEnumerator.h | 0 .../Dxe => PciBusDxe}/PciEnumeratorSupport.c | 0 .../Dxe => PciBusDxe}/PciEnumeratorSupport.h | 0 .../Dxe => PciBusDxe}/PciHotPlugSupport.c | 0 .../Dxe => PciBusDxe}/PciHotPlugSupport.h | 0 .../Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciIo.c | 0 .../Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciIo.h | 0 .../Pci/{PciBus/Dxe => PciBusDxe}/PciLib.c | 0 .../Pci/{PciBus/Dxe => PciBusDxe}/PciLib.h | 0 .../Dxe => PciBusDxe}/PciOptionRomSupport.c | 0 .../Dxe => PciBusDxe}/PciOptionRomSupport.h | 0 .../Dxe => PciBusDxe}/PciPowerManagement.c | 0 .../Dxe => PciBusDxe}/PciPowerManagement.h | 0 .../Dxe => PciBusDxe}/PciResourceSupport.c | 0 .../Dxe => PciBusDxe}/PciResourceSupport.h | 0 .../{PciBus/Dxe => PciBusDxe}/PciRomTable.c | 0 .../{PciBus/Dxe => PciBusDxe}/PciRomTable.h | 0 .../Pci/{PciBus/Dxe => PciBusDxe}/pcibus.c | 0 .../Pci/{PciBus/Dxe => PciBusDxe}/pcibus.h | 0 .../IntelFrameworkModulePkg.dsc | 8 +++--- .../Universal/DataHub/DataHub/Dxe/DataHub.dxs | 25 ------------------ .../DataHubStdErr/Dxe/DataHubStdErr.dxs | 26 ------------------- .../DataHub/Dxe => DataHubDxe}/DataHub.c | 0 .../DataHub/Dxe => DataHubDxe}/DataHub.h | 0 .../DataHub.inf => DataHubDxe/DataHubDxe.inf} | 2 +- .../DataHub.msa => DataHubDxe/DataHubDxe.msa} | 0 .../Dxe => DataHubStdErrDxe}/DataHubStdErr.c | 0 .../DataHubStdErrDxe.inf} | 2 +- .../DataHubStdErrDxe.msa} | 0 53 files changed, 8 insertions(+), 59 deletions(-) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ComponentName.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ComponentName.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/DriverConfiguration.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/DriverDiagnostics.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe/idebus.inf => IdeBusDxe/IdebusDxe.inf} (95%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe/idebus.msa => IdeBusDxe/IdebusDxe.msa} (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ata.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/atapi.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ide.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/ide.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/idebus.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/idebus.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{IdeBus/Dxe => IdeBusDxe}/idedata.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/ComponentName.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/ComponentName.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe/PciBus.inf => PciBusDxe/PciBusDxe.inf} (96%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe/PciBus.msa => PciBusDxe/PciBusDxe.msa} (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciCommand.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciCommand.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciDeviceSupport.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciDeviceSupport.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciDriverOverride.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciDriverOverride.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciEnumerator.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciEnumerator.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciEnumeratorSupport.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciEnumeratorSupport.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciHotPlugSupport.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciHotPlugSupport.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciIo.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciIo.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciLib.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciLib.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciOptionRomSupport.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciOptionRomSupport.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciPowerManagement.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciPowerManagement.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciResourceSupport.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciResourceSupport.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciRomTable.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/PciRomTable.h (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/pcibus.c (100%) rename IntelFrameworkModulePkg/Bus/Pci/{PciBus/Dxe => PciBusDxe}/pcibus.h (100%) delete mode 100644 IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.dxs delete mode 100644 IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.dxs rename IntelFrameworkModulePkg/Universal/{DataHub/DataHub/Dxe => DataHubDxe}/DataHub.c (100%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHub/Dxe => DataHubDxe}/DataHub.h (100%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHub/Dxe/DataHub.inf => DataHubDxe/DataHubDxe.inf} (95%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHub/Dxe/DataHub.msa => DataHubDxe/DataHubDxe.msa} (100%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHubStdErr/Dxe => DataHubStdErrDxe}/DataHubStdErr.c (100%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf => DataHubStdErrDxe/DataHubStdErrDxe.inf} (95%) rename IntelFrameworkModulePkg/Universal/{DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa => DataHubStdErrDxe/DataHubStdErrDxe.msa} (100%) diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.inf similarity index 95% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.inf rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.inf index d331321ea0..5514fa3476 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.inf @@ -22,7 +22,7 @@ ################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = IdeBus + BASE_NAME = IdeBusDxe FILE_GUID = 69FD8E47-A161-4550-B01A-5594CEB2B2B2 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.msa similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.msa diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ide.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ide.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ide.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.h rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ide.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idedata.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h rename to IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idedata.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf similarity index 96% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index a5e7b8a168..22df764e0a 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -23,7 +23,7 @@ ################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = PciBus + BASE_NAME = PciBusDxe FILE_GUID = 93B80004-9FB3-11d4-9A3A-0090273FC14D MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.msa similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.msa diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciCommand.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciCommand.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciCommand.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciCommand.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciPowerManagement.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciPowerManagement.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciPowerManagement.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciPowerManagement.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciResourceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciResourceSupport.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciResourceSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciResourceSupport.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciRomTable.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciRomTable.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciRomTable.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciRomTable.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.c rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h similarity index 100% rename from IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h rename to IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 89b6d17cca..ffd146e444 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -176,15 +176,15 @@ $(WORKSPACE)/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf $(WORKSPACE)/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf $(WORKSPACE)/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf - $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf - $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/IdeBus.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.inf $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.inf $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf - $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf - $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.dxs b/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.dxs deleted file mode 100644 index 226acc532f..0000000000 --- a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.dxs +++ /dev/null @@ -1,25 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - DataHub.dxs - -Abstract: - - Dependency expression source file. - ---*/ -#include - -DEPENDENCY_START - TRUE -DEPENDENCY_END diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.dxs b/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.dxs deleted file mode 100644 index 9603a3e140..0000000000 --- a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.dxs +++ /dev/null @@ -1,26 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - DataHubStdErr.dxs - -Abstract: - - Dependency expression source file. - ---*/ -#include - - -DEPENDENCY_START - EFI_DATA_HUB_PROTOCOL_GUID -DEPENDENCY_END diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c similarity index 100% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c rename to IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h similarity index 100% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.h rename to IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf similarity index 95% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf rename to IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf index 279bb7b64c..e3036a1496 100644 --- a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf @@ -21,7 +21,7 @@ ################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = DataHub + BASE_NAME = DataHubDxe FILE_GUID = 53BCC14F-C24F-434C-B294-8ED2D4CC1860 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.msa similarity index 100% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa rename to IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.msa diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c similarity index 100% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c rename to IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf similarity index 95% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf rename to IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf index af612e4c2b..e4dc6469bf 100644 --- a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf +++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf @@ -21,7 +21,7 @@ ################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = DataHubStdErr + BASE_NAME = DataHubStdErrDxe FILE_GUID = CA515306-00CE-4032-874E-11B755FF6866 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.msa similarity index 100% rename from IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa rename to IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.msa -- 2.39.2