Add Dxe as postfix for WinNtBusDriver driver

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3282 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 5b7ed928b355a2b1c7f99b256dcb061e15ea39ba..bc0545cab8a948da19258b1074848b0fbc2d7e7d 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -415,7 +415,7 @@
   $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
   $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/IdeBus.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf\r
+  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsoleDxe.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d4df4dd78407d9a67db09611a1789c1d66886b7e..c7bd6608ea6952b3d52584eee523ae6d45fa07fb 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -166,7 +166,7 @@ INF  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf
 INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
 INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
 INF  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/IdeBus.inf\r
-INF  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf\r
+INF  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsoleDxe.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf
deleted file mode 100644 (file)
index af5adf7..0000000
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf
+++ /dev/null
@@ -1,136 +0,0 @@
-#/** @file\r
-# Win NT Bus driver\r
-#\r
-# This following section documents the envirnoment variables for the Win NT\r
-#  build. These variables are used to define the (virtual) hardware\r
-#  configuration of the NT environment\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
-#\r
-#  All rights reserved. This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#\r
-#**/\r
-\r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = WinNtBusDriver\r
-  FILE_GUID                      = BD7E9A27-D6C5-416a-B245-5F507D95B2BD\r
-  MODULE_TYPE                    = UEFI_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = InitializeWinNtBusDriver\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32\r
-#\r
-#  DRIVER_BINDING                =  gWinNtBusDriverBinding                       \r
-#  COMPONENT_NAME                =  gWinNtBusDriverComponentName                 \r
-#\r
-\r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
-[Sources.common]\r
-  ComponentName.c\r
-  WinNtBusDriver.c\r
-  WinNtBusDriver.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  Nt32Pkg/Nt32Pkg.dec\r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
-[LibraryClasses]\r
-  MemoryAllocationLib\r
-  DevicePathLib\r
-  UefiBootServicesTableLib\r
-  BaseMemoryLib\r
-  PcdLib\r
-  UefiLib\r
-  UefiDriverEntryPoint\r
-  BaseLib\r
-  DebugLib\r
-\r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
-[Guids]\r
-  gEfiWinNtCPUSpeedGuid                         # ALWAYS_CONSUMED\r
-  gEfiWinNtCPUModelGuid                         # ALWAYS_CONSUMED\r
-  gEfiWinNtMemoryGuid                           # ALWAYS_CONSUMED\r
-  gEfiWinNtConsoleGuid                          # ALWAYS_CONSUMED\r
-  gEfiWinNtGopGuid                              # ALWAYS_CONSUMED\r
-  gEfiWinNtSerialPortGuid                       # ALWAYS_CONSUMED\r
-  gEfiWinNtFileSystemGuid                       # ALWAYS_CONSUMED\r
-  gEfiWinNtPhysicalDisksGuid                    # ALWAYS_CONSUMED\r
-  gEfiWinNtVirtualDisksGuid                     # ALWAYS_CONSUMED\r
-\r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
-[Protocols]\r
-  gWinNtBusDriverGuid                           # PROTOCOL BY_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL BY_START\r
-  gEfiWinNtThunkProtocolGuid                    # PROTOCOL TO_START\r
-  gEfiWinNtIoProtocolGuid                       # PROTOCOL BY_START\r
-\r
-\r
-################################################################################\r
-#\r
-# Pcd DYNAMIC - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r
-[PcdsDynamic.common]\r
-  PcdWinNtMemorySize|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtCpuSpeed|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtCpuModel|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtPhysicalDisk|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtVirtualDisk|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtFileSystem|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtSerialPort|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtGop|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtUga|gEfiNt32PkgTokenSpaceGuid\r
-  PcdWinNtConsole|gEfiNt32PkgTokenSpaceGuid\r
-\r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
new file mode 100644 (file)
index 0000000..bcb4cff
--- /dev/null
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -0,0 +1,136 @@
+#/** @file\r
+# Win NT Bus driver\r
+#\r
+# This following section documents the envirnoment variables for the Win NT\r
+#  build. These variables are used to define the (virtual) hardware\r
+#  configuration of the NT environment\r
+# Copyright (c) 2006 - 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+################################################################################\r
+#\r
+# Defines Section - statements that will be processed to create a Makefile.\r
+#\r
+################################################################################\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = WinNtBusDriverDxe\r
+  FILE_GUID                      = BD7E9A27-D6C5-416a-B245-5F507D95B2BD\r
+  MODULE_TYPE                    = UEFI_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = InitializeWinNtBusDriver\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32\r
+#\r
+#  DRIVER_BINDING                =  gWinNtBusDriverBinding                       \r
+#  COMPONENT_NAME                =  gWinNtBusDriverComponentName                 \r
+#\r
+\r
+################################################################################\r
+#\r
+# Sources Section - list of files that are required for the build to succeed.\r
+#\r
+################################################################################\r
+\r
+[Sources.common]\r
+  ComponentName.c\r
+  WinNtBusDriver.c\r
+  WinNtBusDriver.h\r
+\r
+\r
+################################################################################\r
+#\r
+# Package Dependency Section - list of Package files that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  Nt32Pkg/Nt32Pkg.dec\r
+\r
+\r
+################################################################################\r
+#\r
+# Library Class Section - list of Library Classes that are required for\r
+#                         this module.\r
+#\r
+################################################################################\r
+\r
+[LibraryClasses]\r
+  MemoryAllocationLib\r
+  DevicePathLib\r
+  UefiBootServicesTableLib\r
+  BaseMemoryLib\r
+  PcdLib\r
+  UefiLib\r
+  UefiDriverEntryPoint\r
+  BaseLib\r
+  DebugLib\r
+\r
+\r
+################################################################################\r
+#\r
+# Guid C Name Section - list of Guids that this module uses or produces.\r
+#\r
+################################################################################\r
+\r
+[Guids]\r
+  gEfiWinNtCPUSpeedGuid                         # ALWAYS_CONSUMED\r
+  gEfiWinNtCPUModelGuid                         # ALWAYS_CONSUMED\r
+  gEfiWinNtMemoryGuid                           # ALWAYS_CONSUMED\r
+  gEfiWinNtConsoleGuid                          # ALWAYS_CONSUMED\r
+  gEfiWinNtGopGuid                              # ALWAYS_CONSUMED\r
+  gEfiWinNtSerialPortGuid                       # ALWAYS_CONSUMED\r
+  gEfiWinNtFileSystemGuid                       # ALWAYS_CONSUMED\r
+  gEfiWinNtPhysicalDisksGuid                    # ALWAYS_CONSUMED\r
+  gEfiWinNtVirtualDisksGuid                     # ALWAYS_CONSUMED\r
+\r
+\r
+################################################################################\r
+#\r
+# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
+#                           that this module uses or produces.\r
+#\r
+################################################################################\r
+\r
+[Protocols]\r
+  gWinNtBusDriverGuid                           # PROTOCOL BY_START\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL BY_START\r
+  gEfiWinNtThunkProtocolGuid                    # PROTOCOL TO_START\r
+  gEfiWinNtIoProtocolGuid                       # PROTOCOL BY_START\r
+\r
+\r
+################################################################################\r
+#\r
+# Pcd DYNAMIC - list of PCDs that this module is coded for.\r
+#\r
+################################################################################\r
+\r
+[PcdsDynamic.common]\r
+  PcdWinNtMemorySize|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtCpuSpeed|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtCpuModel|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtPhysicalDisk|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtVirtualDisk|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtFileSystem|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtSerialPort|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtGop|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtUga|gEfiNt32PkgTokenSpaceGuid\r
+  PcdWinNtConsole|gEfiNt32PkgTokenSpaceGuid\r
+\r