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