Clean up the Isa related DXE in IntelFrameworkMoudlePkg.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index 1921d4c7d25f98aa1cc93ae29c466283e4e1934e..352aca9e8d631d05321165947d02e5f610603be6 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
@@ -55,6 +55,73 @@ Revision History:
 \r
 #include "ComponentName.h"\r
 \r
 \r
 #include "ComponentName.h"\r
 \r

+//\r
+// 8237 DMA registers\r
+//\r
+#define R_8237_DMA_BASE_CA_CH0                    0x00\r
+#define R_8237_DMA_BASE_CA_CH1                    0x02\r
+#define R_8237_DMA_BASE_CA_CH2                    0x04\r
+#define R_8237_DMA_BASE_CA_CH3                    0xd6\r
+#define R_8237_DMA_BASE_CA_CH5                    0xc4\r
+#define R_8237_DMA_BASE_CA_CH6                    0xc8\r
+#define R_8237_DMA_BASE_CA_CH7                    0xcc\r
+\r
+#define R_8237_DMA_BASE_CC_CH0                    0x01\r
+#define R_8237_DMA_BASE_CC_CH1                    0x03\r
+#define R_8237_DMA_BASE_CC_CH2                    0x05\r
+#define R_8237_DMA_BASE_CC_CH3                    0xd7\r
+#define R_8237_DMA_BASE_CC_CH5                    0xc6\r
+#define R_8237_DMA_BASE_CC_CH6                    0xca\r
+#define R_8237_DMA_BASE_CC_CH7                    0xce\r
+\r
+#define R_8237_DMA_MEM_LP_CH0                     0x87\r
+#define R_8237_DMA_MEM_LP_CH1                     0x83\r
+#define R_8237_DMA_MEM_LP_CH2                     0x81\r
+#define R_8237_DMA_MEM_LP_CH3                     0x82\r
+#define R_8237_DMA_MEM_LP_CH5                     0x8B\r
+#define R_8237_DMA_MEM_LP_CH6                     0x89\r
+#define R_8237_DMA_MEM_LP_CH7                     0x8A\r
+\r
+\r
+#define R_8237_DMA_COMMAND_CH0_3                  0x08\r
+#define R_8237_DMA_COMMAND_CH4_7                  0xd0\r
+#define   B_8237_DMA_COMMAND_GAP                  0x10\r
+#define   B_8237_DMA_COMMAND_CGE                  0x04\r
+\r
+\r
+#define R_8237_DMA_STA_CH0_3                      0xd8\r
+#define R_8237_DMA_STA_CH4_7                      0xd0\r
+\r
+#define R_8237_DMA_WRSMSK_CH0_3                   0x0a\r
+#define R_8237_DMA_WRSMSK_CH4_7                   0xd4\r
+#define   B_8237_DMA_WRSMSK_CMS                   0x04\r
+\r
+\r
+#define R_8237_DMA_CHMODE_CH0_3                   0x0b\r
+#define R_8237_DMA_CHMODE_CH4_7                   0xd6\r
+#define   V_8237_DMA_CHMODE_DEMAND                0x00\r
+#define   V_8237_DMA_CHMODE_SINGLE                0x40\r
+#define   V_8237_DMA_CHMODE_CASCADE               0xc0\r
+#define   B_8237_DMA_CHMODE_DECREMENT             0x20\r
+#define   B_8237_DMA_CHMODE_INCREMENT             0x00\r
+#define   B_8237_DMA_CHMODE_AE                    0x10\r
+#define   V_8237_DMA_CHMODE_VERIFY                0\r
+#define   V_8237_DMA_CHMODE_IO2MEM                0x04\r
+#define   V_8237_DMA_CHMODE_MEM2IO                0x08\r
+\r
+#define R_8237_DMA_CBPR_CH0_3                     0x0c\r
+#define R_8237_DMA_CBPR_CH4_7                     0xd8\r
+\r
+#define R_8237_DMA_MCR_CH0_3                      0x0d\r
+#define R_8237_DMA_MCR_CH4_7                      0xda\r
+\r
+#define R_8237_DMA_CLMSK_CH0_3                    0x0e\r
+#define R_8237_DMA_CLMSK_CH4_7                    0xdc\r
+\r
+#define R_8237_DMA_WRMSK_CH0_3                    0x0f\r
+#define R_8237_DMA_WRMSK_CH4_7                    0xde\r
+\r
+\r

 extern EFI_ISA_IO_PROTOCOL    IsaIoInterface;\r
 \r
 typedef enum {\r
 extern EFI_ISA_IO_PROTOCOL    IsaIoInterface;\r
 \r
 typedef enum {\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf
deleted file mode 100644 (file)
index 26a1527..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf
+++ /dev/null
@@ -1,130 +0,0 @@
-#/** @file\r
-# Component description file for IsaBus module.\r
-#\r
-# Discovers all the ISA Controllers and their resources by using the ISA PnP\r
-#  Protocol, produces an instance of the ISA I/O Protocol for every ISA\r
-#  Controller found, loads and initializes all ISA Device Drivers, matches ISA\r
-#  Device Drivers with their respective ISA Controllers in a deterministic\r
-#  manner, and informs a ISA Device Driver when it is to start managing an ISA\r
-#  Controller.\r
-#\r
-#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
-#\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                      = IsaBus\r
-  FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = InitializeIsaBus\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-#  DRIVER_BINDING                =  gIsaBusControllerDriver                      \r
-#  COMPONENT_NAME                =  gIsaBusComponentName                         \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
-  IsaIo.c\r
-  IsaBus.c\r
-  IsaIo.h\r
-  IsaBus.h\r
-  IsaAcpi.h\r
-  ComponentName.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
-  MdeModulePkg/MdeModulePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.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
-  PcdLib\r
-  BootScriptLib\r
-  ReportStatusCodeLib\r
-  UefiBootServicesTableLib\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  DevicePathLib\r
-  UefiLib\r
-  UefiDriverEntryPoint\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
-  gEfiStatusCodeSpecificDataGuid                # 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
-  gEfiIsaIoProtocolGuid                         # PROTOCOL BY_START\r
-  gEfiIsaAcpiProtocolGuid                       # PROTOCOL TO_START\r
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL TO_START\r
-\r
-\r
-################################################################################\r
-#\r
-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r
-[PcdsFeatureFlag.common]\r
-  PcdIsaBusOnlySupportSlaveDma|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
-  PcdIsaBusSupportDma|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
-  PcdIsaBusSupportIsaMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
-\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
new file mode 100644 (file)
index 0000000..65e5686
--- /dev/null
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -0,0 +1,73 @@
+#/** @file\r
+# Component description file for IsaBus module.\r
+#\r
+# Discovers all the ISA Controllers and their resources by using the ISA PnP\r
+#  Protocol, produces an instance of the ISA I/O Protocol for every ISA\r
+#  Controller found, loads and initializes all ISA Device Drivers, matches ISA\r
+#  Device Drivers with their respective ISA Controllers in a deterministic\r
+#  manner, and informs a ISA Device Driver when it is to start managing an ISA\r
+#  Controller.\r
+#\r
+#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = IsaBusDxe\r
+  FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = InitializeIsaBus\r
+\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+\r
+[Sources.common]\r
+  ComponentName.c\r
+  IsaIo.c\r
+  IsaBus.c\r
+  IsaIo.h\r
+  IsaBus.h\r
+  IsaAcpi.h\r
+  ComponentName.h\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
+\r
+[LibraryClasses]\r
+  PcdLib\r
+  BootScriptLib\r
+  ReportStatusCodeLib\r
+  UefiBootServicesTableLib\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  DevicePathLib\r
+  UefiLib\r
+  UefiDriverEntryPoint\r
+  DebugLib\r
+\r
+[Guids]\r
+  gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED\r
+\r
+[Protocols]\r
+  gEfiIsaIoProtocolGuid                         # PROTOCOL BY_START\r
+  gEfiIsaAcpiProtocolGuid                       # PROTOCOL TO_START\r
+  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
+  gEfiGenericMemTestProtocolGuid                # PROTOCOL TO_START\r
+\r
+[PcdsFeatureFlag.common]\r
+  PcdIsaBusOnlySupportSlaveDma|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
+  PcdIsaBusSupportDma|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
+  PcdIsaBusSupportIsaMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid\r
+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index a9503f95292eef14ef924446a0f6cd1d31c59776..09f13f3b8f9b275b4d2eafed5e96287ca7ca5e99 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -24,8 +24,6 @@ Abstract:
 //\r
 #include "InternalIsaIo.h"\r
 \r
 //\r
 #include "InternalIsaIo.h"\r
 \r

-#include <IndustryStandard/Pcat.h>\r
-\r

 //\r
 // Driver Support Global Variables\r
 //\r
 //\r
 // Driver Support Global Variables\r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.inf
deleted file mode 100644 (file)
index 1351b0e..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.inf
+++ /dev/null
@@ -1,104 +0,0 @@
-#/** @file\r
-# Component description file for IsaFloppy module.\r
-#\r
-# ISA Floppy Driver\r
-#  1. Support two types diskette drive\r
-#   1.44M drive and 2.88M drive (and now only support 1.44M)\r
-#  2. Support two diskette drives\r
-#  3. Use DMA channel 2 to transfer data\r
-#  4. Do not use interrupt\r
-#  5. Support diskette change line signal and write protect\r
-# \r
-#  Conforming to EFI driver model\r
-#\r
-#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
-#\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                      = IsaFloppy\r
-  FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = InitializeIsaFloppy\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-#  DRIVER_BINDING                =  gFdcControllerDriver                         \r
-#  COMPONENT_NAME                =  gIsaFloppyComponentName                      \r
-#  Create Event Guid C Name:  Event Type: EVENT_TYPE_PERIODIC_TIMER\r
-#\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
-  ComponentName.h\r
-  IsaFloppyCtrl.c\r
-  IsaFloppyBlock.c\r
-  IsaFloppy.c\r
-  IsaFloppy.h\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
-[LibraryClasses]\r
-  ReportStatusCodeLib\r
-  UefiBootServicesTableLib\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  UefiLib\r
-  BaseLib\r
-  UefiDriverEntryPoint\r
-  DebugLib\r
-  TimerLib\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
-  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
-  gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
-\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
new file mode 100644 (file)
index 0000000..58de16a
--- /dev/null
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
@@ -0,0 +1,63 @@
+#/** @file\r
+# Component description file for IsaFloppy module.\r
+#\r
+# ISA Floppy Driver\r
+#  1. Support two types diskette drive\r
+#   1.44M drive and 2.88M drive (and now only support 1.44M)\r
+#  2. Support two diskette drives\r
+#  3. Use DMA channel 2 to transfer data\r
+#  4. Do not use interrupt\r
+#  5. Support diskette change line signal and write protect\r
+# \r
+#  Conforming to EFI driver model\r
+#\r
+#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = IsaFloppyDxe\r
+  FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = InitializeIsaFloppy\r
+\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+\r
+[Sources.common]\r
+  ComponentName.c\r
+  ComponentName.h\r
+  IsaFloppyCtrl.c\r
+  IsaFloppyBlock.c\r
+  IsaFloppy.c\r
+  IsaFloppy.h\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
+\r
+[LibraryClasses]\r
+  ReportStatusCodeLib\r
+  UefiBootServicesTableLib\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  UefiLib\r
+  BaseLib\r
+  UefiDriverEntryPoint\r
+  DebugLib\r
+  TimerLib\r
+\r
+[Protocols]\r
+  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
+  gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.inf
deleted file mode 100644 (file)
index 7e0d0ab..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.inf
+++ /dev/null
@@ -1,108 +0,0 @@
-#/** @file\r
-# Component description file for IsaSerial module.\r
-#\r
-# Serial driver for standard UARTS on an ISA bus.\r
-# Copyright (c) 2006 - 2007, Intel Corporation.\r
-#\r
-#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
-#\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                      = IsaSerial\r
-  FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = InitializeIsaSerial\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-#  DRIVER_BINDING                =  gSerialControllerDriver                      \r
-#  COMPONENT_NAME                =  gIsaSerialComponentName                      \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
-  ComponentName.h\r
-  serial.h\r
-  serial.c\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
-  MdeModulePkg/MdeModulePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.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
-  PcdLib\r
-  ReportStatusCodeLib\r
-  UefiBootServicesTableLib\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  DevicePathLib\r
-  UefiLib\r
-  BaseLib\r
-  UefiDriverEntryPoint\r
-  DebugLib\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
-  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
-  gEfiSerialIoProtocolGuid                      # PROTOCOL BY_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
-\r
-\r
-################################################################################\r
-#\r
-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r
-[PcdsFeatureFlag.common]\r
-  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid\r
-\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
new file mode 100644 (file)
index 0000000..96c6708
--- /dev/null
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -0,0 +1,108 @@
+#/** @file\r
+# Component description file for IsaSerial module.\r
+#\r
+# Serial driver for standard UARTS on an ISA bus.\r
+# Copyright (c) 2006 - 2007, Intel Corporation.\r
+#\r
+#  Copyright (c) 2006 - 2007, Intel Corporation<BR>\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
+#\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                      = IsaSerialDxe\r
+  FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = InitializeIsaSerial\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+#  DRIVER_BINDING                =  gSerialControllerDriver                      \r
+#  COMPONENT_NAME                =  gIsaSerialComponentName                      \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
+  ComponentName.h\r
+  serial.h\r
+  serial.c\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
+  MdeModulePkg/MdeModulePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.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
+  PcdLib\r
+  ReportStatusCodeLib\r
+  UefiBootServicesTableLib\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  DevicePathLib\r
+  UefiLib\r
+  BaseLib\r
+  UefiDriverEntryPoint\r
+  DebugLib\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
+  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
+  gEfiSerialIoProtocolGuid                      # PROTOCOL BY_START\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
+\r
+\r
+################################################################################\r
+#\r
+# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
+#\r
+################################################################################\r
+\r
+[PcdsFeatureFlag.common]\r
+  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid\r
+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
index bcf7f7bf3f354d892349509968e83045f88124a4..7f8b911b00222940f30ed99bb9554eba1de983c6 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
@@ -184,6 +184,7 @@ Ps2KeyboardComponentNameGetControllerName (
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r

+\r

   if (!EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
            ControllerHandle,\r
   if (!EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
            ControllerHandle,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/EntryPoint.c
deleted file mode 100644 (file)
index 71e53ec..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/EntryPoint.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point \r
-\r
-Copyright (c) 2006 - 2007, Intel Corporation\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
-\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
-// Include common header file for this module.\r
-//\r
-#include "Ps2Keyboard.h"\r
-\r
-/**\r
-  The user Entry Point for module Ps2Keyboard. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializePs2Keyboard(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  //\r
-  // Install driver model protocol(s).\r
-  //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
-             ImageHandle,\r
-             SystemTable,\r
-             &gKeyboardControllerDriver,\r
-             ImageHandle,\r
-             &gPs2KeyboardComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index c0763633d09ef3b7c2e425eb05928beb038b888f..91c8b879b16535096c20c8770556778b583295a9 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -466,3 +466,41 @@ KbdControllerDriverStop (
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

+\r
+\r
+/**\r
+  The user Entry Point for module Ps2Keyboard. The user code starts with this function.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InitializePs2Keyboard(\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Install driver model protocol(s).\r
+  //\r
+  Status = EfiLibInstallAllDriverProtocols (\r
+             ImageHandle,\r
+             SystemTable,\r
+             &gKeyboardControllerDriver,\r
+             ImageHandle,\r
+             &gPs2KeyboardComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
index b5f018639e300d8ad77814852c9f356ac06782e0..6a8890613f874e2bedb5a8a76aadd3ba391efe89 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
@@ -16,14 +16,9 @@
 #\r
 #**/\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
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = Ps2Keyboard\r
+  BASE_NAME                      = Ps2KeyboardDxe\r

   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -32,25 +27,7 @@
 \r
   ENTRY_POINT                    = InitializePs2Keyboard\r
 \r
 \r
   ENTRY_POINT                    = InitializePs2Keyboard\r
 \r

-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

-#\r
-#  DRIVER_BINDING                =  gKeyboardControllerDriver\r
-#  COMPONENT_NAME                =  gPs2KeyboardComponentName\r
-#  Create Event Guid C Name:  Event Type: EVENT_TYPE_RELATIVE_TIMER\r
-#  Create Event Guid C Name:  Event Type: EVENT_TYPE_PERIODIC_TIMER\r
-#\r
-#  Signal Event Guid C Name:  Event Type: EVENT_TYPE_PERIODIC_TIMER\r
-#\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
 \r
 [Sources.common]\r
   ComponentName.c\r


@@ -58,30 +35,14 @@
   Ps2KbdCtrller.c\r
   Ps2KbdTextIn.c\r
   Ps2Keyboard.c\r
   Ps2KbdCtrller.c\r
   Ps2KbdTextIn.c\r
   Ps2Keyboard.c\r

-  EntryPoint.c\r

 \r
 \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
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.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
   UefiRuntimeServicesTableLib\r
 [LibraryClasses]\r
   MemoryAllocationLib\r
   UefiRuntimeServicesTableLib\r


@@ -91,14 +52,6 @@
   UefiLib\r
   UefiDriverEntryPoint\r
 \r
   UefiLib\r
   UefiDriverEntryPoint\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
   gEfiPs2PolicyProtocolGuid                     # PROTOCOL TO_START\r
   gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
 [Protocols]\r
   gEfiPs2PolicyProtocolGuid                     # PROTOCOL TO_START\r
   gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c
deleted file mode 100644 (file)
index ffd8281..0000000
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/EntryPoint.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point \r
-\r
-Copyright (c) 2006 - 2007, Intel Corporation\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
-\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
-#include "Ps2Mouse.h"\r
-\r
-/**\r
-  The user Entry Point for module Ps2Mouse. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializePs2Mouse(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  //\r
-  // Install driver model protocol(s).\r
-  //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
-             ImageHandle,\r
-             SystemTable,\r
-             &gPS2MouseDriver,\r
-             ImageHandle,\r
-             &gPs2MouseComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index cc01a5c1650983e65234d0989926a7a97b4253b4..7f2fbc99b98c1792ee6c2999f96b0d43c83110ed 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
@@ -755,3 +755,40 @@ Returns:
   //\r
   PS2MouseGetPacket (MouseDev);\r
 }\r
   //\r
   PS2MouseGetPacket (MouseDev);\r
 }\r

+\r
+/**\r
+  The user Entry Point for module Ps2Mouse. The user code starts with this function.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InitializePs2Mouse(\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Install driver model protocol(s).\r
+  //\r
+  Status = EfiLibInstallAllDriverProtocols (\r
+             ImageHandle,\r
+             SystemTable,\r
+             &gPS2MouseDriver,\r
+             ImageHandle,\r
+             &gPs2MouseComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
index 60a1fcf0af2c7e5a24be8dabcd511bea1363059c..77f97e351a1e027f1e30da5b719d3b1d38abc14c 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@@ -16,14 +16,9 @@
 #\r
 #**/\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
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = Ps2Mouse\r
+  BASE_NAME                      = Ps2MouseDxe\r

   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -32,25 +27,7 @@
 \r
   ENTRY_POINT                    = InitializePs2Mouse\r
 \r
 \r
   ENTRY_POINT                    = InitializePs2Mouse\r
 \r

-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

-#\r
-#  DRIVER_BINDING                =  gPS2MouseDriver\r
-#  COMPONENT_NAME                =  gPs2MouseComponentName\r
-#  Create Event Guid C Name:  Event Type: EVENT_TYPE_RELATIVE_TIMER\r
-#  Create Event Guid C Name:  Event Type: EVENT_TYPE_PERIODIC_TIMER\r
-#\r
-#  Signal Event Guid C Name:  Event Type: EVENT_TYPE_RELATIVE_TIMER\r
-#\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
 \r
 [Sources.common]\r
   ComponentName.c\r


@@ -58,16 +35,6 @@
   CommPs2.c\r
   Ps2Mouse.h\r
   Ps2Mouse.c\r
   CommPs2.c\r
   Ps2Mouse.h\r
   Ps2Mouse.c\r

-  CommonHeader.h\r
-  EntryPoint.c\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
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r


@@ -75,14 +42,6 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.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
   ReportStatusCodeLib\r
   UefiBootServicesTableLib\r
 [LibraryClasses]\r
   ReportStatusCodeLib\r
   UefiBootServicesTableLib\r


@@ -92,14 +51,6 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
   UefiDriverEntryPoint\r
   DebugLib\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
   gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
   gEfiSimplePointerProtocolGuid                 # PROTOCOL BY_START\r
 [Protocols]\r
   gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START\r
   gEfiSimplePointerProtocolGuid                 # PROTOCOL BY_START\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 38556dcca80a873fe1c36e8ad5809ca3b212423a..cc43a674cd096065b6c8aa30404e97e79a9c2c11 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -177,9 +177,9 @@
   $(WORKSPACE)/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r

-  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.inf\r
-  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.inf\r
-  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.inf\r
+  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
+  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf\r
+  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r

   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index c88ff0317dad9b0ef95c1d1a4d21e04bc0e05115..be3b6d8f1d4d683b9f33278ee176d70fca3b27fc 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -4,7 +4,13 @@
 # This module provide an DXE CIS compliant implementation of DXE Core.\r
 # Copyright (c) 2006 - 2007, Intel Corporation\r
 #\r
 # This module provide an DXE CIS compliant implementation of DXE Core.\r
 # Copyright (c) 2006 - 2007, Intel Corporation\r
 #\r

-#  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.\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
+#\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


@@ -25,17 +31,7 @@
 \r
   ENTRY_POINT                    = DxeMain\r
 \r
 \r
   ENTRY_POINT                    = DxeMain\r
 \r

-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\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
   Library.h\r
 \r
 [Sources.common]\r
   Library.h\r


@@ -78,28 +74,11 @@
   Dispatcher/Dispatcher.c\r
   DxeMain/DxeProtocolNotify.c\r
   DxeMain/DxeMain.c\r
   Dispatcher/Dispatcher.c\r
   DxeMain/DxeProtocolNotify.c\r
   DxeMain/DxeMain.c\r

-  CommonHeader.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
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.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
   BaseMemoryLib\r
   CacheMaintenanceLib\r
 [LibraryClasses]\r
   BaseMemoryLib\r
   CacheMaintenanceLib\r


@@ -112,13 +91,6 @@
   DebugLib\r
   DxeCoreEntryPoint\r
 \r
   DebugLib\r
   DxeCoreEntryPoint\r
 \r

-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Guids]\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r
   gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED\r
 [Guids]\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r
   gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED\r


@@ -134,14 +106,6 @@
   gEfiDxeServicesTableGuid                      # ALWAYS_CONSUMED\r
   gEfiMemoryTypeInformationGuid                 # ALWAYS_CONSUMED\r
 \r
   gEfiDxeServicesTableGuid                      # ALWAYS_CONSUMED\r
   gEfiMemoryTypeInformationGuid                 # 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
   gEfiStatusCodeRuntimeProtocolGuid             # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
 [Protocols]\r
   gEfiStatusCodeRuntimeProtocolGuid             # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r