Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...
authorxli24 <xli24@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 31 Jan 2007 04:57:46 +0000 (04:57 +0000)
committerxli24 <xli24@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 31 Jan 2007 04:57:46 +0000 (04:57 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@2338 de2fecce-e211-0410-80a6-f3fac2684e05

100 files changed:
edk2/EdkModulePkg/Application/HelloWorld/HelloWorld.c
edk2/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.c
edk2/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.h
edk2/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.h
edk2/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430UgaDraw.c
edk2/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Pci/Ehci/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c
edk2/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h
edk2/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
edk2/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c
edk2/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
edk2/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h
edk2/EdkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.c
edk2/EdkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
edk2/EdkModulePkg/Bus/Pci/Uhci/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c
edk2/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.h
edk2/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
edk2/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
edk2/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi32.h
edk2/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
edk2/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.h
edk2/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c
edk2/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.h
edk2/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
edk2/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
edk2/EdkModulePkg/Bus/Usb/UsbBus/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
edk2/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
edk2/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
edk2/EdkModulePkg/Bus/Usb/UsbKb/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c
edk2/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.h
edk2/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.h
edk2/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c
edk2/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.h
edk2/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/ComponentName.c
edk2/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c
edk2/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
edk2/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
edk2/EdkModulePkg/Core/Dxe/DxeMain.h
edk2/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
edk2/EdkModulePkg/Core/Dxe/Event/timer.c
edk2/EdkModulePkg/Core/Dxe/Image/ImageFile.c
edk2/EdkModulePkg/Core/Dxe/Mem/Page.c
edk2/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
edk2/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
edk2/EdkModulePkg/Core/Pei/Ipf/IpfPeiMain.h [new file with mode: 0644]
edk2/EdkModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
edk2/EdkModulePkg/Core/Pei/PeiMain.msa
edk2/EdkModulePkg/Core/Pei/Security/Security.c
edk2/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
edk2/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
edk2/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
edk2/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
edk2/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
edk2/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.h
edk2/EdkModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
edk2/EdkModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
edk2/EdkModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
edk2/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.c
edk2/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.h
edk2/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
edk2/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c
edk2/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
edk2/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h [new file with mode: 0644]
edk2/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
edk2/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
edk2/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
edk2/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
edk2/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h
edk2/EdkModulePkg/Universal/Network/PxeBc/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
edk2/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4.c
edk2/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4.h
edk2/EdkModulePkg/Universal/Network/Snp32_64/Dxe/ComponentName.c
edk2/EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h
edk2/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
edk2/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
edk2/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
edk2/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
edk2/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c
edk2/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c
edk2/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h

index 1870510..cd6113f 100644 (file)
@@ -28,13 +28,6 @@ Print (
   return;\r
 }\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-UefiMain (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 UefiMain (\r
index 28be3f7..96ed4d5 100644 (file)
 \r
 #include "AtapiPassThru.h"\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-AtapiScsiPassThruDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-AtapiScsiPassThruDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-AtapiScsiPassThruDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
 ///\r
 /// IDE registers' fixed address\r
 ///\r
index fda5736..f14388b 100644 (file)
@@ -236,6 +236,53 @@ typedef struct {
 //\r
 // function prototype\r
 //\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+AtapiScsiPassThruDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+AtapiScsiPassThruDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+AtapiScsiPassThruDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      Controller,\r
+  IN  UINTN                           NumberOfChildren,\r
+  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+AtapiScsiPassThruComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+AtapiScsiPassThruComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 /**\r
   AtapiScsiPassThruDriverEntryPoint\r
 \r
index b0b2231..1731571 100644 (file)
 **/\r
 #include "AtapiPassThru.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-AtapiScsiPassThruComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-AtapiScsiPassThruComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 ///\r
 /// EFI Component Name Protocol\r
 ///\r
index b1984c8..af841b7 100644 (file)
@@ -62,6 +62,19 @@ typedef struct {
   UINT8                                 *LineBuffer;\r
 } CIRRUS_LOGIC_5430_PRIVATE_DATA;\r
 \r
+///\r
+/// Video Mode structure\r
+///\r
+typedef struct {\r
+  UINT32  Width;\r
+  UINT32  Height;\r
+  UINT32  ColorDepth;\r
+  UINT32  RefreshRate;\r
+  UINT8   *CrtcSettings;\r
+  UINT16  *SeqSettings;\r
+  UINT8   MiscSetting;\r
+} CIRRUS_LOGIC_5430_VIDEO_MODES;\r
+\r
 #define CIRRUS_LOGIC_5430_PRIVATE_DATA_FROM_UGA_DRAW_THIS(a) \\r
   CR(a, CIRRUS_LOGIC_5430_PRIVATE_DATA, UgaDraw, CIRRUS_LOGIC_5430_PRIVATE_DATA_SIGNATURE)\r
 \r
@@ -200,4 +213,79 @@ CirrusLogic5430ControllerDriverStop (
   )\r
 ;\r
 \r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+CirrusLogic5430ComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CirrusLogic5430ComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+//\r
+// Local Function Prototypes\r
+//\r
+VOID\r
+InitializeGraphicsMode (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  CIRRUS_LOGIC_5430_VIDEO_MODES   *ModeData\r
+  );\r
+\r
+VOID\r
+SetPaletteColor (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  UINTN                           Index,\r
+  UINT8                           Red,\r
+  UINT8                           Green,\r
+  UINT8                           Blue\r
+  );\r
+\r
+VOID\r
+SetDefaultPalette (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
+  );\r
+\r
+VOID\r
+DrawLogo (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
+  );\r
+\r
+VOID\r
+outb (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  UINTN                           Address,\r
+  UINT8                           Data\r
+  );\r
+\r
+VOID\r
+outw (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  UINTN                           Address,\r
+  UINT16                          Data\r
+  );\r
+\r
+UINT8\r
+inb (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  UINTN                           Address\r
+  );\r
+\r
+UINT16\r
+inw (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
+  UINTN                           Address\r
+  );\r
+\r
 #endif\r
index be05f87..e71ec8e 100644 (file)
 \r
 #include "CirrusLogic5430.h"\r
 \r
-///\r
-/// Video Mode structure\r
-///\r
-typedef struct {\r
-  UINT32  Width;\r
-  UINT32  Height;\r
-  UINT32  ColorDepth;\r
-  UINT32  RefreshRate;\r
-  UINT8   *CrtcSettings;\r
-  UINT16  *SeqSettings;\r
-  UINT8   MiscSetting;\r
-} CIRRUS_LOGIC_5430_VIDEO_MODES;\r
+STATIC\r
+VOID\r
+ClearScreen (\r
+  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
+  );\r
 \r
 ///\r
 /// Generic Attribute Controller Register Settings\r
@@ -99,66 +92,6 @@ static CIRRUS_LOGIC_5430_VIDEO_MODES  CirrusLogic5430VideoModes[] = {
   { 1024, 768, 8, 60, Crtc_1024_768_256_60, Seq_1024_768_256_60, 0xef } \r
 };\r
 \r
-//\r
-// Local Function Prototypes\r
-//\r
-VOID\r
-InitializeGraphicsMode (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  CIRRUS_LOGIC_5430_VIDEO_MODES   *ModeData\r
-  );\r
-\r
-VOID\r
-SetPaletteColor (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  UINTN                           Index,\r
-  UINT8                           Red,\r
-  UINT8                           Green,\r
-  UINT8                           Blue\r
-  );\r
-\r
-VOID\r
-SetDefaultPalette (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
-  );\r
-\r
-STATIC\r
-VOID\r
-ClearScreen (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
-  );\r
-\r
-VOID\r
-DrawLogo (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
-  );\r
-\r
-VOID\r
-outb (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT8                           Data\r
-  );\r
-\r
-VOID\r
-outw (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT16                          Data\r
-  );\r
-\r
-UINT8\r
-inb (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
-  );\r
-\r
-UINT16\r
-inw (\r
-  CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
-  );\r
-\r
 //\r
 // UGA Draw Protocol Member Functions\r
 //\r
index 38d86a5..361bf83 100644 (file)
 \r
 #include "CirrusLogic5430.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-CirrusLogic5430ComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CirrusLogic5430ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 12cb766..5d332e0 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "Ehci.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-EhciComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index e6a4f61..cb89e17 100644 (file)
@@ -27,190 +27,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINTN    gEHCDebugLevel  = EFI_D_ERROR;
 GLOBAL_REMOVE_IF_UNREFERENCED UINTN    gEHCErrorLevel  = EFI_D_ERROR;\r
 \r
 \r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
-//\r
-// Ehci protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-EhciGetCapability (\r
-  IN  EFI_USB2_HC_PROTOCOL   *This,\r
-  OUT UINT8                  *MaxSpeed,\r
-  OUT UINT8                  *PortNumber,\r
-  OUT UINT8                  *Is64BitCapable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciReset (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  IN  UINT16                   Attributes\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciGetState (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  OUT EFI_USB_HC_STATE         *State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciSetState (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  IN  EFI_USB_HC_STATE         State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciControlTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                 *This,\r
-  IN  UINT8                                DeviceAddress,\r
-  IN  UINT8                                DeviceSpeed,\r
-  IN  UINTN                                MaximumPacketLength,\r
-  IN  EFI_USB_DEVICE_REQUEST               *Request,\r
-  IN  EFI_USB_DATA_DIRECTION               TransferDirection,\r
-  IN  OUT VOID                             *Data,\r
-  IN  OUT UINTN                            *DataLength,\r
-  IN  UINTN                                TimeOut,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR   *Translator,\r
-  OUT UINT32                               *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciBulkTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                *This,\r
-  IN  UINT8                               DeviceAddress,\r
-  IN  UINT8                               EndPointAddress,\r
-  IN  UINT8                               DeviceSpeed,\r
-  IN  UINTN                               MaximumPacketLength,\r
-  IN  UINT8                               DataBuffersNumber,\r
-  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
-  IN  OUT UINTN                           *DataLength,\r
-  IN  OUT UINT8                           *DataToggle,\r
-  IN  UINTN                               TimeOut,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR  *Translator,\r
-  OUT UINT32                              *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciAsyncInterruptTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                  * This,\r
-  IN  UINT8                                 DeviceAddress,\r
-  IN  UINT8                                 EndPointAddress,\r
-  IN  UINT8                                 DeviceSpeed,\r
-  IN  UINTN                                 MaxiumPacketLength,\r
-  IN  BOOLEAN                               IsNewTransfer,\r
-  IN  OUT UINT8                             *DataToggle,\r
-  IN  UINTN                                 PollingInterval,\r
-  IN  UINTN                                 DataLength,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
-  IN  EFI_ASYNC_USB_TRANSFER_CALLBACK       CallBackFunction,\r
-  IN  VOID                                  *Context OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciSyncInterruptTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                  *This,\r
-  IN  UINT8                                 DeviceAddress,\r
-  IN  UINT8                                 EndPointAddress,\r
-  IN  UINT8                                 DeviceSpeed,\r
-  IN  UINTN                                 MaximumPacketLength,\r
-  IN  OUT VOID                              *Data,\r
-  IN  OUT UINTN                             *DataLength,\r
-  IN  OUT UINT8                             *DataToggle,\r
-  IN  UINTN                                 TimeOut,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
-  OUT UINT32                                *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciIsochronousTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                  *This,\r
-  IN  UINT8                                 DeviceAddress,\r
-  IN  UINT8                                 EndPointAddress,\r
-  IN  UINT8                                 DeviceSpeed,\r
-  IN  UINTN                                 MaximumPacketLength,\r
-  IN  UINT8                                 DataBuffersNumber,\r
-  IN  OUT VOID                              *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
-  IN  UINTN                                 DataLength,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
-  OUT UINT32                                *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciAsyncIsochronousTransfer (\r
-  IN  EFI_USB2_HC_PROTOCOL                *This,\r
-  IN  UINT8                               DeviceAddress,\r
-  IN  UINT8                               EndPointAddress,\r
-  IN  UINT8                               DeviceSpeed,\r
-  IN  UINTN                               MaximumPacketLength,\r
-  IN  UINT8                               DataBuffersNumber,\r
-  IN  OUT VOID                            *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
-  IN  UINTN                               DataLength,\r
-  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR  *Translator,\r
-  IN  EFI_ASYNC_USB_TRANSFER_CALLBACK     IsochronousCallBack,\r
-  IN  VOID                                *Context\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciGetRootHubPortStatus (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  IN  UINT8                    PortNumber,\r
-  OUT EFI_USB_PORT_STATUS      *PortStatus\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciSetRootHubPortFeature (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  IN  UINT8                    PortNumber,\r
-  IN  EFI_USB_PORT_FEATURE     PortFeature\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-EhciClearRootHubPortFeature (\r
-  IN  EFI_USB2_HC_PROTOCOL     *This,\r
-  IN  UINT8                    PortNumber,\r
-  IN  EFI_USB_PORT_FEATURE     PortFeature\r
-  );\r
-\r
 //\r
 // Ehci Driver Global Variables\r
 //\r
index 603bb26..dcf3e56 100644 (file)
@@ -403,6 +403,211 @@ typedef struct _USB2_HC_DEV {
 } USB2_HC_DEV;\r
 \r
 \r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      Controller,\r
+  IN  UINTN                           NumberOfChildren,\r
+  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// Ehci protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+EhciGetCapability (\r
+  IN  EFI_USB2_HC_PROTOCOL   *This,\r
+  OUT UINT8                  *MaxSpeed,\r
+  OUT UINT8                  *PortNumber,\r
+  OUT UINT8                  *Is64BitCapable\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciReset (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  IN  UINT16                   Attributes\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciGetState (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  OUT EFI_USB_HC_STATE         *State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciSetState (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  IN  EFI_USB_HC_STATE         State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciControlTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                 *This,\r
+  IN  UINT8                                DeviceAddress,\r
+  IN  UINT8                                DeviceSpeed,\r
+  IN  UINTN                                MaximumPacketLength,\r
+  IN  EFI_USB_DEVICE_REQUEST               *Request,\r
+  IN  EFI_USB_DATA_DIRECTION               TransferDirection,\r
+  IN  OUT VOID                             *Data,\r
+  IN  OUT UINTN                            *DataLength,\r
+  IN  UINTN                                TimeOut,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR   *Translator,\r
+  OUT UINT32                               *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciBulkTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                *This,\r
+  IN  UINT8                               DeviceAddress,\r
+  IN  UINT8                               EndPointAddress,\r
+  IN  UINT8                               DeviceSpeed,\r
+  IN  UINTN                               MaximumPacketLength,\r
+  IN  UINT8                               DataBuffersNumber,\r
+  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
+  IN  OUT UINTN                           *DataLength,\r
+  IN  OUT UINT8                           *DataToggle,\r
+  IN  UINTN                               TimeOut,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR  *Translator,\r
+  OUT UINT32                              *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciAsyncInterruptTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                  * This,\r
+  IN  UINT8                                 DeviceAddress,\r
+  IN  UINT8                                 EndPointAddress,\r
+  IN  UINT8                                 DeviceSpeed,\r
+  IN  UINTN                                 MaxiumPacketLength,\r
+  IN  BOOLEAN                               IsNewTransfer,\r
+  IN  OUT UINT8                             *DataToggle,\r
+  IN  UINTN                                 PollingInterval,\r
+  IN  UINTN                                 DataLength,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
+  IN  EFI_ASYNC_USB_TRANSFER_CALLBACK       CallBackFunction,\r
+  IN  VOID                                  *Context OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciSyncInterruptTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                  *This,\r
+  IN  UINT8                                 DeviceAddress,\r
+  IN  UINT8                                 EndPointAddress,\r
+  IN  UINT8                                 DeviceSpeed,\r
+  IN  UINTN                                 MaximumPacketLength,\r
+  IN  OUT VOID                              *Data,\r
+  IN  OUT UINTN                             *DataLength,\r
+  IN  OUT UINT8                             *DataToggle,\r
+  IN  UINTN                                 TimeOut,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
+  OUT UINT32                                *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciIsochronousTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                  *This,\r
+  IN  UINT8                                 DeviceAddress,\r
+  IN  UINT8                                 EndPointAddress,\r
+  IN  UINT8                                 DeviceSpeed,\r
+  IN  UINTN                                 MaximumPacketLength,\r
+  IN  UINT8                                 DataBuffersNumber,\r
+  IN  OUT VOID                              *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
+  IN  UINTN                                 DataLength,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR    *Translator,\r
+  OUT UINT32                                *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciAsyncIsochronousTransfer (\r
+  IN  EFI_USB2_HC_PROTOCOL                *This,\r
+  IN  UINT8                               DeviceAddress,\r
+  IN  UINT8                               EndPointAddress,\r
+  IN  UINT8                               DeviceSpeed,\r
+  IN  UINTN                               MaximumPacketLength,\r
+  IN  UINT8                               DataBuffersNumber,\r
+  IN  OUT VOID                            *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
+  IN  UINTN                               DataLength,\r
+  IN  EFI_USB2_HC_TRANSACTION_TRANSLATOR  *Translator,\r
+  IN  EFI_ASYNC_USB_TRANSFER_CALLBACK     IsochronousCallBack,\r
+  IN  VOID                                *Context\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciGetRootHubPortStatus (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  IN  UINT8                    PortNumber,\r
+  OUT EFI_USB_PORT_STATUS      *PortStatus\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciSetRootHubPortFeature (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  IN  UINT8                    PortNumber,\r
+  IN  EFI_USB_PORT_FEATURE     PortFeature\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciClearRootHubPortFeature (\r
+  IN  EFI_USB2_HC_PROTOCOL     *This,\r
+  IN  UINT8                    PortNumber,\r
+  IN  EFI_USB_PORT_FEATURE     PortFeature\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+EhciComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+EhciComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      ControllerHandle,\r
+  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **ControllerName\r
+  );\r
+\r
 //\r
 // Internal Functions Declaration\r
 //\r
index 6a05562..7ee2ab3 100644 (file)
@@ -18,33 +18,6 @@ CHAR16 *OptionString[4] = {
   L"Enable Secondary Master  (Y/N)? -->",\r
   L"Enable Secondary Slave   (Y/N)? -->"\r
 };\r
-//\r
-// EFI Driver Configuration Functions\r
-//\r
-EFI_STATUS\r
-IDEBusDriverConfigurationSetOptions (\r
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
-  IN  EFI_HANDLE                                             ControllerHandle,\r
-  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,\r
-  IN  CHAR8                                                  *Language,\r
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired\r
-  );\r
-\r
-EFI_STATUS\r
-IDEBusDriverConfigurationOptionsValid (\r
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-IDEBusDriverConfigurationForceDefaults (\r
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
-  IN  EFI_HANDLE                                             ControllerHandle,\r
-  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,\r
-  IN  UINT32                                                 DefaultType,\r
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired\r
-  );\r
 \r
 //\r
 // EFI Driver Configuration Protocol\r
index 83a273a..44d767c 100644 (file)
 \r
 #define IDE_BUS_DIAGNOSTIC_ERROR  L"PCI IDE/ATAPI Driver Diagnostics Failed"\r
 \r
-//\r
-// EFI Driver Diagnostics Functions\r
-//\r
-EFI_STATUS\r
-IDEBusDriverDiagnosticsRunDiagnostics (\r
-  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
-  IN  EFI_HANDLE                                    ControllerHandle,\r
-  IN  EFI_HANDLE                                    ChildHandle  OPTIONAL,\r
-  IN  EFI_DRIVER_DIAGNOSTIC_TYPE                    DiagnosticType,\r
-  IN  CHAR8                                         *Language,\r
-  OUT EFI_GUID                                      **ErrorType,\r
-  OUT UINTN                                         *BufferSize,\r
-  OUT CHAR16                                        **Buffer\r
-  );\r
-\r
 //\r
 // EFI Driver Diagnostics Protocol\r
 //\r
index 7ea54b9..aea126b 100644 (file)
 \r
 #include "idebus.h"\r
 \r
-\r
-EFI_STATUS\r
-AtaReadSectorsExt (\r
-  IN  IDE_BLK_IO_DEV  *IdeDev,\r
-  IN  OUT VOID        *DataBuffer,\r
-  IN  EFI_LBA         StartLba,\r
-  IN  UINTN           NumberOfBlocks\r
-  );\r
-\r
-EFI_STATUS\r
-AtaWriteSectorsExt (\r
-  IN  IDE_BLK_IO_DEV  *IdeDev,\r
-  IN  VOID            *DataBuffer,\r
-  IN  EFI_LBA         StartLba,\r
-  IN  UINTN           NumberOfBlocks\r
-  );\r
-\r
-EFI_STATUS\r
-AtaPioDataInExt (\r
-  IN  IDE_BLK_IO_DEV  *IdeDev,\r
-  IN  OUT VOID        *Buffer,\r
-  IN  UINT32          ByteCount,\r
-  IN  UINT8           AtaCommand,\r
-  IN  EFI_LBA         StartLba,\r
-  IN  UINT16          SectorCount\r
-  );\r
-\r
-EFI_STATUS\r
-AtaPioDataOutExt (\r
-  IN  IDE_BLK_IO_DEV  *IdeDev,\r
-  IN  VOID            *Buffer,\r
-  IN  UINT32          ByteCount,\r
-  IN  UINT8           AtaCommand,\r
-  IN  EFI_LBA         StartLba,\r
-  IN  UINT16          SectorCount\r
-  );\r
-\r
 /**\r
   Sends out an ATA Identify Command to the specified device.\r
 \r
index e49e762..52c1f26 100644 (file)
@@ -171,6 +171,49 @@ IDEBusDriverBindingStop (
   )\r
 ;\r
 \r
+//\r
+// EFI Driver Configuration Functions\r
+//\r
+EFI_STATUS\r
+IDEBusDriverConfigurationSetOptions (\r
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
+  IN  EFI_HANDLE                                             ControllerHandle,\r
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,\r
+  IN  CHAR8                                                  *Language,\r
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired\r
+  );\r
+\r
+EFI_STATUS\r
+IDEBusDriverConfigurationOptionsValid (\r
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+IDEBusDriverConfigurationForceDefaults (\r
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
+  IN  EFI_HANDLE                                             ControllerHandle,\r
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,\r
+  IN  UINT32                                                 DefaultType,\r
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired\r
+  );\r
+\r
+//\r
+// EFI Driver Diagnostics Functions\r
+//\r
+EFI_STATUS\r
+IDEBusDriverDiagnosticsRunDiagnostics (\r
+  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
+  IN  EFI_HANDLE                                    ControllerHandle,\r
+  IN  EFI_HANDLE                                    ChildHandle  OPTIONAL,\r
+  IN  EFI_DRIVER_DIAGNOSTIC_TYPE                    DiagnosticType,\r
+  IN  CHAR8                                         *Language,\r
+  OUT EFI_GUID                                      **ErrorType,\r
+  OUT UINTN                                         *BufferSize,\r
+  OUT CHAR16                                        **Buffer\r
+  );\r
+\r
 //\r
 // Block I/O Protocol Interface\r
 //\r
index 43d3e38..eb6713f 100644 (file)
@@ -23,42 +23,6 @@ Revision History
 \r
 #include "pcibus.h"\r
 \r
-//\r
-// PCI Bus Support Function Prototypes\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PciBusEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PciBusDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PciBusDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PciBusDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
-  IN  EFI_HANDLE                    Controller,\r
-  IN  UINTN                         NumberOfChildren,\r
-  IN  EFI_HANDLE                    *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // PCI Bus Driver Global Variables\r
 //\r
index a18d12f..cd34d87 100644 (file)
@@ -240,4 +240,32 @@ extern EFI_PCI_PLATFORM_PROTOCOL                    *gPciPlatformProtocol;
 #include "PciHotPlugSupport.h"\r
 #include "PciLib.h"\r
 \r
+//\r
+// PCI Bus Support Function Prototypes\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PciBusDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PciBusDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PciBusDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
+  IN  EFI_HANDLE                    Controller,\r
+  IN  UINTN                         NumberOfChildren,\r
+  IN  EFI_HANDLE                    *ChildHandleBuffer\r
+  );\r
+\r
 #endif\r
index 909912f..b6209e4 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "uhci.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UhciComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UhciComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 7e033df..b3cb1f5 100644 (file)
@@ -21,342 +21,6 @@ Revision History
 \r
 #include "uhci.h"\r
 \r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
-//\r
-// UHCI interface functions\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIReset (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  IN  UINT16                  Attributes\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIGetState (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  OUT EFI_USB_HC_STATE        *State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCISetState (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  IN  EFI_USB_HC_STATE        State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIControlTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL        *This,\r
-  IN       UINT8                      DeviceAddress,\r
-  IN       BOOLEAN                    IsSlowDevice,\r
-  IN       UINT8                      MaximumPacketLength,\r
-  IN       EFI_USB_DEVICE_REQUEST     *Request,\r
-  IN       EFI_USB_DATA_DIRECTION     TransferDirection,\r
-  IN OUT   VOID                       *Data, OPTIONAL\r
-  IN OUT   UINTN                      *DataLength, OPTIONAL\r
-  IN       UINTN                      TimeOut,\r
-  OUT      UINT32                     *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIBulkTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL     *This,\r
-  IN       UINT8                   DeviceAddress,\r
-  IN       UINT8                   EndPointAddress,\r
-  IN       UINT8                   MaximumPacketLength,\r
-  IN OUT   VOID                    *Data,\r
-  IN OUT   UINTN                   *DataLength,\r
-  IN OUT   UINT8                   *DataToggle,\r
-  IN       UINTN                   TimeOut,\r
-  OUT      UINT32                  *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIAsyncInterruptTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL                * This,\r
-  IN       UINT8                              DeviceAddress,\r
-  IN       UINT8                              EndPointAddress,\r
-  IN       BOOLEAN                            IsSlowDevice,\r
-  IN       UINT8                              MaximumPacketLength,\r
-  IN       BOOLEAN                            IsNewTransfer,\r
-  IN OUT   UINT8                              *DataToggle,\r
-  IN       UINTN                              PollingInterval, OPTIONAL\r
-  IN       UINTN                              DataLength, OPTIONAL\r
-  IN       EFI_ASYNC_USB_TRANSFER_CALLBACK    CallBackFunction, OPTIONAL\r
-  IN       VOID                               *Context OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCISyncInterruptTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL     *This,\r
-  IN       UINT8                   DeviceAddress,\r
-  IN       UINT8                   EndPointAddress,\r
-  IN       BOOLEAN                 IsSlowDevice,\r
-  IN       UINT8                   MaximumPacketLength,\r
-  IN OUT   VOID                    *Data,\r
-  IN OUT   UINTN                   *DataLength,\r
-  IN OUT   UINT8                   *DataToggle,\r
-  IN       UINTN                   TimeOut,\r
-  OUT      UINT32                  *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIIsochronousTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL     *This,\r
-  IN       UINT8                   DeviceAddress,\r
-  IN       UINT8                   EndPointAddress,\r
-  IN       UINT8                   MaximumPacketLength,\r
-  IN OUT   VOID                    *Data,\r
-  IN       UINTN                   DataLength,\r
-  OUT      UINT32                  *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIAsyncIsochronousTransfer (\r
-  IN       EFI_USB_HC_PROTOCOL                 * This,\r
-  IN       UINT8                               DeviceAddress,\r
-  IN       UINT8                               EndPointAddress,\r
-  IN       UINT8                               MaximumPacketLength,\r
-  IN OUT   VOID                                *Data,\r
-  IN       UINTN                               DataLength,\r
-  IN       EFI_ASYNC_USB_TRANSFER_CALLBACK     IsochronousCallBack,\r
-  IN       VOID                                *Context OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIGetRootHubPortNumber (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  OUT UINT8                   *PortNumber\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIGetRootHubPortStatus (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  IN  UINT8                   PortNumber,\r
-  OUT EFI_USB_PORT_STATUS     *PortStatus\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCISetRootHubPortFeature (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  IN  UINT8                   PortNumber,\r
-  IN  EFI_USB_PORT_FEATURE    PortFeature\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCIClearRootHubPortFeature (\r
-  IN  EFI_USB_HC_PROTOCOL     *This,\r
-  IN  UINT8                   PortNumber,\r
-  IN  EFI_USB_PORT_FEATURE    PortFeature\r
-  );\r
-\r
-//\r
-// UEFI 2.0 Protocol\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2GetCapability(\r
-  IN  EFI_USB2_HC_PROTOCOL  * This,\r
-  OUT UINT8                 *MaxSpeed,\r
-  OUT UINT8                 *PortNumber,\r
-  OUT UINT8                 *Is64BitCapable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2Reset (\r
-  IN EFI_USB2_HC_PROTOCOL   * This,\r
-  IN UINT16                 Attributes\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2GetState (\r
-  IN  EFI_USB2_HC_PROTOCOL   * This,\r
-  OUT EFI_USB_HC_STATE       * State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2SetState (\r
-  IN EFI_USB2_HC_PROTOCOL   * This,\r
-  IN EFI_USB_HC_STATE       State\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2ControlTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL      * This,\r
-  IN     UINT8                     DeviceAddress,\r
-  IN     UINT8                     DeviceSpeed,\r
-  IN     UINTN                     MaximumPacketLength,\r
-  IN     EFI_USB_DEVICE_REQUEST    * Request,\r
-  IN     EFI_USB_DATA_DIRECTION    TransferDirection,\r
-  IN OUT VOID                      *Data, OPTIONAL\r
-  IN OUT UINTN                     *DataLength, OPTIONAL\r
-  IN     UINTN                     TimeOut,\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
-  OUT    UINT32                    *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2BulkTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL   * This,\r
-  IN     UINT8                  DeviceAddress,\r
-  IN     UINT8                  EndPointAddress,\r
-  IN     UINT8                  DeviceSpeed,\r
-  IN     UINTN                  MaximumPacketLength,\r
-  IN     UINT8                  DataBuffersNumber,\r
-  IN OUT VOID                   *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
-  IN OUT UINTN                  *DataLength,\r
-  IN OUT UINT8                  *DataToggle,\r
-  IN     UINTN                  TimeOut,\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
-  OUT    UINT32                 *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2AsyncInterruptTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL   * This,\r
-  IN     UINT8                  DeviceAddress,\r
-  IN     UINT8                  EndPointAddress,\r
-  IN     UINT8                  DeviceSpeed,\r
-  IN     UINTN                  MaximumPacketLength,\r
-  IN     BOOLEAN                IsNewTransfer,\r
-  IN OUT UINT8                  *DataToggle,\r
-  IN     UINTN                  PollingInterval, OPTIONAL\r
-  IN     UINTN                  DataLength, OPTIONAL\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
-  IN     EFI_ASYNC_USB_TRANSFER_CALLBACK               CallBackFunction, OPTIONAL\r
-  IN     VOID                   *Context OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2SyncInterruptTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL   * This,\r
-  IN     UINT8                  DeviceAddress,\r
-  IN     UINT8                  EndPointAddress,\r
-  IN     UINT8                  DeviceSpeed,\r
-  IN     UINTN                  MaximumPacketLength,\r
-  IN OUT VOID                   *Data,\r
-  IN OUT UINTN                  *DataLength,\r
-  IN OUT UINT8                  *DataToggle,\r
-  IN     UINTN                  TimeOut,\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
-  OUT    UINT32                 *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2IsochronousTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL   * This,\r
-  IN     UINT8                  DeviceAddress,\r
-  IN     UINT8                  EndPointAddress,\r
-  IN     UINT8                  DeviceSpeed,\r
-  IN     UINTN                  MaximumPacketLength,\r
-  IN     UINT8                  DataBuffersNumber,\r
-  IN OUT VOID                   *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
-  IN     UINTN                  DataLength,\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
-  OUT    UINT32                 *TransferResult\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2AsyncIsochronousTransfer (\r
-  IN     EFI_USB2_HC_PROTOCOL   * This,\r
-  IN     UINT8                  DeviceAddress,\r
-  IN     UINT8                  EndPointAddress,\r
-  IN     UINT8                  DeviceSpeed,\r
-  IN     UINTN                  MaximumPacketLength,\r
-  IN     UINT8                  DataBuffersNumber,\r
-  IN OUT VOID                   *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
-  IN     UINTN                  DataLength,\r
-  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
-  IN     EFI_ASYNC_USB_TRANSFER_CALLBACK              IsochronousCallBack,\r
-  IN     VOID                   *Context OPTIONAL\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2GetRootHubPortStatus (\r
-  IN  EFI_USB2_HC_PROTOCOL   * This,\r
-  IN  UINT8                  PortNumber,\r
-  OUT EFI_USB_PORT_STATUS    * PortStatus\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2SetRootHubPortFeature (\r
-  IN EFI_USB2_HC_PROTOCOL    * This,\r
-  IN UINT8                   PortNumber,\r
-  IN EFI_USB_PORT_FEATURE    PortFeature\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UHCI2ClearRootHubPortFeature (\r
-  IN EFI_USB2_HC_PROTOCOL    * This,\r
-  IN UINT8                   PortNumber,\r
-  IN EFI_USB_PORT_FEATURE    PortFeature\r
-  );\r
-\r
-//\r
-// Asynchronous interrupt transfer monitor function\r
-//\r
-VOID\r
-EFIAPI\r
-MonitorInterruptTrans (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
-  );\r
-\r
 //\r
 // UHCI Driver Global Variables\r
 //\r
index c224a16..68571c5 100644 (file)
@@ -285,6 +285,27 @@ typedef struct {
 extern EFI_DRIVER_BINDING_PROTOCOL  gUhciDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUhciComponentName;\r
 \r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UhciComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UhciComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      ControllerHandle,\r
+  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **ControllerName\r
+  );\r
+\r
 EFI_STATUS\r
 WriteUHCCommandReg (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
@@ -2635,4 +2656,340 @@ Returns:
 --*/\r
 ;\r
 \r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      Controller,\r
+  IN  UINTN                           NumberOfChildren,\r
+  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// UHCI interface functions\r
+//\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIReset (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  IN  UINT16                  Attributes\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIGetState (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  OUT EFI_USB_HC_STATE        *State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCISetState (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  IN  EFI_USB_HC_STATE        State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIControlTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL        *This,\r
+  IN       UINT8                      DeviceAddress,\r
+  IN       BOOLEAN                    IsSlowDevice,\r
+  IN       UINT8                      MaximumPacketLength,\r
+  IN       EFI_USB_DEVICE_REQUEST     *Request,\r
+  IN       EFI_USB_DATA_DIRECTION     TransferDirection,\r
+  IN OUT   VOID                       *Data, OPTIONAL\r
+  IN OUT   UINTN                      *DataLength, OPTIONAL\r
+  IN       UINTN                      TimeOut,\r
+  OUT      UINT32                     *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIBulkTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL     *This,\r
+  IN       UINT8                   DeviceAddress,\r
+  IN       UINT8                   EndPointAddress,\r
+  IN       UINT8                   MaximumPacketLength,\r
+  IN OUT   VOID                    *Data,\r
+  IN OUT   UINTN                   *DataLength,\r
+  IN OUT   UINT8                   *DataToggle,\r
+  IN       UINTN                   TimeOut,\r
+  OUT      UINT32                  *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIAsyncInterruptTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL                * This,\r
+  IN       UINT8                              DeviceAddress,\r
+  IN       UINT8                              EndPointAddress,\r
+  IN       BOOLEAN                            IsSlowDevice,\r
+  IN       UINT8                              MaximumPacketLength,\r
+  IN       BOOLEAN                            IsNewTransfer,\r
+  IN OUT   UINT8                              *DataToggle,\r
+  IN       UINTN                              PollingInterval, OPTIONAL\r
+  IN       UINTN                              DataLength, OPTIONAL\r
+  IN       EFI_ASYNC_USB_TRANSFER_CALLBACK    CallBackFunction, OPTIONAL\r
+  IN       VOID                               *Context OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCISyncInterruptTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL     *This,\r
+  IN       UINT8                   DeviceAddress,\r
+  IN       UINT8                   EndPointAddress,\r
+  IN       BOOLEAN                 IsSlowDevice,\r
+  IN       UINT8                   MaximumPacketLength,\r
+  IN OUT   VOID                    *Data,\r
+  IN OUT   UINTN                   *DataLength,\r
+  IN OUT   UINT8                   *DataToggle,\r
+  IN       UINTN                   TimeOut,\r
+  OUT      UINT32                  *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIIsochronousTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL     *This,\r
+  IN       UINT8                   DeviceAddress,\r
+  IN       UINT8                   EndPointAddress,\r
+  IN       UINT8                   MaximumPacketLength,\r
+  IN OUT   VOID                    *Data,\r
+  IN       UINTN                   DataLength,\r
+  OUT      UINT32                  *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIAsyncIsochronousTransfer (\r
+  IN       EFI_USB_HC_PROTOCOL                 * This,\r
+  IN       UINT8                               DeviceAddress,\r
+  IN       UINT8                               EndPointAddress,\r
+  IN       UINT8                               MaximumPacketLength,\r
+  IN OUT   VOID                                *Data,\r
+  IN       UINTN                               DataLength,\r
+  IN       EFI_ASYNC_USB_TRANSFER_CALLBACK     IsochronousCallBack,\r
+  IN       VOID                                *Context OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIGetRootHubPortNumber (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  OUT UINT8                   *PortNumber\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIGetRootHubPortStatus (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  IN  UINT8                   PortNumber,\r
+  OUT EFI_USB_PORT_STATUS     *PortStatus\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCISetRootHubPortFeature (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  IN  UINT8                   PortNumber,\r
+  IN  EFI_USB_PORT_FEATURE    PortFeature\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCIClearRootHubPortFeature (\r
+  IN  EFI_USB_HC_PROTOCOL     *This,\r
+  IN  UINT8                   PortNumber,\r
+  IN  EFI_USB_PORT_FEATURE    PortFeature\r
+  );\r
+\r
+//\r
+// UEFI 2.0 Protocol\r
+//\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2GetCapability(\r
+  IN  EFI_USB2_HC_PROTOCOL  * This,\r
+  OUT UINT8                 *MaxSpeed,\r
+  OUT UINT8                 *PortNumber,\r
+  OUT UINT8                 *Is64BitCapable\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2Reset (\r
+  IN EFI_USB2_HC_PROTOCOL   * This,\r
+  IN UINT16                 Attributes\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2GetState (\r
+  IN  EFI_USB2_HC_PROTOCOL   * This,\r
+  OUT EFI_USB_HC_STATE       * State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2SetState (\r
+  IN EFI_USB2_HC_PROTOCOL   * This,\r
+  IN EFI_USB_HC_STATE       State\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2ControlTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL      * This,\r
+  IN     UINT8                     DeviceAddress,\r
+  IN     UINT8                     DeviceSpeed,\r
+  IN     UINTN                     MaximumPacketLength,\r
+  IN     EFI_USB_DEVICE_REQUEST    * Request,\r
+  IN     EFI_USB_DATA_DIRECTION    TransferDirection,\r
+  IN OUT VOID                      *Data, OPTIONAL\r
+  IN OUT UINTN                     *DataLength, OPTIONAL\r
+  IN     UINTN                     TimeOut,\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
+  OUT    UINT32                    *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2BulkTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL   * This,\r
+  IN     UINT8                  DeviceAddress,\r
+  IN     UINT8                  EndPointAddress,\r
+  IN     UINT8                  DeviceSpeed,\r
+  IN     UINTN                  MaximumPacketLength,\r
+  IN     UINT8                  DataBuffersNumber,\r
+  IN OUT VOID                   *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
+  IN OUT UINTN                  *DataLength,\r
+  IN OUT UINT8                  *DataToggle,\r
+  IN     UINTN                  TimeOut,\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
+  OUT    UINT32                 *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2AsyncInterruptTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL   * This,\r
+  IN     UINT8                  DeviceAddress,\r
+  IN     UINT8                  EndPointAddress,\r
+  IN     UINT8                  DeviceSpeed,\r
+  IN     UINTN                  MaximumPacketLength,\r
+  IN     BOOLEAN                IsNewTransfer,\r
+  IN OUT UINT8                  *DataToggle,\r
+  IN     UINTN                  PollingInterval, OPTIONAL\r
+  IN     UINTN                  DataLength, OPTIONAL\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR            *Translator,\r
+  IN     EFI_ASYNC_USB_TRANSFER_CALLBACK               CallBackFunction, OPTIONAL\r
+  IN     VOID                   *Context OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2SyncInterruptTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL   * This,\r
+  IN     UINT8                  DeviceAddress,\r
+  IN     UINT8                  EndPointAddress,\r
+  IN     UINT8                  DeviceSpeed,\r
+  IN     UINTN                  MaximumPacketLength,\r
+  IN OUT VOID                   *Data,\r
+  IN OUT UINTN                  *DataLength,\r
+  IN OUT UINT8                  *DataToggle,\r
+  IN     UINTN                  TimeOut,\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
+  OUT    UINT32                 *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2IsochronousTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL   * This,\r
+  IN     UINT8                  DeviceAddress,\r
+  IN     UINT8                  EndPointAddress,\r
+  IN     UINT8                  DeviceSpeed,\r
+  IN     UINTN                  MaximumPacketLength,\r
+  IN     UINT8                  DataBuffersNumber,\r
+  IN OUT VOID                   *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
+  IN     UINTN                  DataLength,\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
+  OUT    UINT32                 *TransferResult\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2AsyncIsochronousTransfer (\r
+  IN     EFI_USB2_HC_PROTOCOL   * This,\r
+  IN     UINT8                  DeviceAddress,\r
+  IN     UINT8                  EndPointAddress,\r
+  IN     UINT8                  DeviceSpeed,\r
+  IN     UINTN                  MaximumPacketLength,\r
+  IN     UINT8                  DataBuffersNumber,\r
+  IN OUT VOID                   *Data[EFI_USB_MAX_ISO_BUFFER_NUM],\r
+  IN     UINTN                  DataLength,\r
+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR           *Translator,\r
+  IN     EFI_ASYNC_USB_TRANSFER_CALLBACK              IsochronousCallBack,\r
+  IN     VOID                   *Context OPTIONAL\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2GetRootHubPortStatus (\r
+  IN  EFI_USB2_HC_PROTOCOL   * This,\r
+  IN  UINT8                  PortNumber,\r
+  OUT EFI_USB_PORT_STATUS    * PortStatus\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2SetRootHubPortFeature (\r
+  IN EFI_USB2_HC_PROTOCOL    * This,\r
+  IN UINT8                   PortNumber,\r
+  IN EFI_USB_PORT_FEATURE    PortFeature\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UHCI2ClearRootHubPortFeature (\r
+  IN EFI_USB2_HC_PROTOCOL    * This,\r
+  IN UINT8                   PortNumber,\r
+  IN EFI_USB_PORT_FEATURE    PortFeature\r
+  );\r
+\r
+//\r
+// Asynchronous interrupt transfer monitor function\r
+//\r
+VOID\r
+EFIAPI\r
+MonitorInterruptTrans (\r
+  IN EFI_EVENT     Event,\r
+  IN VOID          *Context\r
+  );\r
+\r
 #endif\r
index 90c6713..c328843 100644 (file)
@@ -24,13 +24,6 @@ Revision history:
 \r
 #pragma data_seg("rtdata")\r
 \r
-//\r
-// Global variables defined outside this file\r
-//\r
-extern PXE_SW_UNDI  *pxe;     // !pxe structure\r
-extern PXE_SW_UNDI  *pxe_31;  // !pxe structure for 3.1 drivers\r
-extern UNDI32_DEV   *UNDI32DeviceList[MAX_NIC_INTERFACES];\r
-\r
 //\r
 // Global variables defined in this file\r
 //\r
index ad91d75..c9a217f 100644 (file)
@@ -31,73 +31,7 @@ PXE_SW_UNDI             *pxe_31 = 0;  // 3.1 entry
 UNDI32_DEV              *UNDI32DeviceList[MAX_NIC_INTERFACES];\r
 \r
 NII_TABLE               *UnidiDataPointer=NULL;    \r
-//\r
-// external Global Variables\r
-//\r
-extern UNDI_CALL_TABLE  api_table[];\r
-\r
-//\r
-// function prototypes\r
-//\r
-EFI_STATUS\r
-InstallConfigTable (\r
-  IN VOID\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeUNDIDriver (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-VOID\r
-UNDI_notify_virtual (\r
-  EFI_EVENT event,\r
-  VOID      *context\r
-  );\r
 \r
-VOID\r
-EFIAPI\r
-UndiNotifyExitBs (\r
-  EFI_EVENT Event,\r
-  VOID      *Context\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UndiDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UndiDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UndiDriverStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
-EFI_STATUS\r
-AppendMac2DevPath (\r
-  IN OUT  EFI_DEVICE_PATH_PROTOCOL **DevPtr,\r
-  IN      EFI_DEVICE_PATH_PROTOCOL *BaseDevPtr,\r
-  IN      NIC_DATA_INSTANCE        *AdapterInfo\r
-  );\r
-//\r
-// end function prototypes\r
-//\r
 VOID\r
 EFIAPI\r
 UndiNotifyVirtual (\r
index d4ad6b6..b7c7212 100644 (file)
@@ -94,6 +94,11 @@ typedef VOID (*map_mem)(UINT64, UINT64, UINT32, UINT32, UINT64);
 typedef VOID (*unmap_mem)(UINT64, UINT64, UINT32, UINT32, UINT64);\r
 typedef VOID (*sync_mem)(UINT64, UINT64, UINT32, UINT32, UINT64);\r
 \r
+extern UNDI_CALL_TABLE  api_table[];\r
+extern PXE_SW_UNDI      *pxe;     // !pxe structure\r
+extern PXE_SW_UNDI      *pxe_31;  // !pxe structure for 3.1 drivers\r
+extern UNDI32_DEV       *UNDI32DeviceList[MAX_NIC_INTERFACES];\r
+\r
 //\r
 // functions defined in e100b.c\r
 //\r
@@ -158,6 +163,63 @@ VOID FindPhySpeedAndDpx (NIC_DATA_INSTANCE *AdapterInfo, UINT32 PhyId);
 //\r
 // functions defined in init.c\r
 //\r
+EFI_STATUS\r
+InstallConfigTable (\r
+  IN VOID\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+InitializeUNDIDriver (\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  );\r
+\r
+VOID\r
+UNDI_notify_virtual (\r
+  EFI_EVENT event,\r
+  VOID      *context\r
+  );\r
+\r
+VOID\r
+EFIAPI\r
+UndiNotifyExitBs (\r
+  EFI_EVENT Event,\r
+  VOID      *Context\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UndiDriverSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UndiDriverStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UndiDriverStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+EFI_STATUS\r
+AppendMac2DevPath (\r
+  IN OUT  EFI_DEVICE_PATH_PROTOCOL **DevPtr,\r
+  IN      EFI_DEVICE_PATH_PROTOCOL *BaseDevPtr,\r
+  IN      NIC_DATA_INSTANCE        *AdapterInfo\r
+  );\r
+\r
 VOID\r
 TmpDelay (\r
   IN UINT64 UnqId,\r
index 3f61c46..2468108 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "ScsiBus.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiBusComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiBusComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index b7b5961..3c79e47 100644 (file)
@@ -21,31 +21,6 @@ Revision History
 \r
 #include "ScsiBus.h"\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gSCSIBusDriverBinding = {\r
   SCSIBusDriverBindingSupported,\r
   SCSIBusDriverBindingStart,\r
index f981871..594953e 100644 (file)
@@ -56,6 +56,52 @@ typedef struct {
 extern EFI_DRIVER_BINDING_PROTOCOL  gScsiBusDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gScsiBusComponentName;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+SCSIBusDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+SCSIBusDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+SCSIBusDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      Controller,\r
+  IN  UINTN                           NumberOfChildren,\r
+  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiBusComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiBusComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 EFI_STATUS\r
 EFIAPI\r
 ScsiGetDeviceType (\r
index e1d0f8d..74a41e8 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "ScsiDisk.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 10134e8..a3f4d6a 100644 (file)
@@ -19,31 +19,6 @@ Abstract:
 \r
 #include "ScsiDisk.h"\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gScsiDiskDriverBinding = {\r
   ScsiDiskDriverBindingSupported,\r
   ScsiDiskDriverBindingStart,\r
index 96d1da4..675c643 100644 (file)
@@ -63,6 +63,52 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gScsiDiskComponentName;
 #define ACTION_READ_CAPACITY        0x01\r
 #define ACTION_RETRY_COMMAND_LATER  0x02\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+ScsiDiskDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiDiskDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiDiskDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      Controller,\r
+  IN  UINTN                           NumberOfChildren,\r
+  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiDiskComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiDiskComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskReset (\r
index ca42285..1b3d5ab 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "bot.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBotComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBotComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index fd830ec..e6a5be4 100644 (file)
@@ -21,44 +21,6 @@ Abstract:
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTDebugLevel  = EFI_D_INFO;\r
 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTErrorLevel  = EFI_D_INFO;\r
-//\r
-// Function prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBotDriverEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-//\r
-// Bot Driver Binding Protocol\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL   gUsbBotDriverBinding = {\r
   BotDriverBindingSupported,\r
@@ -124,6 +86,7 @@ BotMassStorageReset (
   IN  BOOLEAN                   ExtendedVerification\r
   );\r
 \r
+STATIC\r
 VOID\r
 BotReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
@@ -979,6 +942,7 @@ BotMassStorageReset (
   return Status;\r
 }\r
 \r
+STATIC\r
 VOID\r
 BotReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
index 383cfde..6e43a1b 100644 (file)
@@ -78,4 +78,53 @@ extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBotDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBotComponentName;\r
 extern EFI_GUID                     gUsbBotDriverGuid;\r
 \r
+//\r
+// Bot Driver Binding Protocol\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+BotDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+BotDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+BotDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     ControllerHandle,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBotComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBotComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index 8ecbbb0..1233eac 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "usbbus.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBusComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBusComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
-  IN  CHAR8                           *Language,\r
-  OUT CHAR16                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index ffca535..e1fdce7 100644 (file)
@@ -34,36 +34,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED    UINTN    gUSBErrorLevel  = EFI_D_ERROR;
 //\r
 STATIC EFI_GUID             mUsbBusProtocolGuid = EFI_USB_BUS_PROTOCOL_GUID;\r
 \r
-\r
-\r
-//\r
-// EFI_DRIVER_BINDING_PROTOCOL Protocol Interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBusControllerDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBusControllerDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBusControllerDriverStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      Controller,\r
-  IN UINTN                           NumberOfChildren,\r
-  IN EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gUsbBusDriverBinding = {\r
   UsbBusControllerDriverSupported,\r
   UsbBusControllerDriverStart,\r
@@ -154,6 +124,7 @@ ReleasePortToCHC (
   UINT8                     PortNum\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 ResetRootPort (\r
   IN USB_BUS_CONTROLLER_DEVICE *UsbBusDev,\r
@@ -161,6 +132,7 @@ ResetRootPort (
   IN UINT8                     RetryTimes\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 ResetHubPort (\r
   IN USB_IO_CONTROLLER_DEVICE    *UsbIoController,\r
@@ -2341,6 +2313,7 @@ UsbPortReset (
   return ParentPortReset (UsbIoController, TRUE, 0);\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ResetRootPort (\r
   IN USB_BUS_CONTROLLER_DEVICE *UsbBusDev,\r
@@ -2433,6 +2406,7 @@ ResetRootPort (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ResetHubPort (\r
   IN USB_IO_CONTROLLER_DEVICE    *UsbIoController,\r
index 4977d71..ce0e698 100644 (file)
@@ -175,6 +175,55 @@ extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBusDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBusComponentName;\r
 extern EFI_GUID                     gUSBBusDriverGuid;\r
 \r
+//\r
+// EFI_DRIVER_BINDING_PROTOCOL Protocol Interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBusControllerDriverSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBusControllerDriverStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBusControllerDriverStop (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
+  IN EFI_HANDLE                      Controller,\r
+  IN UINTN                           NumberOfChildren,\r
+  IN EFI_HANDLE                      *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBusComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbBusComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL     *This,\r
+  IN  EFI_HANDLE                      ControllerHandle,\r
+  IN  EFI_HANDLE                      ChildHandle, OPTIONAL\r
+  IN  CHAR8                           *Language,\r
+  OUT CHAR16                          **ControllerName\r
+  );\r
+\r
 //\r
 // Usb Device Configuration functions\r
 //\r
index 91a447d..73b8940 100644 (file)
@@ -19,17 +19,6 @@ Abstract:
 \r
 #include "cbi.h"\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;\r
-//\r
-// Function prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCbi0DriverEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
 //\r
 // Bot Driver Binding Protocol\r
 //\r
@@ -61,6 +50,7 @@ Cbi0DriverBindingStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer\r
   );\r
 \r
+STATIC\r
 VOID\r
 Cbi0ReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
@@ -1004,6 +994,7 @@ Cbi0AtapiCommand (
   return Status;\r
 }\r
 \r
+STATIC\r
 VOID\r
 Cbi0ReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
index 7d16b5a..87ff7d2 100644 (file)
@@ -19,29 +19,6 @@ Abstract:
 \r
 #include "cbi.h"\r
 \r
-extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi0DriverBinding;\r
-\r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCbi0ComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCbi0ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index e2a7c9d..d312176 100644 (file)
@@ -67,4 +67,28 @@ typedef struct {
 #define USB_CBI_DEVICE_FROM_THIS(a) \\r
     CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)\r
 \r
+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi0DriverBinding;\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbCbi0ComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbCbi0ComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index f8485dd..316c7f4 100644 (file)
@@ -19,29 +19,6 @@ Abstract:
 \r
 #include "cbi.h"\r
 \r
-extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi1DriverBinding;\r
-\r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCbi1ComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCbi1ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index e2a7c9d..77daa1a 100644 (file)
@@ -67,4 +67,28 @@ typedef struct {
 #define USB_CBI_DEVICE_FROM_THIS(a) \\r
     CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)\r
 \r
+extern EFI_DRIVER_BINDING_PROTOCOL  gUsbCbi1DriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi1ComponentName;\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbCbi1ComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbCbi1ComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index d8ef374..d98d022 100644 (file)
@@ -20,15 +20,6 @@ Abstract:
 \r
 #include "cbi.h"\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi1ComponentName;\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCBI1DriverEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
 //\r
 // CBI Function prototypes\r
 //\r
@@ -107,6 +98,7 @@ CBI1DriverBindingStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer\r
   );\r
 \r
+STATIC\r
 VOID\r
 Cbi1ReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
@@ -827,6 +819,7 @@ CBI1AtapiCommand (
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
+STATIC\r
 VOID\r
 Cbi1ReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
index 3e139f9..71a715f 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "keyboard.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbKeyboardComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbKeyboardComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 1b8c961..a1fd418 100644 (file)
@@ -24,42 +24,6 @@ Revision History
 #include "efikey.h"\r
 #include "keyboard.h"\r
 \r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-USBKeyboardDriverBindingEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBKeyboardDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBKeyboardDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBKeyboardDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // Simple Text In Protocol Interface\r
 //\r
index 31307eb..4bdbfc9 100644 (file)
@@ -117,4 +117,34 @@ typedef struct {
   UINT8 ScrollLock : 1;\r
   UINT8 Resrvd : 5;\r
 } LED_MAP;\r
+\r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+USBKeyboardDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBKeyboardDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBKeyboardDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
 #endif\r
index a01fda3..ef4c1c3 100644 (file)
@@ -24,6 +24,27 @@ Revision History
 \r
 #include "efikey.h"\r
 \r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbKeyboardComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbKeyboardComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 BOOLEAN\r
 IsUSBKeyboard (\r
   IN  EFI_USB_IO_PROTOCOL       *UsbIo\r
index f033361..3e34361 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "UsbMassStorage.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbMassStorageComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbMassStorageComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 7f6cd4d..951ab0a 100644 (file)
@@ -24,44 +24,6 @@ Revision History
 #include "UsbMassStorage.h"\r
 #include "UsbMassStorageHelper.h"\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName;\r
-\r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-USBMassStorageDriverBindingEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBFloppyDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBFloppyDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBFloppyDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // Block I/O Protocol Interface\r
 //\r
index 832befc..27912b0 100644 (file)
@@ -57,4 +57,56 @@ typedef struct {
 #define USB_FLOPPY_DEV_FROM_THIS(a) \\r
     CR(a, USB_FLOPPY_DEV, BlkIo, USB_FLOPPY_DEV_SIGNATURE)\r
 \r
+extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName;\r
+\r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+USBFloppyDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBFloppyDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBFloppyDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbMassStorageComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbMassStorageComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index 5b01cea..695961f 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "usbmouse.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbMouseComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbMouseComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 442b5a2..f7449eb 100644 (file)
@@ -20,43 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "usbmouse.h"\r
 #include "mousehid.h"\r
 \r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-USBMouseDriverBindingEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBMouseDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBMouseDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-USBMouseDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
-  IN  EFI_HANDLE                    Controller,\r
-  IN  UINTN                         NumberOfChildren,\r
-  IN  EFI_HANDLE                    *ChildHandleBuffer\r
-  );\r
-\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gUsbMouseDriverBinding = {\r
   USBMouseDriverBindingSupported,\r
   USBMouseDriverBindingStart,\r
index 47485bf..ac071db 100644 (file)
@@ -82,4 +82,54 @@ MouseReportStatusCode (
   IN EFI_STATUS_CODE_VALUE     Value\r
   );\r
 \r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+USBMouseDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBMouseDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+USBMouseDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
+  IN  EFI_HANDLE                    Controller,\r
+  IN  UINTN                         NumberOfChildren,\r
+  IN  EFI_HANDLE                    *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+UsbMouseComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+UsbMouseComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index e7c23b5..08d5dc3 100644 (file)
@@ -101,11 +101,13 @@ FV_FILEPATH_DEVICE_PATH mFvDevicePath;
 //\r
 // Function Prototypes\r
 //\r
+STATIC\r
 VOID\r
 CoreInsertOnScheduledQueueWhileProcessingBeforeAndAfter (\r
   IN  EFI_CORE_DRIVER_ENTRY   *InsertedDriverEntry\r
   );\r
  \r
+STATIC\r
 VOID\r
 EFIAPI\r
 CoreFwVolEventProtocolNotify (\r
@@ -113,6 +115,7 @@ CoreFwVolEventProtocolNotify (
   IN  VOID            *Context\r
   );\r
 \r
+STATIC\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 CoreFvToDevicePath (\r
   IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
@@ -523,7 +526,7 @@ Returns:
   return ReturnStatus;\r
 }\r
 \r
-\r
+STATIC\r
 VOID\r
 CoreInsertOnScheduledQueueWhileProcessingBeforeAndAfter (\r
   IN  EFI_CORE_DRIVER_ENTRY   *InsertedDriverEntry\r
@@ -664,7 +667,7 @@ Returns:
 \r
 \r
 \r
-\r
+STATIC\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 CoreFvToDevicePath (\r
   IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
@@ -858,7 +861,7 @@ Returns:
   return Status;\r
 }\r
 \r
-\r
+STATIC\r
 VOID\r
 EFIAPI\r
 CoreFwVolEventProtocolNotify (\r
index b38ba8e..d655cd3 100644 (file)
@@ -2507,4 +2507,256 @@ CoreDisplayDiscoveredNotDispatched (
     NONE \r
 \r
 --*/;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg0 (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  None\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg1 (\r
+  UINTN Arg1\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  Arg1        - Undefined\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg2 (\r
+  UINTN Arg1,\r
+  UINTN Arg2\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  Arg1        - Undefined\r
+  \r
+  Arg2        - Undefined\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg3 (\r
+  UINTN Arg1,\r
+  UINTN Arg2,\r
+  UINTN Arg3\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  Arg1        - Undefined\r
+  \r
+  Arg2        - Undefined\r
+  \r
+  Arg3        - Undefined\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg4 (\r
+  UINTN Arg1,\r
+  UINTN Arg2,\r
+  UINTN Arg3,\r
+  UINTN Arg4\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  Arg1        - Undefined\r
+  \r
+  Arg2        - Undefined\r
+  \r
+  Arg3        - Undefined\r
+  \r
+  Arg4        - Undefined\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+CoreEfiNotAvailableYetArg5 (\r
+  UINTN Arg1,\r
+  UINTN Arg2,\r
+  UINTN Arg3,\r
+  UINTN Arg4,\r
+  UINTN Arg5\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Place holder function until all the Boot Services and Runtime Services are available\r
+\r
+Arguments:\r
+\r
+  Arg1        - Undefined\r
+  \r
+  Arg2        - Undefined\r
+  \r
+  Arg3        - Undefined\r
+  \r
+  Arg4        - Undefined\r
+  \r
+  Arg5        - Undefined\r
+\r
+Returns:\r
+\r
+  EFI_NOT_AVAILABLE_YET\r
+\r
+--*/\r
+;\r
+\r
+EFI_STATUS\r
+CoreGetPeiProtocol (\r
+  IN EFI_GUID  *ProtocolGuid,\r
+  IN VOID      **Interface\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Searches for a Protocol Interface passed from PEI through a HOB\r
+\r
+Arguments:\r
+\r
+  ProtocolGuid - The Protocol GUID to search for in the HOB List\r
+\r
+  Interface    - A pointer to the interface for the Protocol GUID\r
+\r
+Returns:\r
+\r
+  EFI_SUCCESS   - The Protocol GUID was found and its interface is returned in Interface\r
+\r
+  EFI_NOT_FOUND - The Protocol GUID was not found in the HOB List\r
+\r
+--*/\r
+;\r
+  \r
+EFI_STATUS\r
+DxeMainUefiDecompressGetInfo (\r
+  IN EFI_DECOMPRESS_PROTOCOL            *This,\r
+  IN   VOID                             *Source,\r
+  IN   UINT32                           SourceSize,\r
+  OUT  UINT32                           *DestinationSize,\r
+  OUT  UINT32                           *ScratchSize\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DxeMainUefiDecompress (\r
+  IN EFI_DECOMPRESS_PROTOCOL              *This,\r
+  IN     VOID                             *Source,\r
+  IN     UINT32                           SourceSize,\r
+  IN OUT VOID                             *Destination,\r
+  IN     UINT32                           DestinationSize,\r
+  IN OUT VOID                             *Scratch,\r
+  IN     UINT32                           ScratchSize\r
+  );\r
+\r
+EFI_STATUS\r
+DxeMainTianoDecompressGetInfo (\r
+  IN EFI_TIANO_DECOMPRESS_PROTOCOL      *This,\r
+  IN   VOID                             *Source,\r
+  IN   UINT32                           SourceSize,\r
+  OUT  UINT32                           *DestinationSize,\r
+  OUT  UINT32                           *ScratchSize\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DxeMainTianoDecompress (\r
+  IN EFI_TIANO_DECOMPRESS_PROTOCOL        *This,\r
+  IN     VOID                             *Source,\r
+  IN     UINT32                           SourceSize,\r
+  IN OUT VOID                             *Destination,\r
+  IN     UINT32                           DestinationSize,\r
+  IN OUT VOID                             *Scratch,\r
+  IN     UINT32                           ScratchSize\r
+  );\r
+\r
+EFI_STATUS\r
+DxeMainCustomDecompressGetInfo (\r
+  IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL  *This,\r
+  IN   VOID                              *Source,\r
+  IN   UINT32                            SourceSize,\r
+  OUT  UINT32                            *DestinationSize,\r
+  OUT  UINT32                            *ScratchSize\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DxeMainCustomDecompress (\r
+  IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL  *This,\r
+  IN     VOID                            *Source,\r
+  IN     UINT32                          SourceSize,\r
+  IN OUT VOID                            *Destination,\r
+  IN     UINT32                          DestinationSize,\r
+  IN OUT VOID                            *Scratch,\r
+  IN     UINT32                          ScratchSize\r
+  );\r
+\r
 #endif\r
index 6b1f084..b590538 100644 (file)
@@ -21,127 +21,6 @@ Abstract:
 \r
 #include <DxeMain.h>\r
 \r
-VOID\r
-EFIAPI\r
-DxeMain (\r
-  IN  VOID *HobStart\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg0 (\r
-  VOID\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg1 (\r
-  UINTN Arg1\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg2 (\r
-  UINTN Arg1,\r
-  UINTN Arg2\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg3 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg4 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3,\r
-  UINTN Arg4\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CoreEfiNotAvailableYetArg5 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3,\r
-  UINTN Arg4,\r
-  UINTN Arg5\r
-  );\r
-\r
-EFI_STATUS\r
-CoreGetPeiProtocol (\r
-  IN EFI_GUID  *ProtocolGuid,\r
-  IN VOID      **Interface\r
-  );\r
-  \r
-EFI_STATUS\r
-DxeMainUefiDecompressGetInfo (\r
-  IN EFI_DECOMPRESS_PROTOCOL            *This,\r
-  IN   VOID                             *Source,\r
-  IN   UINT32                           SourceSize,\r
-  OUT  UINT32                           *DestinationSize,\r
-  OUT  UINT32                           *ScratchSize\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DxeMainUefiDecompress (\r
-  IN EFI_DECOMPRESS_PROTOCOL              *This,\r
-  IN     VOID                             *Source,\r
-  IN     UINT32                           SourceSize,\r
-  IN OUT VOID                             *Destination,\r
-  IN     UINT32                           DestinationSize,\r
-  IN OUT VOID                             *Scratch,\r
-  IN     UINT32                           ScratchSize\r
-  );\r
-\r
-EFI_STATUS\r
-DxeMainTianoDecompressGetInfo (\r
-  IN EFI_TIANO_DECOMPRESS_PROTOCOL      *This,\r
-  IN   VOID                             *Source,\r
-  IN   UINT32                           SourceSize,\r
-  OUT  UINT32                           *DestinationSize,\r
-  OUT  UINT32                           *ScratchSize\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DxeMainTianoDecompress (\r
-  IN EFI_TIANO_DECOMPRESS_PROTOCOL        *This,\r
-  IN     VOID                             *Source,\r
-  IN     UINT32                           SourceSize,\r
-  IN OUT VOID                             *Destination,\r
-  IN     UINT32                           DestinationSize,\r
-  IN OUT VOID                             *Scratch,\r
-  IN     UINT32                           ScratchSize\r
-  );\r
-\r
-EFI_STATUS\r
-DxeMainCustomDecompressGetInfo (\r
-  IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL  *This,\r
-  IN   VOID                              *Source,\r
-  IN   UINT32                            SourceSize,\r
-  OUT  UINT32                            *DestinationSize,\r
-  OUT  UINT32                            *ScratchSize\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DxeMainCustomDecompress (\r
-  IN EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL  *This,\r
-  IN     VOID                            *Source,\r
-  IN     UINT32                          SourceSize,\r
-  IN OUT VOID                            *Destination,\r
-  IN     UINT32                          DestinationSize,\r
-  IN OUT VOID                            *Scratch,\r
-  IN     UINT32                          ScratchSize\r
-  );\r
-\r
 //\r
 // DXE Core Global Variables for Protocols from PEI\r
 //\r
index 8d7932f..a497015 100644 (file)
@@ -33,6 +33,7 @@ CoreCurrentSystemTime (
   VOID\r
   );\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 CoreCheckTimers (\r
@@ -173,6 +174,7 @@ Returns:
   CoreReleaseLock (&mEfiSystemTimeLock);\r
 }\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 CoreCheckTimers (\r
index 999cd69..408688c 100644 (file)
@@ -25,15 +25,6 @@ Revision History
 \r
 #include <DxeMain.h>\r
 \r
-\r
-VOID\r
-CoreDevicePathToFileName (\r
-  IN  FILEPATH_DEVICE_PATH      *FilePath,\r
-  OUT CHAR16                    **String\r
-  );\r
-\r
-\r
-\r
 EFI_STATUS\r
 CoreOpenImageFile (\r
   IN BOOLEAN                        BootPolicy,\r
@@ -432,67 +423,6 @@ Returns:
   return Status;\r
 }\r
 \r
-\r
-VOID\r
-CoreDevicePathToFileName (\r
-  IN  FILEPATH_DEVICE_PATH      *FilePath,\r
-  OUT CHAR16                    **String\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Transfer a device's full path a string.\r
-\r
-Arguments:\r
-\r
-  FilePath      - Device path\r
-  \r
-  String        - The string represent the device's full path\r
-\r
-Returns:\r
-\r
-  None\r
-\r
---*/\r
-{\r
-  UINTN                     StringSize;\r
-  FILEPATH_DEVICE_PATH      *FilePathNode;\r
-  CHAR16                    *Str;\r
-\r
-  *String = NULL;\r
-  StringSize = 0;\r
-  FilePathNode = FilePath;\r
-  while (!IsDevicePathEnd (&FilePathNode->Header)) {\r
-\r
-    //\r
-    // For filesystem access each node should be a filepath component\r
-    //\r
-    if (DevicePathType (&FilePathNode->Header) != MEDIA_DEVICE_PATH ||\r
-        DevicePathSubType (&FilePathNode->Header) != MEDIA_FILEPATH_DP) {\r
-\r
-      return;\r
-    }\r
-\r
-    StringSize += StrLen (FilePathNode->PathName);\r
-\r
-    FilePathNode = (FILEPATH_DEVICE_PATH *) NextDevicePathNode (&FilePathNode->Header);\r
-  }\r
-\r
-  *String = CoreAllocateBootServicesPool (StringSize);\r
-  if (*String == NULL) {\r
-    return;\r
-  }\r
-\r
-  FilePathNode = FilePath;\r
-  Str = *String;\r
-  while (!IsDevicePathEnd (&FilePathNode->Header)) {\r
-    StrCat (Str, FilePathNode->PathName);\r
-    FilePathNode = (FILEPATH_DEVICE_PATH *) NextDevicePathNode (&FilePathNode->Header);\r
-  }\r
-}\r
-\r
-\r
 BOOLEAN\r
 CoreGrowBuffer (\r
   IN OUT EFI_STATUS   *Status,\r
index 44116ab..4f66e0a 100644 (file)
@@ -94,6 +94,7 @@ EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {
 //\r
 // Internal prototypes\r
 //\r
+STATIC\r
 VOID \r
 PromoteMemoryResource (\r
   VOID\r
@@ -175,6 +176,7 @@ Returns:
   CoreReleaseLock (&gMemoryLock);\r
 }\r
 \r
+STATIC\r
 VOID\r
 PromoteMemoryResource (\r
   VOID\r
index 89dd9af..a3e20e6 100644 (file)
@@ -131,6 +131,7 @@ CreateGuidedExtractionRpnEvent (
   IN CORE_SECTION_CHILD_NODE                  *ChildNode\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 OpenSectionStream (\r
@@ -140,6 +141,7 @@ OpenSectionStream (
      OUT UINTN                                *SectionStreamHandle\r
   );\r
   \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 GetSection (\r
@@ -153,6 +155,7 @@ GetSection (
   OUT UINT32                                  *AuthenticationStatus\r
   );\r
   \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 CloseSectionStream (\r
@@ -262,7 +265,7 @@ Returns:
   return Status;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 OpenSectionStream (\r
@@ -308,7 +311,7 @@ Returns:
           );\r
 }\r
   \r
-\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 GetSection (\r
@@ -451,7 +454,7 @@ GetSection_Done:
 }\r
 \r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 CloseSectionStream (\r
index ccd840d..c764b39 100644 (file)
@@ -23,6 +23,7 @@ Revision History
 \r
 #include <PeiMain.h>\r
 \r
+STATIC\r
 VOID *\r
 TransferOldDataToNewDataRange (\r
   IN PEI_CORE_INSTANCE        *PrivateData\r
@@ -506,7 +507,7 @@ Returns:
   return Runnable;\r
 }\r
 \r
-\r
+STATIC\r
 VOID *\r
 TransferOldDataToNewDataRange (\r
   IN PEI_CORE_INSTANCE        *PrivateData\r
diff --git a/edk2/EdkModulePkg/Core/Pei/Ipf/IpfPeiMain.h b/edk2/EdkModulePkg/Core/Pei/Ipf/IpfPeiMain.h
new file mode 100644 (file)
index 0000000..e2df073
--- /dev/null
@@ -0,0 +1,52 @@
+/*++\r
+\r
+Copyright (c) 2006, 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
+Module Name:\r
+\r
+  IpfPeiMain.h\r
+\r
+Abstract:\r
+\r
+  Definition of IPF specific function\r
+\r
+Revision History\r
+\r
+--*/\r
+\r
+#ifndef _IPF_PEI_MAIN_H_\r
+#define _IPF_PEI_MAIN_H_\r
+\r
+#include <PeiMain.h>\r
+\r
+SAL_RETURN_REGS\r
+GetHandOffStatus (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+   This routine is called by all processors simultaneously, to get some hand-off\r
+   status that has been captured by IPF dispatcher and recorded in kernel registers.\r
+  \r
+Arguments :\r
+\r
+  On Entry :  None.\r
+\r
+Returns:\r
+\r
+   Lid, R20Status.\r
+\r
+--*/\r
+\r
+;\r
+\r
+#endif\r
index 36b66f9..db9cb52 100644 (file)
@@ -20,14 +20,9 @@ Abstract:
 Revision History\r
 \r
 --*/\r
-#include <PeiMain.h>\r
-#include "IpfCpuCore.i"\r
 \r
-extern \r
-SAL_RETURN_REGS\r
-GetHandOffStatus (\r
-  VOID\r
-  );\r
+#include "IpfPeiMain.h"\r
+#include "IpfCpuCore.i"\r
 \r
 VOID\r
 SwitchToCacheMode (\r
index 250d539..5daf40f 100644 (file)
@@ -74,6 +74,7 @@
     <Filename SupArchList="IPF">Ipf/SwitchToCacheMode.c</Filename>\r
     <Filename SupArchList="IPF">Ipf/IpfCpuCore.i</Filename>\r
     <Filename SupArchList="IPF">Ipf/IpfCpuCore.s</Filename>\r
+    <Filename SupArchList="IPF">Ipf/IpfPeiMain.h</Filename>\r
     <Filename SupArchList="IPF">Ipf/Stack.c</Filename>\r
     <Filename SupArchList="IA32 X64 EBC">Dispatcher/Stack.c</Filename>\r
   </SourceFiles>\r
index 0bc175a..089995e 100644 (file)
@@ -21,6 +21,7 @@ Abstract:
 \r
 #include <PeiMain.h>\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 SecurityPpiNotifyCallback (\r
@@ -63,6 +64,7 @@ Returns:
   return;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 SecurityPpiNotifyCallback (\r
index bd4b5ad..7271332 100644 (file)
@@ -45,6 +45,7 @@ Abstract:
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 StartGauge (\r
@@ -78,6 +79,7 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 EndGauge (\r
@@ -105,6 +107,7 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL. \r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 GetGauge (\r
@@ -202,6 +205,7 @@ InternalSearchForGaugeEntry (
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 StartGauge (\r
@@ -284,6 +288,7 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 EndGauge (\r
@@ -328,6 +333,7 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL. \r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 GetGauge (\r
index dc2a22f..f82ae55 100644 (file)
@@ -19,57 +19,6 @@ Abstract:
 \r
 #include "ConSplitter.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-ConSplitterComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSplitterConInComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSplitterSimplePointerComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSplitterConOutComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSplitterStdErrComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 4509390..13c4e74 100644 (file)
@@ -293,6 +293,54 @@ ConSplitterStdErrDriverBindingStop (
   )\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterConInComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterSimplePointerComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterConOutComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterStdErrComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 //\r
 // TextIn Constructor/Destructor functions\r
 //\r
index 866aaad..4a2dd59 100644 (file)
@@ -19,34 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "GraphicsConsole.h"\r
 \r
-//\r
-// Function Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleControllerDriverStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
+STATIC\r
 EFI_STATUS\r
 GetTextColors (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -54,12 +27,7 @@ GetTextColors (
   OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Background\r
   );\r
 \r
-EFI_STATUS\r
-DrawUnicodeWeightAtCursor (\r
-  IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
-  IN  CHAR16                        UnicodeWeight\r
-  );\r
-\r
+STATIC\r
 EFI_STATUS\r
 DrawUnicodeWeightAtCursorN (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -67,6 +35,7 @@ DrawUnicodeWeightAtCursorN (
   IN  UINTN                         Count\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 EraseCursor (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This\r
@@ -1532,6 +1501,7 @@ GraphicsConsoleConOutEnableCursor (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 GetTextColors (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -1549,6 +1519,7 @@ GetTextColors (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 DrawUnicodeWeightAtCursorN (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This,\r
@@ -1689,6 +1660,7 @@ DrawUnicodeWeightAtCursorN (
   return ReturnStatus;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EraseCursor (\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *This\r
index 45a2ec4..bcc1d56 100644 (file)
@@ -159,4 +159,29 @@ EfiLocateHiiProtocol (
   VOID\r
   );\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+GraphicsConsoleControllerDriverSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+GraphicsConsoleControllerDriverStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+GraphicsConsoleControllerDriverStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
 #endif\r
index 7a1c23d..bdc6df4 100644 (file)
@@ -20,27 +20,6 @@ Abstract:
 \r
 #include "Terminal.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 45eb632..6aa70e4 100644 (file)
@@ -22,34 +22,6 @@ Revision History:
 \r
 #include "Terminal.h"\r
 \r
-//\r
-// Function Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // Globals\r
 //\r
index 2382d86..e7ce1dc 100644 (file)
@@ -244,6 +244,49 @@ TerminalConOutEnableCursor (
   )\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+TerminalDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+TerminalDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+TerminalDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+TerminalComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+TerminalComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 //\r
 // internal functions\r
 //\r
index 35ca70d..86ed5f2 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "DiskIo.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 39d8766..cdb6739 100644 (file)
@@ -41,4 +41,77 @@ typedef struct {
 extern EFI_DRIVER_BINDING_PROTOCOL  gDiskIoDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gDiskIoComponentName;\r
 \r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     ControllerHandle,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// Disk I/O Protocol Interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoReadDisk (\r
+  IN EFI_DISK_IO_PROTOCOL  *This,\r
+  IN UINT32                MediaId,\r
+  IN UINT64                Offset,\r
+  IN UINTN                 BufferSize,\r
+  OUT VOID                 *Buffer\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoWriteDisk (\r
+  IN EFI_DISK_IO_PROTOCOL  *This,\r
+  IN UINT32                MediaId,\r
+  IN UINT64                Offset,\r
+  IN UINTN                 BufferSize,\r
+  IN VOID                  *Buffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+DiskIoComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 #endif\r
index d378ae3..62ae6d2 100644 (file)
@@ -32,58 +32,6 @@ Abstract:
 \r
 #include "DiskIo.h"\r
 \r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
-//\r
-// Disk I/O Protocol Interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoReadDisk (\r
-  IN EFI_DISK_IO_PROTOCOL  *This,\r
-  IN UINT32                MediaId,\r
-  IN UINT64                Offset,\r
-  IN UINTN                 BufferSize,\r
-  OUT VOID                 *Buffer\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-DiskIoWriteDisk (\r
-  IN EFI_DISK_IO_PROTOCOL  *This,\r
-  IN UINT32                MediaId,\r
-  IN UINT64                Offset,\r
-  IN UINTN                 BufferSize,\r
-  IN VOID                  *Buffer\r
-  );\r
-\r
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {\r
   DiskIoDriverBindingSupported,\r
   DiskIoDriverBindingStart,\r
index 3821690..96ff648 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "Partition.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 4241180..4b4910a 100644 (file)
@@ -22,6 +22,7 @@ Abstract:
 \r
 #include "Partition.h"\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionValidGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -30,6 +31,7 @@ PartitionValidGptTable (
   OUT EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckGptEntryArrayCRC (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -37,6 +39,7 @@ PartitionCheckGptEntryArrayCRC (
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionRestoreGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -44,6 +47,7 @@ PartitionRestoreGptTable (
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionCheckGptEntry (\r
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader,\r
@@ -51,6 +55,7 @@ PartitionCheckGptEntry (
   OUT EFI_PARTITION_ENTRY_STATUS  *PEntryStatus\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrcAltSize (\r
   IN UINTN                 MaxSize,\r
@@ -58,18 +63,21 @@ PartitionCheckCrcAltSize (
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrc (\r
   IN UINTN                 MaxSize,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrcAltSize (\r
   IN UINTN                 Size,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrc (\r
   IN OUT EFI_TABLE_HEADER *Hdr\r
@@ -320,6 +328,7 @@ Done:
   return GptValid;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionValidGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -391,6 +400,7 @@ Returns:
   return TRUE;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckGptEntryArrayCRC (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -457,6 +467,7 @@ Returns:
   return (BOOLEAN) (PartHeader->PartitionEntryArrayCRC32 == Crc);\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionRestoreGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -554,6 +565,7 @@ Done:
   return TRUE;\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionCheckGptEntry (\r
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader,\r
@@ -622,6 +634,7 @@ Returns:
   DEBUG ((EFI_D_INFO, " End check partition entries\n"));\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrc (\r
   IN OUT EFI_TABLE_HEADER *Hdr\r
@@ -645,6 +658,7 @@ Returns:
   PartitionSetCrcAltSize (Hdr->HeaderSize, Hdr);\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrcAltSize (\r
   IN UINTN                 Size,\r
@@ -674,6 +688,7 @@ Returns:
   Hdr->CRC32 = Crc;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrc (\r
   IN UINTN                 MaxSize,\r
@@ -699,6 +714,7 @@ Returns:
   return PartitionCheckCrcAltSize (MaxSize, Hdr->HeaderSize, Hdr);\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrcAltSize (\r
   IN UINTN                 MaxSize,\r
index 6a896e4..b4207d4 100644 (file)
@@ -24,41 +24,6 @@ Abstract:
 \r
 #include "Partition.h"\r
 \r
-//\r
-// Function Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PartitionDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  UINTN                        NumberOfChildren,\r
-  IN  EFI_HANDLE                   *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // Partition Driver Global Variables\r
 //\r
index ba10555..a52b8f5 100644 (file)
@@ -77,6 +77,55 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gPartitionComponentName;
                                    (((UINT8 *) a)[2] << 16) |    \\r
                                    (((UINT8 *) a)[3] << 24) )\r
 \r
+//\r
+// Function Prototypes\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PartitionDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PartitionDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PartitionDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PartitionComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PartitionComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 EFI_STATUS\r
 PartitionInstallChildHandle (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
index ce9b3aa..5e6b3e3 100644 (file)
@@ -134,20 +134,6 @@ VmWriteMem32 (
   IN UINT32     Data\r
   );\r
 \r
-EFI_STATUS\r
-VmWriteMemN (\r
-  IN VM_CONTEXT *VmPtr,\r
-  UINTN         Addr,\r
-  IN UINTN      Data\r
-  );\r
-\r
-EFI_STATUS\r
-VmWriteMem64 (\r
-  IN VM_CONTEXT *VmPtr,\r
-  UINTN         Addr,\r
-  IN UINT64     Data\r
-  );\r
-\r
 STATIC\r
 UINT16\r
 VmReadCode16 (\r
index e38f5be..cf68329 100644 (file)
@@ -41,16 +41,6 @@ typedef struct _EBC_IMAGE_LIST {
   EBC_THUNK_LIST          *ThunkList;\r
 } EBC_IMAGE_LIST;\r
 \r
-//\r
-// Function prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeEbcDriver (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
@@ -77,12 +67,14 @@ EbcGetVersion (
   IN OUT UINT64           *Version\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 InitializeEbcCallback (\r
   IN EFI_DEBUG_SUPPORT_PROTOCOL  *This\r
   );\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 CommonEbcExceptionHandler (\r
@@ -90,6 +82,7 @@ CommonEbcExceptionHandler (
   IN EFI_SYSTEM_CONTEXT   SystemContext\r
   );\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 EbcPeriodicNotifyFunction (\r
@@ -97,6 +90,7 @@ EbcPeriodicNotifyFunction (
   IN VOID          *Context\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugPeriodic (\r
@@ -646,6 +640,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 InitializeEbcCallback (\r
   IN EFI_DEBUG_SUPPORT_PROTOCOL  *This\r
@@ -707,6 +702,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 CommonEbcExceptionHandler (\r
   IN EFI_EXCEPTION_TYPE   InterruptType,\r
@@ -739,6 +735,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 EbcPeriodicNotifyFunction (\r
@@ -774,7 +771,7 @@ Returns:
   return ;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 EbcDebugPeriodic (\r
   IN VM_CONTEXT *VmPtr\r
index 279f420..29ee55b 100644 (file)
@@ -22,34 +22,7 @@ Abstract:
 \r
 #include "EbcInt.h"\r
 #include "EbcExecute.h"\r
-\r
-#define VM_STACK_SIZE   (1024 * 32)\r
-\r
-#define EBC_THUNK_SIZE  128\r
-\r
-//\r
-// For code execution, thunks must be aligned on 16-byte boundary\r
-//\r
-#define EBC_THUNK_ALIGNMENT 16\r
-\r
-//\r
-// Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing\r
-// bits) to insert a jump to the interpreter.\r
-//\r
-#define OPCODE_NOP              (UINT64) 0x00008000000\r
-#define OPCODE_BR_COND_SPTK_FEW (UINT64) 0x00100000000\r
-#define OPCODE_MOV_BX_RX        (UINT64) 0x00E00100000\r
-\r
-//\r
-// Opcode for MOVL instruction\r
-//\r
-#define MOVL_OPCODE 0x06\r
-\r
-VOID\r
-EbcAsmLLCALLEX (\r
-  IN UINTN    CallAddr,\r
-  IN UINTN    EbcSp\r
-  );\r
+#include "EbcSupport.h"\r
 \r
 STATIC\r
 EFI_STATUS\r
diff --git a/edk2/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h b/edk2/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h
new file mode 100644 (file)
index 0000000..93c568e
--- /dev/null
@@ -0,0 +1,55 @@
+/*++\r
+\r
+Copyright (c) 2006, 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
+Module Name:\r
+\r
+  EbcSupport.h\r
+\r
+Abstract:\r
+\r
+  Definition of EBC Support function\r
+\r
+Revision History\r
+\r
+--*/\r
+\r
+#ifndef _IPF_EBC_SUPPORT_H_\r
+#define _IPF_EBC_SUPPORT_H_\r
+\r
+#define VM_STACK_SIZE   (1024 * 32)\r
+\r
+#define EBC_THUNK_SIZE  128\r
+\r
+//\r
+// For code execution, thunks must be aligned on 16-byte boundary\r
+//\r
+#define EBC_THUNK_ALIGNMENT 16\r
+\r
+//\r
+// Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing\r
+// bits) to insert a jump to the interpreter.\r
+//\r
+#define OPCODE_NOP              (UINT64) 0x00008000000\r
+#define OPCODE_BR_COND_SPTK_FEW (UINT64) 0x00100000000\r
+#define OPCODE_MOV_BX_RX        (UINT64) 0x00E00100000\r
+\r
+//\r
+// Opcode for MOVL instruction\r
+//\r
+#define MOVL_OPCODE 0x06\r
+\r
+VOID\r
+EbcAsmLLCALLEX (\r
+  IN UINTN    CallAddr,\r
+  IN UINTN    EbcSp\r
+  );\r
+\r
+#endif\r
index da71705..b4b29cf 100644 (file)
@@ -24,7 +24,6 @@ Revision History
 //\r
 // Don't use module globals after the SetVirtualAddress map is signaled\r
 //\r
-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;\r
 \r
 STATIC\r
 SAL_RETURN_REGS\r
index 55423a2..bf21a3e 100644 (file)
@@ -74,6 +74,8 @@ typedef struct {
   UINT32          FvbInstance;\r
 } ESAL_VARIABLE_GLOBAL;\r
 \r
+extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;\r
+\r
 //\r
 // Functions\r
 //\r
index 143836b..7e196d6 100644 (file)
@@ -27,13 +27,6 @@ Abstract:
 #include <GuidedSection.h>\r
 #include <Crc32SectionExtract.h>\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-InitializeCrc32GuidedSectionExtractionProtocol (\r
-  IN EFI_HANDLE                   ImageHandle,\r
-  IN EFI_SYSTEM_TABLE             *SystemTable\r
-  );\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 InitializeCrc32GuidedSectionExtractionProtocol (\r
index de2bb3a..387e637 100644 (file)
@@ -63,4 +63,33 @@ Returns:
 --*/\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+InitializeCrc32GuidedSectionExtractionProtocol (\r
+  IN EFI_HANDLE                   ImageHandle,\r
+  IN EFI_SYSTEM_TABLE             *SystemTable\r
+  )\r
+/*++\r
+\r
+Routine Description: \r
+\r
+  Entry point of the CRC32 GUIDed section extraction protocol. \r
+  Creates and initializes an instance of the GUIDed section \r
+  extraction protocol with CRC32 GUID.\r
+\r
+Arguments:  \r
+\r
+  ImageHandle   EFI_HANDLE: A handle for the image that is initializing \r
+                this driver\r
+  SystemTable   EFI_SYSTEM_TABLE: A pointer to the EFI system table        \r
+\r
+Returns:  \r
+\r
+  EFI_SUCCESS:          Driver initialized successfully\r
+  EFI_LOAD_ERROR:       Failed to Initialize or has been loaded \r
+  EFI_OUT_OF_RESOURCES: Could not allocate needed resources\r
+\r
+--*/\r
+;\r
+\r
 #endif\r
index 6d5a616..26df291 100644 (file)
@@ -163,6 +163,52 @@ typedef struct {
 \r
 #define EFI_LOAD_FILE_DEV_FROM_THIS(a)  CR (a, LOADFILE_DEVICE, LoadFile, LOADFILE_DEVICE_SIGNATURE)\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+PxeBcDriverSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeBcDriverStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeBcDriverStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     Controller,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PxeBcComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeBcComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 EFI_BIS_PROTOCOL                    *\r
 PxebcBisStart (\r
   PXE_BASECODE_DEVICE     *Private,\r
index 2c11dc4..4c6ebef 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "Bc.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PxeBcComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeBcComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index f3969b9..44f7cf2 100644 (file)
@@ -17,34 +17,6 @@ Abstract:
 \r
 #include "Bc.h"\r
 \r
-//\r
-//\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PxeBcDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeBcDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeBcDriverStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 //\r
 // helper routines\r
 //\r
index b48b5d0..12cc0b0 100644 (file)
@@ -20,31 +20,6 @@ Abstract:
 \r
 #include "PxeDhcp4.h"\r
 \r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4ComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 7bdc78f..f0e87db 100644 (file)
@@ -19,46 +19,6 @@ Abstract:
 \r
 #include "PxeDhcp4.h"\r
 \r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
-//\r
-// Prototypes\r
-// Driver model protocol interface\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4DriverEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4DriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PxeDhcp4DriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
 //\r
 // PXE DHCP Protocol Interface\r
 //\r
index 136d392..a49f169 100644 (file)
@@ -161,6 +161,56 @@ PxeDhcp4Release (
   )\r
 ;\r
 \r
+//\r
+// Prototypes\r
+// Driver model protocol interface\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PxeDhcp4DriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeDhcp4DriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN EFI_HANDLE                     ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeDhcp4DriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
+  IN  EFI_HANDLE                     ControllerHandle,\r
+  IN  UINTN                          NumberOfChildren,\r
+  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  );\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+PxeDhcp4ComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PxeDhcp4ComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 //\r
index 3cc2d98..7ccfcc1 100644 (file)
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "Snp.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-SimpleNetworkComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SimpleNetworkComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
index 3055b86..31cbc8e 100644 (file)
@@ -121,6 +121,29 @@ SNP_DRIVER;
 extern EFI_COMPONENT_NAME_PROTOCOL  gSimpleNetworkComponentName;\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gSimpleNetworkDriverBinding;\r
 \r
+extern EFI_PCI_IO_PROTOCOL          *mPciIoFncs;\r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+SimpleNetworkComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+SimpleNetworkComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 //\r
 //  Virtual to physical mapping for all UNDI 3.0s.\r
 //\r
index 54574cb..2a9c953 100644 (file)
@@ -33,7 +33,6 @@ STATIC EFI_LOCK             mLock;
 //\r
 // End Global variables\r
 //\r
-extern EFI_PCI_IO_PROTOCOL  *mPciIoFncs;\r
 \r
 VOID\r
 snp_undi32_callback_v2p_30 (\r
index eee0c94..cbd7a61 100644 (file)
@@ -44,6 +44,7 @@
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ReportDispatcher (\r
@@ -100,6 +101,7 @@ DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ReportDispatcher (\r
index 0671201..d47be70 100644 (file)
 \r
 #include "PeiStatusCode.h"\r
 \r
-/**\r
-  Report status code to all supported device.\r
-  \r
-  \r
-  @param  PeiServices\r
-\r
-  @param  Type          Indicates the type of status code being reported.  \r
-                        The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
-                        Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
-                        information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers.\r
-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
-                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
-                        their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
-\r
-  @return               Always return EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ReportDispatcher (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
-  IN EFI_STATUS_CODE_TYPE     Type,\r
-  IN EFI_STATUS_CODE_VALUE    Value,\r
-  IN UINT32                   Instance,\r
-  IN EFI_GUID                 *CallerId OPTIONAL,\r
-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
-  );\r
-\r
 STATIC\r
 EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = { \r
   ReportDispatcher\r
index 88ea9ce..2a8e0dd 100644 (file)
@@ -97,4 +97,43 @@ MemoryStatusCodeReportWorker (
   IN UINT32                   Instance\r
   );\r
 \r
+/**\r
+  Report status code to all supported device.\r
+  \r
+  \r
+  @param  PeiServices\r
+\r
+  @param  Type          Indicates the type of status code being reported.  \r
+                        The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
+  @param  Value         Describes the current status of a hardware or software entity.  \r
+                        This includes information about the class and subclass that is used to classify the entity \r
+                        as well as an operation.  For progress codes, the operation is the current activity.  \r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+                        Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
+                        A system may contain multiple entities that match a class/subclass pairing.  \r
+                        The instance differentiates between them.  An instance of 0 indicates that instance \r
+                        information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
+  @param  CallerId      This optional parameter may be used to identify the caller. \r
+                        This parameter allows the status code driver to apply different rules to different callers.\r
+  @param  Data          This optional parameter may be used to pass additional data.  \r
+                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
+                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
+                        their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
+\r
+  @return               Always return EFI_SUCCESS.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ReportDispatcher (\r
+  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN EFI_STATUS_CODE_TYPE     Type,\r
+  IN EFI_STATUS_CODE_VALUE    Value,\r
+  IN UINT32                   Instance,\r
+  IN EFI_GUID                 *CallerId OPTIONAL,\r
+  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
+  );\r
+\r
 #endif\r
index 407f769..8a873b3 100644 (file)
@@ -108,6 +108,7 @@ FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = {
   },\r
 };\r
 \r
+STATIC\r
 EFI_STATUS\r
 InitializeBinaryStructures (\r
   IN  EFI_HII_HANDLE                           *Handle,\r
@@ -118,12 +119,14 @@ InitializeBinaryStructures (
   EFI_FILE_FORM_TAGS                           **FileFormTagsHead\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 InitializeTagStructures (\r
   IN  EFI_IFR_BINARY                            *BinaryData,\r
   OUT EFI_FILE_FORM_TAGS                        *FileFormTags\r
   );\r
 \r
+STATIC\r
 UI_MENU_OPTION        *\r
 DisplayHomePage (\r
   IN UINTN                                    NumberOfIfrImages,\r
@@ -131,6 +134,7 @@ DisplayHomePage (
   IN UINT8                                    *CallbackData\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 GetIfrBinaryData (\r
   IN EFI_HII_PROTOCOL *Hii,\r
@@ -139,6 +143,7 @@ GetIfrBinaryData (
   IN EFI_IFR_BINARY   *BinaryData\r
   );\r
 \r
+STATIC\r
 EFI_STATUS\r
 InstallPrint (\r
   VOID\r
@@ -759,6 +764,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 InitializeTagStructures (\r
   IN  EFI_IFR_BINARY                            *BinaryData,\r
@@ -1706,6 +1712,7 @@ PopulateHomePage (
   return Status;\r
 }\r
 \r
+STATIC\r
 UI_MENU_OPTION *\r
 DisplayHomePage (\r
   IN UINTN                                    NumberOfIfrImages,\r
@@ -1733,6 +1740,7 @@ DisplayHomePage (
   return Selection;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 InitializeBinaryStructures (\r
   IN  EFI_HII_HANDLE                        *Handle,\r
@@ -2044,6 +2052,7 @@ InitializeBinaryStructures (
   return Status;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 GetIfrBinaryData (\r
   IN      EFI_HII_PROTOCOL *Hii,\r
@@ -2204,6 +2213,7 @@ Returns:
 EFI_HANDLE          PrintHandle     = NULL;\r
 EFI_PRINT_PROTOCOL  mPrintProtocol  = { UnicodeVSPrint };\r
 \r
+STATIC\r
 EFI_STATUS\r
 InstallPrint (\r
   VOID\r
index da71705..b4b29cf 100644 (file)
@@ -24,7 +24,6 @@ Revision History
 //\r
 // Don't use module globals after the SetVirtualAddress map is signaled\r
 //\r
-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;\r
 \r
 STATIC\r
 SAL_RETURN_REGS\r
index 014df50..3d0264d 100644 (file)
@@ -75,6 +75,8 @@ typedef struct {
   UINT32          FvbInstance;\r
 } ESAL_VARIABLE_GLOBAL;\r
 \r
+extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;\r
+\r
 //\r
 // Functions\r
 //\r