From: Liming Gao Date: Wed, 27 Jun 2018 13:06:35 +0000 (+0800) Subject: IntelFrameworkModulePkg: Clean up source files X-Git-Tag: edk2-stable201903~1507 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=0a6f48249a601f88af124ae1ff6814b195b699c3 IntelFrameworkModulePkg: Clean up source files 1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao --- diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h index 9e559da72b..0aaac776bb 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h @@ -1,7 +1,7 @@ /** @file The header file for ISA bus driver - -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -157,20 +157,20 @@ typedef struct { // EFI Driver Binding Protocol Interface Functions // -/** - Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided, +/** + Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided, it further tests to see if this driver supports creating a handle for the specified child device. Note that the ISA Bus driver always creates all of its child handles on the first call to Start(). How the Start() function of a driver is implemented can affect how the Supported() function is implemented. - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. @retval EFI_UNSUPPORTED The device is is not supported by this driver. @@ -184,24 +184,24 @@ IsaBusControllerDriverSupported ( ); /** - Start this driver on ControllerHandle. - + Start this driver on ControllerHandle. + Note that the ISA Bus driver always creates all of its child handles on the first call to Start(). - The Start() function is designed to be invoked from the EFI boot service ConnectController(). - As a result, much of the error checking on the parameters to Start() has been moved into this - common boot service. It is legal to call Start() from other locations, but the following calling + The Start() function is designed to be invoked from the EFI boot service ConnectController(). + As a result, much of the error checking on the parameters to Start() has been moved into this + common boot service. It is legal to call Start() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE. 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned EFI_DEVICE_PATH_PROTOCOL. 3. Prior to calling Start(), the Supported() function for the driver specified by This must - have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. + have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -219,11 +219,11 @@ IsaBusControllerDriverStart ( ); /** - Stop this driver on ControllerHandle. - - The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). - As a result, much of the error checking on the parameters to Stop() has been moved - into this common boot service. It is legal to call Stop() from other locations, + Stop this driver on ControllerHandle. + + The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). + As a result, much of the error checking on the parameters to Stop() has been moved + into this common boot service. It is legal to call Stop() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this same driver's Start() function. @@ -231,13 +231,13 @@ IsaBusControllerDriverStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's Start() function, and the Start() function must have called OpenProtocol() on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. - + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. @@ -257,11 +257,11 @@ IsaBusControllerDriverStop ( // /** - Create EFI Handle for a ISA device found via ISA ACPI Protocol + Create EFI Handle for a ISA device found via ISA ACPI Protocol @param[in] This The EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of ISA bus controller(PCI to ISA bridge) - @param[in] PciIo The Pointer to the PCI protocol + @param[in] PciIo The Pointer to the PCI protocol @param[in] ParentDevicePath Device path of the ISA bus controller @param[in] IsaDeviceResourceList The resource list of the ISA device @param[out] ChildDevicePath The pointer to the child device. @@ -285,7 +285,7 @@ IsaCreateDevice ( @param[in] IsaIoDevice The iso device to be initialized. @param[in] IsaDeviceResourceList The resource list. - + **/ VOID InitializeIsaIoInstance ( diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h index 054a6b9bab..cc388a047a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h @@ -1,7 +1,7 @@ /** @file The header file for EFI_ISA_IO protocol implementation. - -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,9 +34,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param[in] IsaIoDevice The ISA device to be verified. @param[in] Type The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo. @param[in] Width The width of the memory operation. - @param[in] Count The number of memory operations to perform. - @param[in] Offset The offset in ISA memory space to start the memory operation. - + @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @retval EFI_SUCCESS Verify success. @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. @retval EFI_UNSUPPORTED The device ont support the access type. @@ -49,14 +49,14 @@ IsaIoVerifyAccess ( IN UINTN Count, IN UINT32 Offset ); - + /** Performs an ISA I/O Read Cycle @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[out] Buffer The destination buffer to store the results @retval EFI_SUCCESS The data was read from the device sucessfully. @@ -79,8 +79,8 @@ IsaIoIoRead ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was writen to the device sucessfully. @@ -102,18 +102,18 @@ IsaIoIoWrite ( Maps a memory region for DMA @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -173,8 +173,8 @@ IsaIoFlush ( @param[in] PageOffset The page's offest. @param[in] CountOffset The count's offset. @param[in] BaseAddress The base address. - @param[in] Count The number of I/O operations to perform. - + @param[in] Count The number of I/O operations to perform. + @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Parameter is invalid. @retval EFI_UNSUPPORTED The address range specified by these Offsets and Count is not valid. @@ -194,7 +194,7 @@ WriteDmaPort ( Writes an 8-bit I/O Port @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Offset The offset in ISA IO space to start the IO operation. + @param[in] Offset The offset in ISA IO space to start the IO operation. @param[in] Value The data to write port. @retval EFI_SUCCESS Success. @@ -207,17 +207,17 @@ WritePort ( IN EFI_ISA_IO_PROTOCOL *This, IN UINT32 Offset, IN UINT8 Value - ); + ); /** Performs an ISA Memory Read Cycle @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[out] Buffer The destination buffer to store the results - + @retval EFI_SUCCESS The data was read from the device successfully. @retval EFI_UNSUPPORTED The Offset is not valid for this device. @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid. @@ -237,10 +237,10 @@ IsaIoMemRead ( /** Performs an ISA Memory Write Cycle - @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. + @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was written to the device sucessfully. @@ -263,7 +263,7 @@ IsaIoMemWrite ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory copy operation. - @param[in] DestOffset The offset of the destination + @param[in] DestOffset The offset of the destination @param[in] SrcOffset The offset of the source @param[in] Count The number of memory copy operations to perform @@ -294,7 +294,7 @@ IsaIoCopyMem ( @retval EFI_SUCCESS The requested memory pages were allocated. @retval EFI_INVALID_PARAMETER Type is invalid or MemoryType is invalid or HostAddress is NULL - @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified + @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified by HostAddress, Pages, and Type is not available for common buffer use. @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. **/ @@ -310,7 +310,7 @@ IsaIoAllocateBuffer ( ); /** - Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). + Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Pages The number of pages to free. diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c index 1312f260f9..a409355dd1 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c @@ -1,12 +1,12 @@ /** @file ISA Bus UEFI driver. - Discovers all the ISA Controllers and their resources by using the ISA ACPI - Protocol, produces an instance of the ISA I/O Protocol for every ISA + Discovers all the ISA Controllers and their resources by using the ISA ACPI + Protocol, produces an instance of the ISA I/O Protocol for every ISA Controller found. This driver is designed to manage a PCI-to-ISA bridge Device such as LPC bridge. - -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,9 +34,9 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver = { /** The main entry point for the ISA Bus driver. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval EFI_OUT_OF_RESOURCES There was not enough memory in pool to install all the protocols. **/ @@ -65,20 +65,20 @@ InitializeIsaBus( return Status; } -/** - Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided, +/** + Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided, it further tests to see if this driver supports creating a handle for the specified child device. Note that the ISA Bus driver always creates all of its child handles on the first call to Start(). How the Start() function of a driver is implemented can affect how the Supported() function is implemented. - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. @retval EFI_UNSUPPORTED The device is is not supported by this driver. @@ -97,7 +97,7 @@ IsaBusControllerDriverSupported ( // // If RemainingDevicePath is not NULL, it should verify that the first device - // path node in RemainingDevicePath is an ACPI Device path node which is a + // path node in RemainingDevicePath is an ACPI Device path node which is a // legal Device Path Node for this bus driver's children. // if (RemainingDevicePath != NULL) { @@ -192,24 +192,24 @@ IsaBusControllerDriverSupported ( } /** - Start this driver on ControllerHandle. - + Start this driver on ControllerHandle. + Note that the ISA Bus driver always creates all of its child handles on the first call to Start(). - The Start() function is designed to be invoked from the EFI boot service ConnectController(). - As a result, much of the error checking on the parameters to Start() has been moved into this - common boot service. It is legal to call Start() from other locations, but the following calling + The Start() function is designed to be invoked from the EFI boot service ConnectController(). + As a result, much of the error checking on the parameters to Start() has been moved into this + common boot service. It is legal to call Start() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE. 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned EFI_DEVICE_PATH_PROTOCOL. 3. Prior to calling Start(), the Supported() function for the driver specified by This must - have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. + have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -413,11 +413,11 @@ IsaBusControllerDriverStart ( } /** - Stop this driver on ControllerHandle. - - The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). - As a result, much of the error checking on the parameters to Stop() has been moved - into this common boot service. It is legal to call Stop() from other locations, + Stop this driver on ControllerHandle. + + The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). + As a result, much of the error checking on the parameters to Stop() has been moved + into this common boot service. It is legal to call Stop() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this same driver's Start() function. @@ -425,13 +425,13 @@ IsaBusControllerDriverStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's Start() function, and the Start() function must have called OpenProtocol() on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. - + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. @@ -538,7 +538,7 @@ IsaBusControllerDriverStop ( This->DriverBindingHandle, ChildHandleBuffer[Index], EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER - ); + ); } } @@ -559,11 +559,11 @@ IsaBusControllerDriverStop ( // /** - Create EFI Handle for a ISA device found via ISA ACPI Protocol + Create EFI Handle for a ISA device found via ISA ACPI Protocol @param[in] This The EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of ISA bus controller(PCI to ISA bridge) - @param[in] PciIo The Pointer to the PCI protocol + @param[in] PciIo The Pointer to the PCI protocol @param[in] ParentDevicePath Device path of the ISA bus controller @param[in] IsaDeviceResourceList The resource list of the ISA device @param[out] ChildDevicePath The pointer to the child device. diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni index 2496381592..2f9ff75fd7 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni @@ -6,13 +6,13 @@ // Controller found. This driver is designed to manage a PCI-to-ISA bridge Device // such as an LPC bridge. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni index fd4cda0a73..304c6a490f 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // IsaBusDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ISA Bus DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c index 6f1cd1b8b1..6b49abd0a1 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c @@ -1,7 +1,7 @@ /** @file - The implementation for EFI_ISA_IO_PROTOCOL. - -Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+ The implementation for EFI_ISA_IO_PROTOCOL. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -18,11 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // Module Variables // EFI_ISA_IO_PROTOCOL mIsaIoInterface = { - { + { IsaIoMemRead, IsaIoMemWrite }, - { + { IsaIoIoRead, IsaIoIoWrite }, @@ -85,7 +85,7 @@ EFI_ISA_DMA_REGISTERS mDmaRegisters[8] = { @param[in] IsaIoDevice The iso device to be initialized. @param[in] IsaDeviceResourceList The resource list. - + **/ VOID InitializeIsaIoInstance ( @@ -110,8 +110,8 @@ InitializeIsaIoInstance ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[out] Buffer The destination buffer to store the results @retval EFI_SUCCESS The data was read from the device sucessfully. @@ -172,8 +172,8 @@ IsaIoIoRead ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was writen to the device sucessfully. @@ -233,7 +233,7 @@ IsaIoIoWrite ( Writes an 8-bit I/O Port @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Offset The offset in ISA IO space to start the IO operation. + @param[in] Offset The offset in ISA IO space to start the IO operation. @param[in] Value The data to write port. @retval EFI_SUCCESS Success. @@ -282,8 +282,8 @@ WritePort ( @param[in] PageOffset The page's offest. @param[in] CountOffset The count's offset. @param[in] BaseAddress The base address. - @param[in] Count The number of I/O operations to perform. - + @param[in] Count The number of I/O operations to perform. + @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Parameter is invalid. @retval EFI_UNSUPPORTED The address range specified by these Offsets and Count is not valid. @@ -420,9 +420,9 @@ IsaIoFlush ( @param[in] IsaIoDevice The ISA device to be verified. @param[in] Type The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo. @param[in] Width The width of the memory operation. - @param[in] Count The number of memory operations to perform. - @param[in] Offset The offset in ISA memory space to start the memory operation. - + @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @retval EFI_SUCCESS Verify success. @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. @retval EFI_UNSUPPORTED The device ont support the access type. @@ -482,10 +482,10 @@ IsaIoVerifyAccess ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[out] Buffer The destination buffer to store the results - + @retval EFI_SUCCESS The data was read from the device successfully. @retval EFI_UNSUPPORTED The Offset is not valid for this device. @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid. @@ -549,10 +549,10 @@ IsaIoMemRead ( /** Performs an ISA Memory Write Cycle - @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. + @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was written to the device sucessfully. @@ -620,7 +620,7 @@ IsaIoMemWrite ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory copy operation. - @param[in] DestOffset The offset of the destination + @param[in] DestOffset The offset of the destination @param[in] SrcOffset The offset of the source @param[in] Count The number of memory copy operations to perform @@ -701,18 +701,18 @@ IsaIoCopyMem ( only supports slave read/write operation to save code size. @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -743,7 +743,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( UINT8 DmaMask; UINT8 DmaClear; UINT8 DmaChannelMode; - + if ((NULL == This) || (NULL == HostAddress) || (NULL == NumberOfBytes) || @@ -762,7 +762,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( // Make sure the Operation parameter is valid. // Light IsaIo only supports two operations. // - if (!(Operation == EfiIsaIoOperationSlaveRead || + if (!(Operation == EfiIsaIoOperationSlaveRead || Operation == EfiIsaIoOperationSlaveWrite)) { return EFI_INVALID_PARAMETER; } @@ -848,7 +848,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( // *DeviceAddress = PhysicalAddress; } - + // // Figure out what to program into the DMA Channel Mode Register // @@ -933,22 +933,22 @@ IsaIoMapOnlySupportSlaveReadWrite ( } /** - Maps a memory region for DMA. This implementation implement the + Maps a memory region for DMA. This implementation implement the the full mapping support. @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS - The range was mapped for the returned NumberOfBytes. @@ -1262,18 +1262,18 @@ IsaIoMapFullSupport ( Maps a memory region for DMA @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -1302,7 +1302,7 @@ IsaIoMap ( return EFI_UNSUPPORTED; } // - // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for + // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for // ISA Bus Master. // // So we just return EFI_UNSUPPORTED for these functions. @@ -1345,7 +1345,7 @@ IsaIoMap ( @retval EFI_SUCCESS The requested memory pages were allocated. @retval EFI_INVALID_PARAMETER Type is invalid or MemoryType is invalid or HostAddress is NULL - @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified + @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified by HostAddress, Pages, and Type is not available for common buffer use. @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. **/ @@ -1364,7 +1364,7 @@ IsaIoAllocateBuffer ( EFI_PHYSICAL_ADDRESS PhysicalAddress; // - // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for + // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for // ISA Bus Master. // Or unset Feature Flag PcdIsaBusSupportDma to disable support for ISA DMA. // @@ -1418,7 +1418,7 @@ IsaIoAllocateBuffer ( } /** - Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). + Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Pages The number of pages to free. @@ -1438,7 +1438,7 @@ IsaIoFreeBuffer ( EFI_STATUS Status; // - // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for + // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for // ISA Bus Master. // Or unset Feature Flag PcdIsaBusSupportDma to disable support for ISA DMA. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.c index 65555d3eb1..768b74c987 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.c @@ -1,14 +1,14 @@ /** @file ISA Floppy Disk UEFI Driver conforming to the UEFI driver model - 1. Support two types diskette drive + 1. Support two types diskette drive 1.44M drive and 2.88M drive (and now only support 1.44M) 2. Support two diskette drives per floppy disk controller 3. Use DMA channel 2 to transfer data 4. Do not use interrupt 5. Support diskette change line signal and write protect - -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -39,9 +39,9 @@ EFI_DRIVER_BINDING_PROTOCOL gFdcControllerDriver = { /** The main Entry Point for this driver. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. **/ @@ -72,14 +72,14 @@ InitializeIsaFloppy( /** Test if the controller is a floppy disk drive device - - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. @retval EFI_UNSUPPORTED The device is is not supported by this driver. **/ @@ -159,10 +159,10 @@ FdcControllerDriverSupported ( Start this driver on Controller. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -248,7 +248,7 @@ FdcControllerDriverStart ( FdcDev->ControllerNameTable = NULL; AddName (FdcDev); - + // // Look up the base address of the Floppy Disk Controller which controls this floppy device // @@ -397,11 +397,11 @@ Done: Stop this driver on ControllerHandle. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h index 30a2d7bf0c..4fdaa64bdd 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h @@ -1,7 +1,7 @@ /** @file Include file for ISA Floppy Driver - -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -482,14 +482,14 @@ typedef struct { /** Test controller is a floppy disk drive device - - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. **/ EFI_STATUS @@ -504,10 +504,10 @@ FdcControllerDriverSupported ( Start this driver on Controller. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -528,11 +528,11 @@ FdcControllerDriverStart ( Stop this driver on ControllerHandle. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. @@ -552,14 +552,14 @@ FdcControllerDriverStop ( // /** - Reset the Floppy Logic Drive, call the FddReset function. - + Reset the Floppy Logic Drive, call the FddReset function. + @param This EFI_BLOCK_IO *: A pointer to the Block I/O protocol interface - @param ExtendedVerification BOOLEAN: Indicate that the driver may perform a more - exhaustive verification operation of the device during - reset, now this par is ignored in this driver + @param ExtendedVerification BOOLEAN: Indicate that the driver may perform a more + exhaustive verification operation of the device during + reset, now this par is ignored in this driver @retval EFI_SUCCESS: The Floppy Logic Drive is reset - @retval EFI_DEVICE_ERROR: The Floppy Logic Drive is not functioning correctly + @retval EFI_DEVICE_ERROR: The Floppy Logic Drive is not functioning correctly and can not be reset **/ @@ -572,7 +572,7 @@ FdcReset ( /** Flush block via fdd controller. - + @param This EFI_BLOCK_IO *: A pointer to the Block I/O protocol interface @return EFI_SUCCESS @@ -584,23 +584,23 @@ FddFlushBlocks ( ); /** - Read the requested number of blocks from the device. - + Read the requested number of blocks from the device. + @param This EFI_BLOCK_IO *: A pointer to the Block I/O protocol interface - @param MediaId UINT32: The media id that the read request is for + @param MediaId UINT32: The media id that the read request is for @param Lba EFI_LBA: The starting logic block address to read from on the device @param BufferSize UINTN: The size of the Buffer in bytes @param Buffer VOID *: A pointer to the destination buffer for the data - + @retval EFI_SUCCESS: The data was read correctly from the device @retval EFI_DEVICE_ERROR:The device reported an error while attempting to perform the read operation @retval EFI_NO_MEDIA: There is no media in the device @retval EFI_MEDIA_CHANGED: The MediaId is not for the current media - @retval EFI_BAD_BUFFER_SIZE: The BufferSize parameter is not a multiple of the + @retval EFI_BAD_BUFFER_SIZE: The BufferSize parameter is not a multiple of the intrinsic block size of the device - @retval EFI_INVALID_PARAMETER:The read request contains LBAs that are not valid, - or the buffer is not on proper alignment + @retval EFI_INVALID_PARAMETER:The read request contains LBAs that are not valid, + or the buffer is not on proper alignment **/ EFI_STATUS @@ -614,24 +614,24 @@ FddReadBlocks ( ); /** - Write a specified number of blocks to the device. - + Write a specified number of blocks to the device. + @param This EFI_BLOCK_IO *: A pointer to the Block I/O protocol interface - @param MediaId UINT32: The media id that the write request is for + @param MediaId UINT32: The media id that the write request is for @param Lba EFI_LBA: The starting logic block address to be written @param BufferSize UINTN: The size in bytes in Buffer @param Buffer VOID *: A pointer to the source buffer for the data - + @retval EFI_SUCCESS: The data were written correctly to the device - @retval EFI_WRITE_PROTECTED: The device can not be written to + @retval EFI_WRITE_PROTECTED: The device can not be written to @retval EFI_NO_MEDIA: There is no media in the device @retval EFI_MEDIA_CHANGED: The MediaId is not for the current media - @retval EFI_DEVICE_ERROR: The device reported an error while attempting to perform - the write operation - @retval EFI_BAD_BUFFER_SIZE: The BufferSize parameter is not a multiple of the + @retval EFI_DEVICE_ERROR: The device reported an error while attempting to perform + the write operation + @retval EFI_BAD_BUFFER_SIZE: The BufferSize parameter is not a multiple of the intrinsic block size of the device - @retval EFI_INVALID_PARAMETER:The write request contains LBAs that are not valid, - or the buffer is not on proper alignment + @retval EFI_INVALID_PARAMETER:The write request contains LBAs that are not valid, + or the buffer is not on proper alignment **/ EFI_STATUS EFIAPI @@ -649,7 +649,7 @@ FddWriteBlocks ( /** Detect the floppy drive is presented or not. - + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the Data Structure FDC_BLK_IO_DEV @retval EFI_SUCCESS Drive is presented @retval EFI_NOT_FOUND Drive is not presented @@ -664,7 +664,7 @@ DiscoverFddDevice ( Do recalibrate and see the drive is presented or not. Set the media parameters. - + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the Data Structure FDC_BLK_IO_DEV @return the drive is presented or not @@ -677,9 +677,9 @@ FddIdentify ( /** Reset the Floppy Logic Drive. - + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the Data Structure FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: The Floppy Logic Drive is reset @retval EFI_DEVICE_ERROR: The Floppy Logic Drive is not functioning correctly and can not be reset @@ -694,9 +694,9 @@ FddReset ( Turn the drive's motor on. The drive's motor must be on before any command can be executed. - + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the Data Structure FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: Turn the drive's motor on successfully @retval EFI_DEVICE_ERROR: The drive is busy, so can not turn motor on @retval EFI_INVALID_PARAMETER: Fail to Set timer(Cancel timer) @@ -710,10 +710,10 @@ MotorOn ( /** Set a Timer and when Timer goes off, turn the motor off. - - + + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the Data Structure FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: Set the Timer successfully @retval EFI_INVALID_PARAMETER: Fail to Set the timer @@ -725,10 +725,10 @@ MotorOff ( /** Detect the disk in the drive is changed or not. - - + + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: No disk media change @retval EFI_DEVICE_ERROR: Fail to do the recalibrate or seek operation @retval EFI_NO_MEDIA: No disk in the drive @@ -743,9 +743,9 @@ DisketChanged ( Do the Specify command, this command sets DMA operation and the initial values for each of the three internal times: HUT, SRT and HLT. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: Execute the Specify command successfully @retval EFI_DEVICE_ERROR: Fail to execute the command @@ -757,7 +757,7 @@ Specify ( /** Set the head of floppy drive to track 0. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @retval EFI_SUCCESS: Execute the Recalibrate operation successfully @retval EFI_DEVICE_ERROR: Fail to execute the Recalibrate operation @@ -770,10 +770,10 @@ Recalibrate ( /** Set the head of floppy drive to the new cylinder. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param Lba EFI_LBA : The logic block address want to seek - + @retval EFI_SUCCESS: Execute the Seek operation successfully @retval EFI_DEVICE_ERROR: Fail to execute the Seek operation @@ -786,12 +786,12 @@ Seek ( /** Do the Sense Interrupt Status command, this command resets the interrupt signal. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param StatusRegister0 UINT8 *: Be used to save Status Register 0 read from FDC @param PresentCylinderNumber UINT8 *: Be used to save present cylinder number read from FDC - + @retval EFI_SUCCESS: Execute the Sense Interrupt Status command successfully @retval EFI_DEVICE_ERROR: Fail to execute the command @@ -805,10 +805,10 @@ SenseIntStatus ( /** Do the Sense Drive Status command. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param Lba EFI_LBA : Logic block address - + @retval EFI_SUCCESS: Execute the Sense Drive Status command successfully @retval EFI_DEVICE_ERROR: Fail to execute the command @retval EFI_WRITE_PROTECTED:The disk is write protected @@ -822,9 +822,9 @@ SenseDrvStatus ( /** Update the disk media properties and if necessary reinstall Block I/O interface. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: Do the operation successfully @retval EFI_DEVICE_ERROR: Fail to the operation @@ -836,7 +836,7 @@ DetectMedia ( /** Set the data rate and so on. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @retval EFI_SUCCESS success to set the data rate @@ -848,13 +848,13 @@ Setup ( /** Read or Write a number of blocks in the same cylinder. - + @param FdcDev A pointer to Data Structure FDC_BLK_IO_DEV - @param HostAddress device address + @param HostAddress device address @param Lba The starting logic block address to read from on the device @param NumberOfBlocks The number of block wanted to be read or write @param Read Operation type: read or write - + @retval EFI_SUCCESS Success operate **/ @@ -869,7 +869,7 @@ ReadWriteDataSector ( /** Fill in FDD command's parameter. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Lba The starting logic block address to read from on the device @param Command FDD command @@ -884,10 +884,10 @@ FillPara ( /** Read result byte from Data Register of FDC. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Pointer Buffer to store the byte read from FDC - + @retval EFI_SUCCESS Read result byte from FDC successfully @retval EFI_DEVICE_ERROR The FDC is not ready to be read @@ -900,10 +900,10 @@ DataInByte ( /** Write command byte to Data Register of FDC. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Pointer Be used to save command byte written to FDC - + @retval EFI_SUCCESS: Write command byte to FDC successfully @retval EFI_DEVICE_ERROR: The FDC is not ready to be written @@ -916,10 +916,10 @@ DataOutByte ( /** Detect the specified floppy logic drive is busy or not within a period of time. - + @param FdcDev Indicate it is drive A or drive B @param Timeout The time period for waiting - + @retval EFI_SUCCESS: The drive and command are not busy @retval EFI_TIMEOUT: The drive or command is still busy after a period time that set by Timeout @@ -933,11 +933,11 @@ FddWaitForBSYClear ( /** Determine whether FDC is ready to write or read. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Dio BOOLEAN: Indicate the FDC is waiting to write or read @param Timeout The time period for waiting - + @retval EFI_SUCCESS: FDC is ready to write or read @retval EFI_NOT_READY: FDC is not ready within the specified time period @@ -969,9 +969,9 @@ CheckResult ( /** Check the drive status information. - + @param StatusRegister3 the value of Status Register 3 - + @retval EFI_SUCCESS The disk is not write protected @retval EFI_WRITE_PROTECTED: The disk is write protected @@ -983,11 +983,11 @@ CheckStatus3 ( /** Calculate the number of block in the same cylinder according to Lba. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param Lba EFI_LBA: The starting logic block address @param NumberOfBlocks UINTN: The number of blocks - + @return The number of blocks in the same cylinder which the starting logic block address is Lba @@ -1001,7 +1001,7 @@ GetTransferBlockCount ( /** When the Timer(2s) off, turn the drive's motor off. - + @param Event EFI_EVENT: Event(the timer) whose notification function is being invoked @param Context VOID *: Pointer to the notification function's context @@ -1016,7 +1016,7 @@ FddTimerProc ( /** Read I/O port for FDC. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param Offset The offset address of port @@ -1029,11 +1029,11 @@ FdcReadPort ( /** Write I/O port for FDC. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to Data Structure FDC_BLK_IO_DEV @param Offset The offset address of port @param Data Value written to port - + **/ VOID FdcWritePort ( @@ -1079,10 +1079,10 @@ FddReadWriteBlocks ( ); /** - Common interface for free cache. - + Common interface for free cache. + @param FdcDev Pointer of FDC_BLK_IO_DEV instance - + **/ VOID FdcFreeCache ( diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c index 39f0ba0191..2dce7ac7e0 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c @@ -1,7 +1,7 @@ -/** @file +/** @file Implementation of the EFI Block IO Protocol for ISA Floppy driver - -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -71,7 +71,7 @@ FddFlushBlocks ( /** Common report status code interface. - + @param This Pointer of FDC_BLK_IO_DEV instance @param Read Read or write operation when error occurrs **/ @@ -107,7 +107,7 @@ FddReportStatus ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -148,7 +148,7 @@ FddReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -189,7 +189,7 @@ FddWriteBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. @retval EFI_WRITE_PROTECTED The device can not be written to. @@ -359,9 +359,9 @@ FddReadWriteBlocks ( /** Free cache for a floppy disk. - + @param FdcDev A Pointer to FDC_BLK_IO_DEV instance - + **/ VOID FdcFreeCache ( diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c index 16ad6b02e3..48e214f173 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c @@ -1,7 +1,7 @@ /** @file Internal floppy disk controller programming functions for the floppy driver. - -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /** Detect whether a floppy drive is present or not. - + @param[in] FdcDev A pointer to the FDC_BLK_IO_DEV @retval EFI_SUCCESS The floppy disk drive is present @@ -49,7 +49,7 @@ DiscoverFddDevice ( /** Do recalibrate and check if the drive is present or not and set the media parameters if the driver is present. - + @param[in] FdcDev A pointer to the FDC_BLK_IO_DEV @retval EFI_SUCCESS The floppy disk drive is present @@ -123,9 +123,9 @@ FddIdentify ( /** Reset the Floppy Logic Drive. - + @param FdcDev FDC_BLK_IO_DEV * : A pointer to the FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: The Floppy Logic Drive is reset @retval EFI_DEVICE_ERROR: The Floppy Logic Drive is not functioning correctly and can not be reset @@ -222,9 +222,9 @@ FddReset ( /** Turn the floppy disk drive's motor on. The drive's motor must be on before any command can be executed. - + @param[in] FdcDev A pointer to the FDC_BLK_IO_DEV - + @retval EFI_SUCCESS The drive's motor was turned on successfully @retval EFI_DEVICE_ERROR The drive is busy, so can not turn motor on **/ @@ -298,9 +298,9 @@ MotorOn ( /** Set a Timer and when Timer goes off, turn the motor off. - + @param[in] FdcDev A pointer to the FDC_BLK_IO_DEV - + @retval EFI_SUCCESS Set the Timer successfully @retval EFI_INVALID_PARAMETER Fail to Set the timer **/ @@ -317,9 +317,9 @@ MotorOff ( /** Detect whether the disk in the drive is changed or not. - + @param[in] FdcDev A pointer to FDC_BLK_IO_DEV - + @retval EFI_SUCCESS No disk media change @retval EFI_DEVICE_ERROR Fail to do the recalibrate or seek operation @retval EFI_NO_MEDIA No disk in the drive @@ -382,9 +382,9 @@ DisketChanged ( Do the Specify command, this command sets DMA operation and the initial values for each of the three internal times: HUT, SRT and HLT. - + @param[in] FdcDev Pointer to instance of FDC_BLK_IO_DEV - + @retval EFI_SUCCESS Execute the Specify command successfully @retval EFI_DEVICE_ERROR Fail to execute the command **/ @@ -422,7 +422,7 @@ Specify ( /** Set the head of floppy drive to track 0. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV @retval EFI_SUCCESS: Execute the Recalibrate operation successfully @retval EFI_DEVICE_ERROR: Fail to execute the Recalibrate operation @@ -496,10 +496,10 @@ Recalibrate ( /** Set the head of floppy drive to the new cylinder. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV @param Lba EFI_LBA : The logic block address want to seek - + @retval EFI_SUCCESS: Execute the Seek operation successfully @retval EFI_DEVICE_ERROR: Fail to execute the Seek operation @@ -600,12 +600,12 @@ Seek ( /** Do the Sense Interrupt Status command, this command resets the interrupt signal. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV @param StatusRegister0 UINT8 *: Be used to save Status Register 0 read from FDC @param PresentCylinderNumber UINT8 *: Be used to save present cylinder number read from FDC - + @retval EFI_SUCCESS: Execute the Sense Interrupt Status command successfully @retval EFI_DEVICE_ERROR: Fail to execute the command @@ -637,10 +637,10 @@ SenseIntStatus ( /** Do the Sense Drive Status command. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV @param Lba EFI_LBA : Logic block address - + @retval EFI_SUCCESS: Execute the Sense Drive Status command successfully @retval EFI_DEVICE_ERROR: Fail to execute the command @retval EFI_WRITE_PROTECTED:The disk is write protected @@ -700,9 +700,9 @@ SenseDrvStatus ( /** Update the disk media properties and if necessary reinstall Block I/O interface. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV - + @retval EFI_SUCCESS: Do the operation successfully @retval EFI_DEVICE_ERROR: Fail to the operation @@ -778,7 +778,7 @@ DetectMedia ( /** Set the data rate and so on. - + @param FdcDev A pointer to FDC_BLK_IO_DEV @retval EFI_SUCCESS success to set the data rate @@ -811,13 +811,13 @@ Setup ( /** Read or Write a number of blocks in the same cylinder. - + @param FdcDev A pointer to FDC_BLK_IO_DEV - @param HostAddress device address + @param HostAddress device address @param Lba The starting logic block address to read from on the device @param NumberOfBlocks The number of block wanted to be read or write @param Read Operation type: read or write - + @retval EFI_SUCCESS Success operate **/ @@ -961,7 +961,7 @@ ReadWriteDataSector ( /** Fill in FDD command's parameter. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Lba The starting logic block address to read from on the device @param Command FDD command @@ -1002,10 +1002,10 @@ FillPara ( /** Read result byte from Data Register of FDC. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Pointer Buffer to store the byte read from FDC - + @retval EFI_SUCCESS Read result byte from FDC successfully @retval EFI_DEVICE_ERROR The FDC is not ready to be read @@ -1041,10 +1041,10 @@ DataInByte ( /** Write command byte to Data Register of FDC. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Pointer Be used to save command byte written to FDC - + @retval EFI_SUCCESS: Write command byte to FDC successfully @retval EFI_DEVICE_ERROR: The FDC is not ready to be written @@ -1081,10 +1081,10 @@ DataOutByte ( /** Detect the specified floppy logic drive is busy or not within a period of time. - + @param FdcDev Indicate it is drive A or drive B @param Timeout The time period for waiting - + @retval EFI_SUCCESS: The drive and command are not busy @retval EFI_TIMEOUT: The drive or command is still busy after a period time that set by Timeout @@ -1135,11 +1135,11 @@ FddWaitForBSYClear ( /** Determine whether FDC is ready to write or read. - + @param FdcDev Pointer to instance of FDC_BLK_IO_DEV @param Dio BOOLEAN: Indicate the FDC is waiting to write or read @param Timeout The time period for waiting - + @retval EFI_SUCCESS: FDC is ready to write or read @retval EFI_NOT_READY: FDC is not ready within the specified time period @@ -1196,7 +1196,7 @@ FddDRQReady ( } /** - Set FDC control structure's attribute according to result. + Set FDC control structure's attribute according to result. @param Result Point to result structure @param FdcDev FDC control structure @@ -1247,9 +1247,9 @@ CheckResult ( /** Check the drive status information. - + @param StatusRegister3 the value of Status Register 3 - + @retval EFI_SUCCESS The disk is not write protected @retval EFI_WRITE_PROTECTED: The disk is write protected @@ -1268,11 +1268,11 @@ CheckStatus3 ( /** Calculate the number of block in the same cylinder according to LBA. - + @param FdcDev FDC_BLK_IO_DEV *: A pointer to FDC_BLK_IO_DEV @param LBA EFI_LBA: The starting logic block address @param NumberOfBlocks UINTN: The number of blocks - + @return The number of blocks in the same cylinder which the starting logic block address is LBA @@ -1304,7 +1304,7 @@ GetTransferBlockCount ( /** When the Timer(2s) off, turn the drive's motor off. - + @param Event EFI_EVENT: Event(the timer) whose notification function is being invoked @param Context VOID *: Pointer to the notification function's context @@ -1343,7 +1343,7 @@ FddTimerProc ( /** Read an I/O port of FDC. - + @param[in] FdcDev A pointer to FDC_BLK_IO_DEV. @param[in] Offset The address offset of the I/O port. @@ -1372,7 +1372,7 @@ FdcReadPort ( /** Write an I/O port of FDC. - + @param[in] FdcDev A pointer to FDC_BLK_IO_DEV @param[in] Offset The address offset of the I/O port @param[in] Data 8-bit Value written to the I/O port diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.uni index 9bf5c6c1de..dfbe50e2e6 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.uni @@ -5,13 +5,13 @@ // driver provides support for two drives per controller, DMA channel 2, diskette // change line and write protect. Currently only 1.44MB drives are supported. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxeExtra.uni index 07af0667ff..57889478e5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // IsaFloppyDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ISA Floppy DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/Fdc.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/Fdc.h index a6a7e42aee..46006377a4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/Fdc.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/Fdc.h @@ -1,8 +1,8 @@ -/** @file +/** @file Definition of FDC registers and structures. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
- +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.c index 765a46dd31..830eb9dfec 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.c @@ -1,8 +1,8 @@ /** @file Floppy Peim to support Recovery function from Floppy device. -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
- +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The @@ -152,7 +152,7 @@ PEI_DMA_TABLE mRegisterTable[] = { }; // -// Table of diskette parameters of various diskette types +// Table of diskette parameters of various diskette types // DISKET_PARA_TABLE DiskPara[9] = { { @@ -292,7 +292,7 @@ FDC_BLK_IO_DEV mBlockIoDevTemplate = { TRUE means input. FALSE means output. @param TimeoutInMseconds Timeout value to wait. - + @retval EFI_SUCCESS FDC is ready. @retval EFI_NOT_READY FDC is not ready within the specified time period. @@ -783,7 +783,7 @@ Recalibrate ( if ((Sts0 & 0xf0) == BIT5 && Pcn == 0) { // - // Recalibration is successful. + // Recalibration is successful. // Info->Pcn = 0; Info->NeedRecalibrate = FALSE; @@ -1022,7 +1022,7 @@ DiscoverFdcDevice ( // // No diskette in floppy. // - MediaInfo->MediaPresent = FALSE; + MediaInfo->MediaPresent = FALSE; } else if (Status != EFI_MEDIA_CHANGED && Status != EFI_SUCCESS) { // // EFI_DEVICE_ERROR @@ -1439,16 +1439,16 @@ ReadDataSector ( /** Gets the count of block I/O devices that one specific block driver detects. - This function is used for getting the count of block I/O devices that one + This function is used for getting the count of block I/O devices that one specific block driver detects. To the PEI ATAPI driver, it returns the number - of all the detected ATAPI devices it detects during the enumeration process. - To the PEI legacy floppy driver, it returns the number of all the legacy - devices it finds during its enumeration process. If no device is detected, - then the function will return zero. - - @param[in] PeiServices General-purpose services that are available + of all the detected ATAPI devices it detects during the enumeration process. + To the PEI legacy floppy driver, it returns the number of all the legacy + devices it finds during its enumeration process. If no device is detected, + then the function will return zero. + + @param[in] PeiServices General-purpose services that are available to every PEIM. - @param[in] This Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI + @param[in] This Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance. @param[out] NumberBlockDevices The number of block I/O devices discovered. @@ -1477,27 +1477,27 @@ FdcGetNumberOfBlockDevices ( /** Gets a block device's media information. - This function will provide the caller with the specified block device's media - information. If the media changes, calling this function will update the media + This function will provide the caller with the specified block device's media + information. If the media changes, calling this function will update the media information accordingly. @param[in] PeiServices General-purpose services that are available to every PEIM @param[in] This Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance. - @param[in] DeviceIndex Specifies the block device to which the function wants - to talk. Because the driver that implements Block I/O - PPIs will manage multiple block devices, the PPIs that - want to talk to a single device must specify the + @param[in] DeviceIndex Specifies the block device to which the function wants + to talk. Because the driver that implements Block I/O + PPIs will manage multiple block devices, the PPIs that + want to talk to a single device must specify the device index that was assigned during the enumeration - process. This index is a number from one to + process. This index is a number from one to NumberBlockDevices. - @param[out] MediaInfo The media information of the specified block media. - The caller is responsible for the ownership of this + @param[out] MediaInfo The media information of the specified block media. + The caller is responsible for the ownership of this data structure. - - @retval EFI_SUCCESS Media information about the specified block device + + @retval EFI_SUCCESS Media information about the specified block device was obtained successfully. - @retval EFI_DEVICE_ERROR Cannot get the media information due to a hardware + @retval EFI_DEVICE_ERROR Cannot get the media information due to a hardware error. @retval Others Other failure occurs. @@ -1559,31 +1559,31 @@ FdcGetBlockDeviceMediaInfo ( /** Reads the requested number of blocks from the specified block device. - The function reads the requested number of blocks from the device. All the + The function reads the requested number of blocks from the device. All the blocks are read, or an error is returned. If there is no media in the device, the function returns EFI_NO_MEDIA. - @param[in] PeiServices General-purpose services that are available to + @param[in] PeiServices General-purpose services that are available to every PEIM. @param[in] This Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance. - @param[in] DeviceIndex Specifies the block device to which the function wants - to talk. Because the driver that implements Block I/O - PPIs will manage multiple block devices, the PPIs that - want to talk to a single device must specify the device - index that was assigned during the enumeration process. + @param[in] DeviceIndex Specifies the block device to which the function wants + to talk. Because the driver that implements Block I/O + PPIs will manage multiple block devices, the PPIs that + want to talk to a single device must specify the device + index that was assigned during the enumeration process. This index is a number from one to NumberBlockDevices. @param[in] StartLBA The starting logical block address (LBA) to read from on the device @param[in] BufferSize The size of the Buffer in bytes. This number must be a multiple of the intrinsic block size of the device. @param[out] Buffer A pointer to the destination buffer for the data. - The caller is responsible for the ownership of the + The caller is responsible for the ownership of the buffer. - + @retval EFI_SUCCESS The data was read correctly from the device. - @retval EFI_DEVICE_ERROR The device reported an error while attempting + @retval EFI_DEVICE_ERROR The device reported an error while attempting to perform the read operation. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not properly aligned. @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_BAD_BUFFER_SIZE The BufferSize parameter is not a multiple of @@ -1729,7 +1729,7 @@ FdcPeimEntry ( // // Allocate memory for instance of FDC_BLK_IO_DEV and copy initial value - // from template to it. + // from template to it. // FdcBlkIoDev = AllocatePages (EFI_SIZE_TO_PAGES(sizeof (FDC_BLK_IO_DEV))); if (FdcBlkIoDev == NULL) { diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.h index 6477394efc..03f79b0449 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/FloppyPeim.h @@ -1,8 +1,8 @@ /** @file Private include file for IsaFloppyPei PEIM. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
- +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The @@ -104,7 +104,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// /// ISA memory range /// -#define ISA_MAX_MEMORY_ADDRESS 0x1000000 +#define ISA_MAX_MEMORY_ADDRESS 0x1000000 // // Macro for time delay & interval diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.uni index 6d99cded27..ef7c7a2f72 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.uni @@ -5,14 +5,14 @@ // the PEIM will install the BlockIo PPI. This module is only dispatched if it // is in the Recovery Boot mode. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPeiExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPeiExtra.uni index 897389c521..ba2ca244aa 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPeiExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file // IsaFloppyPei Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ISA Floppy PEI Module" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c index 8c58b318c6..fcdb5c0a7a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c @@ -2,8 +2,8 @@ IsaIo UEFI driver. Produce an instance of the ISA I/O Protocol for every SIO controller. - -Copyright (c) 2010, Intel Corporation. All rights reserved.
+ +Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -31,9 +31,9 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaIoDriver = { /** The main entry point for the IsaIo driver. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval EFI_OUT_OF_RESOURCES There was not enough memory in pool to install all the protocols. **/ @@ -62,16 +62,16 @@ InitializeIsaIo ( return Status; } -/** +/** Tests to see if a controller can be managed by the IsaIo driver. - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. @retval EFI_UNSUPPORTED The device is is not supported by this driver. @@ -136,23 +136,23 @@ IsaIoDriverSupported ( } /** - Start this driver on ControllerHandle. - - The Start() function is designed to be invoked from the EFI boot service ConnectController(). - As a result, much of the error checking on the parameters to Start() has been moved into this - common boot service. It is legal to call Start() from other locations, but the following calling + Start this driver on ControllerHandle. + + The Start() function is designed to be invoked from the EFI boot service ConnectController(). + As a result, much of the error checking on the parameters to Start() has been moved into this + common boot service. It is legal to call Start() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE. 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned EFI_DEVICE_PATH_PROTOCOL. 3. Prior to calling Start(), the Supported() function for the driver specified by This must - have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. + have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -254,11 +254,11 @@ IsaIoDriverStart ( } /** - Stop this driver on ControllerHandle. - - The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). - As a result, much of the error checking on the parameters to Stop() has been moved - into this common boot service. It is legal to call Stop() from other locations, + Stop this driver on ControllerHandle. + + The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). + As a result, much of the error checking on the parameters to Stop() has been moved + into this common boot service. It is legal to call Stop() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this same driver's Start() function. @@ -266,13 +266,13 @@ IsaIoDriverStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's Start() function, and the Start() function must have called OpenProtocol() on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. - + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h index 64f710bcec..9639d18318 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h @@ -1,7 +1,7 @@ /** @file The header file for ISA driver - -Copyright (c) 2010, Intel Corporation. All rights reserved.
+ +Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -148,18 +148,18 @@ typedef struct { // EFI Driver Binding Protocol Interface Functions // -/** +/** Tests to see if a controller can be managed by the ISA Driver. How the Start() function of a driver is implemented can affect how the Supported() function is implemented. - @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param[in] Controller The handle of the controller to test. @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The device is supported by this driver. @retval EFI_ALREADY_STARTED The device is already being managed by this driver. - @retval EFI_ACCESS_DENIED The device is already being managed by a different driver + @retval EFI_ACCESS_DENIED The device is already being managed by a different driver or an application that requires exclusive access. @retval EFI_UNSUPPORTED The device is is not supported by this driver. @@ -173,23 +173,23 @@ IsaIoDriverSupported ( ); /** - Start this driver on ControllerHandle. - - The Start() function is designed to be invoked from the EFI boot service ConnectController(). - As a result, much of the error checking on the parameters to Start() has been moved into this - common boot service. It is legal to call Start() from other locations, but the following calling + Start this driver on ControllerHandle. + + The Start() function is designed to be invoked from the EFI boot service ConnectController(). + As a result, much of the error checking on the parameters to Start() has been moved into this + common boot service. It is legal to call Start() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE. 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned EFI_DEVICE_PATH_PROTOCOL. 3. Prior to calling Start(), the Supported() function for the driver specified by This must - have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. + have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS. @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle The handle of the controller to start. This handle - must support a protocol interface that supplies + @param[in] ControllerHandle The handle of the controller to start. This handle + must support a protocol interface that supplies an I/O abstraction to the driver. - @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. + @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This parameter is ignored by device drivers, and is optional for bus drivers. @retval EFI_SUCCESS The device was started. @@ -207,11 +207,11 @@ IsaIoDriverStart ( ); /** - Stop this driver on ControllerHandle. - - The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). - As a result, much of the error checking on the parameters to Stop() has been moved - into this common boot service. It is legal to call Stop() from other locations, + Stop this driver on ControllerHandle. + + The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). + As a result, much of the error checking on the parameters to Stop() has been moved + into this common boot service. It is legal to call Stop() from other locations, but the following calling restrictions must be followed or the system behavior will not be deterministic. 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this same driver's Start() function. @@ -219,13 +219,13 @@ IsaIoDriverStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's Start() function, and the Start() function must have called OpenProtocol() on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. - + @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. - @param[in] ControllerHandle A handle to the device being stopped. The handle must - support a bus specific I/O protocol for the driver + @param[in] ControllerHandle A handle to the device being stopped. The handle must + support a bus specific I/O protocol for the driver to use to stop the device. @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer. - @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL + @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. @retval EFI_SUCCESS The device was stopped. @@ -250,7 +250,7 @@ IsaIoDriverStop ( @param[in] IsaIoDevice The isa device to be initialized. @param[in] DevicePath The device path of the isa device. @param[in] Resources The ACPI resource list. - + **/ VOID InitializeIsaIoInstance ( diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c index 2e4361fc0d..837f46001d 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c @@ -1,7 +1,7 @@ /** @file - The implementation for EFI_ISA_IO_PROTOCOL. - -Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ The implementation for EFI_ISA_IO_PROTOCOL. + +Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -18,11 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // Module Variables // EFI_ISA_IO_PROTOCOL mIsaIoInterface = { - { + { IsaIoMemRead, IsaIoMemWrite }, - { + { IsaIoIoRead, IsaIoIoWrite }, @@ -86,9 +86,9 @@ EFI_ISA_DMA_REGISTERS mDmaRegisters[8] = { @param[in] IsaIoDevice The ISA device to be verified. @param[in] Type The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo. @param[in] Width The width of the memory operation. - @param[in] Count The number of memory operations to perform. - @param[in] Offset The offset in ISA memory space to start the memory operation. - + @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @retval EFI_SUCCESS Verify success. @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. @retval EFI_UNSUPPORTED The device ont support the access type. @@ -163,7 +163,7 @@ IsaIoAttribute ( case EFI_ACPI_IO_DECODE_16_BIT: Attribute |= EFI_ISA_ACPI_IO_DECODE_16_BITS; break; - + case EFI_ACPI_IO_DECODE_10_BIT: Attribute |= EFI_ISA_ACPI_IO_DECODE_10_BITS; break; @@ -244,7 +244,7 @@ IsaDmaAttribute ( UINT32 Attribute; Attribute = EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_SINGLE_MODE; - + switch (Information & EFI_ACPI_DMA_SPEED_TYPE_MASK) { case EFI_ACPI_DMA_SPEED_TYPE_COMPATIBILITY: Attribute |= EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_SPEED_COMPATIBLE; @@ -424,7 +424,7 @@ AcpiResourceToIsaResource ( @param[in] IsaIoDevice The isa device to be initialized. @param[in] DevicePath The device path of the isa device. @param[in] Resources The ACPI resource list. - + **/ VOID InitializeIsaIoInstance ( @@ -452,7 +452,7 @@ InitializeIsaIoInstance ( ResourcePtr = Resources; Index = 0; while (ResourcePtr.SmallHeader->Byte != ACPI_END_TAG_DESCRIPTOR) { - + Index += AcpiResourceToIsaResource (ResourcePtr, NULL); if (ResourcePtr.SmallHeader->Bits.Type == 0) { @@ -498,7 +498,7 @@ InitializeIsaIoInstance ( + sizeof (*ResourcePtr.LargeHeader)); } } - + // // Convert the ACPI End Tag // @@ -510,8 +510,8 @@ InitializeIsaIoInstance ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[out] Buffer The destination buffer to store the results @retval EFI_SUCCESS The data was read from the device sucessfully. @@ -572,8 +572,8 @@ IsaIoIoRead ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was writen to the device sucessfully. @@ -633,7 +633,7 @@ IsaIoIoWrite ( Writes an 8-bit I/O Port @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Offset The offset in ISA IO space to start the IO operation. + @param[in] Offset The offset in ISA IO space to start the IO operation. @param[in] Value The data to write port. @retval EFI_SUCCESS Success. @@ -685,8 +685,8 @@ WritePort ( @param[in] PageOffset The page's offest. @param[in] CountOffset The count's offset. @param[in] BaseAddress The base address. - @param[in] Count The number of I/O operations to perform. - + @param[in] Count The number of I/O operations to perform. + @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Parameter is invalid. @retval EFI_UNSUPPORTED The address range specified by these Offsets and Count is not valid. @@ -822,10 +822,10 @@ IsaIoFlush ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[out] Buffer The destination buffer to store the results - + @retval EFI_SUCCESS The data was read from the device successfully. @retval EFI_UNSUPPORTED The Offset is not valid for this device. @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid. @@ -889,10 +889,10 @@ IsaIoMemRead ( /** Performs an ISA Memory Write Cycle - @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. + @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was written to the device sucessfully. @@ -960,7 +960,7 @@ IsaIoMemWrite ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory copy operation. - @param[in] DestOffset The offset of the destination + @param[in] DestOffset The offset of the destination @param[in] SrcOffset The offset of the source @param[in] Count The number of memory copy operations to perform @@ -1041,18 +1041,18 @@ IsaIoCopyMem ( only supports slave read/write operation to save code size. @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -1083,7 +1083,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( UINT8 DmaMask; UINT8 DmaClear; UINT8 DmaChannelMode; - + if ((NULL == This) || (NULL == HostAddress) || (NULL == NumberOfBytes) || @@ -1102,7 +1102,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( // Make sure the Operation parameter is valid. // Light IsaIo only supports two operations. // - if (!(Operation == EfiIsaIoOperationSlaveRead || + if (!(Operation == EfiIsaIoOperationSlaveRead || Operation == EfiIsaIoOperationSlaveWrite)) { return EFI_INVALID_PARAMETER; } @@ -1188,7 +1188,7 @@ IsaIoMapOnlySupportSlaveReadWrite ( // *DeviceAddress = PhysicalAddress; } - + // // Figure out what to program into the DMA Channel Mode Register // @@ -1273,22 +1273,22 @@ IsaIoMapOnlySupportSlaveReadWrite ( } /** - Maps a memory region for DMA. This implementation implement the + Maps a memory region for DMA. This implementation implement the the full mapping support. @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS - The range was mapped for the returned NumberOfBytes. @@ -1602,18 +1602,18 @@ IsaIoMapFullSupport ( Maps a memory region for DMA @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -1642,7 +1642,7 @@ IsaIoMap ( return EFI_UNSUPPORTED; } // - // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for + // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for // ISA Bus Master. // // So we just return EFI_UNSUPPORTED for these functions. @@ -1685,7 +1685,7 @@ IsaIoMap ( @retval EFI_SUCCESS The requested memory pages were allocated. @retval EFI_INVALID_PARAMETER Type is invalid or MemoryType is invalid or HostAddress is NULL - @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified + @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified by HostAddress, Pages, and Type is not available for common buffer use. @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. **/ @@ -1704,7 +1704,7 @@ IsaIoAllocateBuffer ( EFI_PHYSICAL_ADDRESS PhysicalAddress; // - // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for + // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for // ISA Bus Master. // Or unset Feature Flag PcdIsaBusSupportDma to disable support for ISA DMA. // @@ -1758,7 +1758,7 @@ IsaIoAllocateBuffer ( } /** - Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). + Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Pages The number of pages to free. @@ -1778,7 +1778,7 @@ IsaIoFreeBuffer ( EFI_STATUS Status; // - // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for + // Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for // ISA Bus Master. // Or unset Feature Flag PcdIsaBusSupportDma to disable support for ISA DMA. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.h index cc4a1f8b80..7ae2ffaeb5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.h @@ -1,7 +1,7 @@ /** @file The header file for EFI_ISA_IO protocol implementation. - -Copyright (c) 2010, Intel Corporation. All rights reserved.
+ +Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,9 +34,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param[in] IsaIoDevice The ISA device to be verified. @param[in] Type The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo. @param[in] Width The width of the memory operation. - @param[in] Count The number of memory operations to perform. - @param[in] Offset The offset in ISA memory space to start the memory operation. - + @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @retval EFI_SUCCESS Verify success. @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. @retval EFI_UNSUPPORTED The device ont support the access type. @@ -49,14 +49,14 @@ IsaIoVerifyAccess ( IN UINTN Count, IN UINT32 Offset ); - + /** Performs an ISA I/O Read Cycle @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[out] Buffer The destination buffer to store the results @retval EFI_SUCCESS The data was read from the device sucessfully. @@ -79,8 +79,8 @@ IsaIoIoRead ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O operation. - @param[in] Offset The offset in ISA I/O space to start the I/O operation. - @param[in] Count The number of I/O operations to perform. + @param[in] Offset The offset in ISA I/O space to start the I/O operation. + @param[in] Count The number of I/O operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was writen to the device sucessfully. @@ -102,18 +102,18 @@ IsaIoIoWrite ( Maps a memory region for DMA @param This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param Operation Indicates the type of DMA (slave or bus master), and if - the DMA operation is going to read or write to system memory. - @param ChannelNumber The slave channel number to use for this DMA operation. - If Operation and ChannelAttributes shows that this device - performs bus mastering DMA, then this field is ignored. - The legal range for this field is 0..7. + @param Operation Indicates the type of DMA (slave or bus master), and if + the DMA operation is going to read or write to system memory. + @param ChannelNumber The slave channel number to use for this DMA operation. + If Operation and ChannelAttributes shows that this device + performs bus mastering DMA, then this field is ignored. + The legal range for this field is 0..7. @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation - @param HostAddress The system memory address to map to the device. - @param NumberOfBytes On input the number of bytes to map. On output the number + @param HostAddress The system memory address to map to the device. + @param NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param DeviceAddress The resulting map address for the bus master device to use - to access the hosts HostAddress. + @param DeviceAddress The resulting map address for the bus master device to use + to access the hosts HostAddress. @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap(). @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -173,8 +173,8 @@ IsaIoFlush ( @param[in] PageOffset The page's offest. @param[in] CountOffset The count's offset. @param[in] BaseAddress The base address. - @param[in] Count The number of I/O operations to perform. - + @param[in] Count The number of I/O operations to perform. + @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Parameter is invalid. @retval EFI_UNSUPPORTED The address range specified by these Offsets and Count is not valid. @@ -194,7 +194,7 @@ WriteDmaPort ( Writes an 8-bit I/O Port @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Offset The offset in ISA IO space to start the IO operation. + @param[in] Offset The offset in ISA IO space to start the IO operation. @param[in] Value The data to write port. @retval EFI_SUCCESS Success. @@ -207,17 +207,17 @@ WritePort ( IN EFI_ISA_IO_PROTOCOL *This, IN UINT32 Offset, IN UINT8 Value - ); + ); /** Performs an ISA Memory Read Cycle @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[out] Buffer The destination buffer to store the results - + @retval EFI_SUCCESS The data was read from the device successfully. @retval EFI_UNSUPPORTED The Offset is not valid for this device. @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid. @@ -237,10 +237,10 @@ IsaIoMemRead ( /** Performs an ISA Memory Write Cycle - @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. + @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory operation. - @param[in] Offset The offset in ISA memory space to start the memory operation. - @param[in] Count The number of memory operations to perform. + @param[in] Offset The offset in ISA memory space to start the memory operation. + @param[in] Count The number of memory operations to perform. @param[in] Buffer The source buffer to write data from @retval EFI_SUCCESS The data was written to the device sucessfully. @@ -263,7 +263,7 @@ IsaIoMemWrite ( @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the memory copy operation. - @param[in] DestOffset The offset of the destination + @param[in] DestOffset The offset of the destination @param[in] SrcOffset The offset of the source @param[in] Count The number of memory copy operations to perform @@ -294,7 +294,7 @@ IsaIoCopyMem ( @retval EFI_SUCCESS The requested memory pages were allocated. @retval EFI_INVALID_PARAMETER Type is invalid or MemoryType is invalid or HostAddress is NULL - @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified + @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified by HostAddress, Pages, and Type is not available for common buffer use. @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. **/ @@ -310,7 +310,7 @@ IsaIoAllocateBuffer ( ); /** - Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). + Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer(). @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Pages The number of pages to free. diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.uni index ea988f9e7d..cac8025573 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.uni @@ -5,13 +5,13 @@ // I/O protocols are installed based off of the information provided by each // instance of the SIO Protocol found. // -// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxeExtra.uni index 26112e8dc7..d05ba3f6d7 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // IsaIoDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ISA I/O DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf index 4abaac9ff8..d0e629f71b 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf @@ -4,7 +4,7 @@ # Produces the Serial I/O protocol for standard UARTS using ISA I/O. This driver # supports the 8250, 16450, 16550 and 16550A UART types. # -# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -30,8 +30,8 @@ # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -# DRIVER_BINDING = gSerialControllerDriver -# COMPONENT_NAME = gIsaSerialComponentName +# DRIVER_BINDING = gSerialControllerDriver +# COMPONENT_NAME = gIsaSerialComponentName # COMPONENT_NAME2 = gIsaSerialComponentName2 # diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.uni index 154fdd5d42..882db167cc 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.uni @@ -4,13 +4,13 @@ // Produces the Serial I/O protocol for standard UARTS using ISA I/O. This driver // supports the 8250, 16450, 16550 and 16550A UART types. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxeExtra.uni index d45d304a73..6ac2748aa0 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // IsaSerialDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ISA UART Serial Bus DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c index 7824d38a9c..56c2d4dda7 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c @@ -90,7 +90,7 @@ SERIAL_DEV gSerialDevTempate = { Check the device path node whether it's the Flow Control node or not. @param[in] FlowControl The device path node to be checked. - + @retval TRUE It's the Flow Control node. @retval FALSE It's not. @@ -111,7 +111,7 @@ IsUartFlowControlNode ( Check the device path node whether it contains Flow Control node or not. @param[in] DevicePath The device path to be checked. - + @retval TRUE It contains the Flow Control node. @retval FALSE It doesn't. @@ -134,9 +134,9 @@ ContainsFlowControl ( /** The user Entry Point for module IsaSerial. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. @@ -213,7 +213,7 @@ SerialControllerDriverSupported ( // if (RemainingDevicePath != NULL) { // - // Check if RemainingDevicePath is the End of Device Path Node, + // Check if RemainingDevicePath is the End of Device Path Node, // if yes, go on checking other conditions // if (!IsDevicePathEnd (RemainingDevicePath)) { @@ -230,27 +230,27 @@ SerialControllerDriverSupported ( ) { goto Error; } - + if (UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) { goto Error; } - + if (UartNode->Parity < NoParity || UartNode->Parity > SpaceParity) { goto Error; } - + if (UartNode->DataBits < 5 || UartNode->DataBits > 8) { goto Error; } - + if (UartNode->StopBits < OneStopBit || UartNode->StopBits > TwoStopBits) { goto Error; } - + if ((UartNode->DataBits == 5) && (UartNode->StopBits == TwoStopBits)) { goto Error; } - + if ((UartNode->DataBits >= 6) && (UartNode->DataBits <= 8) && (UartNode->StopBits == OneFiveStopBits)) { goto Error; } @@ -510,7 +510,7 @@ SerialControllerDriverStart ( // Clear the bits that are not allowed to pass to SetControl // Control &= (EFI_SERIAL_REQUEST_TO_SEND | EFI_SERIAL_DATA_TERMINAL_READY | - EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | + EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE); Status = SerialIo->SetControl (SerialIo, Control); } @@ -529,7 +529,7 @@ SerialControllerDriverStart ( // // If RemainingDevicePath is the End of Device Path Node, // skip enumerate any device and return EFI_SUCESSS - // + // return EFI_SUCCESS; } } @@ -550,13 +550,13 @@ SerialControllerDriverStart ( FlowControlMap = 0; // - // Check if RemainingDevicePath is NULL, + // Check if RemainingDevicePath is NULL, // if yes, use the values from the gSerialDevTempate as no remaining device path was // passed in. // if (RemainingDevicePath != NULL) { // - // If RemainingDevicePath isn't NULL, + // If RemainingDevicePath isn't NULL, // match the configuration of the RemainingDevicePath. IsHandleSupported() // already checked to make sure the RemainingDevicePath contains settings // that we can support. @@ -577,7 +577,7 @@ SerialControllerDriverStart ( SerialDevice->BaseAddress = (UINT16) SerialDevice->IsaIo->ResourceList->ResourceItem[Index].StartRange; } } - + SerialDevice->HardwareFlowControl = (BOOLEAN) (FlowControlMap == UART_FLOW_CONTROL_HARDWARE); // @@ -601,7 +601,7 @@ SerialControllerDriverStart ( // // Build the device path by appending the UART node to the ParentDevicePath. - // The Uart setings are zero here, since SetAttribute() will update them to match + // The Uart setings are zero here, since SetAttribute() will update them to match // the default setings. // SerialDevice->DevicePath = AppendDevicePathNode ( @@ -853,7 +853,7 @@ IsaSerialFifoFull ( /** Detect whether specific FIFO is empty or not. - + @param Fifo A pointer to the Data Structure SERIAL_DEV_FIFO @return whether specific FIFO is empty or not @@ -1022,7 +1022,7 @@ IsaSerialReceiveTransmit ( Data = READ_RBR (SerialDevice->IsaIo, SerialDevice->BaseAddress); IsaSerialFifoAdd (&SerialDevice->Receive, Data); - + // // For full handshake flow control, if receive buffer full // tell the peer to stop sending data. @@ -1571,7 +1571,7 @@ IsaSerialSetControl ( // first determine the parameter is invalid // if ((Control & (~(EFI_SERIAL_REQUEST_TO_SEND | EFI_SERIAL_DATA_TERMINAL_READY | - EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | + EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE))) != 0) { return EFI_UNSUPPORTED; } @@ -1783,20 +1783,20 @@ IsaSerialWrite ( // // Compute the number of bits in a single character. This is a start bit, // followed by the number of data bits, followed by the number of stop bits. - // The number of stop bits is specified by an enumeration that includes + // The number of stop bits is specified by an enumeration that includes // support for 1.5 stop bits. Treat 1.5 stop bits as 2 stop bits. // - BitsPerCharacter = - 1 + - This->Mode->DataBits + + BitsPerCharacter = + 1 + + This->Mode->DataBits + ((This->Mode->StopBits == TwoStopBits) ? 2 : This->Mode->StopBits); // - // Compute the timeout in microseconds to wait for a single byte to be - // transmitted. The Mode structure contans a Timeout field that is the - // maximum time to transmit or receive a character. However, many UARTs + // Compute the timeout in microseconds to wait for a single byte to be + // transmitted. The Mode structure contans a Timeout field that is the + // maximum time to transmit or receive a character. However, many UARTs // have a FIFO for transmits, so the time required to add one new character - // to the transmit FIFO may be the time required to flush a full FIFO. If + // to the transmit FIFO may be the time required to flush a full FIFO. If // the Timeout in the Mode structure is smaller than the time required to // flush a full FIFO at the current baud rate, then use a timeout value that // is required to flush a full transmit FIFO. @@ -1809,7 +1809,7 @@ IsaSerialWrite ( NULL ) ); - + for (Index = 0; Index < *BufferSize; Index++) { IsaSerialFifoAdd (&SerialDevice->Transmit, CharBuffer[Index]); diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h index 9d50ca9e27..d8f52dda1e 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h @@ -1,7 +1,7 @@ /** @file Include for Serial Driver - -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -603,7 +603,7 @@ IsaSerialFifoFull ( /** Detect whether specific FIFO is empty or not. - + @param Fifo A pointer to the Data Structure SERIAL_DEV_FIFO @return whether specific FIFO is empty or not diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c index e6c739e2ba..5f6c56c219 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file Routines related Component Name protocol. - -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c index 48d8efd516..78c4e3b391 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c @@ -1548,8 +1548,8 @@ InitKeyboard ( // Exceed the max try times. The device may be error. // if (TryTime == KEYBOARD_MAX_TRY) { - Status = EFI_DEVICE_ERROR; - goto Done; + Status = EFI_DEVICE_ERROR; + goto Done; } } // @@ -1579,7 +1579,7 @@ InitKeyboard ( KeyboardError (ConsoleIn, L"\n\r"); goto Done; } - + Status = KeyboardRead (ConsoleIn, &CommandByte); if (EFI_ERROR (Status)) { KeyboardError (ConsoleIn, L"\n\r"); @@ -1595,7 +1595,7 @@ InitKeyboard ( } } else { mEnableMouseInterface = FALSE; - } + } } else { // // 8042 controller is not setup yet: @@ -1611,13 +1611,13 @@ InitKeyboard ( KeyboardError (ConsoleIn, L"\n\r"); goto Done; } - + Status = KeyboardCommand (ConsoleIn, KEYBOARD_8042_COMMAND_DISABLE_MOUSE_INTERFACE); if (EFI_ERROR (Status)) { KeyboardError (ConsoleIn, L"\n\r"); goto Done; } - + REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST, @@ -1631,7 +1631,7 @@ InitKeyboard ( KeyboardError (ConsoleIn, L"8042 controller command write error!\n\r"); goto Done; } - + Status = KeyboardWaitForValue (ConsoleIn, 0x55); if (EFI_ERROR (Status)) { KeyboardError (ConsoleIn, L"8042 controller self test failed!\n\r"); @@ -1903,7 +1903,7 @@ CheckKeyboardConnect ( ConsoleIn, KEYBOARD_KBEN ); - + if (EFI_ERROR (Status)) { return FALSE; } @@ -1917,11 +1917,11 @@ CheckKeyboardConnect ( KEYBOARD_CMDECHO_ACK ); mWaitForValueTimeOut = WaitForValueTimeOutBcakup; - + if (EFI_ERROR (Status)) { return FALSE; } - + return TRUE; } else { return TRUE; diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c index 401b0e8c20..e6eecd3ab4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c @@ -272,7 +272,7 @@ KeyboardReadKeyStroke ( EFI_KEY_DATA KeyData; ConsoleIn = KEYBOARD_CONSOLE_IN_DEV_FROM_THIS (This); - + // // Considering if the partial keystroke is enabled, there maybe a partial // keystroke in the queue, so here skip the partial keystroke and get the @@ -719,7 +719,7 @@ KeyNotifyProcessHandler ( while (TRUE) { // // Enter critical section - // + // OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = PopEfikeyBufHead (&ConsoleIn->EfiKeyQueueForNotify, &KeyData); // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c index ff562b2698..3fbb37820d 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c @@ -3,7 +3,7 @@ PS/2 Keyboard driver. Routines that interacts with callers, conforming to EFI driver model -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -21,11 +21,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // /** Test controller is a keyboard Controller. - + @param This Pointer of EFI_DRIVER_BINDING_PROTOCOL @param Controller driver's controller @param RemainingDevicePath children device path - + @retval EFI_UNSUPPORTED controller is not floppy disk @retval EFI_SUCCESS controller is floppy disk **/ @@ -39,11 +39,11 @@ KbdControllerDriverSupported ( /** Create KEYBOARD_CONSOLE_IN_DEV instance on controller. - + @param This Pointer of EFI_DRIVER_BINDING_PROTOCOL @param Controller driver controller handle @param RemainingDevicePath Children's device path - + @retval whether success to create floppy control instance. **/ EFI_STATUS @@ -79,16 +79,16 @@ KbdControllerDriverStop ( /** Free the waiting key notify list. - + @param ListHead Pointer to list head - + @retval EFI_INVALID_PARAMETER ListHead is NULL @retval EFI_SUCCESS Sucess to free NotifyList **/ EFI_STATUS KbdFreeNotifyList ( IN OUT LIST_ENTRY *ListHead - ); + ); // // DriverBinding Protocol Instance @@ -104,11 +104,11 @@ EFI_DRIVER_BINDING_PROTOCOL gKeyboardControllerDriver = { /** Test controller is a keyboard Controller. - + @param This Pointer of EFI_DRIVER_BINDING_PROTOCOL @param Controller driver's controller @param RemainingDevicePath children device path - + @retval EFI_UNSUPPORTED controller is not floppy disk @retval EFI_SUCCESS controller is floppy disk **/ @@ -158,11 +158,11 @@ KbdControllerDriverSupported ( /** Create KEYBOARD_CONSOLE_IN_DEV instance on controller. - + @param This Pointer of EFI_DRIVER_BINDING_PROTOCOL @param Controller driver controller handle @param RemainingDevicePath Children's device path - + @retval whether success to create floppy control instance. **/ EFI_STATUS @@ -249,17 +249,17 @@ KbdControllerDriverStart ( ConsoleIn->ConInEx.ReadKeyStrokeEx = KeyboardReadKeyStrokeEx; ConsoleIn->ConInEx.SetState = KeyboardSetState; ConsoleIn->ConInEx.RegisterKeyNotify = KeyboardRegisterKeyNotify; - ConsoleIn->ConInEx.UnregisterKeyNotify = KeyboardUnregisterKeyNotify; - + ConsoleIn->ConInEx.UnregisterKeyNotify = KeyboardUnregisterKeyNotify; + InitializeListHead (&ConsoleIn->NotifyList); // // Fix for random hangs in System waiting for the Key if no KBC is present in BIOS. - // When KBC decode (IO port 0x60/0x64 decode) is not enabled, + // When KBC decode (IO port 0x60/0x64 decode) is not enabled, // KeyboardRead will read back as 0xFF and return status is EFI_SUCCESS. // So instead we read status register to detect after read if KBC decode is enabled. // - + // // Return code is ignored on purpose. // @@ -275,7 +275,7 @@ KbdControllerDriverStart ( goto ErrorExit; } } - + // // Setup the WaitForKey event // @@ -293,7 +293,7 @@ KbdControllerDriverStart ( } // // Setup the WaitForKeyEx event - // + // Status = gBS->CreateEvent ( EVT_NOTIFY_WAIT, TPL_NOTIFY, @@ -306,7 +306,7 @@ KbdControllerDriverStart ( StatusCode = EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR; goto ErrorExit; } - + // Setup a periodic timer, used for reading keystrokes at a fixed interval // Status = gBS->CreateEvent ( @@ -442,7 +442,7 @@ ErrorExit: Status1 = KeyboardRead (ConsoleIn, &Data);; } } - + if (ConsoleIn != NULL) { gBS->FreePool (ConsoleIn); } @@ -517,7 +517,7 @@ KbdControllerDriverStop ( if (EFI_ERROR (Status)) { return Status; } - + ConsoleIn = KEYBOARD_CONSOLE_IN_DEV_FROM_THIS (ConIn); // @@ -595,9 +595,9 @@ KbdControllerDriverStop ( /** Free the waiting key notify list. - + @param ListHead Pointer to list head - + @retval EFI_INVALID_PARAMETER ListHead is NULL @retval EFI_SUCCESS Sucess to free NotifyList **/ @@ -613,24 +613,24 @@ KbdFreeNotifyList ( } while (!IsListEmpty (ListHead)) { NotifyNode = CR ( - ListHead->ForwardLink, - KEYBOARD_CONSOLE_IN_EX_NOTIFY, - NotifyEntry, + ListHead->ForwardLink, + KEYBOARD_CONSOLE_IN_EX_NOTIFY, + NotifyEntry, KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE ); RemoveEntryList (ListHead->ForwardLink); gBS->FreePool (NotifyNode); } - + return EFI_SUCCESS; } /** - The module Entry Point for module Ps2Keyboard. + The module Entry Point for module Ps2Keyboard. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni index 9387a85fe4..6a5529c2ec 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni @@ -4,13 +4,13 @@ // Ps2 Keyboard Driver for UEFI. The keyboard type implemented follows IBM // compatible PS2 protocol using Scan Code Set 1. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni index b5356239e8..bf82dc9a35 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // Ps2KeyboardDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "PS2 Keyboard DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf index 9d72cebcb2..a0cdddcca5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf @@ -4,7 +4,7 @@ # Ps2 Keyboard Driver for UEFI. The keyboard type implemented follows IBM # compatible PS2 protocol using Scan Code Set 1. # -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -58,7 +58,7 @@ BaseMemoryLib TimerLib PcdLib - + [Protocols] gEfiSimpleTextInProtocolGuid ## BY_START gEfiSimpleTextInputExProtocolGuid ## BY_START diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c index 5aa17059a3..12bb768451 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c @@ -1,7 +1,7 @@ /** @file PS2 Mouse Communication Interface. - -Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -21,9 +21,9 @@ UINT8 ResolutionTbl[MaxResolution] = { 0, 1, 2, 3 }; /** Issue self test command via IsaIo interface. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return EFI_SUCCESS Success to do keyboard self testing. @return others Fail to do keyboard self testing. **/ @@ -82,9 +82,9 @@ KbcSelfTest ( /** Issue command to enable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -100,9 +100,9 @@ KbcEnableAux ( /** Issue command to disable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -118,9 +118,9 @@ KbcDisableAux ( /** Issue command to enable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -136,9 +136,9 @@ KbcEnableKb ( /** Issue command to disable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -154,10 +154,10 @@ KbcDisableKb ( /** Issue command to check keyboard status. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param KeyboardEnable return whether keyboard is enable. - + @return Status of command issuing. **/ EFI_STATUS @@ -195,9 +195,9 @@ CheckKbStatus ( /** Issue command to reset keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -240,10 +240,10 @@ PS2MouseReset ( /** Issue command to set mouse's sample rate - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - @param SampleRate value of sample rate - + @param SampleRate value of sample rate + @return Status of command issuing. **/ EFI_STATUS @@ -269,10 +269,10 @@ PS2MouseSetSampleRate ( /** Issue command to set mouse's resolution. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Resolution value of resolution - + @return Status of command issuing. **/ EFI_STATUS @@ -298,10 +298,10 @@ PS2MouseSetResolution ( /** Issue command to set mouse's scaling. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Scaling value of scaling - + @return Status of command issuing. **/ EFI_STATUS @@ -322,9 +322,9 @@ PS2MouseSetScaling ( /** Issue command to enable Ps2 mouse. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -341,7 +341,7 @@ PS2MouseEnable ( /** Get mouse packet . Only care first 3 bytes - @param MouseAbsolutePointerDev Pointer to PS2 Absolute Pointer Simulation Device Private Data Structure + @param MouseAbsolutePointerDev Pointer to PS2 Absolute Pointer Simulation Device Private Data Structure @retval EFI_NOT_READY Mouse Device not ready to input data packet, or some error happened during getting the packet @retval EFI_SUCCESS The data packet is gotten successfully. @@ -432,19 +432,19 @@ PS2MouseGetPacket ( RelativeMovementX = Packet[1]; RelativeMovementY = Packet[2]; // - // Bit 7 | Bit 6 | Bit 5 | Bit 4 | Bit 3 | Bit 2 | Bit 1 | Bit 0 - // Byte 0 | Y overflow | X overflow | Y sign bit | X sign bit | Always 1 | Middle Btn | Right Btn | Left Btn - // Byte 1 | 8 bit X Movement - // Byte 2 | 8 bit Y Movement - // + // Bit 7 | Bit 6 | Bit 5 | Bit 4 | Bit 3 | Bit 2 | Bit 1 | Bit 0 + // Byte 0 | Y overflow | X overflow | Y sign bit | X sign bit | Always 1 | Middle Btn | Right Btn | Left Btn + // Byte 1 | 8 bit X Movement + // Byte 2 | 8 bit Y Movement + // // X sign bit + 8 bit X Movement : 9-bit signed twos complement integer that presents the relative displacement of the device in the X direction since the last data transmission. // Y sign bit + 8 bit Y Movement : Same as X sign bit + 8 bit X Movement. // // // First, Clear X and Y high 8 bits // - RelativeMovementX = (INT16) (RelativeMovementX & 0xFF); - RelativeMovementY = (INT16) (RelativeMovementY & 0xFF); + RelativeMovementX = (INT16) (RelativeMovementX & 0xFF); + RelativeMovementY = (INT16) (RelativeMovementY & 0xFF); // // Second, if the 9-bit signed twos complement integer is negative, set the high 8 bit 0xff // @@ -455,7 +455,7 @@ PS2MouseGetPacket ( RelativeMovementY = (INT16) (RelativeMovementY | 0xFF00); } - + RButton = (UINT8) (Packet[0] & 0x2); LButton = (UINT8) (Packet[0] & 0x1); @@ -475,12 +475,12 @@ PS2MouseGetPacket ( /** Read data via IsaIo protocol with given number. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Buffer Buffer receive data of mouse @param BufSize The size of buffer @param State Check input or read data - + @return status of reading mouse data. **/ EFI_STATUS @@ -536,10 +536,10 @@ PS2MouseRead ( // /** I/O work flow of outing 8042 command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command I/O command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -575,10 +575,10 @@ Out8042Command ( /** I/O work flow of outing 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -611,10 +611,10 @@ Out8042Data ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -654,11 +654,11 @@ In8042Data ( /** I/O work flow of outing 8042 Aux command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command Aux I/O command @param Resend Whether need resend the Aux command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -736,10 +736,10 @@ Out8042AuxCommand ( /** I/O work flow of outing 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - @param Data Buffer holding return value - + @param Data Buffer holding return value + @retval EFI_SUCCESS Success to execute I/O work flow. @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -782,10 +782,10 @@ Out8042AuxData ( /** I/O work flow of in 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -813,9 +813,9 @@ In8042AuxData ( /** Check keyboard controller status, if it is output buffer full and for auxiliary device. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @retval EFI_SUCCESS Keyboard controller is ready @retval EFI_NOT_READY Keyboard controller is not ready **/ @@ -840,10 +840,10 @@ CheckForInput ( /** I/O work flow to wait input buffer empty in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout Wating time. - + @retval EFI_TIMEOUT if input is still not empty in given time. @retval EFI_SUCCESS input is empty. **/ @@ -881,10 +881,10 @@ WaitInputEmpty ( /** I/O work flow to wait output buffer full in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout given time - + @retval EFI_TIMEOUT output is not full in given time @retval EFI_SUCCESS output is full in given time. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h index 560389df47..e6ec21c6aa 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h @@ -1,7 +1,7 @@ /** @file Using PS2 Mouse to simulation Absolution Pointer Device. - -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -78,23 +78,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// /// Parity Error /// -#define KBC_PARE 0x80 +#define KBC_PARE 0x80 /// /// General Time Out /// -#define KBC_TIM 0x40 +#define KBC_TIM 0x40 /// /// Output buffer for auxiliary device (PS/2): /// 0 - Holds keyboard data /// 1 - Holds data for auxiliary device /// -#define KBC_AUXB 0x20 +#define KBC_AUXB 0x20 /// /// Keyboard lock status: /// 0 - keyboard locked /// 1 - keyboard free /// -#define KBC_KEYL 0x10 +#define KBC_KEYL 0x10 /// /// Command/Data: /// 0 - data byte written via port 60h @@ -106,25 +106,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// 0 - power-on reset /// 1 - self-test successful /// -#define KBC_SYSF 0x04 +#define KBC_SYSF 0x04 /// /// Input Buffer Status : /// 0 - input buffer empty /// 1 - CPU data in input buffer /// -#define KBC_INPB 0x02 +#define KBC_INPB 0x02 /// /// Output Buffer Status : /// 0 - output buffer empty /// 1 - keyboard controller data in output buffer /// -#define KBC_OUTB 0x01 +#define KBC_OUTB 0x01 /** Issue self test command via IsaIo interface. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return EFI_SUCCESS Success to do keyboard self testing. @return others Fail to do keyboard self testing. **/ @@ -135,9 +135,9 @@ KbcSelfTest ( /** Issue command to enable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -147,9 +147,9 @@ KbcEnableAux ( /** Issue command to disable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -159,9 +159,9 @@ KbcDisableAux ( /** Issue command to enable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -171,9 +171,9 @@ KbcEnableKb ( /** Issue command to disable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -183,10 +183,10 @@ KbcDisableKb ( /** Issue command to check keyboard status. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param KeyboardEnable return whether keyboard is enable. - + @return Status of command issuing. **/ EFI_STATUS @@ -197,9 +197,9 @@ CheckKbStatus ( /** Issue command to reset keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -209,10 +209,10 @@ PS2MouseReset ( /** Issue command to set mouse's sample rate - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - @param SampleRate value of sample rate - + @param SampleRate value of sample rate + @return Status of command issuing. **/ EFI_STATUS @@ -223,10 +223,10 @@ PS2MouseSetSampleRate ( /** Issue command to set mouse's resolution. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Resolution value of resolution - + @return Status of command issuing. **/ EFI_STATUS @@ -237,10 +237,10 @@ PS2MouseSetResolution ( /** Issue command to set mouse's scaling. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Scaling value of scaling - + @return Status of command issuing. **/ EFI_STATUS @@ -251,9 +251,9 @@ PS2MouseSetScaling ( /** Issue command to enable Ps2 mouse. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -277,12 +277,12 @@ PS2MouseGetPacket ( /** Read data via IsaIo protocol with given number. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Buffer Buffer receive data of mouse @param BufSize The size of buffer @param State Check input or read data - + @return status of reading mouse data. **/ EFI_STATUS @@ -298,10 +298,10 @@ PS2MouseRead ( // /** I/O work flow of outing 8042 command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command I/O command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -313,10 +313,10 @@ Out8042Command ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -328,10 +328,10 @@ In8042Data ( /** I/O work flow of outing 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -343,11 +343,11 @@ Out8042Data ( /** I/O work flow of outing 8042 Aux command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command Aux I/O command @param Resend Whether need resend the Aux command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -360,10 +360,10 @@ Out8042AuxCommand ( /** I/O work flow of in 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -375,10 +375,10 @@ In8042AuxData ( /** I/O work flow of outing 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -390,9 +390,9 @@ Out8042AuxData ( /** Check keyboard controller status, if it is output buffer full and for auxiliary device. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @retval EFI_SUCCESS Keyboard controller is ready @retval EFI_NOT_READY Keyboard controller is not ready **/ @@ -403,10 +403,10 @@ CheckForInput ( /** I/O work flow to wait input buffer empty in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout Wating time. - + @retval EFI_TIMEOUT if input is still not empty in given time. @retval EFI_SUCCESS input is empty. **/ @@ -418,10 +418,10 @@ WaitInputEmpty ( /** I/O work flow to wait output buffer full in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout given time - + @retval EFI_TIMEOUT output is not full in given time @retval EFI_SUCCESS output is full in given time. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c index bf8adfcb2f..bbc602a0b5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c @@ -1,8 +1,8 @@ /** @file A faked PS/2 Absolute Pointer driver. Routines that interacts with callers, conforming to EFI driver model - -Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -230,7 +230,7 @@ PS2MouseAbsolutePointerDriverStart ( // // Initialize keyboard controller if necessary // - REPORT_STATUS_CODE_WITH_DEVICE_PATH ( + REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, EFI_PERIPHERAL_MOUSE | EFI_P_MOUSE_PC_SELF_TEST, ParentDevicePath @@ -640,7 +640,7 @@ CheckMouseAbsolutePointerConnect ( /** Get and Clear mouse status. - + @param This - Pointer of simple pointer Protocol. @param State - Output buffer holding status. @@ -743,9 +743,9 @@ PollMouseAbsolutePointer( /** The user Entry Point for module Ps2MouseAbsolutePointer. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h index 8f959fdfe4..94a029ab0a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h @@ -1,7 +1,7 @@ /** @file A Ps2MouseAbsolutePointer driver header file - -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -322,7 +322,7 @@ MouseAbsolutePointerReset ( /** Get and Clear mouse status. - + @param This - Pointer of simple pointer Protocol. @param State - Output buffer holding status. @@ -370,10 +370,10 @@ PollMouseAbsolutePointer ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.uni index d12ca1ad1b..73004f4684 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.uni @@ -4,13 +4,13 @@ // This driver simulates a touch pad absolute pointing device using a standard // PS2 mouse as the input hardware. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxeExtra.uni index 6577f74f77..a983494f4f 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // Ps2MouseAbsolutePointerDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "PS2 Tablet Pointer DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c index 27d378db22..d1c07f65b7 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c @@ -1,7 +1,7 @@ /** @file PS2 Mouse Communication Interface. - -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -21,9 +21,9 @@ UINT8 ResolutionTbl[MaxResolution] = { 0, 1, 2, 3 }; /** Issue self test command via IsaIo interface. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return EFI_SUCCESS Success to do keyboard self testing. @return others Fail to do keyboard self testing. **/ @@ -82,9 +82,9 @@ KbcSelfTest ( /** Issue command to enable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -100,9 +100,9 @@ KbcEnableAux ( /** Issue command to disable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -118,9 +118,9 @@ KbcDisableAux ( /** Issue command to enable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -136,9 +136,9 @@ KbcEnableKb ( /** Issue command to disable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -154,10 +154,10 @@ KbcDisableKb ( /** Issue command to check keyboard status. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param KeyboardEnable return whether keyboard is enable. - + @return Status of command issuing. **/ EFI_STATUS @@ -195,9 +195,9 @@ CheckKbStatus ( /** Issue command to reset keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -240,10 +240,10 @@ PS2MouseReset ( /** Issue command to set mouse's sample rate - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - @param SampleRate value of sample rate - + @param SampleRate value of sample rate + @return Status of command issuing. **/ EFI_STATUS @@ -269,10 +269,10 @@ PS2MouseSetSampleRate ( /** Issue command to set mouse's resolution. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Resolution value of resolution - + @return Status of command issuing. **/ EFI_STATUS @@ -298,10 +298,10 @@ PS2MouseSetResolution ( /** Issue command to set mouse's scaling. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Scaling value of scaling - + @return Status of command issuing. **/ EFI_STATUS @@ -322,9 +322,9 @@ PS2MouseSetScaling ( /** Issue command to enable Ps2 mouse. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -341,7 +341,7 @@ PS2MouseEnable ( /** Get mouse packet . Only care first 3 bytes - @param MouseDev Pointer of PS2 Mouse Private Data Structure + @param MouseDev Pointer of PS2 Mouse Private Data Structure @retval EFI_NOT_READY Mouse Device not ready to input data packet, or some error happened during getting the packet @retval EFI_SUCCESS The data packet is gotten successfully. @@ -432,19 +432,19 @@ PS2MouseGetPacket ( RelativeMovementX = Packet[1]; RelativeMovementY = Packet[2]; // - // Bit 7 | Bit 6 | Bit 5 | Bit 4 | Bit 3 | Bit 2 | Bit 1 | Bit 0 - // Byte 0 | Y overflow | X overflow | Y sign bit | X sign bit | Always 1 | Middle Btn | Right Btn | Left Btn - // Byte 1 | 8 bit X Movement - // Byte 2 | 8 bit Y Movement - // + // Bit 7 | Bit 6 | Bit 5 | Bit 4 | Bit 3 | Bit 2 | Bit 1 | Bit 0 + // Byte 0 | Y overflow | X overflow | Y sign bit | X sign bit | Always 1 | Middle Btn | Right Btn | Left Btn + // Byte 1 | 8 bit X Movement + // Byte 2 | 8 bit Y Movement + // // X sign bit + 8 bit X Movement : 9-bit signed twos complement integer that presents the relative displacement of the device in the X direction since the last data transmission. // Y sign bit + 8 bit Y Movement : Same as X sign bit + 8 bit X Movement. // // // First, Clear X and Y high 8 bits // - RelativeMovementX = (INT16) (RelativeMovementX & 0xFF); - RelativeMovementY = (INT16) (RelativeMovementY & 0xFF); + RelativeMovementX = (INT16) (RelativeMovementX & 0xFF); + RelativeMovementY = (INT16) (RelativeMovementY & 0xFF); // // Second, if the 9-bit signed twos complement integer is negative, set the high 8 bit 0xff // @@ -455,7 +455,7 @@ PS2MouseGetPacket ( RelativeMovementY = (INT16) (RelativeMovementY | 0xFF00); } - + RButton = (UINT8) (Packet[0] & 0x2); LButton = (UINT8) (Packet[0] & 0x1); @@ -475,12 +475,12 @@ PS2MouseGetPacket ( /** Read data via IsaIo protocol with given number. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Buffer Buffer receive data of mouse @param BufSize The size of buffer @param State Check input or read data - + @return status of reading mouse data. **/ EFI_STATUS @@ -535,10 +535,10 @@ PS2MouseRead ( // /** I/O work flow of outing 8042 command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command I/O command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -574,10 +574,10 @@ Out8042Command ( /** I/O work flow of outing 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -610,10 +610,10 @@ Out8042Data ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -653,11 +653,11 @@ In8042Data ( /** I/O work flow of outing 8042 Aux command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command Aux I/O command @param Resend Whether need resend the Aux command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -735,10 +735,10 @@ Out8042AuxCommand ( /** I/O work flow of outing 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -781,10 +781,10 @@ Out8042AuxData ( /** I/O work flow of in 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -812,9 +812,9 @@ In8042AuxData ( /** Check keyboard controller status, if it is output buffer full and for auxiliary device. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @retval EFI_SUCCESS Keyboard controller is ready @retval EFI_NOT_READY Keyboard controller is not ready **/ @@ -839,10 +839,10 @@ CheckForInput ( /** I/O work flow to wait input buffer empty in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout Wating time. - + @retval EFI_TIMEOUT if input is still not empty in given time. @retval EFI_SUCCESS input is empty. **/ @@ -880,10 +880,10 @@ WaitInputEmpty ( /** I/O work flow to wait output buffer full in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout given time - + @retval EFI_TIMEOUT output is not full in given time @retval EFI_SUCCESS output is full in given time. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h index 6c0f8ac6a0..d909d48294 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h @@ -1,7 +1,7 @@ /** @file - PS2 Mouse Communication Interface + PS2 Mouse Communication Interface -Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -78,23 +78,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// /// Parity Error /// -#define KBC_PARE 0x80 +#define KBC_PARE 0x80 /// /// General Time Out /// -#define KBC_TIM 0x40 +#define KBC_TIM 0x40 /// /// Output buffer for auxiliary device (PS/2): /// 0 - Holds keyboard data /// 1 - Holds data for auxiliary device /// -#define KBC_AUXB 0x20 +#define KBC_AUXB 0x20 /// /// Keyboard lock status: /// 0 - keyboard locked /// 1 - keyboard free /// -#define KBC_KEYL 0x10 +#define KBC_KEYL 0x10 /// /// Command/Data: /// 0 - data byte written via port 60h @@ -106,25 +106,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /// 0 - power-on reset /// 1 - self-test successful /// -#define KBC_SYSF 0x04 +#define KBC_SYSF 0x04 /// /// Input Buffer Status : /// 0 - input buffer empty /// 1 - CPU data in input buffer /// -#define KBC_INPB 0x02 +#define KBC_INPB 0x02 /// /// Output Buffer Status : /// 0 - output buffer empty /// 1 - keyboard controller data in output buffer /// -#define KBC_OUTB 0x01 +#define KBC_OUTB 0x01 /** Issue self test command via IsaIo interface. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return EFI_SUCCESS Success to do keyboard self testing. @return others Fail to do keyboard self testing. **/ @@ -135,9 +135,9 @@ KbcSelfTest ( /** Issue command to enable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -147,9 +147,9 @@ KbcEnableAux ( /** Issue command to disable keyboard AUX functionality. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -159,9 +159,9 @@ KbcDisableAux ( /** Issue command to enable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -171,9 +171,9 @@ KbcEnableKb ( /** Issue command to disable keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -183,10 +183,10 @@ KbcDisableKb ( /** Issue command to check keyboard status. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param KeyboardEnable return whether keyboard is enable. - + @return Status of command issuing. **/ EFI_STATUS @@ -197,9 +197,9 @@ CheckKbStatus ( /** Issue command to reset keyboard. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -209,10 +209,10 @@ PS2MouseReset ( /** Issue command to set mouse's sample rate - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - @param SampleRate value of sample rate - + @param SampleRate value of sample rate + @return Status of command issuing. **/ EFI_STATUS @@ -223,10 +223,10 @@ PS2MouseSetSampleRate ( /** Issue command to set mouse's resolution. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Resolution value of resolution - + @return Status of command issuing. **/ EFI_STATUS @@ -237,10 +237,10 @@ PS2MouseSetResolution ( /** Issue command to set mouse's scaling. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Scaling value of scaling - + @return Status of command issuing. **/ EFI_STATUS @@ -251,9 +251,9 @@ PS2MouseSetScaling ( /** Issue command to enable Ps2 mouse. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @return Status of command issuing. **/ EFI_STATUS @@ -264,7 +264,7 @@ PS2MouseEnable ( /** Get mouse packet . Only care first 3 bytes - @param MouseDev Pointer of PS2 Mouse Private Data Structure + @param MouseDev Pointer of PS2 Mouse Private Data Structure @retval EFI_NOT_READY Mouse Device not ready to input data packet, or some error happened during getting the packet @retval EFI_SUCCESS The data packet is gotten successfully. @@ -277,12 +277,12 @@ PS2MouseGetPacket ( /** Read data via IsaIo protocol with given number. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Buffer Buffer receive data of mouse @param BufSize The size of buffer @param State Check input or read data - + @return status of reading mouse data. **/ EFI_STATUS @@ -298,10 +298,10 @@ PS2MouseRead ( // /** I/O work flow of outing 8042 command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command I/O command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -313,10 +313,10 @@ Out8042Command ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -328,10 +328,10 @@ In8042Data ( /** I/O work flow of outing 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -343,11 +343,11 @@ Out8042Data ( /** I/O work flow of outing 8042 Aux command. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Command Aux I/O command @param Resend Whether need resend the Aux command. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -360,10 +360,10 @@ Out8042AuxCommand ( /** I/O work flow of in 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value. - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -375,10 +375,10 @@ In8042AuxData ( /** I/O work flow of outing 8042 Aux data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Buffer holding return value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ @@ -390,9 +390,9 @@ Out8042AuxData ( /** Check keyboard controller status, if it is output buffer full and for auxiliary device. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL - + @retval EFI_SUCCESS Keyboard controller is ready @retval EFI_NOT_READY Keyboard controller is not ready **/ @@ -403,10 +403,10 @@ CheckForInput ( /** I/O work flow to wait input buffer empty in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout Wating time. - + @retval EFI_TIMEOUT if input is still not empty in given time. @retval EFI_SUCCESS input is empty. **/ @@ -418,10 +418,10 @@ WaitInputEmpty ( /** I/O work flow to wait output buffer full in given time. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Timeout given time - + @retval EFI_TIMEOUT output is not full in given time @retval EFI_SUCCESS output is full in given time. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c index 43fad21903..906c972808 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c @@ -1,8 +1,8 @@ /** @file PS/2 Mouse driver. Routines that interacts with callers, conforming to EFI driver model. - -Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -109,7 +109,7 @@ PS2MouseDriverSupported ( } /** - Start this driver on ControllerHandle by opening a IsaIo protocol, creating + Start this driver on ControllerHandle by opening a IsaIo protocol, creating PS2_MOUSE_ABSOLUTE_POINTER_DEV device and install gEfiAbsolutePointerProtocolGuid finally. @@ -239,7 +239,7 @@ PS2MouseDriverStart ( Status = EFI_DEVICE_ERROR; StatusCode = EFI_PERIPHERAL_MOUSE | EFI_P_EC_NOT_DETECTED; goto ErrorExit; - } + } REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, @@ -381,7 +381,7 @@ ErrorExit: if ((MouseDev != NULL) && (MouseDev->ControllerNameTable != NULL)) { FreeUnicodeStringTable (MouseDev->ControllerNameTable); } - + if (Status != EFI_DEVICE_ERROR) { // // Since there will be no timer handler for mouse input any more, @@ -655,7 +655,7 @@ CheckMouseConnect ( /** Get and Clear mouse status. - + @param This - Pointer of simple pointer Protocol. @param State - Output buffer holding status. @@ -757,9 +757,9 @@ PollMouse ( /** The user Entry Point for module Ps2Mouse. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h index 078cefa910..6225e33de9 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h @@ -1,7 +1,7 @@ /** @file PS/2 Mouse driver header file. - -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -322,7 +322,7 @@ MouseReset ( /** Get and Clear mouse status. - + @param This - Pointer of simple pointer Protocol. @param State - Output buffer holding status. @@ -370,10 +370,10 @@ PollMouse ( /** I/O work flow of in 8042 data. - + @param IsaIo Pointer to instance of EFI_ISA_IO_PROTOCOL @param Data Data value - + @retval EFI_SUCCESS Success to execute I/O work flow @retval EFI_TIMEOUT Keyboard controller time out. **/ diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni index 2c3d4a2442..4bf2f02f72 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni @@ -3,13 +3,13 @@ // // This dirver provides support for PS2 based mice. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni index 851cf291f3..f639959742 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // Ps2MouseDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "PS2 Mouse DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c index c541eb8991..7819773f38 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c @@ -1,7 +1,7 @@ /** @file - This file contains all helper functions on the ATA command - - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ This file contains all helper functions on the ATA command + + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -31,9 +31,9 @@ @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. - @retval EFI_SUCCESS The disk specified by IdeDev is a Atapi6 supported one and + @retval EFI_SUCCESS The disk specified by IdeDev is a Atapi6 supported one and 48-bit addressing must be used - @retval EFI_UNSUPPORTED The disk dosn't not support Atapi6 or it supports but the + @retval EFI_UNSUPPORTED The disk dosn't not support Atapi6 or it supports but the capacity is below 120G, 48bit addressing is not needed @retval EFI_DEVICE_ERROR The identify data in IdeDev is incorrect @retval EFI_INVALID_PARAMETER The identify data in IdeDev is NULL. @@ -110,7 +110,7 @@ AtaAtapi6Identify ( /** Enable SMART of the disk if supported - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record all the information of the IDE device. **/ VOID @@ -263,7 +263,7 @@ AtaSMARTSupport ( information it needs to fill the IDE_BLK_IO_DEV data structure, including device type, media block size, media capacity, and etc. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record all the information of the IDE device. @retval EFI_SUCCESS Identify ATA device successfully. @@ -280,7 +280,7 @@ ATAIdentify ( EFI_IDENTIFY_DATA *AtaIdentifyPointer; UINT32 Capacity; UINT8 DeviceSelect; - UINTN Retry; + UINTN Retry; // // AtaIdentifyPointer is used for accommodating returned IDENTIFY data of @@ -297,9 +297,9 @@ ATAIdentify ( // DeviceSelect = (UINT8) ((IdeDev->Device) << 4); - + Retry = 3; - while (Retry > 0) { + while (Retry > 0) { Status = AtaPioDataIn ( IdeDev, (VOID *) AtaIdentifyPointer, @@ -348,20 +348,20 @@ ATAIdentify ( // return EFI_SUCCESS; } else if (Status == EFI_DEVICE_ERROR) { - // - // Some disk with big capacity (>200GB) is slow when being identified - // and will return all zero for word83. - // We try twice at first. If it fails, we do a SoftRest and try again. - // - Retry--; - if (Retry == 1) { - // - // Do a SoftRest before the third attempt. - // - AtaSoftReset (IdeDev); - } - continue; - } + // + // Some disk with big capacity (>200GB) is slow when being identified + // and will return all zero for word83. + // We try twice at first. If it fails, we do a SoftRest and try again. + // + Retry--; + if (Retry == 1) { + // + // Do a SoftRest before the third attempt. + // + AtaSoftReset (IdeDev); + } + continue; + } // // This is a hard disk <= 120GB capacity, treat it as normal hard disk // @@ -390,7 +390,7 @@ ATAIdentify ( } } - break; + break; } gBS->FreePool (AtaIdentifyPointer); @@ -404,12 +404,12 @@ ATAIdentify ( /** This function is a helper function used to change the char order in a string. It - is designed specially for the PrintAtaModuleName() function. After the IDE device - is detected, the IDE driver gets the device module name by sending ATA command + is designed specially for the PrintAtaModuleName() function. After the IDE device + is detected, the IDE driver gets the device module name by sending ATA command called ATA Identify Command or ATAPI Identify Command to the specified IDE device. The module name returned is a string of ASCII characters: the first character is bit8--bit15 of the first word, the second character is BIT0--bit7 of the first word and so on. Thus - the string can not be print directly before it is preprocessed by this func to change + the string can not be print directly before it is preprocessed by this func to change the order of characters in each word in the string. @param Destination Indicates the destination string. @@ -455,7 +455,7 @@ PrintAtaModuleName ( /** This function is used to send out ATA commands conforms to the PIO Data In Protocol. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param Buffer buffer contained data transferred from device to host. @param ByteCount data size in byte unit of the buffer. @@ -465,7 +465,7 @@ PrintAtaModuleName ( @param SectorNumber value of the Sector Number Register @param CylinderLsb value of the low byte of the Cylinder Register @param CylinderMsb value of the high byte of the Cylinder Register - + @retval EFI_SUCCESS send out the ATA command and device send required data successfully. @retval EFI_DEVICE_ERROR command sent failed. @@ -752,7 +752,7 @@ AtaPioDataOut ( some debug information and if there is ERR bit set in the Status Register, the Error Register's value is also be parsed and print out. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @retval EFI_SUCCESS No err information in the Status Register. @@ -850,15 +850,15 @@ CheckErrorStatus ( } /** - This function is called by the AtaBlkIoReadBlocks() to perform reading from + This function is called by the AtaBlkIoReadBlocks() to perform reading from media in block unit. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param DataBuffer A pointer to the destination buffer for the data. @param Lba The starting logical block address to read from on the device media. @param NumberOfBlocks The number of transfer data blocks. - + @return status is fully dependent on the return status of AtaPioDataIn() function. **/ @@ -959,7 +959,7 @@ AtaReadSectors ( } /** - This function is called by the AtaBlkIoWriteBlocks() to perform writing onto + This function is called by the AtaBlkIoWriteBlocks() to perform writing onto media in block unit. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record @@ -967,7 +967,7 @@ AtaReadSectors ( @param BufferData A pointer to the source buffer for the data. @param Lba The starting logical block address to write onto the device media. @param NumberOfBlocks The number of transfer data blocks. - + @return status is fully dependent on the return status of AtaPioDataIn() function. **/ @@ -1055,7 +1055,7 @@ AtaWriteSectors ( } /** This function is used to implement the Soft Reset on the specified device. But, - the ATA Soft Reset mechanism is so strong a reset method that it will force + the ATA Soft Reset mechanism is so strong a reset method that it will force resetting on both devices connected to the same cable. It is called by IdeBlkIoReset(), a interface function of Block @@ -1120,7 +1120,7 @@ AtaSoftReset ( return EFI_SUCCESS; } /** - This function is used to send out ATA commands conforms to the PIO Data In + This function is used to send out ATA commands conforms to the PIO Data In Protocol, supporting ATA/ATAPI-6 standard Comparing with ATA-3 data in protocol, we have two differents here: @@ -1595,27 +1595,27 @@ DoAtaUdma ( // Read BMIS register and clear ERROR and INTR bit // IdeDev->PciIo->Io.Read ( - IdeDev->PciIo, - EfiPciIoWidthUint8, - EFI_PCI_IO_PASS_THROUGH_BAR, - IoPortForBmis, - 1, - &RegisterValue - ); - + IdeDev->PciIo, + EfiPciIoWidthUint8, + EFI_PCI_IO_PASS_THROUGH_BAR, + IoPortForBmis, + 1, + &RegisterValue + ); + RegisterValue |= (BMIS_INTERRUPT | BMIS_ERROR); - + IdeDev->PciIo->Io.Write ( - IdeDev->PciIo, - EfiPciIoWidthUint8, - EFI_PCI_IO_PASS_THROUGH_BAR, - IoPortForBmis, - 1, - &RegisterValue - ); + IdeDev->PciIo, + EfiPciIoWidthUint8, + EFI_PCI_IO_PASS_THROUGH_BAR, + IoPortForBmis, + 1, + &RegisterValue + ); Status = EFI_SUCCESS; - + RemainBlockNum = NumberOfBlocks; while (RemainBlockNum > 0) { @@ -1813,8 +1813,8 @@ DoAtaUdma ( ); if (((RegisterValue & (BMIS_INTERRUPT | BMIS_ERROR)) != 0) || (Count == 0)) { if (((RegisterValue & BMIS_ERROR) != 0) || (Count == 0)) { - Status = EFI_DEVICE_ERROR; - break; + Status = EFI_DEVICE_ERROR; + break; } break; } @@ -1847,7 +1847,7 @@ DoAtaUdma ( 1, &RegisterValue ); - // + // // Read Status Register of IDE device to clear interrupt // RegisterValue = IDEReadPortB(IdeDev->PciIo,IdeDev->IoPort->Reg.Status); @@ -1878,9 +1878,9 @@ DoAtaUdma ( return EFI_DEVICE_ERROR; } - if (EFI_ERROR (Status)) { - break; - } + if (EFI_ERROR (Status)) { + break; + } DataBuffer = (UINT8 *) DataBuffer + NumberOfBlocks * IdeDev->BlkIo.Media->BlockSize; StartLba += NumberOfBlocks; } @@ -1898,10 +1898,10 @@ DoAtaUdma ( /** This function is called by the AtaBlkIoReadBlocks() to perform reading from - media in block unit. The function has been enhanced to support >120GB access + media in block unit. The function has been enhanced to support >120GB access and transfer at most 65536 blocks per command - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param DataBuffer A pointer to the destination buffer for the data. @param StartLba The starting logical block address to read from on the device media. @@ -1930,7 +1930,7 @@ AtaUdmaReadExt ( @param StartLba The starting logical block address to read from on the device media. @param NumberOfBlocks The number of transfer data blocks. - + @return status depends on the function DoAtaUdma() returns. **/ EFI_STATUS @@ -2313,7 +2313,7 @@ AtaUdmaWriteExt ( /** This function is called by the AtaBlkIoWriteBlocks() to perform - writing to media in block unit. + writing to media in block unit. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @@ -2321,7 +2321,7 @@ AtaUdmaWriteExt ( @param StartLba The starting logical block address to write to on the device media. @param NumberOfBlocks The number of transfer data blocks. - + @return status depends on the function DoAtaUdma() returns. **/ EFI_STATUS @@ -2342,7 +2342,7 @@ AtaUdmaWrite ( @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record all the information of the IDE device. @param DataBuffer A pointer to the source buffer for the data. - @param StartLba The starting logical block address to write onto the device + @param StartLba The starting logical block address to write onto the device media. @param NumberOfBlocks The number of transfer data blocks. @@ -2423,7 +2423,7 @@ AtaWriteSectorsExt ( @param BufferSize The size of the Buffer in bytes. This must be a multiple of the intrinsic block size of the device. @param Buffer A pointer to the source buffer for the data.The caller - is responsible for either having implicit or explicit + is responsible for either having implicit or explicit ownership of the memory that data is written from. @retval EFI_SUCCESS Write Blocks successfully. diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c index c641dc5714..1900a76800 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c @@ -1,14 +1,14 @@ /** @file - This file contains all helper functions on the ATAPI command - - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php + This file contains all helper functions on the ATAPI command - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -16,7 +16,7 @@ /** This function is used to get the current status of the media residing - in the LS-120 drive or ZIP drive. The media status is returned in the + in the LS-120 drive or ZIP drive. The media status is returned in the Error Status. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -28,8 +28,8 @@ @retval EFI_NO_MEDIA There is no media in the drive. @retval EFI_WRITE_PROTECTED The media is writing protected. - @note This function must be called after the LS120EnableMediaStatus() - with second parameter set to TRUE + @note This function must be called after the LS120EnableMediaStatus() + with second parameter set to TRUE (means enable media status notification) is called. **/ EFI_STATUS @@ -189,8 +189,8 @@ AtapiReadPendingData ( while ((TempWordBuffer & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) { IDEReadPortWMultiple ( IdeDev->PciIo, - IdeDev->IoPort->Data, - 1, + IdeDev->IoPort->Data, + 1, &TempWordBuffer ); TempWordBuffer = IDEReadPortB (IdeDev->PciIo,IdeDev->IoPort->Alt.AltStatus); @@ -200,7 +200,7 @@ AtapiReadPendingData ( } /** - This function is called by either AtapiPacketCommandIn() or AtapiPacketCommandOut(). + This function is called by either AtapiPacketCommandIn() or AtapiPacketCommandOut(). It is used to transfer data between host and device. The data direction is specified by the fourth parameter. @@ -246,9 +246,9 @@ PioReadWriteData ( } // // for performance, we assert the ByteCount is an even number - // which is actually a resonable assumption + // which is actually a resonable assumption ASSERT((ByteCount%2) == 0); - + PtrBuffer = Buffer; RequiredWordCount = ByteCount / 2; // @@ -257,7 +257,7 @@ PioReadWriteData ( ActualWordCount = 0; while (ActualWordCount < RequiredWordCount) { - + // // before each data transfer stream, the host should poll DRQ bit ready, // to see whether indicates device is ready to transfer data. @@ -266,7 +266,7 @@ PioReadWriteData ( if (EFI_ERROR (Status)) { return CheckErrorStatus (IdeDev); } - + // // read Status Register will clear interrupt // @@ -301,7 +301,7 @@ PioReadWriteData ( PtrBuffer += WordCount; ActualWordCount += WordCount; } - + if (Read) { // // In the case where the drive wants to send more data than we need to read, @@ -326,17 +326,17 @@ PioReadWriteData ( } /** - This function is used to send out ATAPI commands conforms to the Packet Command + This function is used to send out ATAPI commands conforms to the Packet Command with PIO Data In Protocol. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param Packet pointer pointing to ATAPI_PACKET_COMMAND data structure - which contains the contents of the command. + which contains the contents of the command. @param Buffer buffer contained data transferred from device to host. @param ByteCount data size in byte unit of the buffer. - @param TimeOut this parameter is used to specify the timeout value for the - PioReadWriteData() function. + @param TimeOut this parameter is used to specify the timeout value for the + PioReadWriteData() function. @retval EFI_SUCCESS send out the ATAPI packet command successfully and device sends data successfully. @@ -437,10 +437,10 @@ AtapiPacketCommandIn ( which contains the contents of the command. @param Buffer buffer contained data transferred from host to device. @param ByteCount data size in byte unit of the buffer. - @param TimeOut this parameter is used to specify the timeout value - for the PioReadWriteData() function. + @param TimeOut this parameter is used to specify the timeout value + for the PioReadWriteData() function. @retval EFI_SUCCESS send out the ATAPI packet command successfully - and device received data successfully. + and device received data successfully. @retval EFI_DEVICE_ERROR the device failed to send data. **/ @@ -465,7 +465,7 @@ AtapiPacketCommandOut ( if (EFI_ERROR (Status)) { return Status; } - + // // Select device via Device/Head Register. // @@ -587,26 +587,26 @@ AtapiInquiry ( to fill in the Media data structure of the Block I/O Protocol interface. There are 5 steps to reach such objective: - 1. Sends out the ATAPI Identify Command to the specified device. + 1. Sends out the ATAPI Identify Command to the specified device. Only ATAPI device responses to this command. If the command succeeds, - it returns the Identify data structure which filled with information - about the device. Since the ATAPI device contains removable media, + it returns the Identify data structure which filled with information + about the device. Since the ATAPI device contains removable media, the only meaningful information is the device module name. 2. Sends out ATAPI Inquiry Packet Command to the specified device. This command will return inquiry data of the device, which contains the device type information. 3. Allocate sense data space for future use. We don't detect the media - presence here to improvement boot performance, especially when CD + presence here to improvement boot performance, especially when CD media is present. The media detection will be performed just before each BLK_IO read/write - + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @retval EFI_SUCCESS Identify ATAPI device successfully. @retval EFI_DEVICE_ERROR ATAPI Identify Device Command failed or device type is not supported by this IDE driver. - @retval EFI_OUT_OF_RESOURCES Allocate memory for sense data failed + @retval EFI_OUT_OF_RESOURCES Allocate memory for sense data failed @note Parameter "IdeDev" will be updated in this function. **/ @@ -719,7 +719,7 @@ ATAPIIdentify ( // WORM // case 0x04: - + // // Optical // @@ -758,13 +758,13 @@ ATAPIIdentify ( } /** Sends out ATAPI Request Sense Packet Command to the specified device. This command - will return all the current Sense data in the device. This function will pack + will return all the current Sense data in the device. This function will pack all the Sense data in one single buffer. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param SenseCounts allocated in this function, and freed by the calling function. - This buffer is used to accommodate all the sense data returned + This buffer is used to accommodate all the sense data returned by the device. @retval EFI_SUCCESS Request Sense command completes successfully. @@ -850,7 +850,7 @@ AtapiRequestSense ( } /** This function is used to parse sense data. Only the first sense data is honoured - + @param IdeDev Indicates the calling context. @param SenseCount Count of sense data. @param Result The parsed result. @@ -936,12 +936,12 @@ ParseSenseData ( EFI_STATUS AtapiTestUnitReady ( IN IDE_BLK_IO_DEV *IdeDev, - OUT SENSE_RESULT *SResult + OUT SENSE_RESULT *SResult ) { ATAPI_PACKET_COMMAND Packet; EFI_STATUS Status; - UINTN SenseCount; + UINTN SenseCount; // // fill command packet @@ -974,7 +974,7 @@ AtapiTestUnitReady ( Current device status will impact device's response to the Read Capacity Command. For example, if the device once reset, the Read Capacity - Command will fail. The Sense data record the current device status, so + Command will fail. The Sense data record the current device status, so if the Read Capacity Command failed, the Sense data must be requested and be analyzed to determine if the Read Capacity Command should retry. @@ -988,12 +988,12 @@ AtapiTestUnitReady ( @note Parameter "IdeDev" will be updated in this function. - + **/ EFI_STATUS AtapiReadCapacity ( IN IDE_BLK_IO_DEV *IdeDev, - OUT SENSE_RESULT *SResult + OUT SENSE_RESULT *SResult ) { // @@ -1002,7 +1002,7 @@ AtapiReadCapacity ( EFI_STATUS Status; EFI_STATUS SenseStatus; ATAPI_PACKET_COMMAND Packet; - UINTN SenseCount; + UINTN SenseCount; // // used for capacity data returned from ATAPI device @@ -1048,9 +1048,9 @@ AtapiReadCapacity ( SenseStatus = AtapiRequestSense (IdeDev, &SenseCount); if (!EFI_ERROR (SenseStatus)) { - ParseSenseData (IdeDev, SenseCount, SResult); - - if (!EFI_ERROR (Status) && *SResult == SenseNoSenseKey) { + ParseSenseData (IdeDev, SenseCount, SResult); + + if (!EFI_ERROR (Status) && *SResult == SenseNoSenseKey) { if (IdeDev->Type == IdeCdRom) { IdeDev->BlkIo.Media->LastBlock = ((UINT32) Data.LastLba3 << 24) | @@ -1058,7 +1058,7 @@ AtapiReadCapacity ( (Data.LastLba1 << 8) | Data.LastLba0; - IdeDev->BlkIo.Media->MediaPresent = TRUE; + IdeDev->BlkIo.Media->MediaPresent = TRUE; IdeDev->BlkIo.Media->ReadOnly = TRUE; @@ -1077,7 +1077,7 @@ AtapiReadCapacity ( } else { IdeDev->BlkIo.Media->LastBlock = ((UINT32) FormatData.LastLba3 << 24) | - (FormatData.LastLba2 << 16) | + (FormatData.LastLba2 << 16) | (FormatData.LastLba1 << 8) | FormatData.LastLba0; if (IdeDev->BlkIo.Media->LastBlock != 0) { @@ -1110,7 +1110,7 @@ AtapiReadCapacity ( } /** This function is used to test the current media write-protected or not residing - in the LS-120 drive or ZIP drive. + in the LS-120 drive or ZIP drive. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param WriteProtected if True, current media is write protected. @@ -1159,8 +1159,8 @@ IsLS120orZipWriteProtected ( } /** - Used before read/write blocks from/to ATAPI device media. Since ATAPI device - media is removable, it is necessary to detect whether media is present and + Used before read/write blocks from/to ATAPI device media. Since ATAPI device + media is removable, it is necessary to detect whether media is present and get current present media's information, and if media has been changed, Block I/O Protocol need to be reinstalled. @@ -1409,17 +1409,17 @@ AtapiDetectMedia ( This function is called by the AtapiBlkIoReadBlocks() to perform read from media in block unit. - The main command used to access media here is READ(10) Command. - READ(10) Command requests that the ATAPI device media transfer - specified data to the host. Data is transferred in block(sector) + The main command used to access media here is READ(10) Command. + READ(10) Command requests that the ATAPI device media transfer + specified data to the host. Data is transferred in block(sector) unit. The maximum number of blocks that can be transferred once is - 65536. This is the main difference between READ(10) and READ(12) + 65536. This is the main difference between READ(10) and READ(12) Command. The maximum number of blocks in READ(12) is 2 power 32. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. - @param Buffer A pointer to the destination buffer for the data. - @param Lba The starting logical block address to read from on the + @param Buffer A pointer to the destination buffer for the data. + @param Lba The starting logical block address to read from on the device media. @param NumberOfBlocks The number of transfer data blocks. @@ -1527,19 +1527,19 @@ AtapiReadSectors ( /** This function is called by the AtapiBlkIoWriteBlocks() to perform write onto media in block unit. - The main command used to access media here is Write(10) Command. - Write(10) Command requests that the ATAPI device media transfer - specified data to the host. Data is transferred in block (sector) + The main command used to access media here is Write(10) Command. + Write(10) Command requests that the ATAPI device media transfer + specified data to the host. Data is transferred in block (sector) unit. The maximum number of blocks that can be transferred once is - 65536. + 65536. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. - @param Buffer A pointer to the source buffer for the data. - @param Lba The starting logical block address to write onto + @param Buffer A pointer to the source buffer for the data. + @param Lba The starting logical block address to write onto the device media. @param NumberOfBlocks The number of transfer data blocks. - + @return status is fully dependent on the return status of AtapiPacketCommandOut() function. **/ @@ -1594,7 +1594,7 @@ AtapiWriteSectors ( } else { SectorCount = (UINT16) BlocksRemaining; } - + // // Command code is WRITE_10. // @@ -1645,7 +1645,7 @@ AtapiWriteSectors ( condition (such as BSY bit is always set ), I think the Soft Reset command should be sent without waiting for the BSY clear and DRDY set. - This function is called by IdeBlkIoReset(), + This function is called by IdeBlkIoReset(), a interface function of Block I/O protocol. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -1683,7 +1683,7 @@ AtapiSoftReset ( if (EFI_ERROR (Status)) { return EFI_DEVICE_ERROR; } - + // // stall 5 seconds to make the device status stable // @@ -1702,9 +1702,9 @@ AtapiSoftReset ( @param BufferSize The size of the Buffer in bytes. This must be a multiple of the intrinsic block size of the device. @param Buffer A pointer to the destination buffer for the data. The caller - is responsible for either having implicit or explicit + is responsible for either having implicit or explicit ownership of the memory that data is read into. - + @retval EFI_SUCCESS Read Blocks successfully. @retval EFI_DEVICE_ERROR Read Blocks failed. @retval EFI_NO_MEDIA There is no media in the device. @@ -1804,11 +1804,11 @@ AtapiBlkIoReadBlocks ( if (EFI_ERROR (Status)) { return EFI_DEVICE_ERROR; } - + // // Read blocks succeeded // - + // // save the first block to the cache for performance // @@ -1840,8 +1840,8 @@ AtapiBlkIoReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGE The MediaId is not for the current media. @retval EFI_BAD_BUFFER_SIZE The BufferSize parameter is not a multiple of the - intrinsic block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + intrinsic block size of the device. + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the data buffer is not valid. @retval EFI_WRITE_PROTECTED The write protected is enabled or the media does not support write @@ -1889,7 +1889,7 @@ AtapiBlkIoWriteBlocks ( } return Status; } - + // // Get the intrinsic block size // diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c index 5e376d72d7..960c1bf5f4 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c @@ -1,14 +1,14 @@ /** @file UEFI Component Name(2) protocol implementation for ConPlatform driver. - - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h index 9a911a5ec9..c5bd0432e8 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h @@ -1,8 +1,8 @@ /** @file - + UEFI Component Name(2) protocol implementation header file for IDE Bus driver. - - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c index 999e20e016..3a5d3c6f6b 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c @@ -1,15 +1,15 @@ /** @file - Implementation of UEFI Driver Configuration Protocol for IDE bus driver which + Implementation of UEFI Driver Configuration Protocol for IDE bus driver which provides ability to set IDE bus controller specific options. - - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -80,7 +80,7 @@ GetResponse ( } /** - Allows the user to set controller specific options for a controller that a + Allows the user to set controller specific options for a controller that a driver is currently managing. @param This A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance. @@ -91,26 +91,26 @@ GetResponse ( that wish to set options for the bus controller. It will not be NULL for a bus driver that wishes to set options for one of its child controllers. - @param Language A pointer to a three character ISO 639-2 language identifier. - This is the language of the user interface that should be presented - to the user, and it must match one of the languages specified in + @param Language A pointer to a three character ISO 639-2 language identifier. + This is the language of the user interface that should be presented + to the user, and it must match one of the languages specified in SupportedLanguages. The number of languages supported by a driver is up to the driver writer. - @param ActionRequired A pointer to the action that the calling agent is required + @param ActionRequired A pointer to the action that the calling agent is required to perform when this function returns. - - @retval EFI_SUCCESS The driver specified by This successfully set the configuration + + @retval EFI_SUCCESS The driver specified by This successfully set the configuration options for the controller specified by ControllerHandle.. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ActionRequired is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support setting configuration options for + @retval EFI_UNSUPPORTED The driver specified by This does not support setting configuration options for the controller specified by ControllerHandle and ChildHandle. @retval EFI_UNSUPPORTED The driver specified by This does not support the language specified by Language. - @retval EFI_DEVICE_ERROR A device error occurred while attempt to set the configuration options for the + @retval EFI_DEVICE_ERROR A device error occurred while attempt to set the configuration options for the controller specified by ControllerHandle and ChildHandle. - @retval EFI_OUT_RESOURCES There are not enough resources available to set the configuration options for the + @retval EFI_OUT_RESOURCES There are not enough resources available to set the configuration options for the controller specified by ControllerHandle and ChildHandle **/ EFI_STATUS @@ -182,20 +182,20 @@ IDEBusDriverConfigurationSetOptions ( Tests to see if a controller's current configuration options are valid. @param This A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance. - @param ControllerHandle The handle of the controller to test if it's current configuration options + @param ControllerHandle The handle of the controller to test if it's current configuration options are valid. - @param ChildHandle The handle of the child controller to test if it's current configuration - options are valid. This is an optional parameter that may be NULL. It will + @param ChildHandle The handle of the child controller to test if it's current configuration + options are valid. This is an optional parameter that may be NULL. It will be NULL for device drivers. It will also be NULL for a bus drivers that - wish to test the configuration options for the bus controller. It will - not be NULL for a bus driver that wishes to test configuration options for + wish to test the configuration options for the bus controller. It will + not be NULL for a bus driver that wishes to test configuration options for one of its child controllers. @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle that is being managed by the driver specified by This has a valid set of configuration options. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. - @retval EFI_UNSUPPORTED The driver specified by This is not currently managing the controller + @retval EFI_UNSUPPORTED The driver specified by This is not currently managing the controller specified by ControllerHandle and ChildHandle. @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle that is being managed by the driver specified by This has an invalid set of configuration @@ -236,31 +236,31 @@ IDEBusDriverConfigurationOptionsValid ( @param This A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance. @param ControllerHandle The handle of the controller to force default configuration options on. - @param ChildHandle The handle of the child controller to force default configuration - options on This is an optional parameter that may be NULL. It - will be NULL for device drivers. It will also be NULL for a bus + @param ChildHandle The handle of the child controller to force default configuration + options on This is an optional parameter that may be NULL. It + will be NULL for device drivers. It will also be NULL for a bus drivers that wish to force default configuration options for the bus controller. It will not be NULL for a bus driver that wishes to force default configuration options for one of its child controllers. - @param DefaultType The type of default configuration options to force on the controller - specified by ControllerHandle and ChildHandle. - @param ActionRequired A pointer to the action that the calling agent is required to perform + @param DefaultType The type of default configuration options to force on the controller + specified by ControllerHandle and ChildHandle. + @param ActionRequired A pointer to the action that the calling agent is required to perform when this function returns. - @retval EFI_SUCCESS The driver specified by This successfully forced the - default configuration options on the controller specified by + @retval EFI_SUCCESS The driver specified by This successfully forced the + default configuration options on the controller specified by ControllerHandle and ChildHandle. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ActionRequired is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support forcing the default + @retval EFI_UNSUPPORTED The driver specified by This does not support forcing the default configuration options on the controller specified by ControllerHandle and ChildHandle. - @retval EFI_UNSUPPORTED The driver specified by This does not support the configuration type + @retval EFI_UNSUPPORTED The driver specified by This does not support the configuration type specified by DefaultType. - @retval EFI_DEVICE_ERROR A device error occurred while attempt to force the default configuration + @retval EFI_DEVICE_ERROR A device error occurred while attempt to force the default configuration options on the controller specified by ControllerHandle and ChildHandle. - @retval EFI_OUT_RESOURCES There are not enough resources available to force the default configuration + @retval EFI_OUT_RESOURCES There are not enough resources available to force the default configuration options on the controller specified by ControllerHandle and ChildHandle. **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c index 73435dd7ac..497551eaba 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c @@ -1,15 +1,15 @@ /** @file Implementation of UEFI driver Dialnostics protocol which to perform diagnostic on the IDE Bus controller. - - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -42,24 +42,24 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiag @param ChildHandle The handle of the child controller to run diagnostics on This is an optional parameter that may be NULL. It will be NULL for device drivers. It will also be NULL for a - bus drivers that wish to run diagnostics on the bus controller. - It will not be NULL for a bus driver that wishes to run + bus drivers that wish to run diagnostics on the bus controller. + It will not be NULL for a bus driver that wishes to run diagnostics on one of its child controllers. @param DiagnosticType Indicates type of diagnostics to perform on the controller specified by ControllerHandle and ChildHandle. - @param Language A pointer to a three character ISO 639-2 language identifier. - This is the language in which the optional error message should - be returned in Buffer, and it must match one of the languages + @param Language A pointer to a three character ISO 639-2 language identifier. + This is the language in which the optional error message should + be returned in Buffer, and it must match one of the languages specified in SupportedLanguages. The number of languages supported by a driver is up to the driver writer. @param ErrorType A GUID that defines the format of the data returned in Buffer. @param BufferSize The size, in bytes, of the data returned in Buffer. @param Buffer A buffer that contains a Null-terminated Unicode string - plus some additional data whose format is defined by ErrorType. - Buffer is allocated by this function with AllocatePool(), and + plus some additional data whose format is defined by ErrorType. + Buffer is allocated by this function with AllocatePool(), and it is the caller's responsibility to free it with a call to FreePool(). - @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle passed + @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle passed the diagnostic. @retval EFI_INVALID_PARAMETER ControllerHandle is NULL. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @@ -67,18 +67,18 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiag @retval EFI_INVALID_PARAMETER ErrorType is NULL. @retval EFI_INVALID_PARAMETER BufferType is NULL. @retval EFI_INVALID_PARAMETER Buffer is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support running - diagnostics for the controller specified by ControllerHandle + @retval EFI_UNSUPPORTED The driver specified by This does not support running + diagnostics for the controller specified by ControllerHandle and ChildHandle. @retval EFI_UNSUPPORTED The driver specified by This does not support the type of diagnostic specified by DiagnosticType. - @retval EFI_UNSUPPORTED The driver specified by This does not support the language + @retval EFI_UNSUPPORTED The driver specified by This does not support the language specified by Language. - @retval EFI_OUT_OF_RESOURCES There are not enough resources available to complete the + @retval EFI_OUT_OF_RESOURCES There are not enough resources available to complete the diagnostics. - @retval EFI_OUT_OF_RESOURCES There are not enough resources available to return the + @retval EFI_OUT_OF_RESOURCES There are not enough resources available to return the status information in ErrorType, BufferSize,and Buffer. - @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle + @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle did not pass the diagnostic. **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c index ffc818036a..539c961d8e 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c @@ -1,7 +1,7 @@ /** @file The file ontaining the helper functions implement of the Ide Bus driver - - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -24,7 +24,7 @@ UINT8 MasterDeviceType = INVALID_DEVICE_TYPE; read a one-byte data from a IDE port. @param PciIo The PCI IO protocol instance - @param Port the IDE Port number + @param Port the IDE Port number @return the one-byte data read from IDE port **/ @@ -270,7 +270,7 @@ IDEWritePortWMultiple ( @param PciIo Pointer to the EFI_PCI_IO_PROTOCOL instance @param IdeRegsBaseAddr Pointer to IDE_REGISTERS_BASE_ADDR to receive IDE IO port registers' base addresses - + @retval EFI_UNSUPPORTED return this value when the BARs is not IO type @retval EFI_SUCCESS Get the Base address successfully @retval other read the pci configureation data error @@ -351,7 +351,7 @@ GetIdeRegistersBaseAddr ( succeess. @param IdeDev The BLK_IO private data which specifies the IDE device - + @retval EFI_INVALID_PARAMETER return this value when the channel is invalid @retval EFI_SUCCESS reassign the IDE IO resource successfully @retval other get the IDE current base address effor @@ -370,7 +370,7 @@ ReassignIdeResources ( if (IdeDev->Channel >= IdeMaxChannel) { return EFI_INVALID_PARAMETER; } - + // // Requery IDE IO port registers' base addresses in case of the switch of // native and legacy modes @@ -593,7 +593,7 @@ DetectIDEController ( Detect if there is disk attached to this port @param IdeDev The BLK_IO private data which specifies the IDE device. - + @retval EFI_NOT_FOUND The device or channel is not found @retval EFI_SUCCESS The device is found @@ -715,7 +715,7 @@ InitializeIDEChannelData ( Register. DRQ is cleared when the device is finished transferring data. So this function is called after data transfer is finished. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ clear. @@ -778,7 +778,7 @@ DRQClear ( transferring data. So this function is called after data transfer is finished. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ clear. @@ -901,10 +901,10 @@ DRQReady ( } /** This function is used to poll for the DRQ bit set in the Alternate Status Register. - DRQ is set when the device is ready to transfer data. So this function is called after + DRQ is set when the device is ready to transfer data. So this function is called after the command is sent to the device and before required data is transferred. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -966,7 +966,7 @@ DRQReady2 ( This function is used to poll for the BSY bit clear in the Status Register. BSY is clear when the device is not busy. Every command must be sent after device is not busy. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -1008,11 +1008,11 @@ WaitForBSYClear ( return EFI_SUCCESS; } /** - This function is used to poll for the BSY bit clear in the Alternate Status Register. - BSY is clear when the device is not busy. Every command must be sent after device is + This function is used to poll for the BSY bit clear in the Alternate Status Register. + BSY is clear when the device is not busy. Every command must be sent after device is not busy. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -1051,7 +1051,7 @@ WaitForBSYClear2 ( } /** This function is used to poll for the DRDY bit set in the Status Register. DRDY - bit is set when the device is ready to accept command. Most ATA commands must be + bit is set when the device is ready to accept command. Most ATA commands must be sent after DRDY set except the ATAPI Packet Command. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -1103,8 +1103,8 @@ DRDYReady ( return EFI_SUCCESS; } /** - This function is used to poll for the DRDY bit set in the Alternate Status Register. - DRDY bit is set when the device is ready to accept command. Most ATA commands must + This function is used to poll for the DRDY bit set in the Alternate Status Register. + DRDY bit is set when the device is ready to accept command. Most ATA commands must be sent after DRDY set except the ATAPI Packet Command. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h index 2b7e6ea5eb..0fe6c6d502 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h @@ -2,7 +2,7 @@ Header file for IDE Bus Driver, containing the helper functions' prototype. - Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -28,7 +28,7 @@ read a one-byte data from a IDE port. @param PciIo The PCI IO protocol instance - @param Port the IDE Port number + @param Port the IDE Port number return the one-byte data read from IDE port **/ @@ -153,7 +153,7 @@ IDEWritePortWMultiple ( @param PciIo Pointer to the EFI_PCI_IO_PROTOCOL instance @param IdeRegsBaseAddr Pointer to IDE_REGISTERS_BASE_ADDR to receive IDE IO port registers' base addresses - + @retval EFI_UNSUPPORTED return this value when the BARs is not IO type @retval EFI_SUCCESS Get the Base address successfully @retval other read the pci configureation data error @@ -187,7 +187,7 @@ ReassignIdeResources ( Detect if there is disk attached to this port. @param IdeDev The BLK_IO private data which specifies the IDE device. - + @retval EFI_NOT_FOUND The device or channel is not found @retval EFI_SUCCESS The device is found @@ -212,7 +212,7 @@ InitializeIDEChannelData ( Register. DRQ is cleared when the device is finished transferring data. So this function is called after data transfer is finished. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ clear. @@ -236,7 +236,7 @@ DRQClear ( transferring data. So this function is called after data transfer is finished. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ clear. @@ -280,10 +280,10 @@ DRQReady ( /** This function is used to poll for the DRQ bit set in the Alternate Status Register. - DRQ is set when the device is ready to transfer data. So this function is called after + DRQ is set when the device is ready to transfer data. So this function is called after the command is sent to the device and before required data is transferred. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -304,7 +304,7 @@ DRQReady2 ( This function is used to poll for the BSY bit clear in the Status Register. BSY is clear when the device is not busy. Every command must be sent after device is not busy. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -320,11 +320,11 @@ WaitForBSYClear ( ); /** - This function is used to poll for the BSY bit clear in the Alternate Status Register. - BSY is clear when the device is not busy. Every command must be sent after device is + This function is used to poll for the BSY bit clear in the Alternate Status Register. + BSY is clear when the device is not busy. Every command must be sent after device is not busy. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param TimeoutInMilliSeconds used to designate the timeout for the DRQ ready. @@ -341,7 +341,7 @@ WaitForBSYClear2 ( /** This function is used to poll for the DRDY bit set in the Status Register. DRDY - bit is set when the device is ready to accept command. Most ATA commands must be + bit is set when the device is ready to accept command. Most ATA commands must be sent after DRDY set except the ATAPI Packet Command. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -360,8 +360,8 @@ DRDYReady ( ); /** - This function is used to poll for the DRDY bit set in the Alternate Status Register. - DRDY bit is set when the device is ready to accept command. Most ATA commands must + This function is used to poll for the DRDY bit set in the Alternate Status Register. + DRDY bit is set when the device is ready to accept command. Most ATA commands must be sent after DRDY set except the ATAPI Packet Command. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -394,7 +394,7 @@ DRDYReady2 ( information it needs to fill the IDE_BLK_IO_DEV data structure, including device type, media block size, media capacity, and etc. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure,used to record all the information of the IDE device. @retval EFI_SUCCESS Identify ATA device successfully. @@ -420,7 +420,7 @@ PrintAtaModuleName ( /** This function is used to send out ATA commands conforms to the PIO Data In Protocol. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @param Buffer buffer contained data transferred from device to host. @param ByteCount data size in byte unit of the buffer. @@ -430,7 +430,7 @@ PrintAtaModuleName ( @param SectorNumber value of the Sector Number Register @param CylinderLsb value of the low byte of the Cylinder Register @param CylinderMsb value of the high byte of the Cylinder Register - + @retval EFI_SUCCESS send out the ATA command and device send required data successfully. @retval EFI_DEVICE_ERROR command sent failed. @@ -486,7 +486,7 @@ AtaPioDataOut ( some debug information and if there is ERR bit set in the Status Register, the Error Register's value is also be parsed and print out. - @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @retval EFI_SUCCESS No err information in the Status Register. @@ -500,7 +500,7 @@ CheckErrorStatus ( /** This function is used to implement the Soft Reset on the specified device. But, - the ATA Soft Reset mechanism is so strong a reset method that it will force + the ATA Soft Reset mechanism is so strong a reset method that it will force resetting on both devices connected to the same cable. It is called by IdeBlkIoReset(), a interface function of Block @@ -568,7 +568,7 @@ AtaBlkIoReadBlocks ( @param BufferSize The size of the Buffer in bytes. This must be a multiple of the intrinsic block size of the device. @param Buffer A pointer to the source buffer for the data.The caller - is responsible for either having implicit or explicit + is responsible for either having implicit or explicit ownership of the memory that data is written from. @retval EFI_SUCCESS Write Blocks successfully. @@ -600,26 +600,26 @@ AtaBlkIoWriteBlocks ( to fill in the Media data structure of the Block I/O Protocol interface. There are 5 steps to reach such objective: - 1. Sends out the ATAPI Identify Command to the specified device. + 1. Sends out the ATAPI Identify Command to the specified device. Only ATAPI device responses to this command. If the command succeeds, - it returns the Identify data structure which filled with information - about the device. Since the ATAPI device contains removable media, + it returns the Identify data structure which filled with information + about the device. Since the ATAPI device contains removable media, the only meaningful information is the device module name. 2. Sends out ATAPI Inquiry Packet Command to the specified device. This command will return inquiry data of the device, which contains the device type information. 3. Allocate sense data space for future use. We don't detect the media - presence here to improvement boot performance, especially when CD + presence here to improvement boot performance, especially when CD media is present. The media detection will be performed just before each BLK_IO read/write - + @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @retval EFI_SUCCESS Identify ATAPI device successfully. @retval EFI_DEVICE_ERROR ATAPI Identify Device Command failed or device type is not supported by this IDE driver. - @retval EFI_OUT_OF_RESOURCES Allocate memory for sense data failed + @retval EFI_OUT_OF_RESOURCES Allocate memory for sense data failed @note Parameter "IdeDev" will be updated in this function. **/ @@ -637,7 +637,7 @@ ATAPIIdentify ( condition (such as BSY bit is always set ), I think the Soft Reset command should be sent without waiting for the BSY clear and DRDY set. - This function is called by IdeBlkIoReset(), + This function is called by IdeBlkIoReset(), a interface function of Block I/O protocol. @param IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used @@ -662,9 +662,9 @@ AtapiSoftReset ( @param BufferSize The size of the Buffer in bytes. This must be a multiple of the intrinsic block size of the device. @param Buffer A pointer to the destination buffer for the data. The caller - is responsible for either having implicit or explicit + is responsible for either having implicit or explicit ownership of the memory that data is read into. - + @retval EFI_SUCCESS Read Blocks successfully. @retval EFI_DEVICE_ERROR Read Blocks failed. @retval EFI_NO_MEDIA There is no media in the device. @@ -701,8 +701,8 @@ AtapiBlkIoReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGE The MediaId is not for the current media. @retval EFI_BAD_BUFFER_SIZE The BufferSize parameter is not a multiple of the - intrinsic block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + intrinsic block size of the device. + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the data buffer is not valid. @retval EFI_WRITE_PROTECTED The write protected is enabled or the media does not support write diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c index 82fd44f17d..6648dfd541 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c @@ -1,9 +1,9 @@ /** @file - This file implement UEFI driver for IDE Bus which includes device identification, - Child device(Disk, CDROM, etc) enumeration and child handler installation, and + This file implement UEFI driver for IDE Bus which includes device identification, + Child device(Disk, CDROM, etc) enumeration and child handler installation, and driver stop. - - Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+ + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -154,7 +154,7 @@ IDEBusDriverBindingSupported ( if (RemainingDevicePath != NULL) { Node = (EFI_DEV_PATH *) RemainingDevicePath; // - // Check if RemainingDevicePath is the End of Device Path Node, + // Check if RemainingDevicePath is the End of Device Path Node, // if yes, go on checking other conditions // if (!IsDevicePathEnd (Node)) { @@ -190,7 +190,7 @@ IDEBusDriverBindingSupported ( if (EFI_ERROR (Status)) { return Status; } - + // // Close the I/O Abstraction(s) used to perform the supported test // @@ -237,11 +237,11 @@ IDEBusDriverBindingSupported ( Controller, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); - + if (EFI_ERROR (Status)) { return Status; } - + // // Now further check the PCI header: Base class (offset 0x0B) and // Sub Class (offset 0x0A). This controller should be an IDE controller @@ -258,11 +258,11 @@ IDEBusDriverBindingSupported ( // // Examine if it is IDE mode by class code // - if ((PciData.Hdr.ClassCode[2] != PCI_CLASS_MASS_STORAGE) || (PciData.Hdr.ClassCode[1] != PCI_SUB_CLASS_IDE)) { + if ((PciData.Hdr.ClassCode[2] != PCI_CLASS_MASS_STORAGE) || (PciData.Hdr.ClassCode[1] != PCI_SUB_CLASS_IDE)) { Status = EFI_UNSUPPORTED; - } else { + } else { Status = EFI_SUCCESS; - } + } } return Status; @@ -464,7 +464,7 @@ IDEBusDriverBindingStart ( if (EnumAll || RemainingDevicePath == NULL) { // - // If IdeInit->EnumAll is TRUE or RemainingDevicePath is NULL, + // If IdeInit->EnumAll is TRUE or RemainingDevicePath is NULL, // must enumerate all IDE devices anyway // BeginningIdeChannel = IdePrimary; @@ -474,7 +474,7 @@ IDEBusDriverBindingStart ( } else if (!IsDevicePathEnd (RemainingDevicePath)) { // - // If RemainingDevicePath isn't the End of Device Path Node, + // If RemainingDevicePath isn't the End of Device Path Node, // only scan the specified device by RemainingDevicePath // Node = (EFI_DEV_PATH *) RemainingDevicePath; @@ -495,7 +495,7 @@ IDEBusDriverBindingStart ( // // If RemainingDevicePath is the End of Device Path Node, // skip enumerate any device and return EFI_SUCESSS - // + // BeginningIdeChannel = IdeMaxChannel; EndIdeChannel = IdeMaxChannel - 1; BeginningIdeDevice = IdeMaxDevice; @@ -1298,7 +1298,7 @@ IDEBlkIoFlushBlocks ( } /** - This function is used by the IDE bus driver to get inquiry data. + This function is used by the IDE bus driver to get inquiry data. Data format of Identify data is defined by the Interface GUID. @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @@ -1306,9 +1306,9 @@ IDEBlkIoFlushBlocks ( @param InquiryDataSize Pointer to the value for the inquiry data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading InquiryData from device - @retval EFI_BUFFER_TOO_SMALL IntquiryDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading InquiryData from device + @retval EFI_BUFFER_TOO_SMALL IntquiryDataSize not big enough **/ EFI_STATUS @@ -1339,7 +1339,7 @@ IDEDiskInfoInquiry ( } /** - This function is used by the IDE bus driver to get identify data. + This function is used by the IDE bus driver to get identify data. Data format of Identify data is defined by the Interface GUID. @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @@ -1347,9 +1347,9 @@ IDEDiskInfoInquiry ( @param IdentifyDataSize Pointer to the value for the identify data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading IdentifyData from device - @retval EFI_BUFFER_TOO_SMALL IdentifyDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading IdentifyData from device + @retval EFI_BUFFER_TOO_SMALL IdentifyDataSize not big enough **/ EFI_STATUS @@ -1380,18 +1380,18 @@ IDEDiskInfoIdentify ( } /** - This function is used by the IDE bus driver to get sense data. + This function is used by the IDE bus driver to get sense data. Data format of Sense data is defined by the Interface GUID. - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param SenseData Pointer to the SenseData. - @param SenseDataSize Size of SenseData in bytes. + @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. + @param SenseData Pointer to the SenseData. + @param SenseDataSize Size of SenseData in bytes. @param SenseDataNumber Pointer to the value for the identify data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading InquiryData from device - @retval EFI_BUFFER_TOO_SMALL SenseDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading InquiryData from device + @retval EFI_BUFFER_TOO_SMALL SenseDataSize not big enough **/ EFI_STATUS @@ -1409,12 +1409,12 @@ IDEDiskInfoSenseData ( /** This function is used by the IDE bus driver to get controller information. - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. + @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @param IdeChannel Pointer to the Ide Channel number. Primary or secondary. @param IdeDevice Pointer to the Ide Device number. Master or slave. - @retval EFI_SUCCESS IdeChannel and IdeDevice are valid - @retval EFI_UNSUPPORTED This is not an IDE device + @retval EFI_SUCCESS IdeChannel and IdeDevice are valid + @retval EFI_UNSUPPORTED This is not an IDE device **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h index a3db16ca85..7ec872275d 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h @@ -1,7 +1,7 @@ /** @file Header file for IDE Bus Driver. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -181,7 +181,7 @@ IDEBusDriverBindingStop ( // EFI Driver Configuration Functions // /** - Allows the user to set controller specific options for a controller that a + Allows the user to set controller specific options for a controller that a driver is currently managing. @param This A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance. @@ -192,26 +192,26 @@ IDEBusDriverBindingStop ( that wish to set options for the bus controller. It will not be NULL for a bus driver that wishes to set options for one of its child controllers. - @param Language A pointer to a three character ISO 639-2 language identifier. - This is the language of the user interface that should be presented - to the user, and it must match one of the languages specified in + @param Language A pointer to a three character ISO 639-2 language identifier. + This is the language of the user interface that should be presented + to the user, and it must match one of the languages specified in SupportedLanguages. The number of languages supported by a driver is up to the driver writer. - @param ActionRequired A pointer to the action that the calling agent is required + @param ActionRequired A pointer to the action that the calling agent is required to perform when this function returns. - - @retval EFI_SUCCESS The driver specified by This successfully set the configuration + + @retval EFI_SUCCESS The driver specified by This successfully set the configuration options for the controller specified by ControllerHandle.. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ActionRequired is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support setting configuration options for + @retval EFI_UNSUPPORTED The driver specified by This does not support setting configuration options for the controller specified by ControllerHandle and ChildHandle. @retval EFI_UNSUPPORTED The driver specified by This does not support the language specified by Language. - @retval EFI_DEVICE_ERROR A device error occurred while attempt to set the configuration options for the + @retval EFI_DEVICE_ERROR A device error occurred while attempt to set the configuration options for the controller specified by ControllerHandle and ChildHandle. - @retval EFI_OUT_RESOURCES There are not enough resources available to set the configuration options for the + @retval EFI_OUT_RESOURCES There are not enough resources available to set the configuration options for the controller specified by ControllerHandle and ChildHandle **/ EFI_STATUS @@ -228,20 +228,20 @@ IDEBusDriverConfigurationSetOptions ( Tests to see if a controller's current configuration options are valid. @param This A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance. - @param ControllerHandle The handle of the controller to test if it's current configuration options + @param ControllerHandle The handle of the controller to test if it's current configuration options are valid. - @param ChildHandle The handle of the child controller to test if it's current configuration - options are valid. This is an optional parameter that may be NULL. It will + @param ChildHandle The handle of the child controller to test if it's current configuration + options are valid. This is an optional parameter that may be NULL. It will be NULL for device drivers. It will also be NULL for a bus drivers that - wish to test the configuration options for the bus controller. It will - not be NULL for a bus driver that wishes to test configuration options for + wish to test the configuration options for the bus controller. It will + not be NULL for a bus driver that wishes to test configuration options for one of its child controllers. @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle that is being managed by the driver specified by This has a valid set of configuration options. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. - @retval EFI_UNSUPPORTED The driver specified by This is not currently managing the controller + @retval EFI_UNSUPPORTED The driver specified by This is not currently managing the controller specified by ControllerHandle and ChildHandle. @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle that is being managed by the driver specified by This has an invalid set of configuration @@ -260,31 +260,31 @@ IDEBusDriverConfigurationOptionsValid ( @param This A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance. @param ControllerHandle The handle of the controller to force default configuration options on. - @param ChildHandle The handle of the child controller to force default configuration - options on This is an optional parameter that may be NULL. It - will be NULL for device drivers. It will also be NULL for a bus + @param ChildHandle The handle of the child controller to force default configuration + options on This is an optional parameter that may be NULL. It + will be NULL for device drivers. It will also be NULL for a bus drivers that wish to force default configuration options for the bus controller. It will not be NULL for a bus driver that wishes to force default configuration options for one of its child controllers. - @param DefaultType The type of default configuration options to force on the controller - specified by ControllerHandle and ChildHandle. - @param ActionRequired A pointer to the action that the calling agent is required to perform + @param DefaultType The type of default configuration options to force on the controller + specified by ControllerHandle and ChildHandle. + @param ActionRequired A pointer to the action that the calling agent is required to perform when this function returns. - @retval EFI_SUCCESS The driver specified by This successfully forced the - default configuration options on the controller specified by + @retval EFI_SUCCESS The driver specified by This successfully forced the + default configuration options on the controller specified by ControllerHandle and ChildHandle. @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @retval EFI_INVALID_PARAMETER ActionRequired is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support forcing the default + @retval EFI_UNSUPPORTED The driver specified by This does not support forcing the default configuration options on the controller specified by ControllerHandle and ChildHandle. - @retval EFI_UNSUPPORTED The driver specified by This does not support the configuration type + @retval EFI_UNSUPPORTED The driver specified by This does not support the configuration type specified by DefaultType. - @retval EFI_DEVICE_ERROR A device error occurred while attempt to force the default configuration + @retval EFI_DEVICE_ERROR A device error occurred while attempt to force the default configuration options on the controller specified by ControllerHandle and ChildHandle. - @retval EFI_OUT_RESOURCES There are not enough resources available to force the default configuration + @retval EFI_OUT_RESOURCES There are not enough resources available to force the default configuration options on the controller specified by ControllerHandle and ChildHandle. **/ EFI_STATUS @@ -308,24 +308,24 @@ IDEBusDriverConfigurationForceDefaults ( @param ChildHandle The handle of the child controller to run diagnostics on This is an optional parameter that may be NULL. It will be NULL for device drivers. It will also be NULL for a - bus drivers that wish to run diagnostics on the bus controller. - It will not be NULL for a bus driver that wishes to run + bus drivers that wish to run diagnostics on the bus controller. + It will not be NULL for a bus driver that wishes to run diagnostics on one of its child controllers. @param DiagnosticType Indicates type of diagnostics to perform on the controller specified by ControllerHandle and ChildHandle. - @param Language A pointer to a three character ISO 639-2 language identifier. - This is the language in which the optional error message should - be returned in Buffer, and it must match one of the languages + @param Language A pointer to a three character ISO 639-2 language identifier. + This is the language in which the optional error message should + be returned in Buffer, and it must match one of the languages specified in SupportedLanguages. The number of languages supported by a driver is up to the driver writer. @param ErrorType A GUID that defines the format of the data returned in Buffer. @param BufferSize The size, in bytes, of the data returned in Buffer. @param Buffer A buffer that contains a Null-terminated Unicode string - plus some additional data whose format is defined by ErrorType. - Buffer is allocated by this function with AllocatePool(), and + plus some additional data whose format is defined by ErrorType. + Buffer is allocated by this function with AllocatePool(), and it is the caller's responsibility to free it with a call to FreePool(). - @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle passed + @retval EFI_SUCCESS The controller specified by ControllerHandle and ChildHandle passed the diagnostic. @retval EFI_INVALID_PARAMETER ControllerHandle is NULL. @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE. @@ -333,18 +333,18 @@ IDEBusDriverConfigurationForceDefaults ( @retval EFI_INVALID_PARAMETER ErrorType is NULL. @retval EFI_INVALID_PARAMETER BufferType is NULL. @retval EFI_INVALID_PARAMETER Buffer is NULL. - @retval EFI_UNSUPPORTED The driver specified by This does not support running - diagnostics for the controller specified by ControllerHandle + @retval EFI_UNSUPPORTED The driver specified by This does not support running + diagnostics for the controller specified by ControllerHandle and ChildHandle. @retval EFI_UNSUPPORTED The driver specified by This does not support the type of diagnostic specified by DiagnosticType. - @retval EFI_UNSUPPORTED The driver specified by This does not support the language + @retval EFI_UNSUPPORTED The driver specified by This does not support the language specified by Language. - @retval EFI_OUT_OF_RESOURCES There are not enough resources available to complete the + @retval EFI_OUT_OF_RESOURCES There are not enough resources available to complete the diagnostics. - @retval EFI_OUT_OF_RESOURCES There are not enough resources available to return the + @retval EFI_OUT_OF_RESOURCES There are not enough resources available to return the status information in ErrorType, BufferSize,and Buffer. - @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle + @retval EFI_DEVICE_ERROR The controller specified by ControllerHandle and ChildHandle did not pass the diagnostic. **/ EFI_STATUS @@ -427,7 +427,7 @@ IDEBlkIoWriteBlocks ( /** Flushes all modified data to a physical block devices - @param This Indicates a pointer to the calling context which to sepcify a + @param This Indicates a pointer to the calling context which to sepcify a sepcific block device @retval EFI_SUCCESS Always return success. @@ -438,7 +438,7 @@ IDEBlkIoFlushBlocks ( IN EFI_BLOCK_IO_PROTOCOL *This ); /** - This function is used by the IDE bus driver to get inquiry data. + This function is used by the IDE bus driver to get inquiry data. Data format of Identify data is defined by the Interface GUID. @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @@ -446,9 +446,9 @@ IDEBlkIoFlushBlocks ( @param InquiryDataSize Pointer to the value for the inquiry data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading InquiryData from device - @retval EFI_BUFFER_TOO_SMALL IntquiryDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading InquiryData from device + @retval EFI_BUFFER_TOO_SMALL IntquiryDataSize not big enough **/ EFI_STATUS @@ -460,7 +460,7 @@ IDEDiskInfoInquiry ( ); /** - This function is used by the IDE bus driver to get identify data. + This function is used by the IDE bus driver to get identify data. Data format of Identify data is defined by the Interface GUID. @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @@ -468,9 +468,9 @@ IDEDiskInfoInquiry ( @param IdentifyDataSize Pointer to the value for the identify data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading IdentifyData from device - @retval EFI_BUFFER_TOO_SMALL IdentifyDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading IdentifyData from device + @retval EFI_BUFFER_TOO_SMALL IdentifyDataSize not big enough **/ EFI_STATUS @@ -482,18 +482,18 @@ IDEDiskInfoIdentify ( ); /** - This function is used by the IDE bus driver to get sense data. + This function is used by the IDE bus driver to get sense data. Data format of Sense data is defined by the Interface GUID. - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param SenseData Pointer to the SenseData. - @param SenseDataSize Size of SenseData in bytes. + @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. + @param SenseData Pointer to the SenseData. + @param SenseDataSize Size of SenseData in bytes. @param SenseDataNumber Pointer to the value for the identify data size. @retval EFI_SUCCESS The command was accepted without any errors. - @retval EFI_NOT_FOUND Device does not support this data class - @retval EFI_DEVICE_ERROR Error reading InquiryData from device - @retval EFI_BUFFER_TOO_SMALL SenseDataSize not big enough + @retval EFI_NOT_FOUND Device does not support this data class + @retval EFI_DEVICE_ERROR Error reading InquiryData from device + @retval EFI_BUFFER_TOO_SMALL SenseDataSize not big enough **/ EFI_STATUS @@ -508,12 +508,12 @@ IDEDiskInfoSenseData ( /** This function is used by the IDE bus driver to get controller information. - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. + @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. @param IdeChannel Pointer to the Ide Channel number. Primary or secondary. @param IdeDevice Pointer to the Ide Device number. Master or slave. - @retval EFI_SUCCESS IdeChannel and IdeDevice are valid - @retval EFI_UNSUPPORTED This is not an IDE device + @retval EFI_SUCCESS IdeChannel and IdeDevice are valid + @retval EFI_UNSUPPORTED This is not an IDE device **/ EFI_STATUS @@ -524,7 +524,7 @@ IDEDiskInfoWhichIde ( OUT UINT32 *IdeDevice ); /** - The is an event(generally the event is exitBootService event) call back function. + The is an event(generally the event is exitBootService event) call back function. Clear pending IDE interrupt before OS loader/kernel take control of the IDE device. @param Event Pointer to this event diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf index 8beea2d9ca..39a0d536c4 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf @@ -3,7 +3,7 @@ # # This driver will enumerate IDE device and export the blockIo protocol for every device. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -29,9 +29,9 @@ # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -# DRIVER_BINDING = gIDEBusDriverBinding +# DRIVER_BINDING = gIDEBusDriverBinding # COMPONENT_NAME = gIDEBusComponentName -# COMPONENT_NAME2 = gIDEBusComponentName2 +# COMPONENT_NAME2 = gIDEBusComponentName2 # Variable Guid C Name: gConfigurationGuid Variable Name: L"Configuration" # # @@ -53,7 +53,7 @@ [Packages] MdePkg/MdePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec [LibraryClasses] diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxeExtra.uni b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxeExtra.uni index f47950f533..ae8916ecc7 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxeExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // IdeBusDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "IDE Bus DXE Driver" diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h index 487fe6f3ea..821912af01 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h @@ -1,14 +1,14 @@ /** @file Header file for IDE Bus Driver's Data Structures - Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -142,7 +142,7 @@ typedef struct { // // 1 second // -#define ATATIMEOUT 1000 +#define ATATIMEOUT 1000 // // ATAPITIMEOUT is used for waiting operation @@ -152,7 +152,7 @@ typedef struct { // // 1 second // -#define ATAPITIMEOUT 1000 +#define ATAPITIMEOUT 1000 // // ATAPILONGTIMEOUT is used for waiting read and @@ -162,12 +162,12 @@ typedef struct { // // 2 seconds // -#define CDROMLONGTIMEOUT 2000 +#define CDROMLONGTIMEOUT 2000 // // 5 seconds // -#define ATAPILONGTIMEOUT 5000 +#define ATAPILONGTIMEOUT 5000 // // 10 seconds diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c index e495d96af8..a023930e58 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file Implements EFI Component Name Protocol for VGA Mini Port Driver. - -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c index 25d1e3beb7..7633ebe86b 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c @@ -1,7 +1,7 @@ /** @file Implements EFI Driver Binding Protocol and VGA Mini Port Protocol for VGA Mini Port Driver. -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -306,14 +306,14 @@ PciVgaMiniPortDriverBindingStop ( This function implements EFI_VGA_MINI_PORT_PROTOCOL.SetMode(). If ModeNumber exceeds the valid range, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is directly returned without real operation. - + @param This Protocol instance pointer. @param ModeNumber Mode number. 0 - 80x25 1-80x50 @retval EFI_SUCCESS The mode was set @retval EFI_UNSUPPORTED ModeNumber is not supported. @retval EFI_DEVICE_ERROR The device is not functioning properly. - + **/ EFI_STATUS EFIAPI @@ -328,4 +328,4 @@ PciVgaMiniPortSetMode ( return EFI_SUCCESS; } - + diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h index f39c00364b..2080839629 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h @@ -1,7 +1,7 @@ /** @file Internal include file for VGA Mini Port Driver. -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -252,14 +252,14 @@ PciVgaMiniPortComponentNameGetControllerName ( This function implements EFI_VGA_MINI_PORT_PROTOCOL.SetMode(). If ModeNumber exceeds the valid range, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is directly returned without real operation. - + @param This Protocol instance pointer. @param ModeNumber Mode number. 0 - 80x25 1-80x50 @retval EFI_SUCCESS The mode was set @retval EFI_UNSUPPORTED ModeNumber is not supported. @retval EFI_DEVICE_ERROR The device is not functioning properly. - + **/ EFI_STATUS EFIAPI diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.uni b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.uni index ad04f35127..41f45c6420 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.uni +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.uni @@ -3,13 +3,13 @@ // // VGA Mini Port Driver that manages VGA device and produces the VGA Mini Port Protocol. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf index d3c35faa6c..6b5c55f78d 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf @@ -1,7 +1,7 @@ ## @file # VGA Mini Port Driver that manages VGA device and produces VGA Mini Port Protocol. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -29,7 +29,7 @@ # VALID_ARCHITECTURES = IA32 X64 IPF EBC # DRIVER_BINDING = gPciVgaMiniPortDriverBinding; # COMPONENT_NAME = gPciVgaMiniPortComponentName; -# COMPONENT_NAME2 = gPciVgaMiniPortComponentName2; +# COMPONENT_NAME2 = gPciVgaMiniPortComponentName2; # [Sources] diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortExtra.uni b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortExtra.uni index 4e206ae06a..832839142c 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortExtra.uni +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortExtra.uni @@ -1,7 +1,7 @@ // /** @file // VgaMiniPort Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "VGA Mini Port DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c index e8ea11c4f8..9c6b0f7d8e 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c @@ -5,7 +5,7 @@ Availible on http://www.t13.org/#Project drafts Currently at ftp://fission.dt.wdc.com/pub/standards/x3t13/project/d1386r4.pdf -Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -156,14 +156,14 @@ BiosBlockIoDriverBindingSupported ( if (EFI_ERROR (Status)) { return Status; } - + gBS->CloseProtocol ( Controller, &gEfiDevicePathProtocolGuid, This->DriverBindingHandle, Controller - ); - + ); + // // Open the IO Abstraction(s) needed to perform the supported test // @@ -243,8 +243,8 @@ BiosBlockIoDriverBindingStart ( // PciIo = NULL; PciDevPath = NULL; - - DeviceEnable = FALSE; + + DeviceEnable = FALSE; // // See if the Legacy BIOS Protocol is available @@ -292,9 +292,9 @@ BiosBlockIoDriverBindingStart ( if (EFI_ERROR (Status)) { goto Error; } - + DeviceEnable = TRUE; - + // // Check to see if there is a legacy option ROM image associated with this PCI device // @@ -635,9 +635,9 @@ SetBiosInitBlockIoDevicePath ( { EFI_STATUS Status; BLOCKIO_VENDOR_DEVICE_PATH VendorNode; - + Status = EFI_UNSUPPORTED; - + // // BugBug: Check for memory leaks! // @@ -647,7 +647,7 @@ SetBiosInitBlockIoDevicePath ( // Status = BuildEdd30DevicePath (BaseDevicePath, Drive, DevicePath); } - + if (EFI_ERROR (Status)) { // // EDD 1.1 device case or it is unrecognized EDD 3.0 device @@ -767,14 +767,14 @@ BuildEdd30DevicePath ( Drive->Number, Drive->Parameters.InterfaceType ) - ); + ); } } if (Node.DevPath.Type == 0) { return EFI_UNSUPPORTED; } - + *DevicePath = AppendDevicePathNode (BaseDevicePath, &Node.DevPath); return EFI_SUCCESS; } diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h index 91617b79d9..d67b940d1a 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h @@ -1,6 +1,6 @@ /** @file -Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -173,7 +173,7 @@ BiosInitBlockIo ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -203,7 +203,7 @@ Edd30BiosReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -266,7 +266,7 @@ BiosBlockIoReset ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -296,7 +296,7 @@ Edd11BiosReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -325,7 +325,7 @@ Edd11BiosWriteBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -355,7 +355,7 @@ BiosReadLegacyDrive ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -376,7 +376,7 @@ BiosWriteLegacyDrive ( @param Drive Legacy drive. @return Result of device parameter retrieval. - + **/ UINTN Int13GetDeviceParameters ( @@ -391,7 +391,7 @@ Int13GetDeviceParameters ( @param Drive Legacy drive. @return Result of this extension. - + **/ UINTN Int13Extensions ( @@ -406,7 +406,7 @@ Int13Extensions ( @param Drive Legacy drive. @return Result of drive parameter retrieval. - + **/ UINTN GetDriveParameters ( diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c index 698bb620e8..0b77227774 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c @@ -1,7 +1,7 @@ /** @file Routines that use BIOS to support INT 13 devices. -Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -130,7 +130,7 @@ BiosInitBlockIo ( @param Drive Legacy drive. @return Result of device parameter retrieval. - + **/ UINTN Int13GetDeviceParameters ( @@ -185,7 +185,7 @@ Int13GetDeviceParameters ( @param Drive Legacy drive. @return Result of this extension. - + **/ UINTN Int13Extensions ( @@ -227,7 +227,7 @@ Int13Extensions ( @param Drive Legacy drive. @return Result of drive parameter retrieval. - + **/ UINTN GetDriveParameters ( @@ -406,7 +406,7 @@ GetDriveParameters ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -554,7 +554,7 @@ Edd30BiosReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -789,7 +789,7 @@ BiosBlockIoReset ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -942,7 +942,7 @@ Edd11BiosReadBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -1103,7 +1103,7 @@ Edd11BiosWriteBlocks ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ @@ -1305,7 +1305,7 @@ BiosReadLegacyDrive ( @retval EFI_NO_MEDIA There is no media in the device. @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. - @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, or the buffer is not on proper alignment. **/ diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.uni index 3ed1a64d04..8de9ae7f7e 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.uni @@ -4,14 +4,14 @@ // This is the UEFI driver to thunk legacy BIOS int13 interface into UEFI block IO interface. // Once connected it installs EfiBlockIoProtocol on top of legacy BIOS int13. // -// Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxeExtra.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxeExtra.uni index 77dd095970..8fa75fe993 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxeExtra.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // BlockIoDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy Block I/O DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c index ac8e2364c8..63f6303995 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c @@ -58,7 +58,7 @@ Enqueue ( /** Dequeue the key. - + @param Queue The queue to be dequeued. @param KeyData The key data to be dequeued. @@ -85,7 +85,7 @@ Dequeue ( /** Check whether the queue is empty. - + @param Queue The queue to be checked. @retval EFI_NOT_READY The queue is empty. @@ -279,8 +279,8 @@ BiosKeyboardDriverBindingStart ( BiosKeyboardPrivate->SimpleTextInputEx.Reset = BiosKeyboardResetEx; BiosKeyboardPrivate->SimpleTextInputEx.ReadKeyStrokeEx = BiosKeyboardReadKeyStrokeEx; BiosKeyboardPrivate->SimpleTextInputEx.SetState = BiosKeyboardSetState; - BiosKeyboardPrivate->SimpleTextInputEx.RegisterKeyNotify = BiosKeyboardRegisterKeyNotify; - BiosKeyboardPrivate->SimpleTextInputEx.UnregisterKeyNotify = BiosKeyboardUnregisterKeyNotify; + BiosKeyboardPrivate->SimpleTextInputEx.RegisterKeyNotify = BiosKeyboardRegisterKeyNotify; + BiosKeyboardPrivate->SimpleTextInputEx.UnregisterKeyNotify = BiosKeyboardUnregisterKeyNotify; InitializeListHead (&BiosKeyboardPrivate->NotifyList); // @@ -315,7 +315,7 @@ BiosKeyboardDriverBindingStart ( if (EFI_ERROR (Status)) { BiosKeyboardPrivate->SimpleTextInputEx.WaitForKeyEx = NULL; goto Done; - } + } // // Setup a periodic timer, used for reading keystrokes at a fixed interval @@ -373,7 +373,7 @@ BiosKeyboardDriverBindingStart ( FeaturePcdGet (PcdPs2KbdExtendedVerification) ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "[KBD]Reset Failed. Status - %r\n", Status)); + DEBUG ((EFI_D_ERROR, "[KBD]Reset Failed. Status - %r\n", Status)); StatusCode = EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_NOT_DETECTED; goto Done; } @@ -471,13 +471,13 @@ Done: if (EFI_ERROR (Status)) { - if (BiosKeyboardPrivate != NULL) { + if (BiosKeyboardPrivate != NULL) { if ((BiosKeyboardPrivate->SimpleTextIn).WaitForKey != NULL) { gBS->CloseEvent ((BiosKeyboardPrivate->SimpleTextIn).WaitForKey); } if ((BiosKeyboardPrivate->SimpleTextInputEx).WaitForKeyEx != NULL) { - gBS->CloseEvent ((BiosKeyboardPrivate->SimpleTextInputEx).WaitForKeyEx); + gBS->CloseEvent ((BiosKeyboardPrivate->SimpleTextInputEx).WaitForKeyEx); } if (BiosKeyboardPrivate->KeyNotifyProcessEvent != NULL) { @@ -487,7 +487,7 @@ Done: BiosKeyboardFreeNotifyList (&BiosKeyboardPrivate->NotifyList); if (BiosKeyboardPrivate->TimerEvent != NULL) { - gBS->CloseEvent (BiosKeyboardPrivate->TimerEvent); + gBS->CloseEvent (BiosKeyboardPrivate->TimerEvent); } FreePool (BiosKeyboardPrivate); @@ -558,7 +558,7 @@ BiosKeyboardDriverBindingStop ( if (EFI_ERROR (Status)) { return Status; } - + BiosKeyboardPrivate = BIOS_KEYBOARD_DEV_FROM_THIS (SimpleTextIn); Status = gBS->UninstallMultipleProtocolInterfaces ( @@ -930,19 +930,19 @@ KeyboardWaitForValue ( } /** - Reads the next keystroke from the input device. The WaitForKey Event can + Reads the next keystroke from the input device. The WaitForKey Event can be used to test for existance of a keystroke via WaitForEvent () call. @param BiosKeyboardPrivate Bioskeyboard driver private structure. - @param KeyData A pointer to a buffer that is filled in with the keystroke + @param KeyData A pointer to a buffer that is filled in with the keystroke state data for the key that was pressed. @retval EFI_SUCCESS The keystroke information was returned. @retval EFI_NOT_READY There was no keystroke data availiable. - @retval EFI_DEVICE_ERROR The keystroke information was not returned due to + @retval EFI_DEVICE_ERROR The keystroke information was not returned due to hardware errors. - @retval EFI_INVALID_PARAMETER KeyData is NULL. - + @retval EFI_INVALID_PARAMETER KeyData is NULL. + **/ EFI_STATUS KeyboardReadKeyStrokeWorker ( @@ -959,14 +959,14 @@ KeyboardReadKeyStrokeWorker ( // // Use TimerEvent callback function to check whether there's any key pressed // - + // // Stall 1ms to give a chance to let other driver interrupt this routine for their timer event. - // Csm will be used to check whether there is a key pending, but the csm will disable all + // Csm will be used to check whether there is a key pending, but the csm will disable all // interrupt before switch to compatibility16, which mean all the efiCompatibility timer - // event will stop work during the compatibility16. And If a caller recursivly invoke this function, - // e.g. OS loader, other drivers which are driven by timer event will have a bad performance during this period, - // e.g. usb keyboard driver. + // event will stop work during the compatibility16. And If a caller recursivly invoke this function, + // e.g. OS loader, other drivers which are driven by timer event will have a bad performance during this period, + // e.g. usb keyboard driver. // Add a stall period can greatly increate other driver performance during the WaitForKey is recursivly invoked. // 1ms delay will make little impact to the thunk keyboard driver, and user can not feel the delay at all when input. // @@ -1075,17 +1075,17 @@ BiosKeyboardReset ( BiosKeyboardPrivate, KBC_CMDREG_VIA64_CMDBYTE_R ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; } - + Status = KeyboardRead ( BiosKeyboardPrivate, &CommandByte ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; @@ -1106,17 +1106,17 @@ BiosKeyboardReset ( BiosKeyboardPrivate, KBC_CMDREG_VIA64_AUX_DISABLE ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; } - + Status = KeyboardCommand ( BiosKeyboardPrivate, KBC_CMDREG_VIA64_KB_DISABLE ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; @@ -1128,12 +1128,12 @@ BiosKeyboardReset ( // // // Report a Progress Code for performing a self test on the keyboard controller - // + // REPORT_STATUS_CODE ( EFI_PROGRESS_CODE, EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST ); - + Status = KeyboardCommand ( BiosKeyboardPrivate, KBC_CMDREG_VIA64_KBC_SLFTEST @@ -1142,7 +1142,7 @@ BiosKeyboardReset ( Status = EFI_DEVICE_ERROR; goto Exit; } - + Status = KeyboardWaitForValue ( BiosKeyboardPrivate, KBC_CMDECHO_KBCSLFTEST_OK, @@ -1352,7 +1352,7 @@ BiosKeyboardReset ( BiosKeyboardPrivate, KBC_CMDREG_VIA64_KB_ENABLE ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; @@ -1425,7 +1425,7 @@ BiosKeyboardReadKeyStroke ( } } - CopyMem (Key, &KeyData.Key, sizeof (EFI_INPUT_KEY)); + CopyMem (Key, &KeyData.Key, sizeof (EFI_INPUT_KEY)); return EFI_SUCCESS; } @@ -1469,7 +1469,7 @@ BiosKeyboardWaitForKey ( Check key buffer to get the key stroke status. @param This Pointer of the protocol EFI_SIMPLE_TEXT_IN_PROTOCOL. - + @retval EFI_SUCCESS A key is being pressed now. @retval Other No key is now pressed. @@ -1644,7 +1644,7 @@ CONVERT_TABLE_ENTRY mConvertTable[] = { @param KeyChar Unicode of key. @param ScanCode Scan code of key. - @return The value of EFI Scancode for the key. + @return The value of EFI Scancode for the key. @retval SCAN_NULL No corresponding value in the EFI convert table is found for the key. **/ @@ -1682,7 +1682,7 @@ ConvertToEFIScanCode ( /** Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard Command If Keyboard receives 0xF4, it will respond with 'ACK'. If it doesn't respond, the device - should not be in system. + should not be in system. @param BiosKeyboardPrivate Keyboard Private Data Struture @@ -1738,9 +1738,9 @@ CheckKeyboardConnect ( /** Timer event handler: read a series of key stroke from 8042 - and put them into memory key buffer. + and put them into memory key buffer. It is registered as running under TPL_NOTIFY - + @param Event The timer event @param Context A BIOS_KEYBOARD_DEV pointer @@ -1785,7 +1785,7 @@ BiosKeyboardTimerHandler ( if (Regs.X.Flags.ZF != 0) { gBS->RestoreTPL (OldTpl); return; - } + } // // Read the key @@ -1810,27 +1810,27 @@ BiosKeyboardTimerHandler ( KeyData.Key.ScanCode, KeyData.Key.UnicodeChar )); - + KeyData.KeyState.KeyShiftState = EFI_SHIFT_STATE_VALID; KeyData.KeyState.KeyToggleState = EFI_TOGGLE_STATE_VALID; // - // Leagcy Bios use Int 9 which is IRQ1 interrupt handler to get keystroke scancode to KB buffer in BDA (BIOS DATE AREA), then - // Int 16 depend KB buffer and some key bits in BDA to translate the scancode to ASCII code, and return both the scancode and ASCII - // code to Int 16 caller. This translation process works well if the Int 9 could response user input in time. But in Tiano enviorment, the Int 9 - // will be disabled after the thunk call finish, which means if user crazy input during int 9 being disabled, some keystrokes will be lost when - // KB device own hardware buffer overflows. And if the lost keystroke code is CTRL or ALT or SHIFT release code, these function key flags bit - // in BDA will not be updated. So the Int 16 will believe the CTRL or ALT or SHIFT is still pressed, and Int 16 will translate later scancode + // Leagcy Bios use Int 9 which is IRQ1 interrupt handler to get keystroke scancode to KB buffer in BDA (BIOS DATE AREA), then + // Int 16 depend KB buffer and some key bits in BDA to translate the scancode to ASCII code, and return both the scancode and ASCII + // code to Int 16 caller. This translation process works well if the Int 9 could response user input in time. But in Tiano enviorment, the Int 9 + // will be disabled after the thunk call finish, which means if user crazy input during int 9 being disabled, some keystrokes will be lost when + // KB device own hardware buffer overflows. And if the lost keystroke code is CTRL or ALT or SHIFT release code, these function key flags bit + // in BDA will not be updated. So the Int 16 will believe the CTRL or ALT or SHIFT is still pressed, and Int 16 will translate later scancode // to wrong ASCII code. We can increase the Thunk frequence to let Int 9 response in time, but this way will much hurt other drivers // performance, like USB. // - // 1. If CTRL or ALT release code is missed, all later input keys will be translated to wrong ASCII codes which the Tiano cannot support. In - // this case, the KB input seems fail to work, and user input is blocked. To solve the problem, we can help to clear the CTRL or ALT flag in BDA - // after every Int 16 finish. Thus persist to press CTRL or ALT has same effection as only press one time. It is Ok, since user not often use the + // 1. If CTRL or ALT release code is missed, all later input keys will be translated to wrong ASCII codes which the Tiano cannot support. In + // this case, the KB input seems fail to work, and user input is blocked. To solve the problem, we can help to clear the CTRL or ALT flag in BDA + // after every Int 16 finish. Thus persist to press CTRL or ALT has same effection as only press one time. It is Ok, since user not often use the // CTRL and ALT. // - // 2. If SHIFT release code is missed, all later lowercase input will become capital. This is ugly, but not block user input. If user press the lost + // 2. If SHIFT release code is missed, all later lowercase input will become capital. This is ugly, but not block user input. If user press the lost // SHIFT again, the lowercase will come back to normal. Since user often use the SHIFT, it is not reasonable to help to clear the SHIFT flag in BDA, - // which will let persist to press SHIFT has same effection as only press one time. + // which will let persist to press SHIFT has same effection as only press one time. // //0040h:0017h - KEYBOARD - STATUS FLAGS 1 // 7 INSert active @@ -1861,21 +1861,21 @@ BiosKeyboardTimerHandler ( } if ((KbFlag1 & KB_SCROLL_LOCK_BIT) == KB_SCROLL_LOCK_BIT) { DEBUG ((EFI_D_INFO, "[KBD]Scroll Lock Key is pressed.\n")); - } + } if ((KbFlag1 & KB_ALT_PRESSED) == KB_ALT_PRESSED) { if ((KbFlag2 & KB_LEFT_ALT_PRESSED) == KB_LEFT_ALT_PRESSED) { DEBUG ((EFI_D_INFO, "[KBD]Left Alt Key is pressed.\n")); } else { DEBUG ((EFI_D_INFO, "[KBD]Right Alt Key is pressed.\n")); } - } + } if ((KbFlag1 & KB_CTRL_PRESSED) == KB_CTRL_PRESSED) { if ((KbFlag2 & KB_LEFT_CTRL_PRESSED) == KB_LEFT_CTRL_PRESSED) { DEBUG ((EFI_D_INFO, "[KBD]Left Ctrl Key is pressed.\n")); } else { DEBUG ((EFI_D_INFO, "[KBD]Right Ctrl Key is pressed.\n")); } - } + } if ((KbFlag1 & KB_LEFT_SHIFT_PRESSED) == KB_LEFT_SHIFT_PRESSED) { DEBUG ((EFI_D_INFO, "[KBD]Left Shift Key is pressed.\n")); } @@ -1900,13 +1900,13 @@ BiosKeyboardTimerHandler ( // // Record shift state // BUGBUG: Need add Menu key and Left/Right Logo key state in the future - // + // if ((KbFlag1 & KB_ALT_PRESSED) == KB_ALT_PRESSED) { KeyData.KeyState.KeyShiftState |= ((KbFlag2 & KB_LEFT_ALT_PRESSED) == KB_LEFT_ALT_PRESSED) ? EFI_LEFT_ALT_PRESSED : EFI_RIGHT_ALT_PRESSED; - } + } if ((KbFlag1 & KB_CTRL_PRESSED) == KB_CTRL_PRESSED) { KeyData.KeyState.KeyShiftState |= ((KbFlag2 & KB_LEFT_CTRL_PRESSED) == KB_LEFT_CTRL_PRESSED) ? EFI_LEFT_CONTROL_PRESSED : EFI_RIGHT_CONTROL_PRESSED; - } + } if ((KbFlag1 & KB_LEFT_SHIFT_PRESSED) == KB_LEFT_SHIFT_PRESSED) { KeyData.KeyState.KeyShiftState |= EFI_LEFT_SHIFT_PRESSED; } @@ -1923,7 +1923,7 @@ BiosKeyboardTimerHandler ( KbFlag1 &= ~0x0C; *((UINT8 *) (UINTN) 0x417) = KbFlag1; ); - + // // Output EFI input key and shift/toggle state // @@ -1973,9 +1973,9 @@ BiosKeyboardTimerHandler ( // for (Link = BiosKeyboardPrivate->NotifyList.ForwardLink; Link != &BiosKeyboardPrivate->NotifyList; Link = Link->ForwardLink) { CurrentNotify = CR ( - Link, - BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, - NotifyEntry, + Link, + BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, + NotifyEntry, BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE ); if (IsKeyRegistered (&CurrentNotify->KeyData, &KeyData)) { @@ -2001,7 +2001,7 @@ BiosKeyboardTimerHandler ( // gBS->RestoreTPL (OldTpl); - return ; + return ; } /** @@ -2034,7 +2034,7 @@ KeyNotifyProcessHandler ( while (TRUE) { // // Enter critical section - // + // OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = Dequeue (&BiosKeyboardPrivate->QueueForNotify, &KeyData); // @@ -2074,9 +2074,9 @@ BiosKeyboardFreeNotifyList ( } while (!IsListEmpty (ListHead)) { NotifyNode = CR ( - ListHead->ForwardLink, - BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, - NotifyEntry, + ListHead->ForwardLink, + BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, + NotifyEntry, BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE ); RemoveEntryList (ListHead->ForwardLink); @@ -2089,14 +2089,14 @@ BiosKeyboardFreeNotifyList ( /** Check if key is registered. - @param RegsiteredData A pointer to a buffer that is filled in with the keystroke + @param RegsiteredData A pointer to a buffer that is filled in with the keystroke state data for the key that was registered. - @param InputData A pointer to a buffer that is filled in with the keystroke + @param InputData A pointer to a buffer that is filled in with the keystroke state data for the key that was pressed. @retval TRUE Key be pressed matches a registered key. - @retval FLASE Match failed. - + @retval FLASE Match failed. + **/ BOOLEAN IsKeyRegistered ( @@ -2105,24 +2105,24 @@ IsKeyRegistered ( ) { ASSERT (RegsiteredData != NULL && InputData != NULL); - + if ((RegsiteredData->Key.ScanCode != InputData->Key.ScanCode) || (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar)) { - return FALSE; - } - + return FALSE; + } + // // Assume KeyShiftState/KeyToggleState = 0 in Registered key data means these state could be ignored. // if (RegsiteredData->KeyState.KeyShiftState != 0 && RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState) { - return FALSE; - } + return FALSE; + } if (RegsiteredData->KeyState.KeyToggleState != 0 && RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState) { - return FALSE; - } - + return FALSE; + } + return TRUE; } @@ -2132,7 +2132,7 @@ IsKeyRegistered ( @param Event The event that be siganlled when any key has been stroked. @param Context Pointer of the protocol EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL. - + **/ VOID EFIAPI @@ -2140,22 +2140,22 @@ BiosKeyboardWaitForKeyEx ( IN EFI_EVENT Event, IN VOID *Context ) -{ +{ BIOS_KEYBOARD_DEV *BiosKeyboardPrivate; - - BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (Context); + + BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (Context); BiosKeyboardWaitForKey (Event, &BiosKeyboardPrivate->SimpleTextIn); } /** Reset the input device and optionaly run diagnostics - + @param This Protocol instance pointer. @param ExtendedVerification Driver may perform diagnostics on reset. @retval EFI_SUCCESS The device was reset. - @retval EFI_DEVICE_ERROR The device is not functioning properly and could + @retval EFI_DEVICE_ERROR The device is not functioning properly and could not be reset. **/ @@ -2169,11 +2169,11 @@ BiosKeyboardResetEx ( BIOS_KEYBOARD_DEV *BiosKeyboardPrivate; EFI_STATUS Status; EFI_TPL OldTpl; - - BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (This); + + BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (This); Status = BiosKeyboardPrivate->SimpleTextIn.Reset ( - &BiosKeyboardPrivate->SimpleTextIn, + &BiosKeyboardPrivate->SimpleTextIn, ExtendedVerification ); if (EFI_ERROR (Status)) { @@ -2183,25 +2183,25 @@ BiosKeyboardResetEx ( OldTpl = gBS->RaiseTPL (TPL_NOTIFY); gBS->RestoreTPL (OldTpl); - + return EFI_SUCCESS; } /** - Reads the next keystroke from the input device. The WaitForKey Event can + Reads the next keystroke from the input device. The WaitForKey Event can be used to test for existance of a keystroke via WaitForEvent () call. @param This Protocol instance pointer. - @param KeyData A pointer to a buffer that is filled in with the keystroke + @param KeyData A pointer to a buffer that is filled in with the keystroke state data for the key that was pressed. - + @retval EFI_SUCCESS The keystroke information was returned. @retval EFI_NOT_READY There was no keystroke data availiable. - @retval EFI_DEVICE_ERROR The keystroke information was not returned due to + @retval EFI_DEVICE_ERROR The keystroke information was not returned due to hardware errors. - @retval EFI_INVALID_PARAMETER KeyData is NULL. - + @retval EFI_INVALID_PARAMETER KeyData is NULL. + **/ EFI_STATUS EFIAPI @@ -2215,27 +2215,27 @@ BiosKeyboardReadKeyStrokeEx ( if (KeyData == NULL) { return EFI_INVALID_PARAMETER; } - + BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (This); return KeyboardReadKeyStrokeWorker (BiosKeyboardPrivate, KeyData); - + } /** Set certain state for the input device. @param This Protocol instance pointer. - @param KeyToggleState A pointer to the EFI_KEY_TOGGLE_STATE to set the + @param KeyToggleState A pointer to the EFI_KEY_TOGGLE_STATE to set the state for the input device. @retval EFI_SUCCESS The device state was set successfully. - @retval EFI_DEVICE_ERROR The device is not functioning correctly and could + @retval EFI_DEVICE_ERROR The device is not functioning correctly and could not have the setting adjusted. @retval EFI_UNSUPPORTED The device does not have the ability to set its state. - @retval EFI_INVALID_PARAMETER KeyToggleState is NULL. + @retval EFI_INVALID_PARAMETER KeyToggleState is NULL. -**/ +**/ EFI_STATUS EFIAPI BiosKeyboardSetState ( @@ -2293,7 +2293,7 @@ BiosKeyboardSetState ( if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; - } + } Status = KeyboardWaitForValue (BiosKeyboardPrivate, 0xfa, KEYBOARD_WAITFORVALUE_TIMEOUT); if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; @@ -2303,7 +2303,7 @@ BiosKeyboardSetState ( if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto Exit; - } + } // // Call Legacy BIOS Protocol to set whatever is necessary // @@ -2325,12 +2325,12 @@ Exit: Register a notification function for a particular keystroke for the input device. @param This Protocol instance pointer. - @param KeyData A pointer to a buffer that is filled in with the keystroke + @param KeyData A pointer to a buffer that is filled in with the keystroke information data for the key that was pressed. If KeyData.Key, KeyData.KeyState.KeyToggleState and KeyData.KeyState.KeyShiftState are 0, then any incomplete keystroke will trigger a notification of the KeyNotificationFunction. - @param KeyNotificationFunction Points to the function to be called when the key + @param KeyNotificationFunction Points to the function to be called when the key sequence is typed specified by KeyData. This notification function should be called at <=TPL_CALLBACK. @param NotifyHandle Points to the unique handle assigned to the registered notification. @@ -2354,7 +2354,7 @@ BiosKeyboardRegisterKeyNotify ( EFI_TPL OldTpl; BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY *NewNotify; LIST_ENTRY *Link; - BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify; + BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify; if (KeyData == NULL || NotifyHandle == NULL || KeyNotificationFunction == NULL) { return EFI_INVALID_PARAMETER; @@ -2372,24 +2372,24 @@ BiosKeyboardRegisterKeyNotify ( // for (Link = BiosKeyboardPrivate->NotifyList.ForwardLink; Link != &BiosKeyboardPrivate->NotifyList; Link = Link->ForwardLink) { CurrentNotify = CR ( - Link, - BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, - NotifyEntry, + Link, + BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, + NotifyEntry, BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE ); - if (IsKeyRegistered (&CurrentNotify->KeyData, KeyData)) { + if (IsKeyRegistered (&CurrentNotify->KeyData, KeyData)) { if (CurrentNotify->KeyNotificationFn == KeyNotificationFunction) { *NotifyHandle = CurrentNotify; Status = EFI_SUCCESS; goto Exit; } - } + } } // // Allocate resource to save the notification function // - + NewNotify = (BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY *) AllocateZeroPool (sizeof (BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY)); if (NewNotify == NULL) { Status = EFI_OUT_OF_RESOURCES; @@ -2403,25 +2403,25 @@ BiosKeyboardRegisterKeyNotify ( *NotifyHandle = NewNotify; Status = EFI_SUCCESS; - + Exit: // // Leave critical section and return // gBS->RestoreTPL (OldTpl); - return Status; + return Status; } /** Remove a registered notification function from a particular keystroke. - @param This Protocol instance pointer. + @param This Protocol instance pointer. @param NotificationHandle The handle of the notification function being unregistered. - + @retval EFI_SUCCESS The notification function was unregistered successfully. @retval EFI_INVALID_PARAMETER The NotificationHandle is invalid. - -**/ + +**/ EFI_STATUS EFIAPI BiosKeyboardUnregisterKeyNotify ( @@ -2444,10 +2444,10 @@ BiosKeyboardUnregisterKeyNotify ( if (((BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY *) NotificationHandle)->Signature != BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE) { return EFI_INVALID_PARAMETER; - } - + } + BiosKeyboardPrivate = TEXT_INPUT_EX_BIOS_KEYBOARD_DEV_FROM_THIS (This); - + // // Enter critical section // @@ -2455,22 +2455,22 @@ BiosKeyboardUnregisterKeyNotify ( for (Link = BiosKeyboardPrivate->NotifyList.ForwardLink; Link != &BiosKeyboardPrivate->NotifyList; Link = Link->ForwardLink) { CurrentNotify = CR ( - Link, - BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, - NotifyEntry, + Link, + BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY, + NotifyEntry, BIOS_KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE - ); + ); if (CurrentNotify == NotificationHandle) { // // Remove the notification function from NotifyList and free resources // - RemoveEntryList (&CurrentNotify->NotifyEntry); + RemoveEntryList (&CurrentNotify->NotifyEntry); Status = EFI_SUCCESS; goto Exit; } } - + // // Can not find the specified Notification Handle // diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h index 5300eaa0ab..ef2c822c55 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h @@ -234,7 +234,7 @@ typedef struct { LIST_ENTRY NotifyList; EFI_EVENT KeyNotifyProcessEvent; EFI_EVENT TimerEvent; - + } BIOS_KEYBOARD_DEV; #define BIOS_KEYBOARD_DEV_FROM_THIS(a) CR (a, BIOS_KEYBOARD_DEV, SimpleTextIn, BIOS_KEYBOARD_DEV_SIGNATURE) @@ -500,7 +500,7 @@ BiosKeyboardWaitForKey ( Check key buffer to get the key stroke status. @param This Pointer of the protocol EFI_SIMPLE_TEXT_IN_PROTOCOL. - + @retval EFI_SUCCESS A key is being pressed now. @retval Other No key is now pressed. @@ -517,7 +517,7 @@ BiosKeyboardCheckForKey ( @param KeyChar Unicode of key. @param ScanCode Scan code of key. - @return The value of EFI Scancode for the key. + @return The value of EFI Scancode for the key. @retval SCAN_NULL No corresponding value in the EFI convert table is found for the key. **/ @@ -530,7 +530,7 @@ ConvertToEFIScanCode ( /** Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard Command If Keyboard receives 0xF4, it will respond with 'ACK'. If it doesn't respond, the device - should not be in system. + should not be in system. @param BiosKeyboardPrivate Keyboard Private Data Struture @@ -545,9 +545,9 @@ CheckKeyboardConnect ( /** Timer event handler: read a series of key stroke from 8042 - and put them into memory key buffer. + and put them into memory key buffer. It is registered as running under TPL_NOTIFY - + @param Event The timer event @param Context A BIOS_KEYBOARD_DEV pointer @@ -574,12 +574,12 @@ KeyNotifyProcessHandler ( /** Reset the input device and optionaly run diagnostics - + @param This Protocol instance pointer. @param ExtendedVerification Driver may perform diagnostics on reset. @retval EFI_SUCCESS The device was reset. - @retval EFI_DEVICE_ERROR The device is not functioning properly and could + @retval EFI_DEVICE_ERROR The device is not functioning properly and could not be reset. **/ @@ -591,19 +591,19 @@ BiosKeyboardResetEx ( ); /** - Reads the next keystroke from the input device. The WaitForKey Event can + Reads the next keystroke from the input device. The WaitForKey Event can be used to test for existance of a keystroke via WaitForEvent () call. @param This Protocol instance pointer. - @param KeyData A pointer to a buffer that is filled in with the keystroke + @param KeyData A pointer to a buffer that is filled in with the keystroke state data for the key that was pressed. - + @retval EFI_SUCCESS The keystroke information was returned. @retval EFI_NOT_READY There was no keystroke data availiable. - @retval EFI_DEVICE_ERROR The keystroke information was not returned due to + @retval EFI_DEVICE_ERROR The keystroke information was not returned due to hardware errors. - @retval EFI_INVALID_PARAMETER KeyData is NULL. - + @retval EFI_INVALID_PARAMETER KeyData is NULL. + **/ EFI_STATUS EFIAPI @@ -616,16 +616,16 @@ BiosKeyboardReadKeyStrokeEx ( Set certain state for the input device. @param This Protocol instance pointer. - @param KeyToggleState A pointer to the EFI_KEY_TOGGLE_STATE to set the + @param KeyToggleState A pointer to the EFI_KEY_TOGGLE_STATE to set the state for the input device. @retval EFI_SUCCESS The device state was set successfully. - @retval EFI_DEVICE_ERROR The device is not functioning correctly and could + @retval EFI_DEVICE_ERROR The device is not functioning correctly and could not have the setting adjusted. @retval EFI_UNSUPPORTED The device does not have the ability to set its state. - @retval EFI_INVALID_PARAMETER KeyToggleState is NULL. + @retval EFI_INVALID_PARAMETER KeyToggleState is NULL. -**/ +**/ EFI_STATUS EFIAPI BiosKeyboardSetState ( @@ -637,17 +637,17 @@ BiosKeyboardSetState ( Register a notification function for a particular keystroke for the input device. @param This Protocol instance pointer. - @param KeyData A pointer to a buffer that is filled in with the keystroke + @param KeyData A pointer to a buffer that is filled in with the keystroke information data for the key that was pressed. If KeyData.Key, KeyData.KeyState.KeyToggleState and KeyData.KeyState.KeyShiftState are 0, then any incomplete keystroke will trigger a notification of the KeyNotificationFunction. - @param KeyNotificationFunction Points to the function to be called when the key + @param KeyNotificationFunction Points to the function to be called when the key sequence is typed specified by KeyData. This notification function should be called at <=TPL_CALLBACK. @param NotifyHandle Points to the unique handle assigned to the registered notification. - + @retval EFI_SUCCESS The notification function was registered successfully. @retval EFI_OUT_OF_RESOURCES Unable to allocate resources for necesssary data structures. @retval EFI_INVALID_PARAMETER KeyData or NotifyHandle is NULL. @@ -665,13 +665,13 @@ BiosKeyboardRegisterKeyNotify ( /** Remove a registered notification function from a particular keystroke. - @param This Protocol instance pointer. + @param This Protocol instance pointer. @param NotificationHandle The handle of the notification function being unregistered. - + @retval EFI_SUCCESS The notification function was unregistered successfully. @retval EFI_INVALID_PARAMETER The NotificationHandle is invalid. - -**/ + +**/ EFI_STATUS EFIAPI BiosKeyboardUnregisterKeyNotify ( @@ -727,19 +727,19 @@ KeyboardWrite ( EFI_STATUS BiosKeyboardFreeNotifyList ( IN OUT LIST_ENTRY *ListHead - ); + ); /** Check if key is registered. - @param RegsiteredData A pointer to a buffer that is filled in with the keystroke + @param RegsiteredData A pointer to a buffer that is filled in with the keystroke state data for the key that was registered. - @param InputData A pointer to a buffer that is filled in with the keystroke + @param InputData A pointer to a buffer that is filled in with the keystroke state data for the key that was pressed. @retval TRUE Key be pressed matches a registered key. - @retval FLASE Match failed. - + @retval FLASE Match failed. + **/ BOOLEAN IsKeyRegistered ( @@ -752,7 +752,7 @@ IsKeyRegistered ( @param Event The event that be siganlled when any key has been stroked. @param Context Pointer of the protocol EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL. - + **/ VOID EFIAPI diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf index eaaedbfa9c..99a84517db 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf @@ -1,10 +1,10 @@ ## @file # Ps2 Keyboard driver. # -# Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol +# Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol # service. This dirver uses legacy INT16 to get the key stroke status. # -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.uni index d54c8caee6..d7cc7dccd8 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.uni @@ -4,14 +4,14 @@ // Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol // service. This dirver uses legacy INT16 to get the key stroke status. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxeExtra.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxeExtra.uni index 45dc19233e..c54ed031f5 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxeExtra.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // KeyboardDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy Keyboard DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.c b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.c index b586a91c7b..5022a21fd4 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -42,9 +42,9 @@ BOOLEAN mCachedInt1A = FALSE; @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. @param Ax PCI address of Undi device. - - @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. - @retval Others Status of start 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. + @retval Others Status of start 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkStartUndi ( @@ -56,9 +56,9 @@ Undi16SimpleNetworkStartUndi ( Start the UNDI interface @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. - @retval Others Status of start 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. + @retval Others Status of start 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkStopUndi ( @@ -69,9 +69,9 @@ Undi16SimpleNetworkStopUndi ( Stop the UNDI interface @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @retval EFI_DEVICE_ERROR Fail to stop 16 bit UNDI ROM. - @retval Others Status of stop 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to stop 16 bit UNDI ROM. + @retval Others Status of stop 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkCleanupUndi ( @@ -82,9 +82,9 @@ Undi16SimpleNetworkCleanupUndi ( Get runtime information for Undi network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. - @retval Others Fail to get runtime information for Undi network interface. + + @retval EFI_SUCCESS Sucess operation. + @retval Others Fail to get runtime information for Undi network interface. **/ EFI_STATUS Undi16SimpleNetworkGetInformation ( @@ -95,8 +95,8 @@ Undi16SimpleNetworkGetInformation ( Get NIC type @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. + + @retval EFI_SUCCESS Sucess operation. @retval Others Fail to get NIC type. **/ EFI_STATUS @@ -108,8 +108,8 @@ Undi16SimpleNetworkGetNicType ( Get NDIS information @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. + + @retval EFI_SUCCESS Sucess operation. @retval Others Fail to get NDIS information. **/ EFI_STATUS @@ -119,11 +119,11 @@ Undi16SimpleNetworkGetNdisInfo ( /** Signal handlers for ExitBootServices event. - - Clean up any Real-mode UNDI residue from the system - + + Clean up any Real-mode UNDI residue from the system + @param Event ExitBootServices event - @param Context + @param Context **/ VOID EFIAPI @@ -136,7 +136,7 @@ Undi16SimpleNetworkEvent ( Loads the undi driver. @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - + @retval EFI_SUCCESS - Successfully loads undi driver. @retval EFI_NOT_FOUND - Doesn't find undi driver or undi driver load failure. **/ @@ -149,8 +149,8 @@ Undi16SimpleNetworkLoadUndi ( Unload 16 bit UNDI Option ROM from memory @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @return EFI_STATUS + + @return EFI_STATUS **/ EFI_STATUS Undi16SimpleNetworkUnloadUndi ( @@ -162,8 +162,8 @@ Undi16SimpleNetworkUnloadUndi ( @param ImageHandle Handle that identifies the loaded image. @param SystemTable System Table for this image. - - @return EFI_STATUS Return status from EfiLibInstallAllDriverProtocols. + + @return EFI_STATUS Return status from EfiLibInstallAllDriverProtocols. **/ EFI_STATUS EFIAPI @@ -191,7 +191,7 @@ BiosSnp16DriverEntryPoint ( @param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param Controller The handle of the controller to test. @param RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The driver supports given controller. @retval EFI_UNSUPPORT The driver doesn't support given controller. @retval Other Other errors prevent driver finishing to test @@ -286,8 +286,8 @@ Done: @param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param Controller The handle of the controller to test. @param RemainingDevicePath A pointer to the remaining portion of a device path. - - @retval EFI_SUCCESS - The device was started. + + @retval EFI_SUCCESS - The device was started. @retval EFI_DEVICE_ERROR - The device could not be started due to a device error. @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources. **/ @@ -506,12 +506,12 @@ BiosSnp16DriverBindingStart ( // Create an event to be signalled when Legacy Boot occurs to clean up the IVT // Status = EfiCreateEventLegacyBootEx( - TPL_NOTIFY, - Undi16SimpleNetworkEvent, - NULL, + TPL_NOTIFY, + Undi16SimpleNetworkEvent, + NULL, &SimpleNetworkDevice->LegacyBootEvent ); - + if (EFI_ERROR(Status)) { DEBUG ((DEBUG_ERROR,"ERROR : Could not create event. Status = %r\n",Status)); goto Done; @@ -750,7 +750,7 @@ Done: if (SimpleNetworkDevice->LegacyBootEvent != NULL) { gBS->CloseEvent (SimpleNetworkDevice->LegacyBootEvent); } - + if (SimpleNetworkDevice->EfiBootEvent != NULL) { gBS->CloseEvent (SimpleNetworkDevice->EfiBootEvent); } @@ -775,7 +775,7 @@ Done: } gBS->FreePool (SimpleNetworkDevice); - + // // Only restore the vector if it was cached. // @@ -819,7 +819,7 @@ Done: if (Status != EFI_OUT_OF_RESOURCES) { Status = EFI_DEVICE_ERROR; } - } + } return Status; } @@ -831,7 +831,7 @@ Done: @param NumberOfChildren The number of child device handles in ChildHandleBuffer. @param ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. - + @retval EFI_SUCCESS - The device was stopped. @retval EFI_DEVICE_ERROR - The device could not be stopped due to a device error. **/ @@ -899,7 +899,7 @@ BiosSnp16DriverBindingStop ( This->DriverBindingHandle, Controller ); - + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; } @@ -973,7 +973,7 @@ BiosSnp16DriverBindingStop ( if (SimpleNetworkDevice->LegacyBootEvent != NULL) { gBS->CloseEvent (SimpleNetworkDevice->LegacyBootEvent); } - + if (SimpleNetworkDevice->EfiBootEvent != NULL) { gBS->CloseEvent (SimpleNetworkDevice->EfiBootEvent); } @@ -1021,7 +1021,7 @@ BiosSnp16DriverBindingStop ( Judge whether transmit FIFO is full. @param Fifo Point to trasmit FIFO structure. - + @return BOOLEAN whether transmit FIFO is full. **/ BOOLEAN @@ -1040,7 +1040,7 @@ SimpleNetworkTransmitFifoFull ( Judge whether transmit FIFO is empty. @param Fifo Point to trasmit FIFO structure. - + @return BOOLEAN whether transmit FIFO is empty. **/ BOOLEAN @@ -1061,9 +1061,9 @@ SimpleNetworkTransmitFifoEmpty ( @param Fifo Point to trasmit FIFO structure. @param Data The data point want to be added. - - @retval EFI_OUT_OF_RESOURCES FIFO is full - @retval EFI_SUCCESS Success operation. + + @retval EFI_OUT_OF_RESOURCES FIFO is full + @retval EFI_SUCCESS Success operation. **/ EFI_STATUS SimpleNetworkTransmitFifoAdd ( @@ -1085,9 +1085,9 @@ SimpleNetworkTransmitFifoAdd ( @param Fifo Point to trasmit FIFO structure. @param Data On return, point to the data point want to be got and removed. - - @retval EFI_OUT_OF_RESOURCES network transmit buffer is empty. - @retval EFI_SUCCESS Success operation. + + @retval EFI_OUT_OF_RESOURCES network transmit buffer is empty. + @retval EFI_SUCCESS Success operation. **/ EFI_STATUS SimpleNetworkTransmitFifoRemove ( @@ -1108,7 +1108,7 @@ SimpleNetworkTransmitFifoRemove ( Get recive filter setting according to EFI mask value. @param ReceiveFilterSetting filter setting EFI mask value. - + @return UINT16 Undi filter setting value. **/ UINT16 @@ -1149,11 +1149,11 @@ Undi16GetPacketFilterSetting ( /** Get filter setting from multi cast buffer . - + @param Mode Point to mode structure. - @param McastBuffer The multi cast buffer + @param McastBuffer The multi cast buffer @param HwAddressSize Size of filter value. - + **/ VOID Undi16GetMCastFilters ( @@ -1183,7 +1183,7 @@ Undi16GetMCastFilters ( Loads the undi driver. @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - + @retval EFI_SUCCESS - Successfully loads undi driver. @retval EFI_NOT_FOUND - Doesn't find undi driver or undi driver load failure. **/ @@ -1198,11 +1198,11 @@ Undi16SimpleNetworkLoadUndi ( PCI_EXPANSION_ROM_HEADER *PciExpansionRomHeader; PCI_DATA_STRUCTURE *PciDataStructure; PCI_TYPE00 Pci; - + if (!mCachedInt1A) { Status = CacheVectorAddress (0x1A); if (!EFI_ERROR (Status)) { - mCachedInt1A = TRUE; + mCachedInt1A = TRUE; } } @@ -1227,8 +1227,8 @@ Undi16SimpleNetworkLoadUndi ( DEBUG ((DEBUG_INIT, "Option ROM found at %X\n", RomAddress)); // - // If the pointer to the PCI Data Structure is invalid, no further images can be located. - // The PCI Data Structure must be DWORD aligned. + // If the pointer to the PCI Data Structure is invalid, no further images can be located. + // The PCI Data Structure must be DWORD aligned. // if (PciExpansionRomHeader->PcirOffset == 0 || (PciExpansionRomHeader->PcirOffset & 3) != 0 || @@ -1249,7 +1249,7 @@ Undi16SimpleNetworkLoadUndi ( } DEBUG ( - (DEBUG_INIT, + (DEBUG_INIT, "PCI device with matchinng VendorId and DeviceId (%d,%d)\n", (UINTN) PciDataStructure->VendorId, (UINTN) PciDataStructure->DeviceId) @@ -1260,7 +1260,7 @@ Undi16SimpleNetworkLoadUndi ( if (!EFI_ERROR (Status)) { return EFI_SUCCESS; } - + // // Free resources allocated in LaunchBaseCode // @@ -1274,8 +1274,8 @@ Undi16SimpleNetworkLoadUndi ( Unload 16 bit UNDI Option ROM from memory @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @return EFI_STATUS + + @return EFI_STATUS **/ EFI_STATUS Undi16SimpleNetworkUnloadUndi ( @@ -1331,9 +1331,9 @@ Undi16SimpleNetworkUnloadUndi ( @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. @param Ax PCI address of Undi device. - - @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. - @retval Others Status of start 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to start 16 bit UNDI ROM. + @retval Others Status of start 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkStartUndi ( @@ -1376,9 +1376,9 @@ Undi16SimpleNetworkStartUndi ( Stop the UNDI interface @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @retval EFI_DEVICE_ERROR Fail to stop 16 bit UNDI ROM. - @retval Others Status of stop 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to stop 16 bit UNDI ROM. + @retval Others Status of stop 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkStopUndi ( @@ -1411,9 +1411,9 @@ Undi16SimpleNetworkStopUndi ( Cleanup Unid network interface @param SimpleNetworkDevice A pointer to EFI_SIMPLE_NETWORK_DEV data structure. - - @retval EFI_DEVICE_ERROR Fail to cleanup 16 bit UNDI ROM. - @retval Others Status of cleanup 16 bit UNDI ROM. + + @retval EFI_DEVICE_ERROR Fail to cleanup 16 bit UNDI ROM. + @retval Others Status of cleanup 16 bit UNDI ROM. **/ EFI_STATUS Undi16SimpleNetworkCleanupUndi ( @@ -1446,9 +1446,9 @@ Undi16SimpleNetworkCleanupUndi ( Get runtime information for Undi network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. - @retval Others Fail to get runtime information for Undi network interface. + + @retval EFI_SUCCESS Sucess operation. + @retval Others Fail to get runtime information for Undi network interface. **/ EFI_STATUS Undi16SimpleNetworkGetInformation ( @@ -1577,8 +1577,8 @@ Undi16SimpleNetworkGetInformation ( Get NIC type @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. + + @retval EFI_SUCCESS Sucess operation. @retval Others Fail to get NIC type. **/ EFI_STATUS @@ -1628,8 +1628,8 @@ Undi16SimpleNetworkGetNicType ( Get NDIS information @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - - @retval EFI_SUCCESS Sucess operation. + + @retval EFI_SUCCESS Sucess operation. @retval Others Fail to get NDIS information. **/ EFI_STATUS @@ -1687,9 +1687,9 @@ Undi16SimpleNetworkGetNdisInfo ( @param Frame The frame buffer to process network interrupt. @param ProtType The type network transmit protocol @param PktType The type of package. - - @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM's ISR, or status is invalid. - @retval EFI_SUCCESS Success operation. + + @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM's ISR, or status is invalid. + @retval EFI_SUCCESS Success operation. **/ EFI_STATUS Undi16SimpleNetworkIsr ( @@ -1902,7 +1902,7 @@ Undi16SimpleNetworkIsr ( Call 16 bit UNDI ROM to start the network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_DEVICE_ERROR Network interface has not be initialized. @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. @@ -1976,7 +1976,7 @@ Undi16SimpleNetworkStart ( Call 16 bit UNDI ROM to stop the network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_DEVICE_ERROR Network interface has not be initialized. @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. @@ -2024,12 +2024,12 @@ Undi16SimpleNetworkStop ( // Initialize() // /** - Initialize network interface + Initialize network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param ExtraRxBufferSize The size of extra request receive buffer. @param ExtraTxBufferSize The size of extra request transmit buffer. - + @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. **/ @@ -2147,7 +2147,7 @@ Undi16SimpleNetworkInitialize ( @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param ExtendedVerification Need extended verfication. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -2228,7 +2228,7 @@ Undi16SimpleNetworkReset ( Shutdown network interface. @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -2341,7 +2341,7 @@ Undi16SimpleNetworkShutdown ( @param ResetMCastFilter Whether reset multi cast filter or not @param MCastFilterCnt Count of mutli cast filter for different MAC address @param MCastFilter Buffer for mustli cast filter for different MAC address. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -2481,7 +2481,7 @@ Undi16SimpleNetworkReceiveFilters ( &SimpleNetworkDevice->SimpleNetworkMode.MCastFilter[Index], &MCastFilter[Index], sizeof (EFI_MAC_ADDRESS) - ); + ); } } // @@ -2498,7 +2498,7 @@ Undi16SimpleNetworkReceiveFilters ( @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param Reset Whether reset station MAC address to permanent address @param New A pointer to New address - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -2852,11 +2852,11 @@ Undi16SimpleNetworkStatistics ( @param IPv6 IPv6 or IPv4 @param IP A pointer to given Ip address. @param MAC On return, translated MAC address. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_INVALID_PARAMETER Invalid IP address. @retval EFI_INVALID_PARAMETER Invalid return buffer for holding MAC address. - @retval EFI_UNSUPPORTED Do not support IPv6 + @retval EFI_UNSUPPORTED Do not support IPv6 @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @retval EFI_DEVICE_ERROR Invalid status for network device @@ -2937,7 +2937,7 @@ Undi16SimpleNetworkMCastIpToMac ( // NvData() // /** - Performs read and write operations on the NVRAM device attached to a + Performs read and write operations on the NVRAM device attached to a network interface. @param This The protocol instance pointer. @@ -2972,7 +2972,7 @@ Undi16SimpleNetworkNvData ( // GetStatus() // /** - Reads the current interrupt status and recycled transmit buffer status from + Reads the current interrupt status and recycled transmit buffer status from a network interface. @param This The protocol instance pointer. @@ -3089,7 +3089,7 @@ Undi16SimpleNetworkGetStatus ( @retval EFI_SUCCESS The packet was placed on the transmit queue. @retval EFI_NOT_STARTED The network interface has not been started. - @retval EFI_NOT_READY The network interface is too busy to accept this transmit request. + @retval EFI_NOT_READY The network interface is too busy to accept this transmit request. @retval EFI_BUFFER_TOO_SMALL The BufferSize parameter is too small. @retval EFI_INVALID_PARAMETER One or more of the parameters has an unsupported value. @retval EFI_DEVICE_ERROR The command could not be sent to the network interface. @@ -3257,7 +3257,7 @@ Undi16SimpleNetworkTransmit ( /** Receives a packet from a network interface. - + @param This The protocol instance pointer. @param HeaderSize The size, in bytes, of the media header received on the network interface. If this parameter is NULL, then the media header size @@ -3377,7 +3377,7 @@ Undi16SimpleNetworkReceive ( @param Event Event used with WaitForEvent() to wait for a packet to be received. @param Context Event Context - + **/ VOID EFIAPI @@ -3401,7 +3401,7 @@ Undi16SimpleNetworkWaitForPacket ( Check whether packet is ready for receive. @param This The protocol instance pointer. - + @retval EFI_SUCCESS Receive data is ready. @retval EFI_NOT_STARTED The network interface has not been started. @retval EFI_NOT_READY The network interface is too busy to accept this transmit @@ -3466,11 +3466,11 @@ Undi16SimpleNetworkCheckForPacket ( /** Signal handlers for ExitBootServices event. - - Clean up any Real-mode UNDI residue from the system - + + Clean up any Real-mode UNDI residue from the system + @param Event ExitBootServices event - @param Context + @param Context **/ VOID EFIAPI @@ -3494,7 +3494,7 @@ Undi16SimpleNetworkEvent ( @param NumPages The number pages want to be allocated. @param Buffer On return, allocated buffer. - + @return Status of allocating pages. **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h index 447783cd2e..501e27b9c8 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h @@ -1,6 +1,6 @@ /** @file -Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -119,7 +119,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gBiosSnp16ComponentName2; @param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param Controller The handle of the controller to test. @param RemainingDevicePath A pointer to the remaining portion of a device path. - + @retval EFI_SUCCESS The driver supports given controller. @retval EFI_UNSUPPORT The driver doesn't support given controller. @retval Other Other errors prevent driver finishing to test @@ -140,8 +140,8 @@ BiosSnp16DriverBindingSupported ( @param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance. @param Controller The handle of the controller to test. @param RemainingDevicePath A pointer to the remaining portion of a device path. - - @retval EFI_SUCCESS - The device was started. + + @retval EFI_SUCCESS - The device was started. @retval EFI_DEVICE_ERROR - The device could not be started due to a device error. @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources. **/ @@ -162,7 +162,7 @@ BiosSnp16DriverBindingStart ( @param NumberOfChildren The number of child device handles in ChildHandleBuffer. @param ChildHandleBuffer An array of child handles to be freed. May be NULL if NumberOfChildren is 0. - + @retval EFI_SUCCESS - The device was stopped. @retval EFI_DEVICE_ERROR - The device could not be stopped due to a device error. **/ @@ -183,7 +183,7 @@ BiosSnp16DriverBindingStop ( Call 16 bit UNDI ROM to start the network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_DEVICE_ERROR Network interface has not be initialized. @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. @@ -199,7 +199,7 @@ Undi16SimpleNetworkStart ( Call 16 bit UNDI ROM to stop the network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_DEVICE_ERROR Network interface has not be initialized. @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. @@ -212,12 +212,12 @@ Undi16SimpleNetworkStop ( ; /** - Initialize network interface + Initialize network interface @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param ExtraRxBufferSize The size of extra request receive buffer. @param ExtraTxBufferSize The size of extra request transmit buffer. - + @retval EFI_DEVICE_ERROR Fail to execute 16 bit ROM call. @retval EFI_SUCESS Success operation. **/ @@ -235,7 +235,7 @@ Undi16SimpleNetworkInitialize ( @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param ExtendedVerification Need extended verfication. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -254,7 +254,7 @@ Undi16SimpleNetworkReset ( Shutdown network interface. @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -277,7 +277,7 @@ Undi16SimpleNetworkShutdown ( @param ResetMCastFilter Whether reset multi cast filter or not @param MCastFilterCnt Count of mutli cast filter for different MAC address @param MCastFilter Buffer for mustli cast filter for different MAC address. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -302,7 +302,7 @@ Undi16SimpleNetworkReceiveFilters ( @param This A pointer to EFI_SIMPLE_NETWORK_PROTOCOL structure. @param Reset Whether reset station MAC address to permanent address @param New A pointer to New address - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -325,7 +325,7 @@ Undi16SimpleNetworkStationAddress ( @param Reset Whether cleanup old statistics data. @param StatisticsSize The buffer of statistics table. @param StatisticsTable A pointer to statistics buffer. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @@ -349,11 +349,11 @@ Undi16SimpleNetworkStatistics ( @param IPv6 IPv6 or IPv4 @param IP A pointer to given Ip address. @param MAC On return, translated MAC address. - + @retval EFI_INVALID_PARAMETER Invalid This parameter. @retval EFI_INVALID_PARAMETER Invalid IP address. @retval EFI_INVALID_PARAMETER Invalid return buffer for holding MAC address. - @retval EFI_UNSUPPORTED Do not support IPv6 + @retval EFI_UNSUPPORTED Do not support IPv6 @retval EFI_DEVICE_ERROR Network device has not been initialized. @retval EFI_NOT_STARTED Network device has been stopped. @retval EFI_DEVICE_ERROR Invalid status for network device @@ -370,7 +370,7 @@ Undi16SimpleNetworkMCastIpToMac ( ; /** - Performs read and write operations on the NVRAM device attached to a + Performs read and write operations on the NVRAM device attached to a network interface. @param This The protocol instance pointer. @@ -401,7 +401,7 @@ Undi16SimpleNetworkNvData ( ; /** - Reads the current interrupt status and recycled transmit buffer status from + Reads the current interrupt status and recycled transmit buffer status from a network interface. @param This The protocol instance pointer. @@ -460,7 +460,7 @@ Undi16SimpleNetworkGetStatus ( @retval EFI_SUCCESS The packet was placed on the transmit queue. @retval EFI_NOT_STARTED The network interface has not been started. - @retval EFI_NOT_READY The network interface is too busy to accept this transmit request. + @retval EFI_NOT_READY The network interface is too busy to accept this transmit request. @retval EFI_BUFFER_TOO_SMALL The BufferSize parameter is too small. @retval EFI_INVALID_PARAMETER One or more of the parameters has an unsupported value. @retval EFI_DEVICE_ERROR The command could not be sent to the network interface. @@ -530,7 +530,7 @@ Undi16SimpleNetworkReceive ( @param Event Event used with WaitForEvent() to wait for a packet to be received. @param Context Event Context - + **/ VOID EFIAPI @@ -544,7 +544,7 @@ Undi16SimpleNetworkWaitForPacket ( Check whether packet is ready for receive. @param This The protocol instance pointer. - + @retval EFI_SUCCESS Receive data is ready. @retval EFI_NOT_STARTED The network interface has not been started. @retval EFI_NOT_READY The network interface is too busy to accept this transmit @@ -564,7 +564,7 @@ Undi16SimpleNetworkCheckForPacket ( Cache Interrupt verctor address converted from IVT number. @param VectorNumber IVT number - + @retval EFI_SUCCESS Success to operation. **/ EFI_STATUS @@ -574,10 +574,10 @@ CacheVectorAddress ( ; /** - Get interrupt vector address according to IVT number. - + Get interrupt vector address according to IVT number. + @param VectorNumber Given IVT number - + @return cached interrupt vector address. **/ EFI_STATUS @@ -590,14 +590,14 @@ RestoreCachedVectorAddress ( If available, launch the BaseCode from a NIC option ROM. This should install the !PXE and PXENV+ structures in memory for subsequent use. - + @param SimpleNetworkDevice Simple network device instance @param RomAddress The ROM base address for NIC rom. - - @retval EFI_NOT_FOUND The check sum does not match - @retval EFI_NOT_FOUND Rom ID offset is wrong - @retval EFI_NOT_FOUND No Rom ID structure is found + + @retval EFI_NOT_FOUND The check sum does not match + @retval EFI_NOT_FOUND Rom ID offset is wrong + @retval EFI_NOT_FOUND No Rom ID structure is found **/ EFI_STATUS LaunchBaseCode ( @@ -607,7 +607,7 @@ LaunchBaseCode ( ; /** - PXE + PXE START UNDI Op-Code: PXENV_START_UNDI (0000h) Input: Far pointer to a PXENV_START_UNDI_T parameter structure that has been initialized by the caller. @@ -636,13 +636,13 @@ LaunchBaseCode ( contents of these registers can be found in the [PnP], [PCI] and [BBS] specifications. Returned from API service - Status: See the PXENV_STATUS_xxx constants. + Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeStartUndi ( @@ -652,8 +652,8 @@ PxeStartUndi ( ; /** - PXE - UNDI STARTUP + PXE + UNDI STARTUP Op-Code: PXENV_UNDI_STARTUP (0001h) Input: Far pointer to a PXENV_UNDI_STARTUP_T parameter structure that has been initialized by the caller. @@ -670,7 +670,7 @@ PxeStartUndi ( chaining interrupt 1Ah. This must be done by the PXENV_START_UNDI and PXENV_STOP_UNDI API calls. This service cannot be used in protected mode. - typedef struct + typedef struct { PXENV_STATUS Status; } PXENV_UNDI_STARTUP_T; @@ -680,10 +680,10 @@ PxeStartUndi ( Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiStartup ( @@ -693,7 +693,7 @@ PxeUndiStartup ( ; /** - PXE + PXE UNDI CLEANUP Op-Code: PXENV_UNDI_CLEANUP (0002h) Input: Far pointer to a PXENV_UNDI_CLEANUP_T parameter structure. @@ -713,10 +713,10 @@ PxeUndiStartup ( Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiCleanup ( @@ -726,7 +726,7 @@ PxeUndiCleanup ( ; /** - PXE + PXE UNDI INITIALIZE Op-Code: PXENV_UNDI_INITIALIZE (0003h) Input: Far pointer to a PXENV_UNDI_INITIALIZE_T parameter structure that has been initialized by the @@ -756,13 +756,13 @@ PxeUndiCleanup ( protocol.ini file was done by NDIS.) This value can be NULL for any other application interfacing to the universal NIC driver Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance. - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiInitialize ( @@ -773,8 +773,8 @@ PxeUndiInitialize ( /** Wrapper routine for reset adapter. - - PXE + + PXE UNDI RESET ADAPTER Op-Code: PXENV_UNDI_RESET_ADAPTER (0004h) Input: Far pointer to a PXENV_UNDI_RESET_ADAPTER_t parameter structure that has been initialized @@ -806,13 +806,13 @@ PxeUndiInitialize ( addresses. Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance. - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - @param RxFilter Filter setting mask value for PXE recive . - - @return Return value of PXE option ROM far call. + @param RxFilter Filter setting mask value for PXE recive . + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiResetNic ( @@ -823,7 +823,7 @@ PxeUndiResetNic ( ; /** - PXE + PXE UNDI SHUTDOWN Op-Code: PXENV_UNDI_SHUTDOWN (0005h) Input: Far pointer to a PXENV_UNDI_SHUTDOWN_T parameter. @@ -833,7 +833,7 @@ PxeUndiResetNic ( Description: This call resets the network adapter and leaves it in a safe state for another driver to program it. Note: The contents of the PXENV_UNDI_STARTUP parameter structure need to be saved by the Universal NIC Driver in case PXENV_UNDI_INITIALIZE is called again. - typedef struct + typedef struct { PXENV_STATUS Status; } PXENV_UNDI_SHUTDOWN_T; @@ -841,12 +841,12 @@ PxeUndiResetNic ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiShutdown ( @@ -856,7 +856,7 @@ PxeUndiShutdown ( ; /** - PXE + PXE UNDI OPEN Op-Code: PXENV_UNDI_OPEN (0006h) Input: Far pointer to a PXENV_UNDI_OPEN_T parameter structure that has been initialized by the caller. @@ -888,12 +888,12 @@ PxeUndiShutdown ( R_Mcast_Buf: See definition in UNDI RESET ADAPTER (0004h). Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiOpen ( @@ -903,7 +903,7 @@ PxeUndiOpen ( ; /** - PXE + PXE UNDI CLOSE Op-Code: PXENV_UNDI_CLOSE (0007h) Input: Far pointer to a PXENV_UNDI_CLOSE_T parameter. @@ -919,12 +919,12 @@ PxeUndiOpen ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiClose ( @@ -934,7 +934,7 @@ PxeUndiClose ( ; /** - PXE + PXE UNDI TRANSMIT PACKET Op-Code: PXENV_UNDI_TRANSMIT (0008h) Input: Far pointer to a PXENV_UNDI_TRANSMIT_T parameter structure that @@ -1004,13 +1004,13 @@ PxeUndiClose ( TDDataPtr: Segment:Offset of the transmit block. DataBlock: Array of transmit data blocks. Returned from API service - Status: See the PXENV_STATUS_xxx constants - + Status: See the PXENV_STATUS_xxx constants + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiTransmit ( @@ -1020,7 +1020,7 @@ PxeUndiTransmit ( ; /** - PXE + PXE UNDI SET MULTICAST ADDRESS Op-Code: PXENV_UNDI_SET_MCAST_ADDRESS (0009h) Input: Far pointer to a PXENV_TFTP_SET_MCAST_ADDRESS_t parameter structure that has been @@ -1038,13 +1038,13 @@ PxeUndiTransmit ( R_Mcast_Buf: See description in the UNDI RESET ADAPTER (0004h) API. Returned from API service - Status: See the PXENV_STATUS_xxx constants - + Status: See the PXENV_STATUS_xxx constants + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetMcastAddr ( @@ -1054,7 +1054,7 @@ PxeUndiSetMcastAddr ( ; /** - PXE + PXE UNDI SET STATION ADDRESS Op-Code: PXENV_UNDI_SET_STATION_ADDRESS (000Ah) Input: Far pointer to a PXENV_UNDI_SET_STATION_ADDRESS_t parameter structure that has been @@ -1073,13 +1073,13 @@ PxeUndiSetMcastAddr ( StationAddress: Temporary MAC address to be used for transmit and receive. Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetStationAddr ( @@ -1089,7 +1089,7 @@ PxeUndiSetStationAddr ( ; /** - PXE + PXE UNDI SET PACKET FILTER Op-Code: PXENV_UNDI_SET_PACKET_FILTER (000Bh) Input: Far pointer to a PXENV_UNDI_SET_PACKET_FILTER_T parameter structure that has been @@ -1107,13 +1107,13 @@ PxeUndiSetStationAddr ( Filter: See the receive filter values in the UNDI OPEN (0006h) API description. Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetPacketFilter ( @@ -1123,7 +1123,7 @@ PxeUndiSetPacketFilter ( ; /** - PXE + PXE UNDI GET INFORMATION Op-Code: PXENV_UNDI_GET_INFORMATION (000Ch) Input: Far pointer to a PXENV_UNDI_GET_INFORMATION_T parameter structure that has been @@ -1166,13 +1166,13 @@ PxeUndiSetPacketFilter ( PermNodeAddress: Permanent hardware address. ROMAddress: Real mode ROM segment address. RxBufCnt: Receive queue length. - TxBufCnt: Transmit queue length. - + TxBufCnt: Transmit queue length. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetInformation ( @@ -1182,7 +1182,7 @@ PxeUndiGetInformation ( ; /** - PXE + PXE UNDI GET STATISTICS Op-Code: PXENV_UNDI_GET_STATISTICS (000Dh) Input: Far pointer to a PXENV_UNDI_GET_STATISTICS_T parameter structure that has been initialized @@ -1208,12 +1208,12 @@ PxeUndiGetInformation ( error. RcvResourceErrors: Number of frames discarded because receive queue was full. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetStatistics ( @@ -1223,7 +1223,7 @@ PxeUndiGetStatistics ( ; /** - PXE + PXE UNDI CLEAR STATISTICS Op-Code: PXENV_UNDI_CLEAR_STATISTICS (000Eh) Input: Far pointer to a PXENV_UNDI_CLEAR_STATISTICS_T parameter. @@ -1238,12 +1238,12 @@ PxeUndiGetStatistics ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiClearStatistics ( @@ -1253,7 +1253,7 @@ PxeUndiClearStatistics ( ; /** - PXE + PXE UNDI INITIATE DIAGS Op-Code: PXENV_UNDI_INITIATE_DIAGS (000Fh) Input: Far pointer to a PXENV_UNDI_INITIATE_DIAGS_T parameter. @@ -1268,13 +1268,13 @@ PxeUndiClearStatistics ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiInitiateDiags ( @@ -1284,7 +1284,7 @@ PxeUndiInitiateDiags ( ; /** - PXE + PXE UNDI FORCE INTERRUPT Op-Code: PXENV_UNDI_FORCE_INTERRUPT (0010h) Input: Far pointer to a PXENV_UNDI_FORCE_INTERRUPT_T parameter structure that has been @@ -1305,13 +1305,13 @@ PxeUndiInitiateDiags ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiForceInterrupt ( @@ -1321,7 +1321,7 @@ PxeUndiForceInterrupt ( ; /** - PXE + PXE UNDI GET MULTICAST ADDRESS Op-Code: PXENV_UNDI_GET_MCAST_ADDRESS (0011h) Input: Far pointer to a PXENV_GET_MCAST_ADDRESS_t parameter structure that has been initialized @@ -1340,12 +1340,12 @@ PxeUndiForceInterrupt ( Returned from API service Status: See the PXENV_STATUS_xxx constants. MediaAddr: MAC multicast address. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetMcastAddr ( @@ -1355,7 +1355,7 @@ PxeUndiGetMcastAddr ( ; /** - PXE + PXE UNDI GET NIC TYPE Op-Code: PXENV_UNDI_GET_NIC_TYPE (0012h) Input: Far pointer to a PXENV_UNDI_GET_NIC_TYPE_T parameter structure that has been initialized by @@ -1405,13 +1405,13 @@ PxeUndiGetMcastAddr ( NICType: Type of NIC information stored in the parameter structure. Info: Information about the fields in this union can be found - in the [PnP] and [PCI] specifications - + in the [PnP] and [PCI] specifications + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetNicType ( @@ -1421,7 +1421,7 @@ PxeUndiGetNicType ( ; /** - PXE + PXE UNDI GET IFACE INFO Op-Code: PXENV_UNDI_GET_IFACE_INFO (0013h) Input: Far pointer to a PXENV_UNDI_GET_IFACE_INFO_t parameter structure that has been initialized @@ -1454,13 +1454,13 @@ PxeUndiGetNicType ( to the protocol driver. LinkSpeed: Defined in the NDIS 2.0 specification. ServiceFlags: Defined in the NDIS 2.0 specification. - Reserved: Must be zero. - + Reserved: Must be zero. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetNdisInfo ( @@ -1470,7 +1470,7 @@ PxeUndiGetNdisInfo ( ; /** - PXE + PXE UNDI ISR Op-Code: PXENV_UNDI_ISR (0014h) Input: Far pointer to a PXENV_UNDI_ISR_T parameter structure that has been initialized by the caller. @@ -1512,13 +1512,13 @@ PxeUndiGetNdisInfo ( if there is no other interrupt status to be processed, UNDI re-enables the interrupt at the NETWORK INTERFACE level and returns PXENV_UNDI_ISR_OUT_DONE in the FuncFlag. IMPORTANT: It is possible for the protocol driver to be interrupted again while in the - strategy routine when the UNDI re-enables interrupts. - + strategy routine when the UNDI re-enables interrupts. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiIsr ( @@ -1528,7 +1528,7 @@ PxeUndiIsr ( ; /** - PXE + PXE STOP UNDI Op-Code: PXENV_STOP_UNDI (0015h) Input: Far pointer to a PXENV_STOP_UNDI_T parameter structure that has been initialized by the caller. @@ -1547,13 +1547,13 @@ PxeUndiIsr ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiStop ( @@ -1563,7 +1563,7 @@ PxeUndiStop ( ; /** - PXE + PXE UNDI GET STATE Op-Code: PXENV_UNDI_GET_STATE (0015h) Input: Far pointer to a PXENV_UNDI_GET_STATE_T parameter. @@ -1595,13 +1595,13 @@ PxeUndiStop ( constants. Description: This API function will be called at different levels of processing the interrupt. The FuncFlag field in the parameter block indicates the operation to be performed for the call. This field is filled with the - status of that operation on return. - + status of that operation on return. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetState ( @@ -1619,14 +1619,14 @@ PxeUndiGetState ( push offset pxe_data_call_struct ;is pushed onto stack. push Index ;UINT16 is pushed onto stack. call dword ptr (s_PXE ptr es:[di]).EntryPointSP - add sp, 6 ;Caller cleans up stack. + add sp, 6 ;Caller cleans up stack. @param SimpleNetworkDevice Device instance for simple network @param Table Point to parameter/retun value table for legacy far call @param TableSize The size of parameter/return value table @param CallIndex The index of legacy call. - - @return EFI_STATUS + + @return EFI_STATUS **/ EFI_STATUS MakePxeCall ( @@ -1642,7 +1642,7 @@ MakePxeCall ( @param NumPages The number pages want to be allocated. @param Buffer On return, allocated buffer. - + @return Status of allocating pages. **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.uni index 61c640eac3..526f4fd7c3 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.uni @@ -3,14 +3,14 @@ // // Thunk wrapper UEFI driver to produce EFI SNP protocol based on legacy 16 NIC ROM. // -// Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16Extra.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16Extra.uni index 708e27b6f4..19b3991501 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16Extra.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16Extra.uni @@ -1,7 +1,7 @@ // /** @file // BiosSnp16 Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy Simple Network Protocol DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Misc.c b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Misc.c index a1dc86786b..311918cbea 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Misc.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Misc.c @@ -1,7 +1,7 @@ /** @file Helper Routines that use a PXE-enabled NIC option ROM. - -Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
+ +Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -39,7 +39,7 @@ UINT32 CachedVectorAddress[0x100]; Cache Interrupt verctor address converted from IVT number. @param VectorNumber IVT number - + @retval EFI_SUCCESS Success to operation. **/ EFI_STATUS @@ -55,10 +55,10 @@ CacheVectorAddress ( } /** - Get interrupt vector address according to IVT number. - + Get interrupt vector address according to IVT number. + @param VectorNumber Given IVT number - + @return cached interrupt vector address. **/ EFI_STATUS @@ -74,10 +74,10 @@ RestoreCachedVectorAddress ( } /** - Print Undi loader table. + Print Undi loader table. + + @param UndiLoaderStructure Point to Undi Loader table structure. - @param UndiLoaderStructure Point to Undi Loader table structure. - **/ VOID Print_Undi_Loader_Table ( @@ -108,12 +108,12 @@ Print_Undi_Loader_Table ( /** Simple table dumper. The ROMID table is necessary in order to effect the "Early UNDI" trick. Herein, the UNDI layer can be loaded in the - pre-boot phase without having to download a Network Boot Program + pre-boot phase without having to download a Network Boot Program across the wire. It is required in the implementation in that we are not using PXE. @param RomIDStructure Point to RomID structure. - + **/ VOID Print_ROMID_Table ( @@ -199,7 +199,7 @@ Print_ROMID_Table ( Print PXE table. @param PxeTable Point to PXE table structure - + **/ VOID Print_PXE_Table ( @@ -351,7 +351,7 @@ Print_PXE_Table ( Print PXENV table. @param PxenvTable Point to PXENV - + **/ VOID Print_PXENV_Table ( @@ -425,14 +425,14 @@ Print_PXENV_Table ( If available, launch the BaseCode from a NIC option ROM. This should install the !PXE and PXENV+ structures in memory for subsequent use. - + @param SimpleNetworkDevice Simple network device instance @param RomAddress The ROM base address for NIC rom. - - @retval EFI_NOT_FOUND The check sum does not match - @retval EFI_NOT_FOUND Rom ID offset is wrong - @retval EFI_NOT_FOUND No Rom ID structure is found + + @retval EFI_NOT_FOUND The check sum does not match + @retval EFI_NOT_FOUND Rom ID offset is wrong + @retval EFI_NOT_FOUND No Rom ID structure is found **/ EFI_STATUS LaunchBaseCode ( @@ -819,14 +819,14 @@ LaunchBaseCode ( push offset pxe_data_call_struct ;is pushed onto stack. push Index ;UINT16 is pushed onto stack. call dword ptr (s_PXE ptr es:[di]).EntryPointSP - add sp, 6 ;Caller cleans up stack. + add sp, 6 ;Caller cleans up stack. @param SimpleNetworkDevice Device instance for simple network @param Table Point to parameter/retun value table for legacy far call @param TableSize The size of parameter/return value table @param CallIndex The index of legacy call. - - @return EFI_STATUS + + @return EFI_STATUS **/ EFI_STATUS MakePxeCall ( diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Pxe.h b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Pxe.h index 54503a840f..fee7ab2207 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Pxe.h +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Pxe.h @@ -2,12 +2,12 @@ These are PXE Specification 2.1-compliant data structures and defines. This file relies upon the existence of a PXE-compliant ROM - in memory, as defined by the Preboot Execution Environment + in memory, as defined by the Preboot Execution Environment Specification (PXE), Version 2.1, located at http://developer.intel.com/ial/wfm/wfmspecs.htm -Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -69,7 +69,7 @@ typedef UINT32 ADDR32; // // Status codes returned in the status word of PXENV API parameter structures. -// +// // Generic API errors - these do not match up with the M0x or E0x messages // that are reported by the loader. // @@ -92,7 +92,7 @@ typedef enum { /* Driver errors (0x60 to 0x6F) */ -// These errors are for UNDI compatible NIC drivers. +// These errors are for UNDI compatible NIC drivers. #define PXENV_STATUS_UNDI_INVALID_FUNCTION 0x60 #define PXENV_STATUS_UNDI_MEDIATEST_FAILED 0x61 #define PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST 0x62 @@ -260,7 +260,7 @@ typedef struct { #define ADDR_LEN 16 #define MAXNUM_MCADDR 8 -#define IPLEN 4 ///< length of an IP address +#define IPLEN 4 ///< length of an IP address #define XMT_DESTADDR 0x0000 ///< destination address given #define XMT_BROADCAST 0x0001 ///< use broadcast address @@ -288,7 +288,7 @@ typedef struct { IN UINT16 Ax; ///< In: These register fields must be IN UINT16 Bx; ///< filled in with the same data IN UINT16 Dx; ///< that was passed to the MLID - IN UINT16 Di; ///< option ROM boot code by the + IN UINT16 Di; ///< option ROM boot code by the IN UINT16 Es; ///< system BIOS. } PXENV_START_UNDI_T; @@ -302,7 +302,7 @@ typedef struct { typedef struct { OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - + /// /// This is an input parameter and is a 32-bit physical address of /// a memory copy of the driver module in the protocol.ini file @@ -315,7 +315,7 @@ typedef struct { /// itself.) This value can be NULL for for any other application /// interfacing to the Universal NIC Driver. /// - IN UINT32 ProtocolIni; + IN UINT32 ProtocolIni; UINT8 Reserved[8]; } PXENV_UNDI_INITIALIZE_T; @@ -329,23 +329,23 @@ typedef struct { Note: The NIC driver does not remember the multicast addresses provided in any call. So the application must provide the multicast address list with all the calls that - reset the receive unit of the adapter. + reset the receive unit of the adapter. --*/ typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx } PXENV_UNDI_SHUTDOWN_T; typedef struct { OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - + /// /// This is an input parameter and is adapter specific. This is /// supported for Universal NDIS 2.0 driver to pass down the Open /// flags provided by the protocol driver (See NDIS 2.0 - /// specifications). This can be zero. - /// - IN UINT16 OpenFlag; ///< In: See description below - IN UINT16 PktFilter; ///< In: Filter for receiving + /// specifications). This can be zero. + /// + IN UINT16 OpenFlag; ///< In: See description below + IN UINT16 PktFilter; ///< In: Filter for receiving /* packet. It takes the following */ @@ -355,7 +355,7 @@ typedef struct { #define FLTR_DIRECTED 0x0001 ///< directed/multicast #define FLTR_BRDCST 0x0002 ///< broadcast packets #define FLTR_PRMSCS 0x0004 ///< any packet on LAN -#define FLTR_SRC_RTG 0x0008 ///< source routing packet +#define FLTR_SRC_RTG 0x0008 ///< source routing packet IN PXENV_UNDI_MCAST_ADDR_T McastBuffer; /* In: */ /* See t_PXENV_UNDI_MCAST_ADDR. */ } PXENV_UNDI_OPEN_T; @@ -370,22 +370,22 @@ typedef struct { IN UINT16 ImmedLength; ///< In: Data buffer length in /* bytes. */ - UINT16 XmitOffset; ///< 16-bit segment & offset of the - UINT16 XmitSegment; ///< immediate data buffer. - UINT16 DataBlkCount; ///< In: Number of data blocks. + UINT16 XmitOffset; ///< 16-bit segment & offset of the + UINT16 XmitSegment; ///< immediate data buffer. + UINT16 DataBlkCount; ///< In: Number of data blocks. struct DataBlk { - UINT8 TDPtrType; ///< 0 => 32 bit Phys pointer in TDDataPtr, not supported in this version of LSA + UINT8 TDPtrType; ///< 0 => 32 bit Phys pointer in TDDataPtr, not supported in this version of LSA ///< 1 => seg:offser in TDDataPtr which can be a real mode or 16-bit protected mode pointer - UINT8 TDRsvdByte; ///< Reserved, must be zero. - UINT16 TDDataLen; ///< Data block length in bytes. - UINT16 TDDataPtrOffset; ///< Far pointer to data buffer. - UINT16 TDDataPtrSegment; ///< Far pointer to data buffer. + UINT8 TDRsvdByte; ///< Reserved, must be zero. + UINT16 TDDataLen; ///< Data block length in bytes. + UINT16 TDDataPtrOffset; ///< Far pointer to data buffer. + UINT16 TDDataPtrSegment; ///< Far pointer to data buffer. } DataBlock[MAX_DATA_BLKS]; } PXENV_UNDI_TBD_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx /// /// This is the protocol of the upper layer that is calling @@ -403,9 +403,9 @@ typedef struct { /// destination media address in the field DestMediaAddr. If 1, /// the NIC driver fills the broadcast address for the /// destination. - /// - IN UINT8 XmitFlag; -#define XMT_DESTADDR 0x0000 ///< destination address given + /// + IN UINT8 XmitFlag; +#define XMT_DESTADDR 0x0000 ///< destination address given #define XMT_BROADCAST 0x0001 ///< use broadcast address /// @@ -415,70 +415,70 @@ typedef struct { /// media address must be obtained by the upper level protocol /// (with Address Resolution Protocol) and NIC driver does not do /// any address resolution. - /// + /// IN UINT16 DestAddrOffset; ///< 16-bit segment & offset of the IN UINT16 DestAddrSegment; ///< destination media address - - IN UINT16 TBDOffset; ///< 16-bit segment & offset of the - IN UINT16 TBDSegment; ///< transmit buffer descriptor of type - /// XmitBufferDesc + IN UINT16 TBDOffset; ///< 16-bit segment & offset of the + IN UINT16 TBDSegment; ///< transmit buffer descriptor of type + + /// XmitBufferDesc IN UINT32 Reserved[2]; } PXENV_UNDI_TRANSMIT_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - IN PXENV_UNDI_MCAST_ADDR_T McastBuffer; ///< In: + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + IN PXENV_UNDI_MCAST_ADDR_T McastBuffer; ///< In: } PXENV_UNDI_SET_MCAST_ADDR_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - IN UINT8 StationAddress[ADDR_LEN]; ///< new address to be set + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + IN UINT8 StationAddress[ADDR_LEN]; ///< new address to be set } PXENV_UNDI_SET_STATION_ADDR_T; typedef struct s_PXENV_UNDI_SET_PACKET_FILTER { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - IN UINT8 Filter; ///< In: Receive filter value. + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + IN UINT8 Filter; ///< In: Receive filter value. } PXENV_UNDI_SET_PACKET_FILTER_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - OUT UINT16 BaseIo; ///< Out: Adapter's Base IO - OUT UINT16 IntNumber; ///< Out: IRQ number - OUT UINT16 MaxTranUnit; ///< Out: MTU - OUT UINT16 HwType; ///< Out: type of protocol at hardware level + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT16 BaseIo; ///< Out: Adapter's Base IO + OUT UINT16 IntNumber; ///< Out: IRQ number + OUT UINT16 MaxTranUnit; ///< Out: MTU + OUT UINT16 HwType; ///< Out: type of protocol at hardware level #define ETHER_TYPE 1 #define EXP_ETHER_TYPE 2 #define IEEE_TYPE 6 #define ARCNET_TYPE 7 - /*++ + /*++ other numbers can be obtained from rfc1010 for "Assigned Numbers". This number may not be validated by the application and hence adding new numbers to the list should be fine at any - time. + time. --*/ - OUT UINT16 HwAddrLen; ///< Out: actual length of hardware address + OUT UINT16 HwAddrLen; ///< Out: actual length of hardware address OUT UINT8 CurrentNodeAddress[ADDR_LEN]; ///< Out: Current hardware address OUT UINT8 PermNodeAddress[ADDR_LEN]; ///< Out: Permanent hardware address - OUT UINT16 ROMAddress; ///< Out: ROM address - OUT UINT16 RxBufCt; ///< Out: receive Queue length - OUT UINT16 TxBufCt; ///< Out: Transmit Queue length + OUT UINT16 ROMAddress; ///< Out: ROM address + OUT UINT16 RxBufCt; ///< Out: receive Queue length + OUT UINT16 TxBufCt; ///< Out: Transmit Queue length } PXENV_UNDI_GET_INFORMATION_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - OUT UINT32 XmtGoodFrames; ///< Out: No. of good transmissions - OUT UINT32 RcvGoodFrames; ///< Out: No. of good frames received - OUT UINT32 RcvCRCErrors; ///< Out: No. of frames with CRC error - OUT UINT32 RcvResourceErrors; ///< Out: no. of frames discarded + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT32 XmtGoodFrames; ///< Out: No. of good transmissions + OUT UINT32 RcvGoodFrames; ///< Out: No. of good frames received + OUT UINT32 RcvCRCErrors; ///< Out: No. of frames with CRC error + OUT UINT32 RcvResourceErrors; ///< Out: no. of frames discarded /* Out: receive Queue full */ } PXENV_UNDI_GET_STATISTICS_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx } PXENV_UNDI_CLEAR_STATISTICS_T; typedef struct { @@ -490,31 +490,31 @@ typedef struct { } PXENV_UNDI_FORCE_INTERRUPT_T; typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx - IN UINT32 InetAddr; ///< In: IP Multicast Address - OUT UINT8 MediaAddr[ADDR_LEN]; ///< Out: corresponding hardware + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + IN UINT32 InetAddr; ///< In: IP Multicast Address + OUT UINT8 MediaAddr[ADDR_LEN]; ///< Out: corresponding hardware /* multicast address */ } PXENV_UNDI_GET_MCAST_ADDR_T; typedef struct { - OUT UINT16 Vendor_ID; ///< OUT: - OUT UINT16 Dev_ID; ///< OUT: - OUT UINT8 Base_Class; ///< OUT: - OUT UINT8 Sub_Class; ///< OUT: - OUT UINT8 Prog_Intf; ///< OUT: program interface - OUT UINT8 Rev; ///< OUT: Revision number - OUT UINT16 BusDevFunc; ///< OUT: Bus, Device & Function numbers - OUT UINT16 SubVendor_ID; ///< OUT: - OUT UINT16 SubDevice_ID; ///< OUT: + OUT UINT16 Vendor_ID; ///< OUT: + OUT UINT16 Dev_ID; ///< OUT: + OUT UINT8 Base_Class; ///< OUT: + OUT UINT8 Sub_Class; ///< OUT: + OUT UINT8 Prog_Intf; ///< OUT: program interface + OUT UINT8 Rev; ///< OUT: Revision number + OUT UINT16 BusDevFunc; ///< OUT: Bus, Device & Function numbers + OUT UINT16 SubVendor_ID; ///< OUT: + OUT UINT16 SubDevice_ID; ///< OUT: } PCI_INFO_T; typedef struct { - OUT UINT32 EISA_Dev_ID; ///< Out: - OUT UINT8 Base_Class; ///< OUT: - OUT UINT8 Sub_Class; ///< OUT: - OUT UINT8 Prog_Intf; ///< OUT: program interface - OUT UINT16 CardSelNum; ///< OUT: Card Selector Number - OUT UINT8 Reserved; ///< to make it 10 bytes + OUT UINT32 EISA_Dev_ID; ///< Out: + OUT UINT8 Base_Class; ///< OUT: + OUT UINT8 Sub_Class; ///< OUT: + OUT UINT8 Prog_Intf; ///< OUT: program interface + OUT UINT16 CardSelNum; ///< OUT: Card Selector Number + OUT UINT8 Reserved; ///< to make it 10 bytes } PNP_INFO_T; @@ -524,14 +524,14 @@ typedef union { } PCI_PNP_INFO_T; typedef struct { - OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx - OUT UINT8 NicType; ///< OUT: 2=PCI, 3=PnP + OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx + OUT UINT8 NicType; ///< OUT: 2=PCI, 3=PnP PCI_PNP_INFO_T PciPnpInfo; } PXENV_UNDI_GET_NIC_TYPE_T; typedef struct { - OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx - OUT UINT8 IfaceType[16]; ///< OUT: Type name of MAC, AsciiZ + OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx + OUT UINT8 IfaceType[16]; ///< OUT: Type name of MAC, AsciiZ /* format. This is used by the */ @@ -542,14 +542,14 @@ typedef struct { /* Service specific */ /* characteristic table */ - OUT UINT32 LinkSpeed; ///< OUT: - OUT UINT32 ServiceFlags; ///< OUT: as defined in NDIS Spec 2.0X + OUT UINT32 LinkSpeed; ///< OUT: + OUT UINT32 ServiceFlags; ///< OUT: as defined in NDIS Spec 2.0X OUT UINT32 Reserved[4]; ///< OUT: will be filled with 0s till defined } PXENV_UNDI_GET_NDIS_INFO_T; typedef struct { - OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx - IN OUT UINT16 FuncFlag; ///< In: PXENV_UNDI_ISR_IN_xxx + OUT UINT16 Status; ///< OUT: PXENV_STATUS_xxx + IN OUT UINT16 FuncFlag; ///< In: PXENV_UNDI_ISR_IN_xxx /* Out: PXENV_UNDI_ISR_OUT_xxx */ OUT UINT16 BufferLength; @@ -580,7 +580,7 @@ typedef struct { Possible responses from PXENV_UNDI_ISR_IN_START --*/ -#define PXENV_UNDI_ISR_OUT_OURS 0 ///< This is our interrupt. Deal with it. +#define PXENV_UNDI_ISR_OUT_OURS 0 ///< This is our interrupt. Deal with it. #define PXENV_UNDI_ISR_OUT_NOT_OURS 1 ///< This is not our interrupt. /*++ @@ -589,22 +589,22 @@ typedef struct { PXENV_UNDI_ISR_IN_PROCESS --*/ -#define PXENV_UNDI_ISR_OUT_DONE 0 ///< We are done processing this interrupt. -#define PXENV_UNDI_ISR_OUT_TRANSMIT 2 ///< We completed a transmit interrupt. -#define PXENV_UNDI_ISR_OUT_RECEIVE 3 ///< Get data from receive buffer. +#define PXENV_UNDI_ISR_OUT_DONE 0 ///< We are done processing this interrupt. +#define PXENV_UNDI_ISR_OUT_TRANSMIT 2 ///< We completed a transmit interrupt. +#define PXENV_UNDI_ISR_OUT_RECEIVE 3 ///< Get data from receive buffer. #define PXENV_UNDI_ISR_OUT_BUSY 4 /* ? */ typedef struct { - UINT16 Status; ///< Out: PXENV_STATUS_xxx + UINT16 Status; ///< Out: PXENV_STATUS_xxx } PXENV_STOP_UNDI_T; -#define PXENV_UNDI_STARTED 1 ///< not even initialized -#define PXENV_UNDI_INITIALIZED 2 ///< initialized and closed (not opened) -#define PXENV_UNDI_OPENED 3 ///< initialized & opened +#define PXENV_UNDI_STARTED 1 ///< not even initialized +#define PXENV_UNDI_INITIALIZED 2 ///< initialized and closed (not opened) +#define PXENV_UNDI_OPENED 3 ///< initialized & opened typedef struct { - OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx + OUT UINT16 Status; ///< Out: PXENV_STATUS_xxx UINT16 UNDI_State; } PXENV_UNDI_GET_STATE_T; diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c index 7063229dd4..d1435798c0 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c @@ -1,15 +1,15 @@ -/** @file - Wrapper routines that use a PXE-enabled NIC option ROM to - supply internal routines for an EFI SNI (Simple Network +/** @file + Wrapper routines that use a PXE-enabled NIC option ROM to + supply internal routines for an EFI SNI (Simple Network Interface) Protocol. This file relies upon the existence of a PXE-compliant ROM - in memory, as defined by the Preboot Execution Environment + in memory, as defined by the Preboot Execution Environment Specification (PXE), Version 2.1, located at http://developer.intel.com/ial/wfm/wfmspecs.htm -Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "BiosSnp16.h" /** - PXE + PXE START UNDI Op-Code: PXENV_START_UNDI (0000h) Input: Far pointer to a PXENV_START_UNDI_T parameter structure that has been initialized by the caller. @@ -54,13 +54,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. contents of these registers can be found in the [PnP], [PCI] and [BBS] specifications. Returned from API service - Status: See the PXENV_STATUS_xxx constants. + Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeStartUndi ( @@ -77,8 +77,8 @@ PxeStartUndi ( } /** - PXE - UNDI STARTUP + PXE + UNDI STARTUP Op-Code: PXENV_UNDI_STARTUP (0001h) Input: Far pointer to a PXENV_UNDI_STARTUP_T parameter structure that has been initialized by the caller. @@ -95,7 +95,7 @@ PxeStartUndi ( chaining interrupt 1Ah. This must be done by the PXENV_START_UNDI and PXENV_STOP_UNDI API calls. This service cannot be used in protected mode. - typedef struct + typedef struct { PXENV_STATUS Status; } PXENV_UNDI_STARTUP_T; @@ -105,10 +105,10 @@ PxeStartUndi ( Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiStartup ( @@ -125,7 +125,7 @@ PxeUndiStartup ( } /** - PXE + PXE UNDI CLEANUP Op-Code: PXENV_UNDI_CLEANUP (0002h) Input: Far pointer to a PXENV_UNDI_CLEANUP_T parameter structure. @@ -145,10 +145,10 @@ PxeUndiStartup ( Status: See the PXENV_STATUS_xxx constants. @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiCleanup ( @@ -165,7 +165,7 @@ PxeUndiCleanup ( } /** - PXE + PXE UNDI INITIALIZE Op-Code: PXENV_UNDI_INITIALIZE (0003h) Input: Far pointer to a PXENV_UNDI_INITIALIZE_T parameter structure that has been initialized by the @@ -195,13 +195,13 @@ PxeUndiCleanup ( protocol.ini file was done by NDIS.) This value can be NULL for any other application interfacing to the universal NIC driver Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiInitialize ( @@ -219,8 +219,8 @@ PxeUndiInitialize ( /** Wrapper routine for reset adapter. - - PXE + + PXE UNDI RESET ADAPTER Op-Code: PXENV_UNDI_RESET_ADAPTER (0004h) Input: Far pointer to a PXENV_UNDI_RESET_ADAPTER_t parameter structure that has been initialized @@ -252,13 +252,13 @@ PxeUndiInitialize ( addresses. Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance. - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - @param RxFilter Filter setting mask value for PXE recive . - - @return Return value of PXE option ROM far call. + @param RxFilter Filter setting mask value for PXE recive . + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiResetNic ( @@ -310,8 +310,8 @@ PxeUndiResetNic ( &Open.McastBuffer, &PxeUndiTable->R_Mcast_Buf, sizeof (PXENV_UNDI_MCAST_ADDR_T) - ); - + ); + Status = MakePxeCall ( SimpleNetworkDevice, @@ -327,7 +327,7 @@ PxeUndiResetNic ( } /** - PXE + PXE UNDI SHUTDOWN Op-Code: PXENV_UNDI_SHUTDOWN (0005h) Input: Far pointer to a PXENV_UNDI_SHUTDOWN_T parameter. @@ -337,7 +337,7 @@ PxeUndiResetNic ( Description: This call resets the network adapter and leaves it in a safe state for another driver to program it. Note: The contents of the PXENV_UNDI_STARTUP parameter structure need to be saved by the Universal NIC Driver in case PXENV_UNDI_INITIALIZE is called again. - typedef struct + typedef struct { PXENV_STATUS Status; } PXENV_UNDI_SHUTDOWN_T; @@ -345,12 +345,12 @@ PxeUndiResetNic ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiShutdown ( @@ -367,7 +367,7 @@ PxeUndiShutdown ( } /** - PXE + PXE UNDI OPEN Op-Code: PXENV_UNDI_OPEN (0006h) Input: Far pointer to a PXENV_UNDI_OPEN_T parameter structure that has been initialized by the caller. @@ -399,12 +399,12 @@ PxeUndiShutdown ( R_Mcast_Buf: See definition in UNDI RESET ADAPTER (0004h). Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiOpen ( @@ -421,7 +421,7 @@ PxeUndiOpen ( } /** - PXE + PXE UNDI CLOSE Op-Code: PXENV_UNDI_CLOSE (0007h) Input: Far pointer to a PXENV_UNDI_CLOSE_T parameter. @@ -437,12 +437,12 @@ PxeUndiOpen ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiClose ( @@ -459,7 +459,7 @@ PxeUndiClose ( } /** - PXE + PXE UNDI TRANSMIT PACKET Op-Code: PXENV_UNDI_TRANSMIT (0008h) Input: Far pointer to a PXENV_UNDI_TRANSMIT_T parameter structure that @@ -529,13 +529,13 @@ PxeUndiClose ( TDDataPtr: Segment:Offset of the transmit block. DataBlock: Array of transmit data blocks. Returned from API service - Status: See the PXENV_STATUS_xxx constants - + Status: See the PXENV_STATUS_xxx constants + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiTransmit ( @@ -565,7 +565,7 @@ PxeUndiTransmit ( } /** - PXE + PXE UNDI SET MULTICAST ADDRESS Op-Code: PXENV_UNDI_SET_MCAST_ADDRESS (0009h) Input: Far pointer to a PXENV_TFTP_SET_MCAST_ADDRESS_t parameter structure that has been @@ -583,13 +583,13 @@ PxeUndiTransmit ( R_Mcast_Buf: See description in the UNDI RESET ADAPTER (0004h) API. Returned from API service - Status: See the PXENV_STATUS_xxx constants - + Status: See the PXENV_STATUS_xxx constants + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetMcastAddr ( @@ -606,7 +606,7 @@ PxeUndiSetMcastAddr ( } /** - PXE + PXE UNDI SET STATION ADDRESS Op-Code: PXENV_UNDI_SET_STATION_ADDRESS (000Ah) Input: Far pointer to a PXENV_UNDI_SET_STATION_ADDRESS_t parameter structure that has been @@ -625,13 +625,13 @@ PxeUndiSetMcastAddr ( StationAddress: Temporary MAC address to be used for transmit and receive. Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetStationAddr ( @@ -648,7 +648,7 @@ PxeUndiSetStationAddr ( } /** - PXE + PXE UNDI SET PACKET FILTER Op-Code: PXENV_UNDI_SET_PACKET_FILTER (000Bh) Input: Far pointer to a PXENV_UNDI_SET_PACKET_FILTER_T parameter structure that has been @@ -666,13 +666,13 @@ PxeUndiSetStationAddr ( Filter: See the receive filter values in the UNDI OPEN (0006h) API description. Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiSetPacketFilter ( @@ -689,7 +689,7 @@ PxeUndiSetPacketFilter ( } /** - PXE + PXE UNDI GET INFORMATION Op-Code: PXENV_UNDI_GET_INFORMATION (000Ch) Input: Far pointer to a PXENV_UNDI_GET_INFORMATION_T parameter structure that has been @@ -732,13 +732,13 @@ PxeUndiSetPacketFilter ( PermNodeAddress: Permanent hardware address. ROMAddress: Real mode ROM segment address. RxBufCnt: Receive queue length. - TxBufCnt: Transmit queue length. - + TxBufCnt: Transmit queue length. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetInformation ( @@ -755,7 +755,7 @@ PxeUndiGetInformation ( } /** - PXE + PXE UNDI GET STATISTICS Op-Code: PXENV_UNDI_GET_STATISTICS (000Dh) Input: Far pointer to a PXENV_UNDI_GET_STATISTICS_T parameter structure that has been initialized @@ -781,12 +781,12 @@ PxeUndiGetInformation ( error. RcvResourceErrors: Number of frames discarded because receive queue was full. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetStatistics ( @@ -803,7 +803,7 @@ PxeUndiGetStatistics ( } /** - PXE + PXE UNDI CLEAR STATISTICS Op-Code: PXENV_UNDI_CLEAR_STATISTICS (000Eh) Input: Far pointer to a PXENV_UNDI_CLEAR_STATISTICS_T parameter. @@ -818,12 +818,12 @@ PxeUndiGetStatistics ( N/A Returned from API service Status: See the PXENV_STATUS_xxx constants. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiClearStatistics ( @@ -840,7 +840,7 @@ PxeUndiClearStatistics ( } /** - PXE + PXE UNDI INITIATE DIAGS Op-Code: PXENV_UNDI_INITIATE_DIAGS (000Fh) Input: Far pointer to a PXENV_UNDI_INITIATE_DIAGS_T parameter. @@ -855,13 +855,13 @@ PxeUndiClearStatistics ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiInitiateDiags ( @@ -878,7 +878,7 @@ PxeUndiInitiateDiags ( } /** - PXE + PXE UNDI FORCE INTERRUPT Op-Code: PXENV_UNDI_FORCE_INTERRUPT (0010h) Input: Far pointer to a PXENV_UNDI_FORCE_INTERRUPT_T parameter structure that has been @@ -899,13 +899,13 @@ PxeUndiInitiateDiags ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiForceInterrupt ( @@ -922,7 +922,7 @@ PxeUndiForceInterrupt ( } /** - PXE + PXE UNDI GET MULTICAST ADDRESS Op-Code: PXENV_UNDI_GET_MCAST_ADDRESS (0011h) Input: Far pointer to a PXENV_GET_MCAST_ADDRESS_t parameter structure that has been initialized @@ -941,12 +941,12 @@ PxeUndiForceInterrupt ( Returned from API service Status: See the PXENV_STATUS_xxx constants. MediaAddr: MAC multicast address. - + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetMcastAddr ( @@ -963,7 +963,7 @@ PxeUndiGetMcastAddr ( } /** - PXE + PXE UNDI GET NIC TYPE Op-Code: PXENV_UNDI_GET_NIC_TYPE (0012h) Input: Far pointer to a PXENV_UNDI_GET_NIC_TYPE parameter structure that has been initialized by @@ -1013,13 +1013,13 @@ PxeUndiGetMcastAddr ( NICType: Type of NIC information stored in the parameter structure. Info: Information about the fields in this union can be found - in the [PnP] and [PCI] specifications - + in the [PnP] and [PCI] specifications + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetNicType ( @@ -1036,7 +1036,7 @@ PxeUndiGetNicType ( } /** - PXE + PXE UNDI GET IFACE INFO Op-Code: PXENV_UNDI_GET_IFACE_INFO (0013h) Input: Far pointer to a PXENV_UNDI_GET_IFACE_INFO_t parameter structure that has been initialized @@ -1069,13 +1069,13 @@ PxeUndiGetNicType ( to the protocol driver. LinkSpeed: Defined in the NDIS 2.0 specification. ServiceFlags: Defined in the NDIS 2.0 specification. - Reserved: Must be zero. - + Reserved: Must be zero. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetNdisInfo ( @@ -1092,7 +1092,7 @@ PxeUndiGetNdisInfo ( } /** - PXE + PXE UNDI ISR Op-Code: PXENV_UNDI_ISR (0014h) Input: Far pointer to a PXENV_UNDI_ISR_T parameter structure that has been initialized by the caller. @@ -1134,13 +1134,13 @@ PxeUndiGetNdisInfo ( if there is no other interrupt status to be processed, UNDI re-enables the interrupt at the NETWORK INTERFACE level and returns PXENV_UNDI_ISR_OUT_DONE in the FuncFlag. IMPORTANT: It is possible for the protocol driver to be interrupted again while in the - strategy routine when the UNDI re-enables interrupts. - + strategy routine when the UNDI re-enables interrupts. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiIsr ( @@ -1157,7 +1157,7 @@ PxeUndiIsr ( } /** - PXE + PXE STOP UNDI Op-Code: PXENV_STOP_UNDI (0015h) Input: Far pointer to a PXENV_STOP_UNDI_T parameter structure that has been initialized by the caller. @@ -1176,13 +1176,13 @@ PxeUndiIsr ( Set before calling API service N/A Returned from API service - Status: See the PXENV_STATUS_xxx constants. - + Status: See the PXENV_STATUS_xxx constants. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiStop ( @@ -1199,7 +1199,7 @@ PxeUndiStop ( } /** - PXE + PXE UNDI GET STATE Op-Code: PXENV_UNDI_GET_STATE (0015h) Input: Far pointer to a PXENV_UNDI_GET_STATE_T parameter. @@ -1231,13 +1231,13 @@ PxeUndiStop ( constants. Description: This API function will be called at different levels of processing the interrupt. The FuncFlag field in the parameter block indicates the operation to be performed for the call. This field is filled with the - status of that operation on return. - + status of that operation on return. + @param SimpleNetworkDevice Device instance - @param PxeUndiTable Point to structure which hold parameter and return value + @param PxeUndiTable Point to structure which hold parameter and return value for option ROM call. - - @return Return value of PXE option ROM far call. + + @return Return value of PXE option ROM far call. **/ EFI_STATUS PxeUndiGetState ( diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf index 2e6b0c532d..a2b554443e 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf @@ -3,7 +3,7 @@ # # Thunk wrapper UEFI driver to produce EFI SNP protocol based on legacy 16 NIC ROM. # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions @@ -23,7 +23,7 @@ MODULE_TYPE = UEFI_DRIVER INF_VERSION = 0x00010005 VERSION_STRING = 1.0 - + ENTRY_POINT = BiosSnp16DriverEntryPoint # diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c index 08672cf472..9ff7c9d77d 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -1,7 +1,7 @@ /** @file ConsoleOut Routines that speak VGA. -Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -188,7 +188,7 @@ BiosVideoDriverBindingSupported ( if (RemainingDevicePath != NULL) { Node = (EFI_DEV_PATH *) RemainingDevicePath; // - // Check if RemainingDevicePath is the End of Device Path Node, + // Check if RemainingDevicePath is the End of Device Path Node, // if yes, return EFI_SUCCESS // if (!IsDevicePathEnd (Node)) { @@ -295,7 +295,7 @@ BiosVideoDriverBindingStart ( 0, &mOriginalPciAttributes ); - + if (EFI_ERROR (Status)) { goto Done; } @@ -319,7 +319,7 @@ BiosVideoDriverBindingStart ( if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) { Status = EFI_UNSUPPORTED; goto Done; - } + } REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, @@ -384,7 +384,7 @@ BiosVideoDriverBindingStart ( } if (RemainingDevicePath != NULL) { - if (IsDevicePathEnd (RemainingDevicePath) && + if (IsDevicePathEnd (RemainingDevicePath) && (FeaturePcdGet (PcdBiosVideoCheckVbeEnable) || FeaturePcdGet (PcdBiosVideoCheckVgaEnable))) { // // If RemainingDevicePath is the End of Device Path Node, @@ -509,7 +509,7 @@ BiosVideoDriverBindingStop ( (VOID **) &PciIo ); ASSERT_EFI_ERROR (Status); - + // // Restore original PCI attributes // @@ -562,10 +562,10 @@ BiosVideoChildHandleInstall ( // Allocate the private device structure for video device // BiosVideoPrivate = (BIOS_VIDEO_DEV *) AllocateZeroPool ( - sizeof (BIOS_VIDEO_DEV) - ); + sizeof (BIOS_VIDEO_DEV) + ); if (NULL == BiosVideoPrivate) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } @@ -668,7 +668,7 @@ BiosVideoChildHandleInstall ( AcpiDeviceNode.Header.SubType = ACPI_ADR_DP; AcpiDeviceNode.ADR = ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0); SetDevicePathNodeLength (&AcpiDeviceNode.Header, sizeof (ACPI_ADR_DEVICE_PATH)); - + BiosVideoPrivate->GopDevicePath = AppendDevicePathNode ( ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &AcpiDeviceNode @@ -676,7 +676,7 @@ BiosVideoChildHandleInstall ( } else { BiosVideoPrivate->GopDevicePath = AppendDevicePathNode (ParentDevicePath, RemainingDevicePath); } - + // // Creat child handle and device path protocol firstly // @@ -816,7 +816,7 @@ Done: if (EFI_ERROR (Status)) { if ((BiosVideoPrivate != NULL) && (BiosVideoPrivate->ExitBootServicesEvent != NULL)) { gBS->CloseEvent (BiosVideoPrivate->ExitBootServicesEvent); - } + } // // Free private data structure // @@ -1271,7 +1271,7 @@ HasChildHandle ( HasChild = TRUE; } } - + return HasChild; } @@ -1343,7 +1343,7 @@ BiosVideoCheckForVbe ( } ZeroMem (&ValidEdidTiming, sizeof (VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING)); - + // // Fill in the VBE related data structures // @@ -1405,7 +1405,7 @@ BiosVideoCheckForVbe ( // EdidOverrideDataBlock = AllocatePool (VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE * 2); if (NULL == EdidOverrideDataBlock) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } @@ -1449,13 +1449,13 @@ BiosVideoCheckForVbe ( // Set EDID Discovered Data // BiosVideoPrivate->EdidDiscovered.SizeOfEdid = VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE; - BiosVideoPrivate->EdidDiscovered.Edid = (UINT8 *) AllocateCopyPool ( + BiosVideoPrivate->EdidDiscovered.Edid = (UINT8 *) AllocateCopyPool ( VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE, BiosVideoPrivate->VbeEdidDataBlock - ); + ); if (NULL == BiosVideoPrivate->EdidDiscovered.Edid) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } @@ -1470,9 +1470,9 @@ BiosVideoCheckForVbe ( EdidActiveDataSize = EdidOverrideDataSize; EdidActiveDataBlock = EdidOverrideDataBlock; EdidFound = TRUE; - } + } - if (EdidFound) { + if (EdidFound) { // // Parse EDID data structure to retrieve modes supported by monitor // @@ -1486,7 +1486,7 @@ BiosVideoCheckForVbe ( EdidActiveDataBlock ); if (NULL == BiosVideoPrivate->EdidActive.Edid) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } } @@ -1507,7 +1507,7 @@ BiosVideoCheckForVbe ( PreferMode = 0; ModeNumber = 0; - + // // ModeNumberPtr may be not 16-byte aligned, so ReadUnaligned16 is used to access the buffer pointed by ModeNumberPtr. // @@ -1635,7 +1635,7 @@ BiosVideoCheckForVbe ( // Record the highest resolution mode to set later // if ((BiosVideoPrivate->VbeModeInformationBlock->XResolution > HighestHorizontalResolution) || - ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == HighestHorizontalResolution) && + ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == HighestHorizontalResolution) && (BiosVideoPrivate->VbeModeInformationBlock->YResolution > HighestVerticalResolution))) { HighestHorizontalResolution = BiosVideoPrivate->VbeModeInformationBlock->XResolution; HighestVerticalResolution = BiosVideoPrivate->VbeModeInformationBlock->YResolution; @@ -1647,10 +1647,10 @@ BiosVideoCheckForVbe ( // ModeNumber ++; ModeBuffer = (BIOS_VIDEO_MODE_DATA *) AllocatePool ( - ModeNumber * sizeof (BIOS_VIDEO_MODE_DATA) - ); + ModeNumber * sizeof (BIOS_VIDEO_MODE_DATA) + ); if (NULL == ModeBuffer) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } @@ -1715,7 +1715,7 @@ BiosVideoCheckForVbe ( // Make sure the FrameBufferSize does not exceed the max available frame buffer size reported by VEB. // ASSERT (CurrentModeData->FrameBufferSize <= ((UINT32)BiosVideoPrivate->VbeInformationBlock->TotalMemory * 64 * 1024)); - + BiosVideoPrivate->ModeData = ModeBuffer; } // @@ -1821,7 +1821,7 @@ BiosVideoCheckForVga ( sizeof (BIOS_VIDEO_MODE_DATA) ); if (NULL == ModeBuffer) { - Status = EFI_OUT_OF_RESOURCES; + Status = EFI_OUT_OF_RESOURCES; goto Done; } @@ -1913,8 +1913,8 @@ BiosVideoGraphicsOutputQueryMode ( } *Info = (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) AllocatePool ( - sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION) - ); + sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION) + ); if (NULL == *Info) { return EFI_OUT_OF_RESOURCES; } @@ -1969,8 +1969,8 @@ BiosVideoSetModeWorker ( } BiosVideoPrivate->LineBuffer = (UINT8 *) AllocatePool ( - ModeData->BytesPerScanLine - ); + ModeData->BytesPerScanLine + ); if (NULL == BiosVideoPrivate->LineBuffer) { return EFI_OUT_OF_RESOURCES; } @@ -1998,9 +1998,9 @@ BiosVideoSetModeWorker ( // Allocate a working buffer for BLT operations to the VBE frame buffer // BiosVideoPrivate->VbeFrameBuffer = - (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocatePool ( - ModeData->BytesPerScanLine * ModeData->VerticalResolution - ); + (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocatePool ( + ModeData->BytesPerScanLine * ModeData->VerticalResolution + ); if (NULL == BiosVideoPrivate->VbeFrameBuffer) { return EFI_OUT_OF_RESOURCES; } @@ -2079,11 +2079,11 @@ BiosVideoGraphicsOutputSetMode ( if (ModeNumber >= This->Mode->MaxMode) { return EFI_UNSUPPORTED; } - + if (ModeNumber == This->Mode->Mode) { // // Clear screen to black - // + // ZeroMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); BiosVideoGraphicsOutputVbeBlt ( This, diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxe.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxe.uni index 117755f54c..3d353505f2 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxe.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxe.uni @@ -4,14 +4,14 @@ // This driver by using Legacy Bios protocol service to support csm Video // and produce Graphics Output Protocol. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxeExtra.uni b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxeExtra.uni index c212e38ce8..c8490847bb 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxeExtra.uni +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideoDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // BiosVideoDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy Video DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/IpfBootSupport.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/IpfBootSupport.c index ee08c86c70..b4cc8d253d 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/IpfBootSupport.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/IpfBootSupport.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -248,7 +248,7 @@ RelocateImageUnder4GIfNeeded ( // // Create a new handle with gEfiCallerIdGuid to be used as the ImageHandle fore the reloaded image - // + // NewImageHandle = NULL; Status = gBS->InstallProtocolInterface ( &NewImageHandle, diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBbs.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBbs.c index 6ee43ad676..cdb28c8200 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBbs.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBbs.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -31,7 +31,7 @@ BOOLEAN IsHaveMediaInFloppy = TRUE; /** Checks the state of the floppy and if media is inserted. - + This routine checks the state of the floppy and if media is inserted. There are 3 cases: No floppy present - Set BBS entry to ignore diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c index 9466e3e4dd..8f14687b28 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -271,7 +271,7 @@ ShadowAndStartLegacy16 ( if (EFI_ERROR (Status)) { // // Bugbug: need to figure out whether C/D/E/F segment should be marked as reserved memory. - // + // DEBUG ((DEBUG_ERROR, "Failed to allocate the C/D/E/F segment Status = %r", Status)); } } @@ -415,7 +415,7 @@ ShadowAndStartLegacy16 ( Private->Legacy8259->GetMask(Private->Legacy8259, &OldMask, NULL, NULL, NULL); NewMask = 0xFFFF; Private->Legacy8259->SetMask(Private->Legacy8259, &NewMask, NULL, NULL, NULL); - + // // Call into Legacy16 code to do an INIT // @@ -437,7 +437,7 @@ ShadowAndStartLegacy16 ( // Restore original legacy interrupt mask value // Private->Legacy8259->SetMask(Private->Legacy8259, &OldMask, NULL, NULL, NULL); - + if (Regs.X.AX != 0) { return EFI_DEVICE_ERROR; } @@ -653,7 +653,7 @@ GetPciInterfaceVersion ( UINT16 PciInterfaceVersion; PciInterfaceVersion = 0; - + Reg.X.AX = 0xB101; Reg.E.EDI = 0; @@ -693,7 +693,7 @@ InstallSmbiosEventCallback ( { EFI_STATUS Status; SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure; - + // // Get SMBIOS table from EFI configuration table // @@ -704,7 +704,7 @@ InstallSmbiosEventCallback ( if ((EFI_ERROR (Status)) || (mRuntimeSmbiosEntryPoint == NULL)) { return; } - + EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) mRuntimeSmbiosEntryPoint; // @@ -728,8 +728,8 @@ InstallSmbiosEventCallback ( } DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Entry Point Structure\n")); } - - if ((mStructureTableAddress != 0) && + + if ((mStructureTableAddress != 0) && (mStructureTablePages < EFI_SIZE_TO_PAGES ((UINT32)EntryPointStructure->TableLength))) { // // If original buffer is not enough for the new SMBIOS table, free original buffer and re-allocate @@ -739,7 +739,7 @@ InstallSmbiosEventCallback ( mStructureTablePages = 0; DEBUG ((EFI_D_INFO, "Original size is not enough. Re-allocate the memory.\n")); } - + if (mStructureTableAddress == 0) { // // Allocate reserved memory below 4GB. @@ -755,7 +755,7 @@ InstallSmbiosEventCallback ( ); if (EFI_ERROR (Status)) { gBS->FreePages ( - mReserveSmbiosEntryPoint, + mReserveSmbiosEntryPoint, EFI_SIZE_TO_PAGES ((UINTN) (EntryPointStructure->EntryPointLength)) ); mReserveSmbiosEntryPoint = 0; @@ -843,7 +843,7 @@ LegacyBiosInstall ( FreePool (SecureBoot); return EFI_SECURITY_VIOLATION; } - + if (SecureBoot != NULL) { FreePool (SecureBoot); } @@ -1047,7 +1047,7 @@ LegacyBiosInstall ( // Allocate low PMM memory and zero it out // MemorySize = PcdGet32 (PcdLowPmmMemorySize); - ASSERT ((MemorySize & 0xFFF) == 0); + ASSERT ((MemorySize & 0xFFF) == 0); Status = AllocateLegacyMemory ( AllocateMaxAddress, EfiBootServicesCode, @@ -1089,7 +1089,7 @@ LegacyBiosInstall ( ASSERT ((MemorySize & 0xFFF) == 0); // // Allocate high PMM Memory under 16 MB - // + // Status = AllocateLegacyMemory ( AllocateMaxAddress, EfiBootServicesCode, @@ -1100,19 +1100,19 @@ LegacyBiosInstall ( if (EFI_ERROR (Status)) { // // If it fails, allocate high PMM Memory under 4GB - // + // Status = AllocateLegacyMemory ( AllocateMaxAddress, EfiBootServicesCode, 0xFFFFFFFF, EFI_SIZE_TO_PAGES (MemorySize), &MemoryAddress - ); + ); } if (!EFI_ERROR (Status)) { EfiToLegacy16InitTable->HiPmmMemory = (UINT32) (EFI_PHYSICAL_ADDRESS) (UINTN) MemoryAddress; EfiToLegacy16InitTable->HiPmmMemorySizeInBytes = MemorySize; - } + } // // ShutdownAPs(); @@ -1149,7 +1149,7 @@ LegacyBiosInstall ( // Save EFI value // Private->ThunkSeg = (UINT16) (EFI_SEGMENT (IntRedirCode)); - + // // Allocate reserved memory for SMBIOS table used in legacy boot if SMBIOS table exists // @@ -1166,7 +1166,7 @@ LegacyBiosInstall ( &gEfiSmbiosTableGuid, &InstallSmbiosEvent ); - ASSERT_EFI_ERROR (Status); + ASSERT_EFI_ERROR (Status); // // Create callback to update status of EndOfDxe, which is needed by NULL @@ -1193,9 +1193,9 @@ LegacyBiosInstall ( &Private->LegacyBios ); Private->Csm16PciInterfaceVersion = GetPciInterfaceVersion (Private); - - DEBUG ((EFI_D_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n", - (UINT8) (Private->Csm16PciInterfaceVersion >> 8), + + DEBUG ((EFI_D_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n", + (UINT8) (Private->Csm16PciInterfaceVersion >> 8), (UINT8) Private->Csm16PciInterfaceVersion )); ASSERT (Private->Csm16PciInterfaceVersion != 0); diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.uni b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.uni index 107593d9db..57c1235bbf 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.uni +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.uni @@ -3,14 +3,14 @@ // // This driver installs Legacy Bios Protocol to support CSM module work in EFI system. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxeExtra.uni b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxeExtra.uni index 1c68bfc3af..fd9bd9af1b 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxeExtra.uni +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // LegacyBiosDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy BIOS Support DXE Driver" diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h index 9f3a1a693c..497a71190f 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h @@ -101,9 +101,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define PROTECTED_MODE_BASE_VECTOR_SLAVE 0x70 // -// When we call CSM16 functions, some CSM16 use es:[offset + 0xabcd] to get data passed from CSM32, -// offset + 0xabcd could overflow which exceeds 0xFFFF which is invalid in real mode. -// So this will keep offset as small as possible to avoid offset overflow in real mode. +// When we call CSM16 functions, some CSM16 use es:[offset + 0xabcd] to get data passed from CSM32, +// offset + 0xabcd could overflow which exceeds 0xFFFF which is invalid in real mode. +// So this will keep offset as small as possible to avoid offset overflow in real mode. // #define NORMALIZE_EFI_SEGMENT(_Adr) (UINT16) (((UINTN) (_Adr)) >> 4) #define NORMALIZE_EFI_OFFSET(_Adr) (UINT16) (((UINT16) ((UINTN) (_Adr))) & 0xf) @@ -544,7 +544,7 @@ extern BOOLEAN mEndOfDxe; // // Timer 0, Read/Write LSB then MSB, Square wave output, binary count use. // -#define TIMER0_CONTROL_WORD 0x36 +#define TIMER0_CONTROL_WORD 0x36 #define LEGACY_BIOS_INSTANCE_SIGNATURE SIGNATURE_32 ('L', 'B', 'I', 'T') typedef struct { @@ -556,16 +556,16 @@ typedef struct { EFI_HANDLE ImageHandle; // - // CPU Architectural Protocol + // CPU Architectural Protocol // EFI_CPU_ARCH_PROTOCOL *Cpu; // - // Timer Architectural Protocol + // Timer Architectural Protocol // EFI_TIMER_ARCH_PROTOCOL *Timer; - BOOLEAN TimerUses8254; - + BOOLEAN TimerUses8254; + // // Protocol to Lock and Unlock 0xc0000 - 0xfffff // @@ -577,7 +577,7 @@ typedef struct { // Interrupt control for thunk and PCI IRQ // EFI_LEGACY_8259_PROTOCOL *Legacy8259; - + // // PCI Interrupt PIRQ control // @@ -673,7 +673,7 @@ typedef struct { // // Indicate that whether GenericLegacyBoot is entered or not // - BOOLEAN LegacyBootEntered; + BOOLEAN LegacyBootEntered; // // CSM16 PCI Interface Version @@ -1350,7 +1350,7 @@ ShadowAndStartLegacy16 ( /** Checks the state of the floppy and if media is inserted. - + This routine checks the state of the floppy and if media is inserted. There are 3 cases: No floppy present - Set BBS entry to ignore diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c index 57ab78d648..a7b8e6a9a0 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -791,15 +791,15 @@ CreateSmbiosTableInReservedMemory ( ) { SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure; - - if ((mRuntimeSmbiosEntryPoint == NULL) || - (mReserveSmbiosEntryPoint == 0) || + + if ((mRuntimeSmbiosEntryPoint == NULL) || + (mReserveSmbiosEntryPoint == 0) || (mStructureTableAddress == 0)) { return; } - + EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) mRuntimeSmbiosEntryPoint; - + // // Copy SMBIOS Entry Point Structure // @@ -808,7 +808,7 @@ CreateSmbiosTableInReservedMemory ( EntryPointStructure, EntryPointStructure->EntryPointLength ); - + // // Copy SMBIOS Structure Table into EfiReservedMemoryType memory // @@ -817,22 +817,22 @@ CreateSmbiosTableInReservedMemory ( (VOID *)(UINTN) EntryPointStructure->TableAddress, EntryPointStructure->TableLength ); - + // // Update TableAddress in Entry Point Structure // EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)(UINTN) mReserveSmbiosEntryPoint; EntryPointStructure->TableAddress = (UINT32)(UINTN) mStructureTableAddress; - + // // Fixup checksums in the Entry Point Structure // EntryPointStructure->IntermediateChecksum = 0; EntryPointStructure->EntryPointStructureChecksum = 0; - EntryPointStructure->IntermediateChecksum = + EntryPointStructure->IntermediateChecksum = CalculateCheckSum8 ( - (UINT8 *) EntryPointStructure + OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString), + (UINT8 *) EntryPointStructure + OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString), EntryPointStructure->EntryPointLength - OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString) ); EntryPointStructure->EntryPointStructureChecksum = @@ -898,7 +898,7 @@ GenericLegacyBoot ( EfiToLegacy16BootTable->MajorVersion = EFI_TO_LEGACY_MAJOR_VERSION; EfiToLegacy16BootTable->MinorVersion = EFI_TO_LEGACY_MINOR_VERSION; - + // // If booting to a legacy OS then force HDD drives to the appropriate // boot mode by calling GetIdeHandle. @@ -916,7 +916,7 @@ GenericLegacyBoot ( ); if (!EFI_ERROR (Status)) { IdeController = HandleBuffer[0]; - } + } } // // Unlock the Legacy BIOS region @@ -1295,7 +1295,7 @@ GenericLegacyBoot ( // Disable DXE Timer while executing in real mode // Private->Timer->SetTimerPeriod (Private->Timer, 0); - + // // Save and disable interrupt of debug timer // @@ -1464,8 +1464,8 @@ LegacyBiosBootUnconventionalDevice ( } UcdTable = (UD_TABLE *) AllocatePool ( - sizeof (UD_TABLE) - ); + sizeof (UD_TABLE) + ); if (NULL == UcdTable) { return EFI_OUT_OF_RESOURCES; } diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyIde.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyIde.c index 4d520f8a32..6a26157e54 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyIde.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyIde.c @@ -1,7 +1,7 @@ /** @file Collect IDE information from Native EFI Driver -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -76,7 +76,7 @@ LegacyBiosBuildIdeData ( (VOID *) &LocalHddInfo ); if (!EFI_ERROR (Status)) { - IdeController = HandleBuffer[0]; + IdeController = HandleBuffer[0]; // // Force IDE drive spin up! // @@ -279,8 +279,8 @@ InitLegacyIdeController ( // and has PCI I/O resources allocated // Status = gBS->HandleProtocol ( - IdeController, - &gEfiPciIoProtocolGuid, + IdeController, + &gEfiPciIoProtocolGuid, (VOID **)&PciIo ); if (EFI_ERROR (Status)) { diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c index b10a9dcef6..8245a2b65e 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -150,7 +150,7 @@ EFI_STATUS RomShadow ( IN EFI_HANDLE PciHandle, IN UINT32 ShadowAddress, - IN UINT32 ShadowedSize, + IN UINT32 ShadowedSize, IN UINT8 DiskStart, IN UINT8 DiskEnd ) @@ -258,7 +258,7 @@ IsLegacyRom ( } /** - Find the PC-AT ROM Image in the raw PCI Option ROM. Also return the + Find the PC-AT ROM Image in the raw PCI Option ROM. Also return the related information from the header. @param Csm16Revision The PCI interface version of underlying CSM16 @@ -321,7 +321,7 @@ GetPciLegacyRom ( if (((UINTN)RomHeader.Raw - (UINTN)*Rom) + Pcir->ImageLength * 512 > *ImageSize) { break; } - + if (Pcir->CodeType == PCI_CODE_TYPE_PCAT_IMAGE) { Match = FALSE; if (Pcir->VendorId == VendorId) { @@ -384,7 +384,7 @@ GetPciLegacyRom ( DEBUG ((EFI_D_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x)\n", (UINTN)VendorId, (UINTN)DeviceId)); } } - + if ((Pcir->Indicator & 0x80) == 0x80) { break; } else { @@ -415,7 +415,7 @@ GetPciLegacyRom ( } if (OpRomRevision != NULL) { - // + // // Optional return PCI Data Structure revision // if (Pcir->Length >= 0x1C) { @@ -815,7 +815,7 @@ CopyPirqTable ( // Regs.X.BX = (UINT16) 0x1; // - // 16-byte boundary alignment requirement according to + // 16-byte boundary alignment requirement according to // PCI IRQ Routing Table Specification // Regs.X.DX = 0x10; @@ -832,7 +832,7 @@ CopyPirqTable ( if (Regs.X.AX != 0) { DEBUG ((EFI_D_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize)); } else { - DEBUG ((EFI_D_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer)); + DEBUG ((EFI_D_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer)); Private->Legacy16Table->IrqRoutingTableLength = (UINT32)PirqTableSize; CopyMem ( (VOID *) (UINTN)Private->Legacy16Table->IrqRoutingTablePointer, @@ -1595,11 +1595,11 @@ PciShadowRoms ( &HandleBuffer, &HandleCount, NULL - ); + ); if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } - + VgaHandle = HandleBuffer[0]; Status = gBS->LocateHandleBuffer ( @@ -1699,13 +1699,13 @@ PciShadowRoms ( sizeof (Pci) / sizeof (UINT32), &Pci ); - + // - // Only one Video OPROM can be given control in BIOS phase. If there are multiple Video devices, - // one will work in legacy mode (OPROM will be given control) and + // Only one Video OPROM can be given control in BIOS phase. If there are multiple Video devices, + // one will work in legacy mode (OPROM will be given control) and // other Video devices will work in native mode (OS driver will handle these devices). - // - if (IS_PCI_DISPLAY (&Pci) && Index != 0) { + // + if (IS_PCI_DISPLAY (&Pci) && Index != 0) { continue; } // @@ -1715,11 +1715,11 @@ PciShadowRoms ( if (!EFI_ERROR (Status)) { continue; } - + // // If legacy VBIOS Oprom has not been dispatched before, install legacy VBIOS here. // - if (IS_PCI_DISPLAY (&Pci) && Index == 0) { + if (IS_PCI_DISPLAY (&Pci) && Index == 0) { Status = LegacyBiosInstallVgaRom (Private); // // A return status of EFI_NOT_FOUND is considered valid (No EFI @@ -2104,7 +2104,7 @@ LegacyBiosInstallVgaRom ( if (EFI_ERROR (Status)) { return Status; } - + for (Index = 0; Index < EntryCount; Index++) { if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) { Status = gBS->HandleProtocol ( @@ -2123,7 +2123,7 @@ LegacyBiosInstallVgaRom ( } } } - + // // Kick off the native EFI driver // @@ -2305,7 +2305,7 @@ LegacyBiosInstallRom ( MaxRomAddr = PcdGet32 (PcdEndOpromShadowAddress); if ((Private->Legacy16Table->TableLength >= OFFSET_OF(EFI_COMPATIBILITY16_TABLE, HiPermanentMemoryAddress)) && - (Private->Legacy16Table->UmaAddress != 0) && + (Private->Legacy16Table->UmaAddress != 0) && (Private->Legacy16Table->UmaSize != 0) && (MaxRomAddr > (Private->Legacy16Table->UmaAddress))) { MaxRomAddr = Private->Legacy16Table->UmaAddress; @@ -2326,7 +2326,7 @@ LegacyBiosInstallRom ( EFI_SIZE_TO_PAGES (ImageSize), &PhysicalAddress ); - + if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); // @@ -2389,7 +2389,7 @@ LegacyBiosInstallRom ( (UINT32) ImageSize, &Granularity ); - + DEBUG ((EFI_D_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize)); CopyMem ((VOID *) InitAddress, RomImage, ImageSize); @@ -2466,7 +2466,7 @@ LegacyBiosInstallRom ( // gRT->GetTime (&BootTime, NULL); LocalTime = BootTime.Hour * 3600 + BootTime.Minute * 60 + BootTime.Second; - + // // Multiply result by 18.2 for number of ticks since midnight. // Use 182/10 to avoid floating point math. @@ -2476,21 +2476,21 @@ LegacyBiosInstallRom ( BdaPtr = (UINT32 *) ((UINTN) 0x46C); *BdaPtr = LocalTime; ); - + // // Pass in handoff data // PciEnableStatus = EFI_UNSUPPORTED; ZeroMem (&Regs, sizeof (Regs)); if (PciHandle != NULL) { - + Status = gBS->HandleProtocol ( PciHandle, &gEfiPciIoProtocolGuid, (VOID **) &PciIo ); ASSERT_EFI_ERROR (Status); - + // // Enable command register. // @@ -2500,7 +2500,7 @@ LegacyBiosInstallRom ( EFI_PCI_DEVICE_ENABLE, NULL ); - + PciIo->GetLocation ( PciIo, &Segment, @@ -2510,10 +2510,10 @@ LegacyBiosInstallRom ( ); DEBUG ((EFI_D_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function)); } - + mIgnoreBbsUpdateFlag = FALSE; Regs.X.AX = Legacy16DispatchOprom; - + // // Generate DispatchOpRomTable data // @@ -2545,7 +2545,7 @@ LegacyBiosInstallRom ( } else { Regs.X.BX = 0; } - + if (Private->IntThunk->DispatchOpromTable.NumberBbsEntries != (UINT8) Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries) { Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries = (UINT8) Private->IntThunk->DispatchOpromTable.NumberBbsEntries; mIgnoreBbsUpdateFlag = TRUE; @@ -2618,7 +2618,7 @@ LegacyBiosInstallRom ( ACCESS_PAGE0_CODE ( LocalDiskEnd = (UINT8) ((*(UINT8 *) ((UINTN) 0x475)) + 0x80); ); - + // // Allow platform to perform any required actions after the // OPROM has been initialized. @@ -2687,7 +2687,7 @@ LegacyBiosInstallRom ( Private->OptionRom = (UINT32) (RuntimeAddress + *RuntimeImageLength); Status = EFI_SUCCESS; - + Done: if (PhysicalAddress != 0) { // @@ -2879,7 +2879,7 @@ LegacyBiosInstallPciRom ( *Flags = 0; if ((PciHandle != NULL) && (RomImage == NULL)) { // - // If PciHandle has OpRom to Execute + // If PciHandle has OpRom to Execute // and OpRom are all associated with Hardware // Status = gBS->HandleProtocol ( @@ -3025,7 +3025,7 @@ LegacyBiosInstallPciRom ( mVgaInstallationInProgress = FALSE; return EFI_UNSUPPORTED; } - + Pcir = (PCI_3_0_DATA_STRUCTURE *) ((UINT8 *) LocalRomImage + ((PCI_EXPANSION_ROM_HEADER *) LocalRomImage)->PcirOffset); diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Thunk.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Thunk.c index d330f4870b..d59686eac9 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Thunk.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Thunk.c @@ -1,7 +1,7 @@ /** @file Call into 16-bit BIOS code, Use AsmThunk16 function of BaseLib. -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -77,7 +77,7 @@ LegacyBiosInt86 ( Segment = (UINT16)(((UINT32 *)0)[BiosInt] >> 16); Offset = (UINT16)((UINT32 *)0)[BiosInt]; ); - + return InternalLegacyBiosFarCall ( This, Segment, @@ -131,7 +131,7 @@ LegacyBiosFarCall86 ( } /** - Provide NULL interrupt handler which is used to check + Provide NULL interrupt handler which is used to check if there is more than one HW interrupt registers with the CPU AP. @param InterruptType - The type of interrupt that occured @@ -218,7 +218,7 @@ InternalLegacyBiosFarCall ( // Disable DXE Timer while executing in real mode // Private->Timer->SetTimerPeriod (Private->Timer, 0); - + // // Save and disable interrupt of debug timer // @@ -231,14 +231,14 @@ InternalLegacyBiosFarCall ( // // Check to see if there is more than one HW interrupt registers with the CPU AP. - // If there is, then ASSERT() since that is not compatible with the CSM because - // interupts other than the Timer interrupt that was disabled above can not be + // If there is, then ASSERT() since that is not compatible with the CSM because + // interupts other than the Timer interrupt that was disabled above can not be // handled properly from real mode. // DEBUG_CODE ( UINTN Vector; UINTN Count; - + for (Vector = 0x20, Count = 0; Vector < 0x100; Vector++) { Status = Private->Cpu->RegisterInterruptHandler (Private->Cpu, Vector, LegacyBiosNullInterruptHandler); if (Status == EFI_ALREADY_STARTED) { @@ -255,14 +255,14 @@ InternalLegacyBiosFarCall ( ); // - // If the Timer AP has enabled the 8254 timer IRQ and the current 8254 timer - // period is less than the CSM required rate of 54.9254, then force the 8254 + // If the Timer AP has enabled the 8254 timer IRQ and the current 8254 timer + // period is less than the CSM required rate of 54.9254, then force the 8254 // PIT counter to 0, which is the CSM required rate of 54.9254 ms // if (Private->TimerUses8254 && TimerPeriod < 549254) { SetPitCount (0); } - + if (Stack != NULL && StackSize != 0) { // // Copy Stack to low memory stack @@ -310,7 +310,7 @@ InternalLegacyBiosFarCall ( // End critical section // gBS->RestoreTPL (OriginalTpl); - + // // OPROM may allocate EBDA range by itself and change EBDA base and EBDA size. // Get the current EBDA base address, and compared with pre-allocate minimum @@ -385,27 +385,27 @@ LegacyBiosInitializeThunk ( TimerVector = 0; Status = Private->Legacy8259->GetVector (Private->Legacy8259, Efi8259Irq0, &TimerVector); ASSERT_EFI_ERROR (Status); - + // // Check to see if the Timer AP has hooked the IRQ0 from the 8254 PIT - // + // Status = Private->Cpu->RegisterInterruptHandler ( - Private->Cpu, - TimerVector, + Private->Cpu, + TimerVector, LegacyBiosNullInterruptHandler ); if (Status == EFI_SUCCESS) { // - // If the Timer AP has not enabled the 8254 timer IRQ, then force the 8254 PIT + // If the Timer AP has not enabled the 8254 timer IRQ, then force the 8254 PIT // counter to 0, which is the CSM required rate of 54.9254 ms // Private->Cpu->RegisterInterruptHandler ( - Private->Cpu, - TimerVector, + Private->Cpu, + TimerVector, NULL ); SetPitCount (0); - + // // Save status that the Timer AP is not using the 8254 PIT // @@ -421,6 +421,6 @@ LegacyBiosInitializeThunk ( // ASSERT (FALSE); } - + return EFI_SUCCESS; } diff --git a/IntelFrameworkModulePkg/Include/Guid/AcpiVariableCompatibility.h b/IntelFrameworkModulePkg/Include/Guid/AcpiVariableCompatibility.h index 6c9f851543..3a247885ed 100644 --- a/IntelFrameworkModulePkg/Include/Guid/AcpiVariableCompatibility.h +++ b/IntelFrameworkModulePkg/Include/Guid/AcpiVariableCompatibility.h @@ -1,7 +1,7 @@ /** @file Definitions for data structures used in S3 resume. -Copyright (c) 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -62,8 +62,8 @@ typedef struct { // // S3 Debug extension // - EFI_PHYSICAL_ADDRESS S3DebugBufferAddress; - EFI_PHYSICAL_ADDRESS S3ResumeNvsEntryPoint; + EFI_PHYSICAL_ADDRESS S3DebugBufferAddress; + EFI_PHYSICAL_ADDRESS S3ResumeNvsEntryPoint; } ACPI_VARIABLE_SET_COMPATIBILITY; #endif diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h index e22babc5b6..caa953b520 100644 --- a/IntelFrameworkModulePkg/Include/Guid/BdsHii.h +++ b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h @@ -1,13 +1,13 @@ /** @file GUIDs used as HII FormSet and HII Package list GUID in BdsDxe driver. - -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. +http://opensource.org/licenses/bsd-license.php. -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h index 1a2bb024c4..8834219a5c 100644 --- a/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h +++ b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h @@ -1,13 +1,13 @@ /** @file GUID used as HII Package list GUID in GenericBdsLib module. - -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. +http://opensource.org/licenses/bsd-license.php. -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h index 71aa05a595..8a80b98043 100644 --- a/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h +++ b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h @@ -1,13 +1,13 @@ /** @file Guid for unrecognized EDD 3.0 device. -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h index 7e97d17f23..e50ce6fa9b 100644 --- a/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h +++ b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h @@ -1,13 +1,13 @@ /** @file GUID to specify which FFS file to store the updated capsule data. -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h index a03a09712c..820213a539 100644 --- a/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h +++ b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h @@ -1,14 +1,14 @@ /** @file GUID used to identify Data Hub records logged by Status Code Protocol. - -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h index fae0839791..15cf19f1f8 100644 --- a/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h +++ b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h @@ -1,13 +1,13 @@ /** @file GUID used as EFI Variable for the device path of Boot file on HardDevice. - -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. +http://opensource.org/licenses/bsd-license.php. -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/IntelFrameworkModulePkgTokenSpace.h b/IntelFrameworkModulePkg/Include/Guid/IntelFrameworkModulePkgTokenSpace.h index a80c2315ba..36b37c70b4 100644 --- a/IntelFrameworkModulePkg/Include/Guid/IntelFrameworkModulePkgTokenSpace.h +++ b/IntelFrameworkModulePkg/Include/Guid/IntelFrameworkModulePkgTokenSpace.h @@ -1,13 +1,13 @@ /** @file - GUID for IntelFrameworkModulePkg PCD Token Space + GUID for IntelFrameworkModulePkg PCD Token Space -Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h index 8d9e37fab2..9193df2e9e 100644 --- a/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h +++ b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h @@ -1,13 +1,13 @@ /** @file GUID used as EFI variable to store platform language at last time enumeration. - -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. +http://opensource.org/licenses/bsd-license.php. -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define __LAST_ENUM_LANGUAGE_GUID_H__ /// -/// This GUID is used for Set/Get platform language into/from variable at last time enumeration +/// This GUID is used for Set/Get platform language into/from variable at last time enumeration /// to ensure the enumeration will only execute once. /// #define LAST_ENUM_LANGUAGE_GUID \ diff --git a/IntelFrameworkModulePkg/Include/Guid/LegacyBios.h b/IntelFrameworkModulePkg/Include/Guid/LegacyBios.h index 1fcea9ccfb..793f3425ba 100644 --- a/IntelFrameworkModulePkg/Include/Guid/LegacyBios.h +++ b/IntelFrameworkModulePkg/Include/Guid/LegacyBios.h @@ -1,11 +1,11 @@ /** @file Defines a Tag GUID used to mark a UEFI legacy BIOS thunk driver based - on legacy BIOS services and legacy option ROM. This Tag GUID must be installed on - the ImageHandle of any module that follows the EFI Driver Model and uses + on legacy BIOS services and legacy option ROM. This Tag GUID must be installed on + the ImageHandle of any module that follows the EFI Driver Model and uses the Int86() or FarCall() services of the Legacy Bios Protocol to produce a standard UEFI I/O Protocol. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -22,8 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define _LEGACY_BIOS_H_ /// -/// The Global ID for the Legacy BIOS GUID that must be installed onto the ImageHandle -/// of any module follows the EFI Driver Model and uses the Int86() or FarCall() +/// The Global ID for the Legacy BIOS GUID that must be installed onto the ImageHandle +/// of any module follows the EFI Driver Model and uses the Int86() or FarCall() /// services of the Legacy BIOS Protocol to produce a standard UEFI I/O Protocol. /// #define EFI_LEGACY_BIOS_GUID \ diff --git a/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h index 684f098d58..2dfeb52bcd 100644 --- a/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h +++ b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h @@ -2,13 +2,13 @@ Guid of a NV Variable which store the information about the FD/HD/CD/NET/BEV order. -Copyright (c) 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h b/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h index 7c2a6a6b93..526300d150 100644 --- a/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h +++ b/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h @@ -1,13 +1,13 @@ /** @file Tiano Custom decompress Guid definition. - -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define __TIANO_CUSTOM_DECOMPRESS_GUID_H__ /// -/// The Global ID used to identify a section of an FFS file of type -/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using +/// The Global ID used to identify a section of an FFS file of type +/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using /// Tiano Custom compression. /// #define TIANO_CUSTOM_DECOMPRESS_GUID \ diff --git a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h index c338c4d022..c0bb371a9d 100644 --- a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h +++ b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h @@ -4,13 +4,13 @@ 2) BDS boot device connect interface. 3) BDS Misc interfaces for mainting boot variable, ouput string. -Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -134,51 +134,51 @@ BdsLibBootViaBootOption ( /** This function will enumerate all possible boot devices in the system, and - automatically create boot options for Network, Shell, Removable BlockIo, - and Non-BlockIo Simplefile devices. - + automatically create boot options for Network, Shell, Removable BlockIo, + and Non-BlockIo Simplefile devices. + BDS separates EFI boot options into six types: - 1. Network - The boot option points to the SimpleNetworkProtocol device. + 1. Network - The boot option points to the SimpleNetworkProtocol device. Bds will try to automatically create this type of boot option during enumeration. - 2. Shell - The boot option points to internal flash shell. + 2. Shell - The boot option points to internal flash shell. Bds will try to automatically create this type of boot option during enumeration. 3. Removable BlockIo - The boot option points to a removable media device, such as a USB flash drive or DVD drive. These devices should contain a *removable* blockIo protocol in their device handle. - Bds will try to automatically create this type boot option + Bds will try to automatically create this type boot option when enumerate. - 4. Fixed BlockIo - The boot option points to a Fixed blockIo device, + 4. Fixed BlockIo - The boot option points to a Fixed blockIo device, such as a hard disk. These devices should contain a *fixed* blockIo protocol in their device handle. BDS will skip fixed blockIo devices, and not - automatically create boot option for them. But BDS - will help to delete those fixed blockIo boot options, + automatically create boot option for them. But BDS + will help to delete those fixed blockIo boot options, whose description rules conflict with other auto-created boot options. - 5. Non-BlockIo Simplefile - The boot option points to a device whose handle + 5. Non-BlockIo Simplefile - The boot option points to a device whose handle has SimpleFileSystem Protocol, but has no blockio protocol. These devices do not offer blockIo - protocol, but BDS still can get the + protocol, but BDS still can get the \EFI\BOOT\boot{machinename}.EFI by SimpleFileSystem Protocol. - 6. File - The boot option points to a file. These boot options are usually + 6. File - The boot option points to a file. These boot options are usually created by the user, either manually or with an OS loader. BDS will not delete or modify - these boot options. - + these boot options. + This function will enumerate all possible boot devices in the system, and - automatically create boot options for Network, Shell, Removable BlockIo, + automatically create boot options for Network, Shell, Removable BlockIo, and Non-BlockIo Simplefile devices. It will execute once every boot. - + @param BdsBootOptionList The header of the linked list that indexed all current boot options. - @retval EFI_SUCCESS Finished all the boot device enumerations and + @retval EFI_SUCCESS Finished all the boot device enumerations and created the boot option based on the boot device. - @retval EFI_OUT_OF_RESOURCES Failed to enumerate the boot device and create + @retval EFI_OUT_OF_RESOURCES Failed to enumerate the boot device and create the boot option list. **/ EFI_STATUS @@ -190,7 +190,7 @@ BdsLibEnumerateAllBootOption ( /** Build the boot option with the handle parsed in. - @param Handle The handle representing the device path for which + @param Handle The handle representing the device path for which to create a boot option. @param BdsBootOptionList The header of the link list that indexed all current boot options. @@ -283,8 +283,8 @@ BdsLibBuildOptionFromVar ( @param VendorGuid The GUID part of the EFI variable name. @param VariableSize Returns the size of the EFI variable that was read. - @return Dynamically allocated memory that contains a copy - of the EFI variable. The caller is responsible for + @return Dynamically allocated memory that contains a copy + of the EFI variable. The caller is responsible for freeing the buffer. @retval NULL The variable was not read. @@ -366,7 +366,7 @@ BdsLibRegisterNewOption ( // Bds connect and disconnect driver lib funcions // /** - This function connects all system drivers with the corresponding controllers. + This function connects all system drivers with the corresponding controllers. **/ VOID @@ -407,12 +407,12 @@ BdsLibConnectDevicePath ( ); /** - This function will connect all current system handles recursively. - gBS->ConnectController() service is invoked for each handle exist in system handler buffer. + This function will connect all current system handles recursively. + gBS->ConnectController() service is invoked for each handle exist in system handler buffer. If the handle is bus type handler, all childrens also will be connected recursively by gBS->ConnectController(). - + @retval EFI_SUCCESS All handles and child handles have been - connected. + connected. @retval EFI_STATUS Return the status of gBS->LocateHandleBuffer(). **/ EFI_STATUS @@ -422,10 +422,10 @@ BdsLibConnectAllEfi ( ); /** - This function will disconnect all current system handles. - gBS->DisconnectController() is invoked for each handle exists in system handle buffer. + This function will disconnect all current system handles. + gBS->DisconnectController() is invoked for each handle exists in system handle buffer. If handle is a bus type handle, all childrens also are disconnected recursively by gBS->DisconnectController(). - + @retval EFI_SUCCESS All handles have been disconnected. @retval EFI_STATUS Error status returned by of gBS->LocateHandleBuffer(). @@ -535,7 +535,7 @@ BdsLibConnectConsoleVariable ( // Bds device path related lib functions // /** - Delete the instance in Multi that overlaps with Single. + Delete the instance in Multi that overlaps with Single. @param Multi A pointer to a multi-instance device path data structure. @@ -563,9 +563,9 @@ BdsLibDelPartMatchInstance ( @param Single A pointer to a single-instance device path data structure. - @retval TRUE If the Single device path is contained within a + @retval TRUE If the Single device path is contained within a Multi device path. - @retval FALSE The Single device path is not contained within a + @retval FALSE The Single device path is not contained within a Multi device path. **/ @@ -657,7 +657,7 @@ BdsDeleteAllInvalidLegacyBootOptions ( /** Add the legacy boot options from BBS table if they do not exist. - @retval EFI_SUCCESS The boot options were added successfully, + @retval EFI_SUCCESS The boot options were added successfully, or they are already in boot options. @retval EFI_NOT_FOUND No legacy boot options is found. @retval EFI_OUT_OF_RESOURCE No enough memory. @@ -670,7 +670,7 @@ BdsAddNonExistingLegacyBootOptions ( ); /** - Add the legacy boot devices from BBS table into + Add the legacy boot devices from BBS table into the legacy device boot order. @retval EFI_SUCCESS The boot devices were added successfully. @@ -689,7 +689,7 @@ BdsUpdateLegacyDevOrder ( Refresh the boot priority for BBS entries based on boot option entry and boot order. @param Entry The boot option is to be checked for a refreshed BBS table. - + @retval EFI_SUCCESS The boot priority for BBS entries refreshed successfully. @retval EFI_NOT_FOUND BBS entries can't be found. @retval EFI_OUT_OF_RESOURCES Failed to get the legacy device boot order. @@ -858,7 +858,7 @@ MatchPartitionDevicePathNode ( /** Expand a device path that starts with a hard drive media device path node to be a - full device path that includes the full hardware path to the device. This function enables the device to boot. + full device path that includes the full hardware path to the device. This function enables the device to boot. To avoid requiring a connect on every boot, the front match is saved in a variable (the part point to the partition node. E.g. ACPI() /PCI()/ATA()/Partition() ). All successful history device paths @@ -875,7 +875,7 @@ EFIAPI BdsExpandPartitionPartialDevicePathToFull ( IN HARDDRIVE_DEVICE_PATH *HardDriveDevicePath ); - + /** Return the bootable media handle. First, check whether the device is connected. @@ -892,7 +892,7 @@ EFIAPI BdsLibGetBootableHandle ( IN EFI_DEVICE_PATH_PROTOCOL *DevicePath ); - + /** Checks whether the Device path in a boot option points to a valid bootable device, and if the device @@ -941,21 +941,21 @@ BdsLibIsValidEFIBootOptDevicePathExt ( @param DevicePath The bootable device Path to check. @retval BDS_EFI_MEDIA_HD_BOOT The given device path contains MEDIA_DEVICE_PATH type device path node, - whose subtype is MEDIA_HARDDRIVE_DP. - @retval BDS_EFI_MEDIA_CDROM_BOOT If given device path contains MEDIA_DEVICE_PATH type device path node, - whose subtype is MEDIA_CDROM_DP. - @retval BDS_EFI_ACPI_FLOPPY_BOOT A given device path contains ACPI_DEVICE_PATH type device path node, - whose HID is floppy device. - @retval BDS_EFI_MESSAGE_ATAPI_BOOT A given device path contains MESSAGING_DEVICE_PATH type device path node, - and its last device path node's subtype is MSG_ATAPI_DP. + whose subtype is MEDIA_HARDDRIVE_DP. + @retval BDS_EFI_MEDIA_CDROM_BOOT If given device path contains MEDIA_DEVICE_PATH type device path node, + whose subtype is MEDIA_CDROM_DP. + @retval BDS_EFI_ACPI_FLOPPY_BOOT A given device path contains ACPI_DEVICE_PATH type device path node, + whose HID is floppy device. + @retval BDS_EFI_MESSAGE_ATAPI_BOOT A given device path contains MESSAGING_DEVICE_PATH type device path node, + and its last device path node's subtype is MSG_ATAPI_DP. @retval BDS_EFI_MESSAGE_SCSI_BOOT A given device path contains MESSAGING_DEVICE_PATH type device path node, - and its last device path node's subtype is MSG_SCSI_DP. - @retval BDS_EFI_MESSAGE_USB_DEVICE_BOOT A given device path contains MESSAGING_DEVICE_PATH type device path node, + and its last device path node's subtype is MSG_SCSI_DP. + @retval BDS_EFI_MESSAGE_USB_DEVICE_BOOT A given device path contains MESSAGING_DEVICE_PATH type device path node, and its last device path node's subtype is MSG_USB_DP. - @retval BDS_EFI_MESSAGE_MISC_BOOT The device path does not contain any media device path node, and - its last device path node points to a message device path node. - @retval BDS_LEGACY_BBS_BOOT A given device path contains BBS_DEVICE_PATH type device path node. - @retval BDS_EFI_UNSUPPORT An EFI Removable BlockIO device path does not point to a media and message device. + @retval BDS_EFI_MESSAGE_MISC_BOOT The device path does not contain any media device path node, and + its last device path node points to a message device path node. + @retval BDS_LEGACY_BBS_BOOT A given device path contains BBS_DEVICE_PATH type device path node. + @retval BDS_EFI_UNSUPPORT An EFI Removable BlockIO device path does not point to a media and message device. **/ UINT32 @@ -975,12 +975,12 @@ EFIAPI BdsLibSaveMemoryTypeInformation ( VOID ); - + /** Identify a user and, if authenticated, returns the current user profile handle. @param[out] User Points to the user profile handle. - + @retval EFI_SUCCESS The user is successfully identified, or user identification is not supported. @retval EFI_ACCESS_DENIED The user was not successfully identified. @@ -990,7 +990,7 @@ EFI_STATUS EFIAPI BdsLibUserIdentify ( OUT EFI_USER_PROFILE_HANDLE *User - ); + ); /** This function checks if a Fv file device path is valid, according to a file GUID. If it is invalid, @@ -1030,7 +1030,7 @@ BdsLibUpdateFvFileDevicePath ( path. @retval EFI_SUCCESS The specific Usb device is connected successfully. - @retval EFI_INVALID_PARAMETER Invalid HostControllerPi (not 0x00, 0x20 or 0xFF) + @retval EFI_INVALID_PARAMETER Invalid HostControllerPi (not 0x00, 0x20 or 0xFF) or RemainingDevicePath is not the USB class device path. @retval EFI_NOT_FOUND The device specified by device path is not found. @@ -1041,7 +1041,7 @@ BdsLibConnectUsbDevByShortFormDP( IN UINT8 HostControllerPI, IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath ); - + // // The implementation of this function is provided by Platform code. @@ -1098,7 +1098,7 @@ EnableQuietBoot ( /** - Use SystemTable ConOut to turn on video based Simple Text Out consoles. The + Use SystemTable ConOut to turn on video based Simple Text Out consoles. The Simple Text Out screens will now be synced up with all non-video output devices. @retval EFI_SUCCESS UGA devices are back in text mode and synced up. diff --git a/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h b/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h index f971e670f0..d160d722b5 100644 --- a/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h +++ b/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h @@ -1,14 +1,14 @@ /** @file - Platform BDS library definition. A platform can implement + Platform BDS library definition. A platform can implement instances to support platform-specific behavior. -Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -54,7 +54,7 @@ EFI_STATUS @retval EFI_SUCCESS There is no error when processing a capsule. **/ -typedef +typedef EFI_STATUS (EFIAPI *PROCESS_CAPSULES)( IN EFI_BOOT_MODE BootMode @@ -92,7 +92,7 @@ PlatformBdsPolicyBehavior ( ); /** - Hook point for a user-provided function, for after a boot attempt fails. + Hook point for a user-provided function, for after a boot attempt fails. @param Option A pointer to Boot Option that failed to boot. @param Status The status returned from failed boot. diff --git a/IntelFrameworkModulePkg/Include/Protocol/IsaAcpi.h b/IntelFrameworkModulePkg/Include/Protocol/IsaAcpi.h index 7de3504417..4ac2bea127 100644 --- a/IntelFrameworkModulePkg/Include/Protocol/IsaAcpi.h +++ b/IntelFrameworkModulePkg/Include/Protocol/IsaAcpi.h @@ -2,13 +2,13 @@ EFI ISA ACPI Protocol is used to enumerate and manage all the ISA controllers on the platform's ISA Bus. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -71,13 +71,13 @@ typedef struct _EFI_ISA_ACPI_PROTOCOL EFI_ISA_ACPI_PROTOCOL; #define EFI_ISA_ACPI_IO_DECODE_16_BITS 0x02 ///< ISA controllers uses a 16-bit address decoder for I/O cycles. /// -/// EFI ISA ACPI resource type +/// EFI ISA ACPI resource type /// typedef enum { EfiIsaAcpiResourceEndOfList, ///< Marks the end if a resource list. EfiIsaAcpiResourceIo, ///< ISA I/O port resource range. EfiIsaAcpiResourceMemory, ///< ISA MMIO resource range. - EfiIsaAcpiResourceDma, ///< ISA DMA resource. + EfiIsaAcpiResourceDma, ///< ISA DMA resource. EfiIsaAcpiResourceInterrupt ///< ISA interrupt resource. } EFI_ISA_ACPI_RESOURCE_TYPE; @@ -112,10 +112,10 @@ typedef struct { This service allows all the ISA controllers on an ISA bus to be enumerated. If Device is a pointer to a NULL value, then the first ISA controller on the ISA - bus is returned in Device and EFI_SUCCESS is returned. If Device is a pointer - to a value that was returned on a prior call to DeviceEnumerate(), then the next + bus is returned in Device and EFI_SUCCESS is returned. If Device is a pointer + to a value that was returned on a prior call to DeviceEnumerate(), then the next ISA controller on the ISA bus is returned in Device and EFI_SUCCESS is returned. - If Device is a pointer to the last ISA controller on the ISA bus, then + If Device is a pointer to the last ISA controller on the ISA bus, then EFI_NOT_FOUND is returned. @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance. @@ -135,8 +135,8 @@ EFI_STATUS /** Sets the power state of an ISA controller. - This services sets the power state of the ISA controller specified by Device to - the power state specified by OnOff. TRUE denotes on, FALSE denotes off. + This services sets the power state of the ISA controller specified by Device to + the power state specified by OnOff. TRUE denotes on, FALSE denotes off. If the power state is sucessfully set on the ISA Controller, then EFI_SUCCESS is returned. @@ -155,11 +155,11 @@ EFI_STATUS IN EFI_ISA_ACPI_DEVICE_ID *Device, IN BOOLEAN OnOff ); - + /** Retrieves the current set of resources associated with an ISA controller. - Retrieves the set of I/O, MMIO, DMA, and interrupt resources currently + Retrieves the set of I/O, MMIO, DMA, and interrupt resources currently assigned to the ISA controller specified by Device. These resources are returned in ResourceList. @@ -209,7 +209,7 @@ EFI_STATUS @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance. @param[in] Device The pointer to an ISA controller named by ACPI HID/UID. - @param[in] ResourceList The pointer to a resources list that must be one of the + @param[in] ResourceList The pointer to a resources list that must be one of the resource lists returned by GetPosResource() for the ISA controller specified by Device. @@ -223,7 +223,7 @@ EFI_STATUS IN EFI_ISA_ACPI_PROTOCOL *This, IN EFI_ISA_ACPI_DEVICE_ID *Device, IN EFI_ISA_ACPI_RESOURCE_LIST *ResourceList - ); + ); /** Enables or disables an ISA controller. @@ -243,7 +243,7 @@ EFI_STATUS IN EFI_ISA_ACPI_PROTOCOL *This, IN EFI_ISA_ACPI_DEVICE_ID *Device, IN BOOLEAN Enable - ); + ); /** Initializes an ISA controller, so that it can be used. This service must be called @@ -261,14 +261,14 @@ EFI_STATUS (EFIAPI *EFI_ISA_ACPI_INIT_DEVICE)( IN EFI_ISA_ACPI_PROTOCOL *This, IN EFI_ISA_ACPI_DEVICE_ID *Device - ); + ); /** - Initializes all the HW states required for the ISA controllers on the ISA bus + Initializes all the HW states required for the ISA controllers on the ISA bus to be enumerated and managed by the rest of the services in this prorotol. This service must be called before any of the other services in this protocol will function as expected. - + @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance. @retval EFI_SUCCESS Successfully initialized all required hardware states. @@ -283,9 +283,9 @@ EFI_STATUS /// /// The EFI_ISA_ACPI_PROTOCOL provides the services to enumerate and manage -/// ISA controllers on an ISA bus. These services include the ability to initialize, -/// enable, disable, and manage the power state of ISA controllers. It also -/// includes services to query current resources, query possible resources, +/// ISA controllers on an ISA bus. These services include the ability to initialize, +/// enable, disable, and manage the power state of ISA controllers. It also +/// includes services to query current resources, query possible resources, /// and assign resources to an ISA controller. /// struct _EFI_ISA_ACPI_PROTOCOL { @@ -300,5 +300,5 @@ struct _EFI_ISA_ACPI_PROTOCOL { }; extern EFI_GUID gEfiIsaAcpiProtocolGuid; - + #endif diff --git a/IntelFrameworkModulePkg/Include/Protocol/IsaIo.h b/IntelFrameworkModulePkg/Include/Protocol/IsaIo.h index cf6632e737..c81a5d1e0e 100644 --- a/IntelFrameworkModulePkg/Include/Protocol/IsaIo.h +++ b/IntelFrameworkModulePkg/Include/Protocol/IsaIo.h @@ -1,14 +1,14 @@ /** @file - ISA I/O Protocol is used by ISA device drivers to perform I/O, MMIO and DMA + ISA I/O Protocol is used by ISA device drivers to perform I/O, MMIO and DMA operations on the ISA controllers they manage. - -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -84,7 +84,7 @@ typedef enum { EfiIsaIoOperationBusMasterWrite, /// /// Provides both read and write access to system memory by both the processor - /// and a bus master. The buffer is coherent from both the processor's and the + /// and a bus master. The buffer is coherent from both the processor's and the /// bus master's point of view. /// EfiIsaIoOperationBusMasterCommonBuffer, @@ -102,15 +102,15 @@ typedef enum { /** Performs ISA I/O and MMIO Read/Write Cycles - @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. + @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @param[in] Width Specifies the width of the I/O or MMIO operation. - @param[in] Offset The offset into the ISA I/O or MMIO space to start the - operation. + @param[in] Offset The offset into the ISA I/O or MMIO space to start the + operation. @param[in] Count The number of I/O or MMIO operations to perform. - @param[in, out] Buffer For read operations, the destination buffer to store - the results. For write operations, the source buffer to - write data from. - + @param[in, out] Buffer For read operations, the destination buffer to store + the results. For write operations, the source buffer to + write data from. + @retval EFI_SUCCESS The data was successfully read from or written to the device. @retval EFI_UNSUPPORTED The Offset is not valid for this device. @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid. @@ -171,48 +171,48 @@ EFI_STATUS Maps a memory region for DMA. This function returns the device-specific addresses required to access system memory. - This function is used to map system memory for ISA DMA operations. All ISA DMA - operations must be performed through their mapped addresses, and such mappings must + This function is used to map system memory for ISA DMA operations. All ISA DMA + operations must be performed through their mapped addresses, and such mappings must be freed with EFI_ISA_IO_PROTOCOL.Unmap() after the DMA operation is completed. - - If the DMA operation is a single read or write data transfer through an ISA bus - master, then EfiIsaIoOperationBusMasterRead or EfiIsaIoOperationBusMasterWrite + + If the DMA operation is a single read or write data transfer through an ISA bus + master, then EfiIsaIoOperationBusMasterRead or EfiIsaIoOperationBusMasterWrite is used and the range is unmapped to complete the operation. If the DMA operation - is a single read or write data transfer through an ISA slave controller, then - EfiIsaIoOperationSlaveRead or EfiIsaIoOperationSlaveWrite is used and the range - is unmapped to complete the operation. - - If performing a DMA read operation, all the data must be present in system memory before the Map() is performed. Similarly, - if performing a DMA write operation, the data must not be accessed in system - memory until EFI_ISA_IO_PROTOCOL.Unmap() is performed. Bus master operations that - require both read and write access or require multiple host device interactions - within the same mapped region must use EfiIsaIoOperationBusMasterCommonBuffer. - However, only memory allocated via the EFI_ISA_IO_PROTOCOL.AllocateBuffer() interface - is guaranteed to be able to be mapped for this operation type. In all mapping + is a single read or write data transfer through an ISA slave controller, then + EfiIsaIoOperationSlaveRead or EfiIsaIoOperationSlaveWrite is used and the range + is unmapped to complete the operation. + + If performing a DMA read operation, all the data must be present in system memory before the Map() is performed. Similarly, + if performing a DMA write operation, the data must not be accessed in system + memory until EFI_ISA_IO_PROTOCOL.Unmap() is performed. Bus master operations that + require both read and write access or require multiple host device interactions + within the same mapped region must use EfiIsaIoOperationBusMasterCommonBuffer. + However, only memory allocated via the EFI_ISA_IO_PROTOCOL.AllocateBuffer() interface + is guaranteed to be able to be mapped for this operation type. In all mapping requests the NumberOfBytes returned may be less than originally requested. It is the caller's responsibility to make additional requests to complete the entire transfer. @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Operation Indicates the type of DMA (slave or bus master), - and if the DMA operation is going to read or - write to system memory. - @param[in] ChannelNumber The slave channel number to use for this DMA - operation. If Operation and ChannelAttributes - shows that this device performs bus mastering - DMA, then this field is ignored. The legal + @param[in] Operation Indicates the type of DMA (slave or bus master), + and if the DMA operation is going to read or + write to system memory. + @param[in] ChannelNumber The slave channel number to use for this DMA + operation. If Operation and ChannelAttributes + shows that this device performs bus mastering + DMA, then this field is ignored. The legal range for this field is 0..7. @param[in] ChannelAttributes A bitmask of the attributes used to configure - the slave DMA channel for this DMA operation. + the slave DMA channel for this DMA operation. See EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_* for the legal bit combinations. @param[in] HostAddress The system memory address to map to the device. - @param[in, out] NumberOfBytes On input the number of bytes to map. On + @param[in, out] NumberOfBytes On input the number of bytes to map. On output the number of bytes that were mapped. - @param[out] DeviceAddress The resulting map address for the bus master - device to use to access the hosts HostAddress. + @param[out] DeviceAddress The resulting map address for the bus master + device to use to access the hosts HostAddress. @param[out] Mapping A returned value that must be passed to into - EFI_ISA_IO_PROTOCOL.Unmap() to free all the the + EFI_ISA_IO_PROTOCOL.Unmap() to free all the the resources associated with this map request. @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @@ -239,9 +239,9 @@ EFI_STATUS /** Unmaps a memory region that was previously mapped with EFI_ISA_IO_PROTOCOL.Map(). - The EFI_ISA_IO_PROTOCOL.Map() operation is completed and any corresponding - resources are released. If the operation was EfiIsaIoOperationSlaveWrite - or EfiIsaIoOperationBusMasterWrite, the data is committed to system memory. + The EFI_ISA_IO_PROTOCOL.Map() operation is completed and any corresponding + resources are released. If the operation was EfiIsaIoOperationSlaveWrite + or EfiIsaIoOperationBusMasterWrite, the data is committed to system memory. Any resources used for the mapping are freed. @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. @@ -259,10 +259,10 @@ EFI_STATUS /** Allocates pages that are suitable for an EfiIsaIoOperationBusMasterCommonBuffer - mapping. + mapping. @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance. - @param[in] Type The type allocation to perform. + @param[in] Type The type allocation to perform. @param[in] MemoryType The type of memory to allocate. @param[in] Pages The number of pages to allocate. @param[out] HostAddress A pointer to store the base address of the allocated range. @@ -325,10 +325,10 @@ EFI_STATUS ); /// -/// The EFI_ISA_IO_PROTOCOL provides the basic Memory, I/O, and DMA interfaces -/// used to abstract accesses to ISA controllers. There is one EFI_ISA_IO_PROTOCOL -/// instance for each ISA controller on a ISA bus. A device driver that wishes -/// to manage an ISA controller in a system will have to retrieve the +/// The EFI_ISA_IO_PROTOCOL provides the basic Memory, I/O, and DMA interfaces +/// used to abstract accesses to ISA controllers. There is one EFI_ISA_IO_PROTOCOL +/// instance for each ISA controller on a ISA bus. A device driver that wishes +/// to manage an ISA controller in a system will have to retrieve the /// ISA_PCI_IO_PROTOCOL instance associated with the ISA controller. /// struct _EFI_ISA_IO_PROTOCOL { @@ -350,10 +350,10 @@ struct _EFI_ISA_IO_PROTOCOL { /// UINT32 RomSize; /// - /// A pointer to the in memory copy of the ROM image. The ISA Bus Driver is responsible + /// A pointer to the in memory copy of the ROM image. The ISA Bus Driver is responsible /// for allocating memory for the ROM image, and copying the contents of the ROM to memory /// during ISA Bus initialization. - /// + /// VOID *RomImage; }; diff --git a/IntelFrameworkModulePkg/Include/Protocol/OEMBadging.h b/IntelFrameworkModulePkg/Include/Protocol/OEMBadging.h index c56b7e725b..0e1d8cd137 100644 --- a/IntelFrameworkModulePkg/Include/Protocol/OEMBadging.h +++ b/IntelFrameworkModulePkg/Include/Protocol/OEMBadging.h @@ -1,14 +1,14 @@ /** @file - The OEM Badging Protocol defines the interface to get the OEM badging + The OEM Badging Protocol defines the interface to get the OEM badging image with the display attribute. This protocol can be produced based on OEM badging images. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -53,8 +53,8 @@ typedef enum { @param This The pointer to this protocol instance. @param Instance The visible image instance is found. @param Format The format of the image. Examples: BMP, JPEG. - @param ImageData The image data for the badge file. Currently only - supports the .bmp file format. + @param ImageData The image data for the badge file. Currently only + supports the .bmp file format. @param ImageSize The size of the image returned. @param Attribute The display attributes of the image returned. @param CoordinateX The X coordinate of the image. diff --git a/IntelFrameworkModulePkg/Include/Protocol/VgaMiniPort.h b/IntelFrameworkModulePkg/Include/Protocol/VgaMiniPort.h index e912eed213..7e6906023c 100644 --- a/IntelFrameworkModulePkg/Include/Protocol/VgaMiniPort.h +++ b/IntelFrameworkModulePkg/Include/Protocol/VgaMiniPort.h @@ -1,13 +1,13 @@ /** @file The VGA Mini Port Protocol used to set the text display mode of a VGA controller. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-This program and the accompanying materials are licensed and made available under -the terms and conditions of the BSD License that accompanies this distribution. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -30,22 +30,22 @@ typedef struct _EFI_VGA_MINI_PORT_PROTOCOL EFI_VGA_MINI_PORT_PROTOCOL; /** Sets the text display mode of a VGA controller. - - Sets the text display mode of the VGA controller to the mode specified by - ModeNumber. A ModeNumber of 0 is a request for an 80x25 text mode. A + + Sets the text display mode of the VGA controller to the mode specified by + ModeNumber. A ModeNumber of 0 is a request for an 80x25 text mode. A ModeNumber of 1 is a request for an 80x50 text mode. If ModeNumber is greater - than MaxModeNumber, then EFI_UNSUPPORTED is returned. If the VGA controller + than MaxModeNumber, then EFI_UNSUPPORTED is returned. If the VGA controller is not functioning properly, then EFI_DEVICE_ERROR is returned. If the VGA - controller is sucessfully set to the mode number specified by ModeNumber, then + controller is sucessfully set to the mode number specified by ModeNumber, then EFI_SUCCESS is returned. - + @param[in] This A pointer to the EFI_VGA_MINI_PORT_PROTOCOL instance. @param[in] ModeNumber The requested mode number. 0 for 80x25. 1 for 80x5. @retval EFI_SUCCESS The mode number was set. @retval EFI_UNSUPPORTED The mode number specified by ModeNumber is not supported. @retval EFI_DEVICE_ERROR The device is not functioning properly. - + **/ typedef EFI_STATUS @@ -69,17 +69,17 @@ struct _EFI_VGA_MINI_PORT_PROTOCOL { /// UINT64 CrtcDataRegisterOffset; /// - /// PCI Controller MMIO BAR index of the VGA text mode frame buffer. Typically + /// PCI Controller MMIO BAR index of the VGA text mode frame buffer. Typically /// set to EFI_PCI_IO_PASS_THROUGH_BAR /// UINT8 VgaMemoryBar; /// - /// PCI Controller I/O BAR index of the VGA CRTC address register. Typically + /// PCI Controller I/O BAR index of the VGA CRTC address register. Typically /// set to EFI_PCI_IO_PASS_THROUGH_BAR /// UINT8 CrtcAddressRegisterBar; /// - /// PCI Controller I/O BAR index of the VGA CRTC data register. Typically set + /// PCI Controller I/O BAR index of the VGA CRTC data register. Typically set /// to EFI_PCI_IO_PASS_THROUGH_BAR /// UINT8 CrtcDataRegisterBar; diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index 5327242172..5557b5a1cd 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -4,7 +4,7 @@ # This package contains the definitions and module implementation # which follows Intel EFI Framework Specification. # -# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -51,16 +51,16 @@ ## Include/Guid/LegacyBios.h gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { 0x97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }} - + ## Include/Guid/LegacyDevOrder.h gEfiLegacyDevOrderVariableGuid = { 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52 }} ## Include/Guid/CapsuleDataFile.h gEfiUpdateDataFileGuid = { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e }} - + ## Include/Guid/BlockIoVendor.h gBlockIoVendorGuid = { 0xcf31fac5, 0xc24e, 0x11d2, {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b }} - + ## Include/Guid/BdsHii.h gFrontPageFormSetGuid = { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }} gBootManagerFormSetGuid = { 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }} @@ -68,10 +68,10 @@ gDriverHealthFormSetGuid = { 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34 }} gBootMaintFormSetGuid = { 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22 }} gFileExploreFormSetGuid = { 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b }} - + ## Include/Guid/BdsLibHii.h gBdsLibStringPackageGuid = { 0x3b4d9b23, 0x95ac, 0x44f6, {0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 }} - + ## Include/Guid/LastEnumLang.h gLastEnumLangGuid = { 0xe8c545b, 0xa2ee, 0x470d, {0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 }} @@ -130,7 +130,7 @@ # @Prompt Turn on Legacy Support in S3 Boot gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport|TRUE|BOOLEAN|0x00010044 - ## Indicates if Framework Acpi Support protocol is installed.

+ ## Indicates if Framework Acpi Support protocol is installed.

# TRUE - Install Framework Acpi Support protocol.
# FALSE - Doesn't install Framework Acpi Support protocol.
# @Prompt Enable Framework Acpi Support @@ -201,30 +201,30 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|TRUE|BOOLEAN|0x00000004 ## Specify memory size with bytes to reserve EBDA below 640K for OPROM. - # The value should be a multiple of 4KB. + # The value should be a multiple of 4KB. # @Prompt Reserved EBDA Memory Size # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize < 0xA0000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize & 0x1000) == 0) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x8000|UINT32|0x30000005 ## Specify memory base address for OPROM to find free memory. - # Some OPROMs do not use EBDA or PMM to allocate memory for its usage, + # Some OPROMs do not use EBDA or PMM to allocate memory for its usage, # instead they find the memory filled with zero from 0x20000. # The value should be a multiple of 4KB. - # The range should be below the EBDA reserved range from + # The range should be below the EBDA reserved range from # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP. # @Prompt Reserved Memory Base Address for OPROM # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase >= 0x20000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase & 0x1000) == 0) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase|0x60000|UINT32|0x3000000c - + ## Specify memory size with bytes for OPROM to find free memory. - # The value should be a multiple of 4KB. And the range should be below the EBDA reserved range from + # The value should be a multiple of 4KB. And the range should be below the EBDA reserved range from # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP. # @Prompt Reserved Memory Size for OPROM # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize < 0x80000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize & 0x1000) == 0) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize|0x28000|UINT32|0x3000000d ## Specify memory size with page number for a pre-allocated reserved memory to be used - # by PEI in S3 phase. The default size 32K. When changing the value make sure the memory size + # by PEI in S3 phase. The default size 32K. When changing the value make sure the memory size # is large enough to meet PEI requirement in the S3 phase. # @Prompt Reserved S3 Boot ACPI Memory Size gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x8000|UINT32|0x30000006 @@ -234,13 +234,13 @@ # @Prompt Top Address of Shadowed Legacy OpROM # @Expression 0x80000001 | gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress < 0x100000 gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress|0xdffff|UINT32|0x30000008 - + ## Specify the low PMM (Post Memory Manager) size with bytes below 1MB. # The value should be a multiple of 4KB. # @Prompt Low PMM (Post Memory Manager) Size # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize < 0x100000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize & 0x1000) == 0) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize|0x10000|UINT32|0x30000009 - + ## Specify the high PMM (Post Memory Manager) size with bytes above 1MB. # The value should be a multiple of 4KB. # @Prompt High PMM (Post Memory Manager) Size diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 6c6c3d802a..d3077fd494 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -4,15 +4,15 @@ # This file is used to build all modules in IntelFrameworkModulePkg. # #Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
-#This program and the accompanying materials are licensed and made available under -#the terms and conditions of the BSD License that accompanies this distribution. +#This program and the accompanying materials are licensed and made available under +#the terms and conditions of the BSD License that accompanies this distribution. #The full text of the license may be found at -#http://opensource.org/licenses/bsd-license.php. +#http://opensource.org/licenses/bsd-license.php. # # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # -## +## ################################################################################ # @@ -42,7 +42,7 @@ CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -94,7 +94,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf - + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform @@ -178,7 +178,7 @@ [Components.IA32,Components.X64,Components.IPF] IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf - + [Components.IA32] IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf { @@ -192,7 +192,7 @@ IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf } - + [Components.IPF] IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf { diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkgExtra.uni b/IntelFrameworkModulePkg/IntelFrameworkModulePkgExtra.uni index 87e60d38de..13eb9fbeb5 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkgExtra.uni +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkgExtra.uni @@ -1,7 +1,7 @@ // /** @file // IntelFrameworkModule Package Localized Strings and Content. // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_PACKAGE_NAME -#language en-US +#string STR_PROPERTIES_PACKAGE_NAME +#language en-US "IntelFrameworkModule package" diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c index cb009e7771..ab7987acf0 100644 --- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c +++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c @@ -1,15 +1,15 @@ /** @file - UEFI and Tiano Custom Decompress Library + UEFI and Tiano Custom Decompress Library It will do Tiano or UEFI decompress with different verison parameter. - -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /** Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source. - + @param Sd The global scratch data - @param NumOfBits The number of bits to shift and read. + @param NumOfBits The number of bits to shift and read. **/ VOID FillBuf ( @@ -62,7 +62,7 @@ FillBuf ( // Calculate additional bit count read to update mBitCount // Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits); - + // // Copy NumOfBits of bits from mSubBitBuf into mBitBuf // @@ -72,8 +72,8 @@ FillBuf ( /** Get NumOfBits of bits out from mBitBuf - Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent - NumOfBits of bits from source. Returns NumOfBits of bits that are + Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent + NumOfBits of bits from source. Returns NumOfBits of bits that are popped out. @param Sd The global scratch data. @@ -92,7 +92,7 @@ GetBits ( // // Pop NumOfBits of Bits from Left - // + // OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits)); // @@ -106,7 +106,7 @@ GetBits ( /** Creates Huffman Code mapping table according to code length array. - Creates Huffman Code mapping table for Extra Set, Char&Len Set + Creates Huffman Code mapping table for Extra Set, Char&Len Set and Position Set according to code length array. If TableBits > 16, then ASSERT (). @@ -157,7 +157,7 @@ MakeTable ( for (Index = 0; Index < NumOfChar; Index++) { Count[BitLen[Index]]++; } - + Start[0] = 0; Start[1] = 0; @@ -173,7 +173,7 @@ MakeTable ( } JuBits = (UINT16) (16 - TableBits); - + Weight[0] = 0; for (Index = 1; Index <= TableBits; Index++) { Start[Index] >>= JuBits; @@ -182,7 +182,7 @@ MakeTable ( while (Index <= 16) { Weight[Index] = (UINT16) (1U << (16 - Index)); - Index++; + Index++; } Index = (UINT16) (Start[TableBits + 1] >> JuBits); @@ -223,7 +223,7 @@ MakeTable ( Sd->mRight[Avail] = Sd->mLeft[Avail] = 0; *Pointer = Avail++; } - + if (*Pointer < (2 * NC - 1)) { if ((Index3 & Mask) != 0) { Pointer = &Sd->mRight[*Pointer]; @@ -250,11 +250,11 @@ MakeTable ( /** Decodes a position value. - + Get a position value according to Position Huffman Table. @param Sd the global scratch data - + @return The position value decoded. **/ UINT32 @@ -325,7 +325,7 @@ ReadPTLen ( ASSERT (nn <= NPT); // - // Read Extra Set Code Length Array size + // Read Extra Set Code Length Array size // Number = (UINT16) GetBits (Sd, nbit); @@ -352,7 +352,7 @@ ReadPTLen ( // // If a code length is less than 7, then it is encoded as a 3-bit - // value. Or it is encoded as a series of "1"s followed by a + // value. Or it is encoded as a series of "1"s followed by a // terminating "0". The number of "1"s = Code length - 4. // if (CharC == 7) { @@ -362,15 +362,15 @@ ReadPTLen ( CharC += 1; } } - + FillBuf (Sd, (UINT16) ((CharC < 7) ? 3 : CharC - 3)); Sd->mPTLen[Index++] = (UINT8) CharC; - + // - // For Code&Len Set, + // For Code&Len Set, // After the third length of the code length concatenation, - // a 2-bit value is used to indicated the number of consecutive + // a 2-bit value is used to indicated the number of consecutive // zero lengths after the third length. // if (Index == Special) { @@ -384,13 +384,13 @@ ReadPTLen ( while (Index < nn && Index < NPT) { Sd->mPTLen[Index++] = 0; } - + return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable); } /** Reads code lengths for Char&Len Set. - + Read in and decode the Char&Len Set Code Length Array, then generate the Huffman Code mapping table for the Char&Len Set. @@ -477,7 +477,7 @@ ReadCLen ( /** Decode a character/length value. - + Read one value from mBitBuf, Get one code from mBitBuf. If it is at block boundary, generates Huffman code mapping table for Extra Set, Code&Len Set and Position Set. @@ -499,7 +499,7 @@ DecodeC ( // // Starting a new block // Read BlockSize from block header - // + // Sd->mBlockSize = (UINT16) GetBits (Sd, 16); // @@ -556,7 +556,7 @@ DecodeC ( /** Decode the source data and put the resulting data into the destination buffer. - + @param Sd The global scratch data **/ VOID @@ -575,7 +575,7 @@ Decode ( for (;;) { // // Get one code from mBitBuf - // + // CharC = DecodeC (Sd); if (Sd->mBadTableFlag != 0) { goto Done; @@ -599,7 +599,7 @@ Decode ( // Process a Pointer // CharC = (UINT16) (CharC - (BIT8 - THRESHOLD)); - + // // Get string length // @@ -630,18 +630,18 @@ Done: } /** - Given a compressed source buffer, this function retrieves the size of - the uncompressed buffer and the size of the scratch buffer required + Given a compressed source buffer, this function retrieves the size of + the uncompressed buffer and the size of the scratch buffer required to decompress the compressed source buffer. - Retrieves the size of the uncompressed buffer and the temporary scratch buffer + Retrieves the size of the uncompressed buffer and the temporary scratch buffer required to decompress the buffer specified by Source and SourceSize. If the size of the uncompressed buffer or the size of the scratch buffer cannot - be determined from the compressed data specified by Source and SourceData, + be determined from the compressed data specified by Source and SourceData, then RETURN_INVALID_PARAMETER is returned. Otherwise, the size of the uncompressed buffer is returned in DestinationSize, the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned. - This function does not have scratch buffer available to perform a thorough + This function does not have scratch buffer available to perform a thorough checking of the validity of the source data. It just retrieves the "Original Size" field from the beginning bytes of the source data and output it as DestinationSize. And ScratchSize is specific to the decompression implementation. @@ -656,16 +656,16 @@ Done: that will be generated when the compressed buffer specified by Source and SourceSize is decompressed.. @param ScratchSize A pointer to the size, in bytes, of the scratch buffer that - is required to decompress the compressed buffer specified + is required to decompress the compressed buffer specified by Source and SourceSize. - @retval RETURN_SUCCESS The size of the uncompressed data was returned - in DestinationSize and the size of the scratch + @retval RETURN_SUCCESS The size of the uncompressed data was returned + in DestinationSize and the size of the scratch buffer was returned in ScratchSize. - @retval RETURN_INVALID_PARAMETER - The size of the uncompressed data or the size of - the scratch buffer cannot be determined from - the compressed data specified by Source + @retval RETURN_INVALID_PARAMETER + The size of the uncompressed data or the size of + the scratch buffer cannot be determined from + the compressed data specified by Source and SourceSize. **/ RETURN_STATUS @@ -704,10 +704,10 @@ UefiDecompressGetInfo ( Extracts decompressed data to its original form. This function is designed so that the decompression algorithm can be implemented without using any memory services. As a result, this function is not allowed to - call any memory allocation services in its implementation. It is the caller's + call any memory allocation services in its implementation. It is the caller's responsibility to allocate and free the Destination and Scratch buffers. - If the compressed source data specified by Source is successfully decompressed - into Destination, then RETURN_SUCCESS is returned. If the compressed source data + If the compressed source data specified by Source is successfully decompressed + into Destination, then RETURN_SUCCESS is returned. If the compressed source data specified by Source is not in a valid compressed data format, then RETURN_INVALID_PARAMETER is returned. @@ -718,14 +718,14 @@ UefiDecompressGetInfo ( @param Source The source buffer containing the compressed data. @param Destination The destination buffer to store the decompressed data @param Scratch A temporary scratch buffer that is used to perform the decompression. - This is an optional parameter that may be NULL if the + This is an optional parameter that may be NULL if the required scratch buffer size is 0. @param Version 1 for UEFI Decompress algoruthm, 2 for Tiano Decompess algorithm. - @retval RETURN_SUCCESS Decompression completed successfully, and + @retval RETURN_SUCCESS Decompression completed successfully, and the uncompressed buffer is returned in Destination. - @retval RETURN_INVALID_PARAMETER - The source buffer specified by Source is corrupted + @retval RETURN_INVALID_PARAMETER + The source buffer specified by Source is corrupted (not in a valid compressed format). **/ RETURN_STATUS @@ -815,10 +815,10 @@ UefiTianoDecompress ( Extracts decompressed data to its original form. This function is designed so that the decompression algorithm can be implemented without using any memory services. As a result, this function is not allowed to - call any memory allocation services in its implementation. It is the caller's + call any memory allocation services in its implementation. It is the caller's responsibility to allocate and free the Destination and Scratch buffers. - If the compressed source data specified by Source is successfully decompressed - into Destination, then RETURN_SUCCESS is returned. If the compressed source data + If the compressed source data specified by Source is successfully decompressed + into Destination, then RETURN_SUCCESS is returned. If the compressed source data specified by Source is not in a valid compressed data format, then RETURN_INVALID_PARAMETER is returned. @@ -829,13 +829,13 @@ UefiTianoDecompress ( @param Source The source buffer containing the compressed data. @param Destination The destination buffer to store the decompressed data @param Scratch A temporary scratch buffer that is used to perform the decompression. - This is an optional parameter that may be NULL if the + This is an optional parameter that may be NULL if the required scratch buffer size is 0. - @retval RETURN_SUCCESS Decompression completed successfully, and + @retval RETURN_SUCCESS Decompression completed successfully, and the uncompressed buffer is returned in Destination. - @retval RETURN_INVALID_PARAMETER - The source buffer specified by Source is corrupted + @retval RETURN_INVALID_PARAMETER + The source buffer specified by Source is corrupted (not in a valid compressed format). **/ RETURN_STATUS @@ -853,16 +853,16 @@ UefiDecompress ( Examines a GUIDed section and returns the size of the decoded buffer and the size of an optional scratch buffer required to actually decode the data in a GUIDed section. - Examines a GUIDed section specified by InputSection. + Examines a GUIDed section specified by InputSection. If GUID for InputSection does not match the GUID that this handler supports, - then RETURN_UNSUPPORTED is returned. + then RETURN_UNSUPPORTED is returned. If the required information can not be retrieved from InputSection, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then the size required to hold the decoded buffer is returned in OututBufferSize, the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute. - + If InputSection is NULL, then ASSERT(). If OutputBufferSize is NULL, then ASSERT(). If ScratchBufferSize is NULL, then ASSERT(). @@ -905,7 +905,7 @@ TianoDecompressGetInfo ( return RETURN_INVALID_PARAMETER; } // - // Get guid attribute of guid section. + // Get guid attribute of guid section. // *SectionAttribute = ((EFI_GUID_DEFINED_SECTION2 *) InputSection)->Attributes; @@ -925,7 +925,7 @@ TianoDecompressGetInfo ( return RETURN_INVALID_PARAMETER; } // - // Get guid attribute of guid section. + // Get guid attribute of guid section. // *SectionAttribute = ((EFI_GUID_DEFINED_SECTION *) InputSection)->Attributes; @@ -943,16 +943,16 @@ TianoDecompressGetInfo ( /** Decompress a Tiano compressed GUIDed section into a caller allocated output buffer. - - Decodes the GUIDed section specified by InputSection. - If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. + + Decodes the GUIDed section specified by InputSection. + If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then InputSection is decoded into the buffer specified by OutputBuffer and the authentication status of this decode operation is returned in AuthenticationStatus. If the decoded buffer is identical to the data in InputSection, then OutputBuffer is set to point at the data in InputSection. Otherwise, the decoded data will be placed in caller allocated buffer specified by OutputBuffer. - + If InputSection is NULL, then ASSERT(). If OutputBuffer is NULL, then ASSERT(). If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT(). @@ -960,10 +960,10 @@ TianoDecompressGetInfo ( @param[in] InputSection A pointer to a GUIDed section of an FFS formatted file. - @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. + @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. @param[in] ScratchBuffer A caller allocated buffer that may be required by this function - as a scratch buffer to perform the decode operation. - @param[out] AuthenticationStatus + as a scratch buffer to perform the decode operation. + @param[out] AuthenticationStatus A pointer to the authentication status of the decoded output buffer. See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h index 3992875011..5319989782 100644 --- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h +++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h @@ -1,7 +1,7 @@ /** @file Internal data structure and interfaces defintions for UEFI and Tiano Decompress Library. - Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -115,7 +115,7 @@ GetBits ( /** Creates Huffman Code mapping table according to code length array. - Creates Huffman Code mapping table for Extra Set, Char&Len Set + Creates Huffman Code mapping table for Extra Set, Char&Len Set and Position Set according to code length array. @param Sd The global scratch data @@ -141,7 +141,7 @@ MakeTable ( Decodes a position value. Get a position value according to Position Huffman Table. - + @param Sd the global scratch data @return The position value decoded. @@ -177,7 +177,7 @@ ReadPTLen ( /** Reads code lengths for Char&Len Set. - + Read in and decode the Char&Len Set Code Length Array, then generate the Huffman Code mapping table for the Char&Len Set. @@ -191,7 +191,7 @@ ReadCLen ( /** Decode a character/length value. - + Read one value from mBitBuf, Get one code from mBitBuf. If it is at block boundary, generates Huffman code mapping table for Extra Set, Code&Len Set and Position Set. diff --git a/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c b/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c index eaed06e012..88e609d08a 100644 --- a/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c +++ b/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c @@ -1,7 +1,7 @@ /** @file Capsule Library instance to process capsule images. - Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -82,7 +82,7 @@ ValidateFmpCapsule ( if (ItemNum == FmpCapsuleHeader->EmbeddedDriverCount) { // - // No payload element + // No payload element // if (((UINT8 *)FmpCapsuleHeader + ItemOffsetList[ItemNum - 1]) < EndOfCapsule) { return EFI_SUCCESS; @@ -123,7 +123,7 @@ ValidateFmpCapsule ( } /** - Process Firmware management protocol data capsule. + Process Firmware management protocol data capsule. @param CapsuleHeader Points to a capsule header. @@ -185,15 +185,15 @@ ProcessFmpCapsuleImage ( } // - // 1. ConnectAll to ensure - // All the communication protocol required by driver in capsule installed + // 1. ConnectAll to ensure + // All the communication protocol required by driver in capsule installed // All FMP protocols are installed // BdsLibConnectAll(); // - // 2. Try to load & start all the drivers within capsule + // 2. Try to load & start all the drivers within capsule // SetDevicePathNodeLength (&MemMapNode.Header, sizeof (MemMapNode)); MemMapNode.Header.Type = HARDWARE_DEVICE_PATH; @@ -230,8 +230,8 @@ ProcessFmpCapsuleImage ( } Status = gBS->StartImage( - ImageHandle, - &ExitDataSize, + ImageHandle, + &ExitDataSize, NULL ); if (EFI_ERROR(Status)) { @@ -241,7 +241,7 @@ ProcessFmpCapsuleImage ( } // - // Connnect all again to connect drivers within capsule + // Connnect all again to connect drivers within capsule // if (FmpCapsuleHeader->EmbeddedDriverCount > 0) { BdsLibConnectAll(); @@ -318,7 +318,7 @@ ProcessFmpCapsuleImage ( TempFmpImageInfo = FmpImageInfoBuf; for (Index2 = 0; Index2 < FmpImageInfoCount; Index2++) { // - // Check all the payload entry in capsule payload list + // Check all the payload entry in capsule payload list // for (Index = FmpCapsuleHeader->EmbeddedDriverCount; Index < ItemNum; Index++) { ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]); diff --git a/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.uni b/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.uni index 78e170fa69..01455877c5 100644 --- a/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.uni +++ b/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.uni @@ -3,13 +3,13 @@ // // Capsule library instance for DXE_DRIVER and DXE_RUNTIME_DRIVER module types. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c index a3603f862f..a3c4b2b056 100644 --- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c +++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c @@ -1,7 +1,7 @@ /** @file Report Status Code Library for DXE Phase. - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -106,13 +106,13 @@ InternalReportStatusCode ( return EFI_UNSUPPORTED; } } - + // // A status code service is present in system, so pass in all the parameters to the service. // return (*mReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data); } - + return EFI_UNSUPPORTED; } @@ -508,7 +508,7 @@ ReportStatusCodeEx ( // Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL); gBS->RestoreTPL (Tpl); - + StatusCodeData = NULL; if (Tpl <= TPL_NOTIFY) { // diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c index 9c2d592fc6..178679ffb8 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c @@ -43,12 +43,12 @@ BmEndOfBdsPerfCode ( /** The constructor function register UNI strings into imageHandle. - - It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. + + It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The constructor successfully added string package. @retval Other value The constructor can't add string package. @@ -432,7 +432,7 @@ BdsCreateLegacyBootOption ( ); FreePool (Buffer); - + Buffer = NULL; NewBootOrderList = AllocateZeroPool (*BootOrderListSize + sizeof (UINT16)); @@ -593,10 +593,10 @@ BdsDeleteAllInvalidLegacyBootOptions ( return EFI_OUT_OF_RESOURCES; } } - + // // Skip Non-Legacy boot option - // + // if (!BdsIsLegacyBootOption (BootOptionVar, &BbsEntry, &BbsIndex)) { if (BootOptionVar!= NULL) { FreePool (BootOptionVar); @@ -803,7 +803,7 @@ BdsCreateOneLegacyBootOption ( /** Add the legacy boot options from BBS table if they do not exist. - @retval EFI_SUCCESS The boot options are added successfully + @retval EFI_SUCCESS The boot options are added successfully or they are already in boot options. @retval EFI_NOT_FOUND No legacy boot options is found. @retval EFI_OUT_OF_RESOURCE No enough memory. @@ -953,7 +953,7 @@ BdsFillDevOrderBuf ( @param BbsTable The BBS table. @param BbsCount The BBS Count. - @retval EFI_SUCCES The buffer is created and the EFI variable named + @retval EFI_SUCCES The buffer is created and the EFI variable named VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid is set correctly. @retval EFI_OUT_OF_RESOURCES Memmory or storage is not enough. @@ -1044,11 +1044,11 @@ BdsCreateDevOrder ( DevOrderPtr->BbsType = BBS_HARDDISK; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data); - + DevOrderPtr->BbsType = BBS_CDROM; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data); - + DevOrderPtr->BbsType = BBS_EMBED_NETWORK; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data); @@ -1075,7 +1075,7 @@ BdsCreateDevOrder ( } /** - Add the legacy boot devices from BBS table into + Add the legacy boot devices from BBS table into the legacy device boot order. @retval EFI_SUCCESS The boot devices are added successfully. @@ -1293,7 +1293,7 @@ BdsUpdateLegacyDevOrder ( NETIndex++; } NewNETPtr = NewPtr->Data; - + // // copy BEV // @@ -1517,7 +1517,7 @@ PrintBbsTable ( Set the boot priority for BBS entries based on boot option entry and boot order. @param Entry The boot option is to be checked for refresh BBS table. - + @retval EFI_SUCCESS The boot priority for BBS entries is refreshed successfully. @retval EFI_NOT_FOUND BBS entries can't be found. @retval EFI_OUT_OF_RESOURCES Failed to get the legacy device boot order. @@ -1719,7 +1719,7 @@ BdsLibDoLegacyBoot ( Status = EfiCreateEventLegacyBootEx( TPL_NOTIFY, BmEndOfBdsPerfCode, - NULL, + NULL, &LegacyBootEvent ); ASSERT_EFI_ERROR (Status); @@ -1976,7 +1976,7 @@ BdsMatchUsbWwid ( /** Find a USB device path which match the specified short-form device path start - with USB Class or USB WWID device path and load the boot file then return the + with USB Class or USB WWID device path and load the boot file then return the image handle. If ParentDevicePath is NULL, this function will search in all USB devices of the platform. If ParentDevicePath is not NULL,this function will only search in its child devices. @@ -2133,7 +2133,7 @@ BdsFindUsbDevice ( /** Expand USB Class or USB WWID device path node to be full device path of a USB - device in platform then load the boot file on this full device path and return the + device in platform then load the boot file on this full device path and return the image handle. This function support following 4 cases: @@ -2365,9 +2365,9 @@ BdsLibBootViaBootOption ( } else { DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Booting %S\n", Option->Description)); } - + DEBUG_CODE_END(); - + // // Report status code for OS Loader LoadImage. // @@ -2421,7 +2421,7 @@ BdsLibBootViaBootOption ( REPORT_STATUS_CODE ( EFI_ERROR_CODE | EFI_ERROR_MINOR, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR) - ); + ); goto Done; } @@ -2690,7 +2690,7 @@ BdsExpandPartitionPartialDevicePathToFull ( // // Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller - // If the user try to boot many OS in different HDs or partitions, in theory, + // If the user try to boot many OS in different HDs or partitions, in theory, // the HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable maybe become larger and larger. // InstanceNum = 0; @@ -3214,7 +3214,7 @@ BdsLibEnumerateAllBootOption ( // // Parse removable media followed by fixed media. - // The Removable[] array is used by the for-loop below to create removable media boot options + // The Removable[] array is used by the for-loop below to create removable media boot options // at first, and then to create fixed media boot options. // Removable[0] = FALSE; @@ -3629,7 +3629,7 @@ BdsLibGetBootableHandle ( UpdatedDevicePath = DevicePath; // - // Enter to critical section to protect the acquired BlockIo instance + // Enter to critical section to protect the acquired BlockIo instance // from getting released due to the USB mass storage hotplug event // OldTpl = gBS->RaiseTPL (TPL_CALLBACK); @@ -3653,10 +3653,10 @@ BdsLibGetBootableHandle ( } } else { // - // For removable device boot option, its contained device path only point to the removable device handle, - // should make sure all its children handles (its child partion or media handles) are created and connected. + // For removable device boot option, its contained device path only point to the removable device handle, + // should make sure all its children handles (its child partion or media handles) are created and connected. // - gBS->ConnectController (Handle, NULL, NULL, TRUE); + gBS->ConnectController (Handle, NULL, NULL, TRUE); // // Get BlockIo protocol and check removable attribute // @@ -4030,7 +4030,7 @@ BdsLibIsValidEFIBootOptDevicePathExt ( // // Check if it's a valid boot option for network boot device. - // Check if there is EfiLoadFileProtocol installed. + // Check if there is EfiLoadFileProtocol installed. // If yes, that means there is a boot option for network. // Status = gBS->LocateDevicePath ( @@ -4068,7 +4068,7 @@ BdsLibIsValidEFIBootOptDevicePathExt ( } } else { return TRUE; - } + } } // diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConnect.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConnect.c index f487aa611a..c52188424a 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConnect.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConnect.c @@ -1,7 +1,7 @@ /** @file BDS Lib functions which relate with connect the device -Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -109,7 +109,7 @@ BdsLibConnectDevicePath ( return EFI_OUT_OF_RESOURCES; } CopyOfDevicePath = DevicePath; - + do { // // The outer loop handles multi instance device paths. @@ -122,7 +122,7 @@ BdsLibConnectDevicePath ( FreePool (CopyOfDevicePath); return EFI_OUT_OF_RESOURCES; } - + Next = Instance; while (!IsDevicePathEndType (Next)) { Next = NextDevicePathNode (Next); @@ -203,8 +203,8 @@ BdsLibConnectDevicePath ( } /** - This function will connect all current system handles recursively. - + This function will connect all current system handles recursively. + gBS->ConnectController() service is invoked for each handle exist in system handler buffer. If the handle is bus type handler, all childrens also will be connected recursively by gBS->ConnectController(). @@ -247,8 +247,8 @@ BdsLibConnectAllEfi ( } /** - This function will disconnect all current system handles. - + This function will disconnect all current system handles. + gBS->DisconnectController() is invoked for each handle exists in system handle buffer. If handle is a bus type handle, all childrens also are disconnected recursively by gBS->DisconnectController(). diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c index 9c21cfcd59..167ad69c64 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c @@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Check if we need to save the EFI variable with "ConVarName" as name as NV type If ConVarName is NULL, then ASSERT(). - + @param ConVarName The name of the EFI variable. @retval TRUE Set the EFI variable as NV type. @@ -33,7 +33,7 @@ IsNvNeed ( CHAR16 *Ptr; ASSERT (ConVarName != NULL); - + Ptr = ConVarName; // @@ -47,7 +47,7 @@ IsNvNeed ( if (((INTN)((UINTN)Ptr - (UINTN)ConVarName) / sizeof (CHAR16)) <= 3) { return TRUE; } - + if ((*(Ptr - 3) == 'D') && (*(Ptr - 2) == 'e') && (*(Ptr - 1) == 'v')) { return FALSE; } else { @@ -59,20 +59,20 @@ IsNvNeed ( Fill console handle in System Table if there are no valid console handle in. Firstly, check the validation of console handle in System Table. If it is invalid, - update it by the first console device handle from EFI console variable. + update it by the first console device handle from EFI console variable. @param VarName The name of the EFI console variable. @param ConsoleGuid Specified Console protocol GUID. - @param ConsoleHandle On IN, console handle in System Table to be checked. + @param ConsoleHandle On IN, console handle in System Table to be checked. On OUT, new console handle in system table. - @param ProtocolInterface On IN, console protocol on console handle in System Table to be checked. + @param ProtocolInterface On IN, console protocol on console handle in System Table to be checked. On OUT, new console protocol on new console handle in system table. @retval TRUE System Table has been updated. @retval FALSE System Table hasn't been updated. **/ -BOOLEAN +BOOLEAN UpdateSystemTableConsole ( IN CHAR16 *VarName, IN EFI_GUID *ConsoleGuid, @@ -108,7 +108,7 @@ UpdateSystemTableConsole ( return FALSE; } } - + // // Get all possible consoles device path from EFI variable // @@ -135,7 +135,7 @@ UpdateSystemTableConsole ( FreePool (FullDevicePath); ASSERT (FALSE); } - + // // Find console device handle by device path instance // @@ -371,7 +371,7 @@ BdsLibConnectConsoleVariable ( FreePool (StartDevicePath); return EFI_UNSUPPORTED; } - + Next = Instance; while (!IsDevicePathEndType (Next)) { Next = NextDevicePathNode (Next); @@ -380,7 +380,7 @@ BdsLibConnectConsoleVariable ( SetDevicePathEndNode (Next); // // Connect the USB console - // USB console device path is a short-form device path that + // USB console device path is a short-form device path that // starts with the first element being a USB WWID // or a USB Class device path // @@ -791,7 +791,7 @@ EnableQuietBoot ( Attribute = EfiBadgingDisplayAttributeCenter; } else { Attribute = EfiBadgingDisplayAttributeCustomized; - } + } } if (Blt != NULL) { @@ -968,7 +968,7 @@ Done: Status = EFI_SUCCESS; } else { // - // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation. + // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation. // if (Blt != NULL) { FreePool (Blt); @@ -1034,7 +1034,7 @@ Done: } /** - Use SystemTable Conout to turn on video based Simple Text Out consoles. The + Use SystemTable Conout to turn on video based Simple Text Out consoles. The Simple Text Out screens will now be synced up with all non video output devices @retval EFI_SUCCESS UGA devices are back in text mode and synced up. diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c index 48938b0670..7a4a8e66b1 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c @@ -1,7 +1,7 @@ /** @file Misc BDS library function -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -51,7 +51,7 @@ BdsLibLoadDrivers ( // for (Link = BdsDriverLists->ForwardLink; Link != BdsDriverLists; Link = Link->ForwardLink) { Option = CR (Link, BDS_COMMON_OPTION, Link, BDS_LOAD_OPTION_SIGNATURE); - + // // If a load option is not marked as LOAD_OPTION_ACTIVE, // the boot manager will not automatically load the option. @@ -59,7 +59,7 @@ BdsLibLoadDrivers ( if (!IS_LOAD_OPTION_TYPE (Option->Attribute, LOAD_OPTION_ACTIVE)) { continue; } - + // // If a driver load option is marked as LOAD_OPTION_FORCE_RECONNECT, // then all of the EFI drivers in the system will be disconnected and @@ -68,7 +68,7 @@ BdsLibLoadDrivers ( if (IS_LOAD_OPTION_TYPE (Option->Attribute, LOAD_OPTION_FORCE_RECONNECT)) { ReconnectAll = TRUE; } - + // // Make sure the driver path is connected. // @@ -117,7 +117,7 @@ BdsLibLoadDrivers ( gBS->SetWatchdogTimer (0x0000, 0x0000, 0x0000, NULL); } } - + // // Process the LOAD_OPTION_FORCE_RECONNECT driver option // @@ -280,7 +280,7 @@ BdsLibRegisterNewOption ( // Notes: the description may will change base on the GetStringToken // if (CompareMem (OptionDevicePath, DevicePath, GetDevicePathSize (OptionDevicePath)) == 0) { - if (CompareMem (Description, String, StrSize (Description)) == 0) { + if (CompareMem (Description, String, StrSize (Description)) == 0) { // // Got the option, so just return // @@ -304,7 +304,7 @@ BdsLibRegisterNewOption ( OptionSize += GetDevicePathSize (DevicePath); OptionPtr = AllocateZeroPool (OptionSize); ASSERT (OptionPtr != NULL); - + TempPtr = OptionPtr; *(UINT32 *) TempPtr = LOAD_OPTION_ACTIVE; TempPtr += sizeof (UINT32); @@ -316,7 +316,7 @@ BdsLibRegisterNewOption ( if (UpdateDescription) { // - // The number in option#### to be updated. + // The number in option#### to be updated. // In this case, we must have non-NULL TempOptionPtr. // ASSERT (TempOptionPtr != NULL); @@ -375,7 +375,7 @@ BdsLibRegisterNewOption ( } return Status; } - + // // TempOptionPtr must not be NULL if TempOptionSize is not zero. // @@ -406,15 +406,15 @@ BdsLibRegisterNewOption ( /** Returns the size of a device path in bytes. - This function returns the size, in bytes, of the device path data structure - specified by DevicePath including the end of device path node. If DevicePath + This function returns the size, in bytes, of the device path data structure + specified by DevicePath including the end of device path node. If DevicePath is NULL, then 0 is returned. If the length of the device path is bigger than MaxSize, also return 0 to indicate this is an invalidate device path. @param DevicePath A pointer to a device path data structure. - @param MaxSize Max valid device path size. If big than this size, + @param MaxSize Max valid device path size. If big than this size, return error. - + @retval 0 An invalid device path. @retval Others The size of a device path in bytes. @@ -456,12 +456,12 @@ GetDevicePathSizeEx ( } /** - Returns the length of a Null-terminated Unicode string. If the length is - bigger than MaxStringLen, return length 0 to indicate that this is an + Returns the length of a Null-terminated Unicode string. If the length is + bigger than MaxStringLen, return length 0 to indicate that this is an invalidate string. This function returns the byte length of Unicode characters in the Null-terminated - Unicode string specified by String. + Unicode string specified by String. If String is NULL, then ASSERT(). If String is not aligned on a 16-bit boundary, then ASSERT(). @@ -503,7 +503,7 @@ StrSizeEx ( @retval FALSE The variable data is corrupted. **/ -BOOLEAN +BOOLEAN ValidateOption ( UINT8 *Variable, UINTN VariableSize @@ -559,9 +559,9 @@ ValidateOption ( /** Convert a single character to number. It assumes the input Char is in the scope of L'0' ~ L'9' and L'A' ~ L'F' - + @param Char The input char which need to change to a hex number. - + **/ UINTN CharToUint ( @@ -703,7 +703,7 @@ BdsLibVariableToOption ( // if (*VariableName == 'B') { NumOff = (UINT8) (sizeof (L"Boot") / sizeof (CHAR16) - 1); - Option->BootCurrent = (UINT16) (CharToUint (VariableName[NumOff+0]) * 0x1000) + Option->BootCurrent = (UINT16) (CharToUint (VariableName[NumOff+0]) * 0x1000) + (UINT16) (CharToUint (VariableName[NumOff+1]) * 0x100) + (UINT16) (CharToUint (VariableName[NumOff+2]) * 0x10) + (UINT16) (CharToUint (VariableName[NumOff+3]) * 0x1); @@ -1004,7 +1004,7 @@ BdsLibOutputStrings ( break; } } - + VA_END(Args); return Status; } @@ -1298,7 +1298,7 @@ BdsLibGetImageHeader ( } /** - This routine adjust the memory information for different memory type and + This routine adjust the memory information for different memory type and save them into the variables for next boot. **/ VOID @@ -1333,7 +1333,7 @@ BdsSetMemoryTypeInformationVariable ( } // - // Only check the the Memory Type Information variable in the boot mode + // Only check the the Memory Type Information variable in the boot mode // other than BOOT_WITH_DEFAULT_SETTINGS because the Memory Type // Information is not valid in this boot mode. // @@ -1342,8 +1342,8 @@ BdsSetMemoryTypeInformationVariable ( Status = gRT->GetVariable ( EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME, &gEfiMemoryTypeInformationGuid, - NULL, - &VariableSize, + NULL, + &VariableSize, NULL ); if (Status == EFI_BUFFER_TOO_SMALL) { @@ -1474,7 +1474,7 @@ BdsLibSaveMemoryTypeInformation ( Identify a user and, if authenticated, returns the current user profile handle. @param[out] User Point to user profile handle. - + @retval EFI_SUCCESS User is successfully identified, or user identification is not supported. @retval EFI_ACCESS_DENIED User is not successfully identified @@ -1488,7 +1488,7 @@ BdsLibUserIdentify ( { EFI_STATUS Status; EFI_USER_MANAGER_PROTOCOL *Manager; - + Status = gBS->LocateProtocol ( &gEfiUserManagerProtocolGuid, NULL, @@ -1510,15 +1510,15 @@ BdsLibUserIdentify ( then EFI_INVALID_PARAMETER is returned. @param VendorGuid A unique identifier for the vendor. @param Attributes Attributes bitmask to set for the variable. - @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, - EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or - EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero - causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is - set, then a SetVariable() call with a DataSize of zero will not cause any change to - the variable value (the timestamp associated with the variable may be updated however - even if no new data value is provided,see the description of the - EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not - be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). + @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero + causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is + set, then a SetVariable() call with a DataSize of zero will not cause any change to + the variable value (the timestamp associated with the variable may be updated however + even if no new data value is provided,see the description of the + EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not + be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). @param Data The contents for the variable. @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as @@ -1530,8 +1530,8 @@ BdsLibUserIdentify ( @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. @retval EFI_WRITE_PROTECTED The variable in question is read-only. @retval EFI_WRITE_PROTECTED The variable in question cannot be deleted. - @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS - or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo + @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS + or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo does NOT pass the validation check carried out by the firmware. @retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found. diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf index 698dd26065..bdffad175d 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf @@ -1,20 +1,20 @@ ## @file # General BDS library. -# +# # General BDS defines and produce general interfaces for platform BDS driver including: # 1) BDS boot policy interface; # 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. -# +# # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] @@ -24,7 +24,7 @@ FILE_GUID = e405ec31-ccaa-4dd4-83e8-0aec01703f7e MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = GenericBdsLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION + LIBRARY_CLASS = GenericBdsLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION CONSTRUCTOR = GenericBdsLibConstructor # @@ -43,7 +43,7 @@ String.h String.c GenericBdsStrings.uni - + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec @@ -76,7 +76,7 @@ ## SOMETIMES_CONSUMES ## SystemTable # The identifier of memory type information type in system table ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation" ## SOMETIMES_PRODUCES ## Variable:L"MemoryTypeInformation" - gEfiMemoryTypeInformationGuid + gEfiMemoryTypeInformationGuid ## SOMETIMES_CONSUMES ## Variable:L"BootXXXX" # Boot option variable ## SOMETIMES_PRODUCES ## Variable:L"BootXXXX" # Boot option variable ## SOMETIMES_CONSUMES ## Variable:L"DriverXXXX" # Driver load option. @@ -138,7 +138,7 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES # -# [BootMode] +# [BootMode] # RECOVERY_FULL ## SOMETIMES_CONSUMES # Memory Type Information variable # diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.uni b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.uni index dae4adf656..eac582a831 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.uni +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.uni @@ -6,13 +6,13 @@ // 2) BDS boot device connect interface; // 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsStrings.uni b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsStrings.uni index 53266853fa..5a2bbfcdce 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsStrings.uni +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsStrings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for Boot Option description. -// -// Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h index 2ed2b99815..3ec9ba987c 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h @@ -107,7 +107,7 @@ BdsLibGetImageHeader ( ); /** - This routine adjust the memory information for different memory type and + This routine adjust the memory information for different memory type and save them into the variables for next boot. **/ VOID @@ -125,7 +125,7 @@ BdsSetMemoryTypeInformationVariable ( @retval FALSE The variable data is corrupted. **/ -BOOLEAN +BOOLEAN ValidateOption ( UINT8 *Variable, UINTN VariableSize @@ -140,15 +140,15 @@ ValidateOption ( then EFI_INVALID_PARAMETER is returned. @param VendorGuid A unique identifier for the vendor. @param Attributes Attributes bitmask to set for the variable. - @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, - EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or - EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero - causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is - set, then a SetVariable() call with a DataSize of zero will not cause any change to - the variable value (the timestamp associated with the variable may be updated however - even if no new data value is provided,see the description of the - EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not - be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). + @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero + causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is + set, then a SetVariable() call with a DataSize of zero will not cause any change to + the variable value (the timestamp associated with the variable may be updated however + even if no new data value is provided,see the description of the + EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not + be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). @param Data The contents for the variable. @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as @@ -160,8 +160,8 @@ ValidateOption ( @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. @retval EFI_WRITE_PROTECTED The variable in question is read-only. @retval EFI_WRITE_PROTECTED The variable in question cannot be deleted. - @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS - or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo + @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS + or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo does NOT pass the validation check carried out by the firmware. @retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found. diff --git a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c index 3092184ab7..ad57764b38 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c +++ b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c @@ -1,7 +1,7 @@ /** @file Legacy Boot Maintainence UI implementation. -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2018 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -84,13 +84,13 @@ HII_VENDOR_DEVICE_PATH mLegacyBootOptionHiiVendorDevicePath = { (UINT8) (sizeof (VENDOR_DEVICE_PATH)), (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) } - }, + }, { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 } } }, { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -151,9 +151,9 @@ OrderLegacyBootOption4SameType ( UINTN BootOrderSize; UINTN Index; UINTN StartPosition; - + EFI_BOOT_MANAGER_LOAD_OPTION BootOption; - + CHAR16 OptionName[sizeof ("Boot####")]; UINT16 *BbsIndexArray; UINT16 *DeviceTypeArray; @@ -176,11 +176,11 @@ OrderLegacyBootOption4SameType ( ASSERT (*DisBootOption != NULL); for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) { - + UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]); Status = EfiBootManagerVariableToLoadOption (OptionName, &BootOption); ASSERT_EFI_ERROR (Status); - + if ((DevicePathType (BootOption.FilePath) == BBS_DEVICE_PATH) && (DevicePathSubType (BootOption.FilePath) == BBS_BBS_DP)) { // @@ -209,7 +209,7 @@ OrderLegacyBootOption4SameType ( if (BbsIndexArray[Index] == (DevOrder[DevOrderCount] & 0xFF)) { StartPosition = MIN (StartPosition, Index); NewBootOption[DevOrderCount] = BootOrder[Index]; - + if ((DevOrder[DevOrderCount] & 0xFF00) == 0xFF00) { (*DisBootOption)[*DisBootOptionCount] = BootOrder[Index]; (*DisBootOptionCount)++; @@ -283,7 +283,7 @@ UpdateBBSOption ( UINT16 *DisBootOption; UINTN DisBootOptionCount; UINTN BufferSize; - + DisMap = NULL; NewOrder = NULL; @@ -291,7 +291,7 @@ UpdateBBSOption ( EnBootOption = NULL; DisBootOption = NULL; - + DisMap = mLegacyBootOptionPrivate->MaintainMapData->DisableMap; Status = EFI_SUCCESS; @@ -470,7 +470,7 @@ UpdateBBSOption ( CurrentType++; } - + Status = gRT->SetVariable ( VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, @@ -575,8 +575,8 @@ LegacyBootOptionRouteConfig ( } Status = gBS->LocateProtocol ( - &gEfiHiiConfigRoutingProtocolGuid, - NULL, + &gEfiHiiConfigRoutingProtocolGuid, + NULL, (VOID **) &ConfigRouting ); if (EFI_ERROR (Status)) { @@ -594,7 +594,7 @@ LegacyBootOptionRouteConfig ( &BufferSize, Progress ); - ASSERT_EFI_ERROR (Status); + ASSERT_EFI_ERROR (Status); Status = UpdateBBSOption (CurrentNVMapData); @@ -690,7 +690,7 @@ GetMenuEntry ( /** Create string tokens for a menu from its help strings and display strings - + @param HiiHandle Hii Handle of the package to be updated. @param MenuOption The Menu whose string tokens need to be created @@ -817,7 +817,7 @@ UpdateLegacyDeviceOrderPage ( DEBUG ((EFI_D_ERROR, "Invalid command ID for updating page!\n")); return; } - + HiiSetString (mLegacyBootOptionPrivate->HiiHandle, STRING_TOKEN(STR_ORDER_CHANGE_PROMPT), FormTitle, NULL); CreateLegacyMenuStringToken (mLegacyBootOptionPrivate->HiiHandle, OptionMenu); @@ -859,12 +859,12 @@ UpdateLegacyDeviceOrderPage ( ASSERT (DefaultOpCodeHandle != NULL); HiiCreateDefaultOpCode ( - DefaultOpCodeHandle, - EFI_HII_DEFAULT_CLASS_STANDARD, - EFI_IFR_TYPE_NUM_SIZE_16, + DefaultOpCodeHandle, + EFI_HII_DEFAULT_CLASS_STANDARD, + EFI_IFR_TYPE_NUM_SIZE_16, *Default++ ); - + // // Create the string for oneof tag // @@ -886,7 +886,7 @@ UpdateLegacyDeviceOrderPage ( OptionsOpCodeHandle, DefaultOpCodeHandle //NULL // ); - + HiiFreeOpCodeHandle (DefaultOpCodeHandle); } @@ -894,8 +894,8 @@ UpdateLegacyDeviceOrderPage ( mLegacyBootOptionPrivate->HiiHandle, &mLegacyBootOptionGuid, LEGACY_ORDER_CHANGE_FORM_ID, - mLegacyStartOpCodeHandle, - mLegacyEndOpCodeHandle + mLegacyStartOpCodeHandle, + mLegacyEndOpCodeHandle ); HiiFreeOpCodeHandle (OptionsOpCodeHandle); @@ -966,7 +966,7 @@ AdjustOptionValue ( CurrentVal = CurrentNVMap->LegacyBEV; Default = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyBEV; } - + // // First, find the different position // if there is change, it should be only one @@ -1245,27 +1245,27 @@ GetLegacyOptionsOrder ( LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD; OptionMenu = &LegacyFDMenu; break; - + case BBS_HARDDISK: LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD; OptionMenu = &LegacyHDMenu; break; - + case BBS_CDROM: LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD; OptionMenu = &LegacyCDMenu; break; - + case BBS_EMBED_NETWORK: LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET; OptionMenu = &LegacyNETMenu; break; - + case BBS_BEV_DEVICE: LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV; OptionMenu = &LegacyBEVMenu; break; - + case BBS_UNKNOWN: default: ASSERT (FALSE); @@ -1337,7 +1337,7 @@ GetLegacyOptions ( BEVNum = 0; EfiBootManagerConnectAll (); - + // // for better user experience // 1. User changes HD configuration (e.g.: unplug HDD), here we have a chance to remove the HDD boot option @@ -1431,7 +1431,7 @@ LegacyBootMaintUiLibConstructor ( // LegacyBootOptionData = AllocateZeroPool (sizeof (LEGACY_BOOT_OPTION_CALLBACK_DATA)); ASSERT (LegacyBootOptionData != NULL); - + LegacyBootOptionData->MaintainMapData = AllocateZeroPool (sizeof (LEGACY_BOOT_MAINTAIN_DATA)); ASSERT (LegacyBootOptionData->MaintainMapData != NULL); @@ -1499,7 +1499,7 @@ LegacyBootMaintUiLibDestructor ( NULL ); ASSERT_EFI_ERROR (Status); - + HiiRemovePackages (mLegacyBootOptionPrivate->HiiHandle); FreePool (mLegacyBootOptionPrivate->MaintainMapData); diff --git a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf index 17c9cac811..79a1195ddc 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf +++ b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf @@ -1,15 +1,15 @@ ## @file # Legacy Boot Maintainence UI module is library for BDS phase. # -# Copyright (c) 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] diff --git a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiStrings.uni b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiStrings.uni index 7219db6e13..70230a723a 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiStrings.uni +++ b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiStrings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for Legacy Boot Maintainece Ui. -// -// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# @@ -46,4 +46,4 @@ #language fr-FR "Change Driver Boot Order." #string STR_DISABLE_LEGACY_DEVICE #language en-US "Disabled" #language fr-FR "Disabled" - \ No newline at end of file + diff --git a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/InternalLegacyBm.h b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/InternalLegacyBm.h index e7bdde9def..f1208d826d 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/InternalLegacyBm.h +++ b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/InternalLegacyBm.h @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -63,4 +63,4 @@ LegacyBmRefreshAllBootOption ( VOID ); -#endif // _INTERNAL_LEGACY_BM_H_ \ No newline at end of file +#endif // _INTERNAL_LEGACY_BM_H_ diff --git a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBm.c b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBm.c index 76902eced3..2e6ada170a 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBm.c +++ b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBm.c @@ -3,7 +3,7 @@ and manage the legacy boot option, all legacy boot option is getting from the legacy BBS table. -Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -237,7 +237,7 @@ LegacyBmFuzzyMatch ( ); if ((StrCmp (Description, BootOption->Description) == 0) && !BbsIndexUsed[BbsData->BbsIndex]) { // - // If devices with the same description string are connected, + // If devices with the same description string are connected, // the BbsIndex of the first device is returned for the other device also. // So, check if the BbsIndex is already being used, before assigning the BbsIndex. // @@ -264,7 +264,7 @@ LegacyBmFuzzyMatch ( ); if ((StrCmp (Description, BootOption->Description) == 0) && !BbsIndexUsed[Index]) { // - // If devices with the same description string are connected, + // If devices with the same description string are connected, // the BbsIndex of the first device is assigned for the other device also. // So, check if the BbsIndex is already being used, before assigning the corrected BbsIndex. // @@ -309,7 +309,7 @@ LegacyBmUpdateBbsIndex ( ((LegacyDevOrder != NULL) && (*LegacyDevOrderSize != 0)) ); - for (Entry = LegacyDevOrder; + for (Entry = LegacyDevOrder; Entry < (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) LegacyDevOrder + *LegacyDevOrderSize); Entry = (LEGACY_DEV_ORDER_ENTRY *) ((UINTN) Entry + sizeof (BBS_TYPE) + Entry->Length) ) { @@ -321,8 +321,8 @@ LegacyBmUpdateBbsIndex ( // Delete the old entry // CopyMem ( - &Entry->Data[Index], - &Entry->Data[Index + 1], + &Entry->Data[Index], + &Entry->Data[Index + 1], (UINT8 *) LegacyDevOrder + *LegacyDevOrderSize - (UINT8 *) &Entry->Data[Index + 1] ); Entry->Length -= sizeof (UINT16); @@ -531,7 +531,7 @@ LegacyBmCreateLegacyBootOption ( if ((BootOption == NULL) || (BbsEntry == NULL)) { return EFI_INVALID_PARAMETER; } - + LegacyBmBuildLegacyDevNameString (BbsEntry, BbsIndex, sizeof (Description), Description); // @@ -574,7 +574,7 @@ LegacyBmCreateLegacyBootOption ( ); FreePool (DevicePath); FreePool (OptionalData); - + return Status; } @@ -621,7 +621,7 @@ LegacyBmFillDevOrderBuf ( @param BbsTable The BBS table. @param BbsCount The BBS Count. - @retval EFI_SUCCES The buffer is created and the EFI variable named + @retval EFI_SUCCES The buffer is created and the EFI variable named VAR_LEGACY_DEV_ORDER and EfiLegacyDevOrderGuid is set correctly. @retval EFI_OUT_OF_RESOURCES Memmory or storage is not enough. @@ -712,11 +712,11 @@ LegacyBmCreateDevOrder ( DevOrderPtr->BbsType = BBS_HARDDISK; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data); - + DevOrderPtr->BbsType = BBS_CDROM; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data); - + DevOrderPtr->BbsType = BBS_EMBED_NETWORK; DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16)); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data); @@ -743,7 +743,7 @@ LegacyBmCreateDevOrder ( } /** - Add the legacy boot devices from BBS table into + Add the legacy boot devices from BBS table into the legacy device boot order. @retval EFI_SUCCESS The boot devices are added successfully. @@ -944,7 +944,7 @@ LegacyBmUpdateDevOrder ( NETIndex++; } NewNETPtr = NewPtr->Data; - + // // copy BEV // @@ -1164,7 +1164,7 @@ LegacyBmPrintBbsTable ( Set the boot priority for BBS entries based on boot option entry and boot order. @param BootOption The boot option is to be checked for refresh BBS table. - + @retval EFI_SUCCESS The boot priority for BBS entries is refreshed successfully. @retval EFI_NOT_FOUND BBS entries can't be found. @retval EFI_OUT_OF_RESOURCES Failed to get the legacy device boot order. @@ -1224,7 +1224,7 @@ LegacyBmRefreshBbsTableForBoot ( // // boot priority always starts at 0 // - Priority = 0; + Priority = 0; if ((DevicePathType (BootOption->FilePath) == BBS_DEVICE_PATH) && (DevicePathSubType (BootOption->FilePath) == BBS_BBS_DP)) { // @@ -1255,7 +1255,7 @@ LegacyBmRefreshBbsTableForBoot ( (DevicePathSubType (Option[Index].FilePath) != BBS_BBS_DP)) { continue; } - + DevType = LegacyBmDeviceType (Option[Index].FilePath); for (DeviceTypeIndex = 0; DeviceTypeIndex < DeviceTypeCount; DeviceTypeIndex++) { if (DeviceType[DeviceTypeIndex] == DevType) { @@ -1284,7 +1284,7 @@ LegacyBmRefreshBbsTableForBoot ( DEBUG_CODE_BEGIN(); LegacyBmPrintBbsTable (LocalBbsTable, BbsCount); DEBUG_CODE_END(); - + return Status; } @@ -1459,7 +1459,7 @@ LegacyBmRefreshAllBootOption ( PERF_START (NULL, "LegacyBootOptionEnum", "BDS", 0); // - // Before enumerating the legacy boot option, we need to dispatch all the legacy option roms + // Before enumerating the legacy boot option, we need to dispatch all the legacy option roms // to ensure the GetBbsInfo() counts all the legacy devices. // gBS->LocateHandleBuffer ( @@ -1481,7 +1481,7 @@ LegacyBmRefreshAllBootOption ( for (Index = 0; Index < HandleCount; Index++) { // // Start the thunk driver so that the legacy option rom gets dispatched. - // Note: We don't directly call InstallPciRom because some thunk drivers + // Note: We don't directly call InstallPciRom because some thunk drivers // (e.g. BlockIo thunk driver) depend on the immediate result after dispatching // Status = LegacyBios->CheckPciRom ( diff --git a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf index 4025c82886..9865ec8b06 100644 --- a/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf +++ b/IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf @@ -1,15 +1,15 @@ ## @file # Legacy Boot Manager module is library for BDS phase. # -# Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] @@ -31,7 +31,7 @@ [Sources] LegacyBm.c InternalLegacyBm.h - + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c index b02dc515f8..29150d375a 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c @@ -1,10 +1,10 @@ /** @file - LZMA Decompress GUIDed Section Extraction Library, which produces LZMA custom + LZMA Decompress GUIDed Section Extraction Library, which produces LZMA custom decompression algorithm with the converter for the different arch code. It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces and registers them into GUIDed handler table. - Copyright (c) 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -22,16 +22,16 @@ Examines a GUIDed section and returns the size of the decoded buffer and the size of an scratch buffer required to actually decode the data in a GUIDed section. - Examines a GUIDed section specified by InputSection. + Examines a GUIDed section specified by InputSection. If GUID for InputSection does not match the GUID that this handler supports, - then RETURN_UNSUPPORTED is returned. + then RETURN_UNSUPPORTED is returned. If the required information can not be retrieved from InputSection, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then the size required to hold the decoded buffer is returned in OututBufferSize, the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute. - + If InputSection is NULL, then ASSERT(). If OutputBufferSize is NULL, then ASSERT(). If ScratchBufferSize is NULL, then ASSERT(). @@ -100,16 +100,16 @@ LzmaArchGuidedSectionGetInfo ( /** Decompress a LZAM compressed GUIDed section into a caller allocated output buffer. - - Decodes the GUIDed section specified by InputSection. - If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. + + Decodes the GUIDed section specified by InputSection. + If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then InputSection is decoded into the buffer specified by OutputBuffer and the authentication status of this decode operation is returned in AuthenticationStatus. If the decoded buffer is identical to the data in InputSection, then OutputBuffer is set to point at the data in InputSection. Otherwise, the decoded data will be placed in caller allocated buffer specified by OutputBuffer. - + If InputSection is NULL, then ASSERT(). If OutputBuffer is NULL, then ASSERT(). If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT(). @@ -117,10 +117,10 @@ LzmaArchGuidedSectionGetInfo ( @param[in] InputSection A pointer to a GUIDed section of an FFS formatted file. - @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. + @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. @param[out] ScratchBuffer A caller allocated buffer that may be required by this function - as a scratch buffer to perform the decode operation. - @param[out] AuthenticationStatus + as a scratch buffer to perform the decode operation. + @param[out] AuthenticationStatus A pointer to the authentication status of the decoded output buffer. See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must @@ -147,7 +147,7 @@ LzmaArchGuidedSectionExtraction ( UINT32 X86State; UINT32 OutputBufferSize; UINT32 ScratchBufferSize; - + ASSERT (OutputBuffer != NULL); ASSERT (InputSection != NULL); @@ -178,7 +178,7 @@ LzmaArchGuidedSectionExtraction ( ); // - // After decompress, the data need to be converted to the raw data. + // After decompress, the data need to be converted to the raw data. // if (!EFI_ERROR (Status)) { Status = LzmaUefiDecompressGetInfo ( @@ -187,13 +187,13 @@ LzmaArchGuidedSectionExtraction ( &OutputBufferSize, &ScratchBufferSize ); - + if (!EFI_ERROR (Status)) { x86_Convert_Init(X86State); x86_Convert(*OutputBuffer, OutputBufferSize, 0, &X86State, 0); } } - + return Status; } diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c index 7ef9fbbfc6..c15fa8bc0f 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c @@ -3,7 +3,7 @@ It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces and registers them into GUIDed handler table. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -20,16 +20,16 @@ Examines a GUIDed section and returns the size of the decoded buffer and the size of an scratch buffer required to actually decode the data in a GUIDed section. - Examines a GUIDed section specified by InputSection. + Examines a GUIDed section specified by InputSection. If GUID for InputSection does not match the GUID that this handler supports, - then RETURN_UNSUPPORTED is returned. + then RETURN_UNSUPPORTED is returned. If the required information can not be retrieved from InputSection, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then the size required to hold the decoded buffer is returned in OututBufferSize, the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute. - + If InputSection is NULL, then ASSERT(). If OutputBufferSize is NULL, then ASSERT(). If ScratchBufferSize is NULL, then ASSERT(). @@ -98,16 +98,16 @@ LzmaGuidedSectionGetInfo ( /** Decompress a LZAM compressed GUIDed section into a caller allocated output buffer. - - Decodes the GUIDed section specified by InputSection. - If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. + + Decodes the GUIDed section specified by InputSection. + If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then InputSection is decoded into the buffer specified by OutputBuffer and the authentication status of this decode operation is returned in AuthenticationStatus. If the decoded buffer is identical to the data in InputSection, then OutputBuffer is set to point at the data in InputSection. Otherwise, the decoded data will be placed in caller allocated buffer specified by OutputBuffer. - + If InputSection is NULL, then ASSERT(). If OutputBuffer is NULL, then ASSERT(). If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT(). @@ -115,10 +115,10 @@ LzmaGuidedSectionGetInfo ( @param[in] InputSection A pointer to a GUIDed section of an FFS formatted file. - @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. + @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. @param[out] ScratchBuffer A caller allocated buffer that may be required by this function - as a scratch buffer to perform the decode operation. - @param[out] AuthenticationStatus + as a scratch buffer to perform the decode operation. + @param[out] AuthenticationStatus A pointer to the authentication status of the decoded output buffer. See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must @@ -197,6 +197,6 @@ LzmaDecompressLibConstructor ( &gLzmaCustomDecompressGuid, LzmaGuidedSectionGetInfo, LzmaGuidedSectionExtraction - ); + ); } diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt index 7a6a77f952..0824bd75cd 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt @@ -1,4 +1,4 @@ LzmaCustomDecompressLib is based on the LZMA SDK 16.04. LZMA SDK 16.04 was placed in the public domain on 2016-10-04. It was released on the -http://www.7-zip.org/sdk.html website. \ No newline at end of file +http://www.7-zip.org/sdk.html website. diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c index cdf4c08cab..501a15d99d 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c @@ -1,7 +1,7 @@ /** @file LZMA Decompress interfaces - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -105,15 +105,15 @@ GetDecodedSizeOfBuf( // /** - Given a Lzma compressed source buffer, this function retrieves the size of - the uncompressed buffer and the size of the scratch buffer required + Given a Lzma compressed source buffer, this function retrieves the size of + the uncompressed buffer and the size of the scratch buffer required to decompress the compressed source buffer. - Retrieves the size of the uncompressed buffer and the temporary scratch buffer + Retrieves the size of the uncompressed buffer and the temporary scratch buffer required to decompress the buffer specified by Source and SourceSize. - The size of the uncompressed buffer is returned in DestinationSize, + The size of the uncompressed buffer is returned in DestinationSize, the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned. - This function does not have scratch buffer available to perform a thorough + This function does not have scratch buffer available to perform a thorough checking of the validity of the source data. It just retrieves the "Original Size" field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize. And ScratchSize is specific to the decompression implementation. @@ -126,11 +126,11 @@ GetDecodedSizeOfBuf( that will be generated when the compressed buffer specified by Source and SourceSize is decompressed. @param ScratchSize A pointer to the size, in bytes, of the scratch buffer that - is required to decompress the compressed buffer specified + is required to decompress the compressed buffer specified by Source and SourceSize. - @retval RETURN_SUCCESS The size of the uncompressed data was returned - in DestinationSize and the size of the scratch + @retval RETURN_SUCCESS The size of the uncompressed data was returned + in DestinationSize and the size of the scratch buffer was returned in ScratchSize. **/ @@ -158,8 +158,8 @@ LzmaUefiDecompressGetInfo ( Decompresses a Lzma compressed source buffer. Extracts decompressed data to its original form. - If the compressed source data specified by Source is successfully decompressed - into Destination, then RETURN_SUCCESS is returned. If the compressed source data + If the compressed source data specified by Source is successfully decompressed + into Destination, then RETURN_SUCCESS is returned. If the compressed source data specified by Source is not in a valid compressed data format, then RETURN_INVALID_PARAMETER is returned. @@ -167,13 +167,13 @@ LzmaUefiDecompressGetInfo ( @param SourceSize The size of source buffer. @param Destination The destination buffer to store the decompressed data @param Scratch A temporary scratch buffer that is used to perform the decompression. - This is an optional parameter that may be NULL if the + This is an optional parameter that may be NULL if the required scratch buffer size is 0. - - @retval RETURN_SUCCESS Decompression completed successfully, and + + @retval RETURN_SUCCESS Decompression completed successfully, and the uncompressed buffer is returned in Destination. - @retval RETURN_INVALID_PARAMETER - The source buffer specified by Source is corrupted + @retval RETURN_INVALID_PARAMETER + The source buffer specified by Source is corrupted (not in a valid compressed format). **/ RETURN_STATUS @@ -195,7 +195,7 @@ LzmaUefiDecompress ( AllocFuncs.Functions.Free = SzFree; AllocFuncs.Buffer = Scratch; AllocFuncs.BufferSize = SCRATCH_BUFFER_REQUEST_SIZE; - + DecodedBufSize = (SizeT)GetDecodedSizeOfBuf((UINT8*)Source); EncodedDataSize = (SizeT) (SourceSize - LZMA_HEADER_SIZE); diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h index 3096e91dbe..ac91d66009 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h @@ -1,7 +1,7 @@ /** @file LZMA Decompress Library internal header file declares Lzma decompress interfaces. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -23,15 +23,15 @@ #include /** - Given a Lzma compressed source buffer, this function retrieves the size of - the uncompressed buffer and the size of the scratch buffer required + Given a Lzma compressed source buffer, this function retrieves the size of + the uncompressed buffer and the size of the scratch buffer required to decompress the compressed source buffer. - Retrieves the size of the uncompressed buffer and the temporary scratch buffer + Retrieves the size of the uncompressed buffer and the temporary scratch buffer required to decompress the buffer specified by Source and SourceSize. - The size of the uncompressed buffer is returned in DestinationSize, + The size of the uncompressed buffer is returned in DestinationSize, the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned. - This function does not have scratch buffer available to perform a thorough + This function does not have scratch buffer available to perform a thorough checking of the validity of the source data. It just retrieves the "Original Size" field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize. And ScratchSize is specific to the decompression implementation. @@ -44,11 +44,11 @@ that will be generated when the compressed buffer specified by Source and SourceSize is decompressed. @param ScratchSize A pointer to the size, in bytes, of the scratch buffer that - is required to decompress the compressed buffer specified + is required to decompress the compressed buffer specified by Source and SourceSize. - @retval RETURN_SUCCESS The size of the uncompressed data was returned - in DestinationSize and the size of the scratch + @retval RETURN_SUCCESS The size of the uncompressed data was returned + in DestinationSize and the size of the scratch buffer was returned in ScratchSize. **/ @@ -65,8 +65,8 @@ LzmaUefiDecompressGetInfo ( Decompresses a Lzma compressed source buffer. Extracts decompressed data to its original form. - If the compressed source data specified by Source is successfully decompressed - into Destination, then RETURN_SUCCESS is returned. If the compressed source data + If the compressed source data specified by Source is successfully decompressed + into Destination, then RETURN_SUCCESS is returned. If the compressed source data specified by Source is not in a valid compressed data format, then RETURN_INVALID_PARAMETER is returned. @@ -74,13 +74,13 @@ LzmaUefiDecompressGetInfo ( @param SourceSize The size of source buffer. @param Destination The destination buffer to store the decompressed data @param Scratch A temporary scratch buffer that is used to perform the decompression. - This is an optional parameter that may be NULL if the + This is an optional parameter that may be NULL if the required scratch buffer size is 0. - - @retval RETURN_SUCCESS Decompression completed successfully, and + + @retval RETURN_SUCCESS Decompression completed successfully, and the uncompressed buffer is returned in Destination. - @retval RETURN_INVALID_PARAMETER - The source buffer specified by Source is corrupted + @retval RETURN_INVALID_PARAMETER + The source buffer specified by Source is corrupted (not in a valid compressed format). **/ RETURN_STATUS diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c index 7b07916bbd..b0445115a9 100644 --- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c +++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c @@ -4,7 +4,7 @@ Note that if the debug message length is larger than the maximum allowable record length, then the debug message will be ignored directly. - Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -30,8 +30,8 @@ /** Prints a debug message to the debug output device if the specified error level is enabled. - If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function - GetDebugPrintErrorLevel (), then print the message specified by Format and the + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function + GetDebugPrintErrorLevel (), then print the message specified by Format and the associated variable argument list to the debug output device. If Format is NULL, then ASSERT(). @@ -41,7 +41,7 @@ @param ErrorLevel The error level of the debug message. @param Format Format string for the debug message to print. - @param ... Variable argument list whose contents are accessed + @param ... Variable argument list whose contents are accessed based on the format string specified by Format. **/ @@ -76,7 +76,7 @@ DebugPrint ( // // Compute the total size of the record. - // Note that the passing-in format string and variable parameters will be constructed to + // Note that the passing-in format string and variable parameters will be constructed to // the following layout: // // Buffer->|------------------------| @@ -172,7 +172,7 @@ DebugPrint ( if (*Format == '\0') { // // Make no output if Format string terminates unexpectedly when - // looking up for flag, width, precision and type. + // looking up for flag, width, precision and type. // Format--; } @@ -182,7 +182,7 @@ DebugPrint ( // break; } - + // // Pack variable arguments into the storage area following EFI_DEBUG_INFO. // @@ -205,7 +205,7 @@ DebugPrint ( // // If the converted BASE_LIST is larger than the 12 * sizeof (UINT64) allocated bytes, then ASSERT() - // This indicates that the DEBUG() macro is passing in more argument than can be handled by + // This indicates that the DEBUG() macro is passing in more argument than can be handled by // the EFI_DEBUG_INFO record // ASSERT ((CHAR8 *)BaseListMarker <= FormatString); @@ -235,14 +235,14 @@ DebugPrint ( } /** - Prints an assert message containing a filename, line number, and description. + Prints an assert message containing a filename, line number, and description. This may be followed by a breakpoint or a dead loop. Print a message of the form "ASSERT (): \n" - to the debug output device. If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of - PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if - DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then - CpuDeadLoop() is called. If neither of these bits are set, then this function + to the debug output device. If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of + PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if + DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then + CpuDeadLoop() is called. If neither of these bits are set, then this function returns immediately after the message is printed to the debug output device. DebugAssert() must actively prevent recursion. If DebugAssert() is called while processing another DebugAssert(), then DebugAssert() must return immediately. @@ -366,14 +366,14 @@ DebugAssert ( /** Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer. - This function fills Length bytes of Buffer with the value specified by + This function fills Length bytes of Buffer with the value specified by PcdDebugClearMemoryValue, and returns Buffer. If Buffer is NULL, then ASSERT(). - If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). + If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). @param Buffer Pointer to the target buffer to be filled with PcdDebugClearMemoryValue. - @param Length Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. + @param Length Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. @return Buffer Pointer to the target buffer filled with PcdDebugClearMemoryValue. @@ -394,7 +394,7 @@ DebugClearMemory ( /** Returns TRUE if ASSERT() macros are enabled. - This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set. Otherwise FALSE is returned. @retval TRUE The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set. @@ -411,10 +411,10 @@ DebugAssertEnabled ( } -/** +/** Returns TRUE if DEBUG() macros are enabled. - This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set. Otherwise FALSE is returned. @retval TRUE The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set. @@ -431,10 +431,10 @@ DebugPrintEnabled ( } -/** +/** Returns TRUE if DEBUG_CODE() macros are enabled. - This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set. Otherwise FALSE is returned. @retval TRUE The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set. @@ -451,10 +451,10 @@ DebugCodeEnabled ( } -/** +/** Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled. - This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of + This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set. Otherwise FALSE is returned. @retval TRUE The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set. diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf index 55446672d7..12a063f5b8 100644 --- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf +++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf @@ -2,7 +2,7 @@ # Debug Library based on report status code library # # Debug Library for PEIMs and DXE drivers that sends debug messages to ReportStatusCode -# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -36,7 +36,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - + [LibraryClasses] PcdLib ReportStatusCodeLib diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c index fc729a899c..d9430483d5 100644 --- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c +++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c @@ -3,9 +3,9 @@ This library instance is no longer used and module using this library class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined - in PI 1.2 specification. + in PI 1.2 specification. -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /** Calling this function causes the system do recovery. - + @retval EFI_SUCESS Sucess to do recovery. @retval Others Fail to do recovery. **/ @@ -36,7 +36,7 @@ PeiRecoverFirmware ( { EFI_STATUS Status; EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery; - + Status = PeiServicesLocatePpi ( &gEfiPeiRecoveryModulePpiGuid, 0, diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf index 9bd321e178..2391deb1da 100644 --- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf +++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf @@ -3,9 +3,9 @@ # # This library instance is no longer used and module using this library # class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined -# in PI 1.2 specification. +# in PI 1.2 specification. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -46,5 +46,5 @@ [Ppis] gEfiPeiRecoveryModulePpiGuid ## CONSUMES - - \ No newline at end of file + + diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c index d16e3cac24..9db5b7e09c 100644 --- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c +++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c @@ -1,11 +1,11 @@ /** @file - This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode. + This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode. This library instance is no longer used and module using this library class should update to directly locate EFI_PEI_S3_RESUME_PPI defined - in PI 1.2 specification. + in PI 1.2 specification. -Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /** This function is responsible for calling the S3 resume vector in the ACPI Tables. - + @retval EFI_SUCESS Success to restore config from S3. @retval Others Fail to restore config from S3. **/ @@ -37,7 +37,7 @@ AcpiS3ResumeOs ( { EFI_STATUS Status; EFI_PEI_S3_RESUME_PPI *S3Resume; - + Status = PeiServicesLocatePpi ( &gEfiPeiS3ResumePpiGuid, 0, @@ -46,6 +46,6 @@ AcpiS3ResumeOs ( ); ASSERT_EFI_ERROR (Status); - return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer()); + return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer()); } diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf index b01e1860f4..4b5e911d39 100644 --- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf +++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf @@ -3,9 +3,9 @@ # # This library instance is no longer used and module using this library # class should update to directly locate EFI_PEI_S3_RESUME_PPI defined -# in PI 1.2 specification. +# in PI 1.2 specification. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License diff --git a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLib.uni b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLib.uni index 1afcf5e92c..dace2de21b 100644 --- a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLib.uni +++ b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLib.uni @@ -3,13 +3,13 @@ // // NULL implementation for PlatformBdsLib library class interfaces. // -// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf index 37c98cff00..8b9077a7fb 100644 --- a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf +++ b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf @@ -1,15 +1,15 @@ ## @file # NULL implementation for PlatformBdsLib library class interfaces. -# -# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+# +# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] @@ -19,7 +19,7 @@ FILE_GUID = 143B5044-7C1B-4904-9778-EA16F1F3D554 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER + LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER # # The following information is for reference only and not required by the build tools. @@ -36,7 +36,7 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + [LibraryClasses] BaseLib MemoryAllocationLib @@ -44,4 +44,4 @@ BaseMemoryLib DebugLib PcdLib - GenericBdsLib \ No newline at end of file + GenericBdsLib diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf index 6964e44f34..ba1b836505 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf @@ -5,7 +5,7 @@ # In SMM, it logs message via SMM Status Code Protocol. # Otherwise, it logs message to ReportStatusCode() in framework runtime services table or runtime report status code protocol. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -25,7 +25,7 @@ MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 LIBRARY_CLASS = ReportStatusCodeLib|DXE_RUNTIME_DRIVER DXE_SMM_DRIVER - + CONSTRUCTOR = ReportStatusCodeLibConstruct DESTRUCTOR = ReportStatusCodeLibDestruct # diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c index 554be152b3..d97a7f7753 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c @@ -1,7 +1,7 @@ /** @file Library constructor & destructor, event handlers, and other internal worker functions. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -26,7 +26,7 @@ EFI_SMM_STATUS_CODE_PROTOCOL *mSmmStatusCodeProtocol; /** Locates and caches SMM Status Code Protocol. - + **/ VOID SmmStatusCodeInitialize ( @@ -43,20 +43,20 @@ SmmStatusCodeInitialize ( /** Report status code via SMM Status Code Protocol. - + @param Type Indicates the type of status code being reported. - @param Value Describes the current status of a hardware or software entity. - This included information about the class and subclass that is used to classify the entity - as well as an operation. For progress codes, the operation is the current activity. - For error codes, it is the exception. For debug codes, it is not defined at this time. - @param Instance The enumeration of a hardware or software entity within the system. - A system may contain multiple entities that match a class/subclass pairing. - The instance differentiates between them. An instance of 0 indicates that instance information is unavailable, + @param Value Describes the current status of a hardware or software entity. + This included information about the class and subclass that is used to classify the entity + as well as an operation. For progress codes, the operation is the current activity. + For error codes, it is the exception. For debug codes, it is not defined at this time. + @param Instance The enumeration of a hardware or software entity within the system. + A system may contain multiple entities that match a class/subclass pairing. + The instance differentiates between them. An instance of 0 indicates that instance information is unavailable, not meaningful, or not relevant. Valid instance numbers start with 1. - @param CallerId This optional parameter may be used to identify the caller. - This parameter allows the status code driver to apply different rules to different callers. + @param CallerId This optional parameter may be used to identify the caller. + This parameter allows the status code driver to apply different rules to different callers. @param Data This optional parameter may be used to pass additional data - + @retval EFI_SUCCESS Always return EFI_SUCCESS. **/ @@ -99,9 +99,9 @@ InternalGetReportStatusCode ( } else if (mInternalRT != NULL && mInternalRT->Hdr.Revision < 0x20000) { return ((FRAMEWORK_EFI_RUNTIME_SERVICES*)mInternalRT)->ReportStatusCode; } else if (!mHaveExitedBootServices) { - // - // Check gBS just in case. ReportStatusCode is called before gBS is initialized. - // + // + // Check gBS just in case. ReportStatusCode is called before gBS is initialized. + // if (gBS != NULL) { Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**)&StatusCodeProtocol); if (!EFI_ERROR (Status) && StatusCodeProtocol != NULL) { @@ -156,13 +156,13 @@ InternalReportStatusCode ( return EFI_UNSUPPORTED; } } - + // // A status code service is present in system, so pass in all the parameters to the service. // return (*mReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data); } - + return EFI_UNSUPPORTED; } @@ -220,7 +220,7 @@ ReportStatusCodeLibExitBootServices ( @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. **/ @@ -242,8 +242,8 @@ ReportStatusCodeLibConstruct ( if (mInSmm) { Status = mSmmBase->SmmAllocatePool ( mSmmBase, - EfiRuntimeServicesData, - sizeof (EFI_STATUS_CODE_DATA) + EFI_STATUS_CODE_DATA_MAX_SIZE, + EfiRuntimeServicesData, + sizeof (EFI_STATUS_CODE_DATA) + EFI_STATUS_CODE_DATA_MAX_SIZE, (VOID **) &mStatusCodeData ); ASSERT_EFI_ERROR (Status); @@ -257,7 +257,7 @@ ReportStatusCodeLibConstruct ( // If not in SMM mode, then allocate runtime memory for extended status code data. // // Library should not use the gRT directly, for it may be converted by other library instance. - // + // mInternalRT = gRT; mInSmm = FALSE; @@ -265,12 +265,12 @@ ReportStatusCodeLibConstruct ( ASSERT (mStatusCodeData != NULL); // // Cache the report status code service - // + // mReportStatusCode = InternalGetReportStatusCode (); // // Register notify function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE - // + // Status = gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, @@ -283,7 +283,7 @@ ReportStatusCodeLibConstruct ( // // Register notify function for EVT_SIGNAL_EXIT_BOOT_SERVICES - // + // Status = gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, TPL_NOTIFY, @@ -299,13 +299,13 @@ ReportStatusCodeLibConstruct ( /** The destructor function of SMM Runtime DXE Report Status Code Lib. - + The destructor function frees memory allocated by constructor, and closes related events. - It will ASSERT() if that related operation fails and it will always return EFI_SUCCESS. + It will ASSERT() if that related operation fails and it will always return EFI_SUCCESS. @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. **/ diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c index e03101cab8..fefa41a3af 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c @@ -2,7 +2,7 @@ This is an implementation of the ACPI S3 Save protocol. This is defined in S3 boot path specification 0.9. -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -55,7 +55,7 @@ EFI_ACPI_S3_SAVE_PROTOCOL mS3Save = { @param MemoryType Memory type of memory to allocate. @param Size Size of memory to allocate. - + @return Allocated address for output. **/ @@ -88,7 +88,7 @@ AllocateMemoryBelow4G ( } /** - Gets the buffer of legacy memory below 1 MB + Gets the buffer of legacy memory below 1 MB This function is to get the buffer in legacy memory below 1MB that is required during S3 resume. @param This A pointer to the EFI_ACPI_S3_SAVE_PROTOCOL instance. @@ -115,9 +115,9 @@ LegacyGetS3MemorySize ( /** Prepares all information that is needed in the S3 resume boot path. - - Allocate the resources or prepare informations and save in ACPI variable set for S3 resume boot path - + + Allocate the resources or prepare informations and save in ACPI variable set for S3 resume boot path + @param This A pointer to the EFI_ACPI_S3_SAVE_PROTOCOL instance. @param LegacyMemoryAddress The base address of legacy memory. @@ -156,9 +156,9 @@ S3Ready ( /** The Driver Entry Point. - + The function is the driver Entry point which will produce AcpiS3SaveProtocol. - + @param ImageHandle A handle for the image that is initializing this driver @param SystemTable A pointer to the EFI system table diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h index 65974a3402..48d77e7b5b 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h @@ -1,8 +1,8 @@ /** @file - This is an implementation of the ACPI S3 Save protocol. This is defined in + This is an implementation of the ACPI S3 Save protocol. This is defined in S3 boot path specification 0.9. -Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define _ACPI_S3_SAVE_H_ /** - Gets the buffer of legacy memory below 1 MB + Gets the buffer of legacy memory below 1 MB This function is to get the buffer in legacy memory below 1MB that is required during S3 resume. @param This A pointer to the EFI_ACPI_S3_SAVE_PROTOCOL instance. @@ -38,9 +38,9 @@ LegacyGetS3MemorySize ( /** Prepares all information that is needed in the S3 resume boot path. - - Allocate the resources or prepare informations and save in ACPI variable set for S3 resume boot path - + + Allocate the resources or prepare informations and save in ACPI variable set for S3 resume boot path + @param This A pointer to the EFI_ACPI_S3_SAVE_PROTOCOL instance. @param LegacyMemoryAddress The base address of legacy memory. @@ -54,6 +54,6 @@ EFI_STATUS EFIAPI S3Ready ( IN EFI_ACPI_S3_SAVE_PROTOCOL *This, - IN VOID *LegacyMemoryAddress + IN VOID *LegacyMemoryAddress ); #endif diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf index 179aa82d8d..e40153b813 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf @@ -1,7 +1,7 @@ ## @file # AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data. # -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are # licensed and made available under the terms and conditions of the BSD License @@ -73,7 +73,7 @@ [Depex] # # Note: the extra dependency of gEfiMpServiceProtocolGuid is to ensure that ACPI variable is set by MpDxe driver before - # AcpiS3SaveDxe module is executed. + # AcpiS3SaveDxe module is executed. # gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid AND gEfiMpServiceProtocolGuid diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.uni b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.uni index 7d4eed80a8..4ebaba2502 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.uni +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.uni @@ -3,13 +3,13 @@ // // AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxeExtra.uni b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxeExtra.uni index 0596a9dcf2..2753d98b98 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // AcpiS3SaveDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ACPI S3 Save State DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c index 105b142b28..1aac2f181a 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c @@ -1,7 +1,7 @@ /** @file This is an implementation of the AcpiVariable platform field for ECP platform. -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -25,8 +25,8 @@ typedef struct { ACPI_CPU_DATA_COMPATIBILITY AcpiCpuData; EFI_PHYSICAL_ADDRESS VideoOpromAddress; UINT32 VideoOpromSize; - EFI_PHYSICAL_ADDRESS S3DebugBufferAddress; - EFI_PHYSICAL_ADDRESS S3ResumeNvsEntryPoint; + EFI_PHYSICAL_ADDRESS S3DebugBufferAddress; + EFI_PHYSICAL_ADDRESS S3ResumeNvsEntryPoint; } ACPI_VARIABLE_SET_COMPATIBILITY; **/ @@ -54,7 +54,7 @@ ACPI_VARIABLE_SET_COMPATIBILITY *mAcpiVariableSetCompatibility = N @param MemoryType Memory type of memory to allocate. @param Size Size of memory to allocate. - + @return Allocated address for output. **/ @@ -167,8 +167,8 @@ InstallAcpiS3SaveThunk ( ); if (!EFI_ERROR (Status)) { // - // On ECP platform, if framework CPU drivers are in use, The compatible version of ACPI variable set - // should be produced by CPU driver. + // On ECP platform, if framework CPU drivers are in use, The compatible version of ACPI variable set + // should be produced by CPU driver. // VarSize = sizeof (mAcpiVariableSetCompatibility); Status = gRT->GetVariable ( @@ -184,7 +184,7 @@ InstallAcpiS3SaveThunk ( } } else { // - // Allocate/initialize the compatible version of Acpi Variable Set since Framework chipset/platform + // Allocate/initialize the compatible version of Acpi Variable Set since Framework chipset/platform // driver need this variable. ACPI_GLOBAL_VARIABLE variable is not used in runtime phase, // so RT attribute is not needed for it. // diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.c index a8b1f06117..689318b87d 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.c @@ -1,8 +1,8 @@ /** @file - This is an implementation of the ACPI Support protocol. This is defined in + This is an implementation of the ACPI Support protocol. This is defined in the Tiano ACPI External Product Specification, revision 0.3.6. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -26,14 +26,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_HANDLE mHandle = NULL; /** - Entry point of the ACPI support driver. This function creates and initializes an instance of the ACPI Support + Entry point of the ACPI support driver. This function creates and initializes an instance of the ACPI Support Protocol and installs it on a new handle. @param ImageHandle A handle for the image that is initializing this driver - @param SystemTable A pointer to the EFI system table + @param SystemTable A pointer to the EFI system table @retval EFI_SUCCESS Driver initialized successfully - @retval EFI_LOAD_ERROR Failed to Initialize or has been loaded + @retval EFI_LOAD_ERROR Failed to Initialize or has been loaded @retval EFI_OUT_OF_RESOURCES Could not allocate needed resources **/ EFI_STATUS @@ -85,7 +85,7 @@ InstallAcpiSupport ( NULL ); ASSERT_EFI_ERROR (Status); - } + } return Status; } diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h index 1bcf1e6ee5..d66d1023d7 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h @@ -2,7 +2,7 @@ This is an implementation of the ACPI Support protocol. It is in compliance with the 0.9 definition of the protocol. -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -131,12 +131,12 @@ typedef struct { AcpiTableProtocol, \ EFI_ACPI_SUPPORT_SIGNATURE \ ) - + /** - Constructor for the ACPI support protocol. - + Constructor for the ACPI support protocol. + Constructor for the ACPI support protocol to initializes instance data. - + @param AcpiSupportInstance Instance to construct @retval EFI_SUCCESS Instance initialized. @@ -147,14 +147,14 @@ AcpiSupportAcpiSupportConstructor ( IN EFI_ACPI_SUPPORT_INSTANCE *AcpiSupportInstance ); /** - Entry point of the ACPI support driver. This function creates and initializes an instance of the ACPI Support + Entry point of the ACPI support driver. This function creates and initializes an instance of the ACPI Support Protocol and installs it on a new handle. @param ImageHandle A handle for the image that is initializing this driver - @param SystemTable A pointer to the EFI system table + @param SystemTable A pointer to the EFI system table @retval EFI_SUCCESS Driver initialized successfully - @retval EFI_LOAD_ERROR Failed to Initialize or has been loaded + @retval EFI_LOAD_ERROR Failed to Initialize or has been loaded @retval EFI_OUT_OF_RESOURCES Could not allocate needed resources **/ EFI_STATUS diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c index 6443c3acd0..aeacd02f6a 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c @@ -1,7 +1,7 @@ /** @file ACPI Support Protocol implementation -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -19,9 +19,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // #include "AcpiSupport.h" // -// The maximum number of tables that pre-allocated. +// The maximum number of tables that pre-allocated. // -UINTN mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES; +UINTN mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES; /** This function adds an ACPI table to the table list. It will detect FACS and allocate the correct type of memory and properly align the table. @@ -91,10 +91,10 @@ ChecksumCommonTables ( ); /** - This function returns a table specified by an index if it exists. - - The function returns a buffer containing the table that the caller must free. - The function also returns a handle used to identify the table for update or + This function returns a table specified by an index if it exists. + + The function returns a buffer containing the table that the caller must free. + The function also returns a handle used to identify the table for update or deletion using the SetAcpiTable function. @param This Instance of the protocol. @@ -165,7 +165,7 @@ GetAcpiTable ( } /** This function adds, removes, or updates ACPI tables. If the address is not - null and the handle value is null, the table is added. If both the address and + null and the handle value is null, the table is added. If both the address and handle are not null, the table at handle is updated with the table at address. If the address is null and the handle is not, the table at handle is deleted. @@ -371,7 +371,7 @@ PublishTables ( @param TableKey Reurns a key to refer to the ACPI table. @return EFI_SUCCESS The table was successfully inserted. - @return EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize + @return EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize and the size field embedded in the ACPI table pointed to by AcpiTableBuffer are not in sync. @return EFI_OUT_OF_RESOURCES Insufficient resources exist to complete the request. @@ -427,7 +427,7 @@ InstallAcpiTable ( ); } FreePool (AcpiTableBufferConst); - + return Status; } /** @@ -500,7 +500,7 @@ ReallocateAcpiTableBuffer ( EFI_STATUS Status; UINT64 CurrentData; - CopyMem (&TempPrivateData, AcpiSupportInstance, sizeof (EFI_ACPI_SUPPORT_INSTANCE)); + CopyMem (&TempPrivateData, AcpiSupportInstance, sizeof (EFI_ACPI_SUPPORT_INSTANCE)); // // Enlarge the max table number from mEfiAcpiMaxNumTables to mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES // @@ -538,7 +538,7 @@ ReallocateAcpiTableBuffer ( Pointer = (UINT8 *) (UINTN) PageAddress; ZeroMem (Pointer, TotalSize); - + AcpiSupportInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer; Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32)); AcpiSupportInstance->Rsdt3 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer; @@ -554,12 +554,12 @@ ReallocateAcpiTableBuffer ( CopyMem (&AcpiSupportInstance->Rsdp3->XsdtAddress, &CurrentData, sizeof (UINT64)); // - // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer + // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer // - CopyMem (AcpiSupportInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); - CopyMem (AcpiSupportInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); + CopyMem (AcpiSupportInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); + CopyMem (AcpiSupportInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); CopyMem (AcpiSupportInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64))); - + // // Calculate orignal ACPI table buffer size // @@ -570,10 +570,10 @@ ReallocateAcpiTableBuffer ( sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 XSDT mEfiAcpiMaxNumTables * sizeof (UINT64); gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_SIZE_TO_PAGES (TotalSize)); - + // // Update the Max ACPI table number - // + // mEfiAcpiMaxNumTables = NewMaxTableNumber; return EFI_SUCCESS; } @@ -650,7 +650,7 @@ AddTableToList ( // // Allocation memory type depends on the type of the table // - if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) || + if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) || (CurrentTableSignature == EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE)) { // // Allocate memory for the FACS. This structure must be aligned @@ -778,7 +778,7 @@ AddTableToList ( // // Update pointers in FADT. If tables don't exist this will put NULL pointers there. - // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and + // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and // vice-versa. // if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) { @@ -913,7 +913,7 @@ AddTableToList ( // if (AcpiSupportInstance->Fadt3 != NULL) { // - // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and + // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and // vice-versa. // if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) { @@ -984,7 +984,7 @@ AddTableToList ( ); } } - + if ((Version & EFI_ACPI_TABLE_VERSION_2_0) != 0 || (Version & EFI_ACPI_TABLE_VERSION_3_0) != 0) { // @@ -1014,7 +1014,7 @@ AddTableToList ( Checksum) ); } - } + } // // Checksum the table // @@ -1094,7 +1094,7 @@ AddTableToList ( if (AcpiSupportInstance->NumberOfTableEntries3 >= mEfiAcpiMaxNumTables) { Status = ReallocateAcpiTableBuffer (AcpiSupportInstance); ASSERT_EFI_ERROR (Status); - } + } // // At this time, it is assumed that RSDT and XSDT maintain parallel lists of tables. // If it becomes necessary to maintain separate table lists, changes will be required. @@ -1159,7 +1159,7 @@ AddTableToList ( @param Handle Table to find. @param TableList Table list to search - @param Table Pointer to table found. + @param Table Pointer to table found. @return EFI_SUCCESS The function completed successfully. @return EFI_NOT_FOUND No table found matching the handle specified. @@ -1207,7 +1207,7 @@ FindTableByHandle ( For Acpi 1.0 tables, pass in the Rsdt. For Acpi 2.0 tables, pass in both Rsdt and Xsdt. - @param Table Pointer to table found. + @param Table Pointer to table found. @param NumberOfTableEntries Current number of table entries in the RSDT/XSDT @param Rsdt Pointer to the RSDT to remove from @param Xsdt Pointer to the Xsdt to remove from @@ -1417,11 +1417,11 @@ DeleteTable ( // if (Version & EFI_ACPI_TABLE_VERSION_2_0 & Table->Version) { Table->Version = Table->Version &~EFI_ACPI_TABLE_VERSION_2_0; - } + } if (Version & EFI_ACPI_TABLE_VERSION_3_0 & Table->Version) { Table->Version = Table->Version &~EFI_ACPI_TABLE_VERSION_3_0; } - + // // Remove from Rsdt and Xsdt. We don't care about the return value // because it is acceptable for the table to not exist in Rsdt/Xsdt. @@ -1435,7 +1435,7 @@ DeleteTable ( AcpiSupportInstance->Xsdt ); } - } + } // // Free the table, clean up any dependent tables and our private data pointers. // @@ -1495,7 +1495,7 @@ DeleteTable ( Checksum) ); } - } + } break; case EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE: @@ -1520,7 +1520,7 @@ DeleteTable ( } } - + if ((Version & EFI_ACPI_TABLE_VERSION_2_0) != 0 || (Version & EFI_ACPI_TABLE_VERSION_3_0) != 0) { AcpiSupportInstance->Dsdt3 = NULL; @@ -1733,12 +1733,12 @@ ChecksumCommonTables ( OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, Checksum) ); - + return EFI_SUCCESS; } -/** +/** Constructor for the ACPI support protocol to initializes instance data. - + @param AcpiSupportInstance Instance to construct @retval EFI_SUCCESS Instance initialized. @@ -1769,7 +1769,7 @@ AcpiSupportAcpiSupportConstructor ( AcpiSupportInstance->AcpiTableProtocol.InstallAcpiTable = InstallAcpiTable; AcpiSupportInstance->AcpiTableProtocol.UninstallAcpiTable = UninstallAcpiTable; - + // // Create RSDP table // diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf index 32ca4f648f..415397e626 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf @@ -1,10 +1,10 @@ ## @file # Acpi Support Dirver to install Framework Acpi Support Protocol. # -# This driver initializes ACPI support protocol instance data structure and intstall +# This driver initializes ACPI support protocol instance data structure and intstall # ACPI support protocol to provide Get, Set and Publish Table services. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.uni b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.uni index b463bb7414..2a43a78bd6 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.uni +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.uni @@ -4,14 +4,14 @@ // This driver initializes ACPI support protocol instance data structure and intstall // ACPI support protocol to provide Get, Set and Publish Table services. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions // of the BSD License which accompanies this distribution. The // full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxeExtra.uni b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxeExtra.uni index 0520a0cc2c..a90ab77248 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // AcpiSupportDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions @@ -14,8 +14,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "ACPI Support DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h index beb9226180..21523831d2 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h @@ -198,15 +198,15 @@ BdsProcessCapsules ( then EFI_INVALID_PARAMETER is returned. @param VendorGuid A unique identifier for the vendor. @param Attributes Attributes bitmask to set for the variable. - @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, - EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or - EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero - causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is - set, then a SetVariable() call with a DataSize of zero will not cause any change to - the variable value (the timestamp associated with the variable may be updated however - even if no new data value is provided,see the description of the - EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not - be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). + @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero + causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is + set, then a SetVariable() call with a DataSize of zero will not cause any change to + the variable value (the timestamp associated with the variable may be updated however + even if no new data value is provided,see the description of the + EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not + be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). @param Data The contents for the variable. @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as @@ -218,8 +218,8 @@ BdsProcessCapsules ( @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. @retval EFI_WRITE_PROTECTED The variable in question is read-only. @retval EFI_WRITE_PROTECTED The variable in question cannot be deleted. - @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS - or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo + @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS + or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo does NOT pass the validation check carried out by the firmware. @retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf index 92a473769a..e11c81d2d9 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -1,28 +1,28 @@ ## @file # BDSDxe module is core driver for BDS phase. # -# When DxeCore dispatching all DXE driver, this module will produce architecture protocol +# When DxeCore dispatching all DXE driver, this module will produce architecture protocol # gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry # interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered. # -# Generally, this module take reposiblity to connect all necessary devices for platform boot, +# Generally, this module take reposiblity to connect all necessary devices for platform boot, # these boot device path are hold in PlatformBdsLib library instance produced by platform. # For legacy boot, BDS will transfer control to legacy BIOS after legacy boot device is select. -# For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI, +# For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI, # EFI\BOOT\BOOTIA64.EFI file from selected boot device and transfer control to boot loader. # # BDSDxe also maintain the UI for "Boot Manager, Boot Maintaince Manager, Device Manager" which # is used for user to configure boot option or maintain hardware device. -# +# # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] @@ -31,7 +31,7 @@ MODULE_UNI_FILE = BdsDxe.uni FILE_GUID = FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 + VERSION_STRING = 1.0 ENTRY_POINT = BdsInitialize # @@ -91,7 +91,7 @@ MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + [LibraryClasses] DevicePathLib BaseLib @@ -112,7 +112,7 @@ CapsuleLib PcdLib UefiHiiServicesLib - + [Guids] ## SOMETIMES_PRODUCES ## Variable:L"BootXXXX" # Boot option variable ## SOMETIMES_PRODUCES ## Variable:L"DriverXXXX" # Driver load option. @@ -170,7 +170,7 @@ gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES ## CONSUMES ## NOTIFY - gEfiSimpleTextInputExProtocolGuid + gEfiSimpleTextInputExProtocolGuid gEfiHiiConfigAccessProtocolGuid ## SOMETIMES_PRODUCES gEfiFormBrowser2ProtocolGuid ## CONSUMES gEfiSerialIoProtocolGuid ## SOMETIMES_CONSUMES @@ -201,7 +201,7 @@ ## CONSUMES ## PRODUCES gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## PRODUCES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## PRODUCES @@ -220,7 +220,7 @@ TRUE # -# [BootMode] +# [BootMode] # FLASH_UPDATE ## SOMETIMES_CONSUMES # Update Capsule Image # diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.uni index 5911c7b305..06452af2ed 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.uni @@ -4,23 +4,23 @@ // When DxeCore dispatching all DXE driver, this module will produce architecture protocol // gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry // interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered. -// +// // Generally, this module take reposiblity to connect all necessary devices for platform boot, // these boot device path are hold in PlatformBdsLib library instance produced by platform. // For legacy boot, BDS will transfer control to legacy BIOS after legacy boot device is select. // For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI, // EFI\BOOT\BOOTIA64.EFI file from selected boot device and transfer control to boot loader. -// +// // BDSDxe also maintain the UI for "Boot Manager, Boot Maintaince Manager, Device Manager" which // is used for user to configure boot option or maintain hardware device. // -// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxeExtra.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxeExtra.uni index b73cfead99..c5a3ba2967 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // BdsDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Boot Device Selection Core DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c index 9c5a91b22d..b9bbce6150 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c @@ -179,7 +179,7 @@ BdsBootDeviceSelect ( BdsLibBuildOptionFromVar (&BootLists, L"BootOrder"); // - // When we didn't have chance to build boot option variables in the first + // When we didn't have chance to build boot option variables in the first // full configuration boot (e.g.: Reset in the first page or in Device Manager), // we have no boot options in the following mini configuration boot. // Give the last chance to enumerate the boot options. @@ -260,7 +260,7 @@ BdsBootDeviceSelect ( // Restore to original mode before launching boot option. // BdsSetConsoleMode (FALSE); - + // // All the driver options should have been processed since // now boot will be performed. @@ -325,10 +325,10 @@ BdsBootDeviceSelect ( /** - Validate input console variable data. + Validate input console variable data. If found the device path is not a valid device path, remove the variable. - + @param VariableName Input console variable name. **/ @@ -346,7 +346,7 @@ BdsFormalizeConsoleVariable ( &gEfiGlobalVariableGuid, &VariableSize ); - if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) { + if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) { Status = gRT->SetVariable ( VariableName, &gEfiGlobalVariableGuid, @@ -363,15 +363,15 @@ BdsFormalizeConsoleVariable ( /** - Formalize Bds global variables. + Formalize Bds global variables. 1. For ConIn/ConOut/ConErr, if found the device path is not a valid device path, remove the variable. - 2. For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps + 2. For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps 3. Delete OsIndications variable if it is not NV/BS/RT UINT64 Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable. - + **/ -VOID +VOID BdsFormalizeEfiGlobalVariable ( VOID ) @@ -381,7 +381,7 @@ BdsFormalizeEfiGlobalVariable ( UINT64 OsIndication; UINTN DataSize; UINT32 Attributes; - + // // Validate Console variable. // @@ -604,15 +604,15 @@ BdsEntry ( then EFI_INVALID_PARAMETER is returned. @param VendorGuid A unique identifier for the vendor. @param Attributes Attributes bitmask to set for the variable. - @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, - EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or - EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero - causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is - set, then a SetVariable() call with a DataSize of zero will not cause any change to - the variable value (the timestamp associated with the variable may be updated however - even if no new data value is provided,see the description of the - EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not - be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). + @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero + causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is + set, then a SetVariable() call with a DataSize of zero will not cause any change to + the variable value (the timestamp associated with the variable may be updated however + even if no new data value is provided,see the description of the + EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not + be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). @param Data The contents for the variable. @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as @@ -624,8 +624,8 @@ BdsEntry ( @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. @retval EFI_WRITE_PROTECTED The variable in question is read-only. @retval EFI_WRITE_PROTECTED The variable in question cannot be deleted. - @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS - or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo + @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS + or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo does NOT pass the validation check carried out by the firmware. @retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c index 2ef9cf13eb..f9ba0a7bc7 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c @@ -3,7 +3,7 @@ and manage the legacy boot option, all legacy boot option is getting from the legacy BBS table. -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -53,9 +53,9 @@ OrderLegacyBootOption4SameType ( UINTN BootOrderSize; UINTN Index; UINTN StartPosition; - + BDS_COMMON_OPTION *BootOption; - + CHAR16 OptionName[sizeof ("Boot####")]; UINT16 *BbsIndexArray; UINT16 *DeviceTypeArray; @@ -82,12 +82,12 @@ OrderLegacyBootOption4SameType ( ASSERT (*DisBootOption != NULL); for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) { - + UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]); InitializeListHead (&List); BootOption = BdsLibVariableToOption (&List, OptionName); ASSERT (BootOption != NULL); - + if ((DevicePathType (BootOption->DevicePath) == BBS_DEVICE_PATH) && (DevicePathSubType (BootOption->DevicePath) == BBS_BBS_DP)) { // @@ -119,7 +119,7 @@ OrderLegacyBootOption4SameType ( if (BbsIndexArray[Index] == (DevOrder[DevOrderCount] & 0xFF)) { StartPosition = MIN (StartPosition, Index); NewBootOption[DevOrderCount] = BootOrder[Index]; - + if ((DevOrder[DevOrderCount] & 0xFF00) == 0xFF00) { (*DisBootOption)[*DisBootOptionCount] = BootOrder[Index]; (*DisBootOptionCount)++; @@ -157,7 +157,7 @@ OrderLegacyBootOption4SameType ( /** Group the legacy boot options in the BootOption. - The routine assumes the boot options in the beginning that covers all the device + The routine assumes the boot options in the beginning that covers all the device types are ordered properly and re-position the following boot options just after the corresponding boot options with the same device type. For example: diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h index e73dc85995..94833fff52 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h @@ -1,7 +1,7 @@ /** @file declares interface functions -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -39,7 +39,7 @@ BdsBuildLegacyDevNameString ( /** Group the legacy boot options in the BootOption. - The routine assumes the boot options in the beginning that covers all the device + The routine assumes the boot options in the beginning that covers all the device types are ordered properly and re-position the following boot options just after the corresponding boot options with the same device type. For example: diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr index 0d35c2c37e..ae2979b59e 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr @@ -1,16 +1,16 @@ ///** @file -// +// // Boot Maintenance Utility Formset -// -// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ #include "FormGuid.h" @@ -114,9 +114,9 @@ formset subtitle text = STRING_TOKEN(STR_NULL_STRING); // - // We will add "Select Legacy Boot Floppy Drive" and "Select Legacy Boot Hard Drive" - // here dynamically - // + // We will add "Select Legacy Boot Floppy Drive" and "Select Legacy Boot Hard Drive" + // here dynamically + // label FORM_BOOT_LEGACY_DEVICE_ID; label LABEL_END; diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c index 4424831859..d27113c015 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c @@ -1,7 +1,7 @@ /** @file Utility routines used by boot maintenance modules. -Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -146,7 +146,7 @@ EfiLibGetVariable ( @param VarName A Null-terminated Unicode string that is the name of the vendor's variable. - + @param VarGuid A unique identifier for the vendor. @retval EFI_SUCCESS The variable was found and removed @@ -361,7 +361,7 @@ EfiReallocatePool ( } /** - Get a string from the Data Hub record based on + Get a string from the Data Hub record based on a device path. @param DevPath The device Path. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni index 6066549049..ca99ad06e3 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for Boot Maintenance Utility. -// -// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c index d5ea0f4577..187e37ddc7 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c @@ -1,7 +1,7 @@ /** @file The functions for Boot Maintainence Main menu. -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -43,7 +43,7 @@ HII_VENDOR_DEVICE_PATH mBmmHiiVendorDevicePath = { { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -65,7 +65,7 @@ HII_VENDOR_DEVICE_PATH mFeHiiVendorDevicePath = { { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -143,8 +143,8 @@ InitializeBmmConfig ( // // Initialize data which located in Console Options Menu - // - GetConsoleOutMode (CallbackData); + // + GetConsoleOutMode (CallbackData); GetConsoleInCheck (CallbackData); GetConsoleOutCheck (CallbackData); GetConsoleErrCheck (CallbackData); @@ -314,7 +314,7 @@ BootMaintExtractConfig ( @param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. @param[in] Configuration A null-terminated Unicode string in - format. + format. @param[out] Progress A pointer to a string filled in with the offset of the most recent '&' before the first failing name / value pair (or the @@ -324,7 +324,7 @@ BootMaintExtractConfig ( successful. @retval EFI_SUCCESS The results have been distributed or are - awaiting distribution. + awaiting distribution. @retval EFI_OUT_OF_RESOURCES Not enough memory to store the parts of the results that must be stored awaiting possible future @@ -352,9 +352,9 @@ BootMaintRouteConfig ( BM_TERMINAL_CONTEXT *NewTerminalContext; BM_MENU_ENTRY *NewMenuEntry; BM_LOAD_CONTEXT *NewLoadContext; - UINT16 Index; + UINT16 Index; BOOLEAN TerminalAttChange; - BMM_CALLBACK_DATA *Private; + BMM_CALLBACK_DATA *Private; if (Progress == NULL) { return EFI_INVALID_PARAMETER; @@ -374,8 +374,8 @@ BootMaintRouteConfig ( } Status = gBS->LocateProtocol ( - &gEfiHiiConfigRoutingProtocolGuid, - NULL, + &gEfiHiiConfigRoutingProtocolGuid, + NULL, (VOID**) &ConfigRouting ); if (EFI_ERROR (Status)) { @@ -401,7 +401,7 @@ BootMaintRouteConfig ( ); ASSERT_EFI_ERROR (Status); // - // Compare new and old BMM configuration data and only do action for modified item to + // Compare new and old BMM configuration data and only do action for modified item to // avoid setting unnecessary non-volatile variable // @@ -429,27 +429,27 @@ BootMaintRouteConfig ( } // - // Change for "delete boot option" page need update NewBmmData->BootOptionOrder, so process + // Change for "delete boot option" page need update NewBmmData->BootOptionOrder, so process // NewBmmData->BootOptionOrder before NewBmmData->BootOptionDel // - if (CompareMem (NewBmmData->BootOptionOrder, OldBmmData->BootOptionOrder, sizeof (NewBmmData->BootOptionOrder)) != 0) { + if (CompareMem (NewBmmData->BootOptionOrder, OldBmmData->BootOptionOrder, sizeof (NewBmmData->BootOptionOrder)) != 0) { Status = Var_UpdateBootOrder (Private); } // - // Change for "delete driver option" page need update NewBmmData->DriverOptionOrder, so process + // Change for "delete driver option" page need update NewBmmData->DriverOptionOrder, so process // NewBmmData->DriverOptionOrder before NewBmmData->DriverOptionDel // - if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) { + if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) { Status = Var_UpdateDriverOrder (Private); } // // Check data which located in Boot Options Menu and save the settings if need // - if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) { - for (Index = 0; - ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0])))); + if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) { + for (Index = 0; + ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0])))); Index ++) { NewMenuEntry = BOpt_GetMenuEntry (&BootOptionMenu, Index); NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext; @@ -464,9 +464,9 @@ BootMaintRouteConfig ( // // Check data which located in Driver Options Menu and save the settings if need // - if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) { - for (Index = 0; - ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0])))); + if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) { + for (Index = 0; + ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0])))); Index++) { NewMenuEntry = BOpt_GetMenuEntry (&DriverOptionMenu, Index); NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext; @@ -490,14 +490,14 @@ BootMaintRouteConfig ( // // Bugbug: code not exit in UiApp but in IntelFrameworkModulePkg, need do more check. // - Private->BmmOldFakeNVData.BootTimeOut = NewBmmData->BootTimeOut; + Private->BmmOldFakeNVData.BootTimeOut = NewBmmData->BootTimeOut; } if (CompareMem (&NewBmmData->BootNext, &OldBmmData->BootNext, sizeof (NewBmmData->BootNext)) != 0) { Status = Var_UpdateBootNext (Private); } - if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0) { + if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0) { Var_UpdateConMode (Private); } @@ -570,7 +570,7 @@ BootMaintRouteConfig ( Var_UpdateConsoleOutOption (); } - if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0) { + if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0) { for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++) { NewMenuEntry = BOpt_GetMenuEntry (&ConsoleErrMenu, Index); NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; @@ -600,7 +600,7 @@ InitializeLegacyBootOption ( { RefreshUpdateData (); mStartLabel->Number = FORM_BOOT_LEGACY_DEVICE_ID; - + // // If LegacyBios Protocol is installed, add 3 tags about legacy boot option // in BootOption form: legacy FD/HD/CD/NET/BEV @@ -649,7 +649,7 @@ InitializeLegacyBootOption ( EFI_IFR_FLAG_CALLBACK, FORM_SET_BEV_ORDER_ID ); - + HiiUpdateForm ( mBmmCallbackInfo->BmmHiiHandle, &gBootMaintFormSetGuid, @@ -657,7 +657,7 @@ InitializeLegacyBootOption ( mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID mEndOpCodeHandle // LABEL_END ); - + return EFI_SUCCESS; } @@ -700,7 +700,7 @@ BootMaintCallback ( UINTN Pos; UINTN Bit; UINT16 NewValuePos; - UINT16 Index3; + UINT16 Index3; UINT16 Index2; UINT16 Index; UINT8 *OldLegacyDev; @@ -717,17 +717,17 @@ BootMaintCallback ( if (!EFI_ERROR (Status)) { InitializeLegacyBootOption (); } - + return EFI_SUCCESS; } - if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) { + if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) { // // All other action return unsupported. // return EFI_UNSUPPORTED; } - + Status = EFI_SUCCESS; OldValue = 0; NewValue = 0; @@ -747,7 +747,7 @@ BootMaintCallback ( if (Value == NULL) { return EFI_INVALID_PARAMETER; } - + UpdatePageId (Private, QuestionId); if (QuestionId < FILE_OPTION_OFFSET) { @@ -1021,7 +1021,7 @@ BootMaintCallback ( // DiscardChangeHandler (Private, CurrentFakeNVMap); *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT; - break; + break; case FORM_RESET: gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL); @@ -1121,7 +1121,7 @@ InitializeBM ( UINT8 *Data; Status = EFI_SUCCESS; - BmmCallbackInfo = mBmmCallbackInfo; + BmmCallbackInfo = mBmmCallbackInfo; BmmCallbackInfo->BmmPreviousPageId = FORM_MAIN_ID; BmmCallbackInfo->BmmCurrentPageId = FORM_MAIN_ID; @@ -1131,17 +1131,17 @@ InitializeBM ( // // Reinstall String packages to include more new strings. // - + // // String package size // Length = ReadUnaligned32 ((UINT32 *) BdsDxeStrings) - sizeof (UINT32); // - // Add the length of the Package List Header and the terminating Package Header + // Add the length of the Package List Header and the terminating Package Header // Length += sizeof (EFI_HII_PACKAGE_LIST_HEADER) + sizeof (EFI_HII_PACKAGE_HEADER); - + // // Allocate the storage for the entire Package List // @@ -1160,12 +1160,12 @@ InitializeBM ( PackageListHeader->PackageLength = Length; // - // Copy String Data into Package list. + // Copy String Data into Package list. // Data = (UINT8 *)(PackageListHeader + 1); Length = ReadUnaligned32 ((UINT32 *) BdsDxeStrings) - sizeof (UINT32); CopyMem (Data, (UINT8 *) BdsDxeStrings + sizeof (UINT32), Length); - + // // Add End type HII package. // @@ -1178,13 +1178,13 @@ InitializeBM ( // CopyGuid (&PackageListHeader->PackageListGuid, &gBootMaintFormSetGuid); Status = gHiiDatabase->UpdatePackageList (gHiiDatabase, BmmCallbackInfo->BmmHiiHandle, PackageListHeader); - + // // Update String package for FE. // CopyGuid (&PackageListHeader->PackageListGuid, &gFileExploreFormSetGuid); Status = gHiiDatabase->UpdatePackageList (gHiiDatabase, BmmCallbackInfo->FeHiiHandle, PackageListHeader); - + FreePool (PackageListHeader); // @@ -1226,7 +1226,7 @@ InitializeBM ( CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &DriverOptionMenu); CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &TerminalMenu); CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &DriverMenu); - + InitializeBmmConfig (BmmCallbackInfo); // @@ -1238,7 +1238,7 @@ InitializeBM ( // Clean up. // CleanUpStringDepository (); - + FreeAllMenu (); Exit: @@ -1544,7 +1544,7 @@ InitBMPackage ( BMM_CALLBACK_DATA *BmmCallbackInfo; EFI_STATUS Status; UINT8 *Ptr; - + // // Create CallbackData structures for Driver Callback // @@ -1552,7 +1552,7 @@ InitBMPackage ( if (BmmCallbackInfo == NULL) { return EFI_OUT_OF_RESOURCES; } - + // // Create LoadOption in BmmCallbackInfo for Driver Callback // @@ -1633,10 +1633,10 @@ InitBMPackage ( NULL ); ASSERT (BmmCallbackInfo->FeHiiHandle != NULL); - + mBmmCallbackInfo = BmmCallbackInfo; - - return EFI_SUCCESS; + + return EFI_SUCCESS; } /** @@ -1683,8 +1683,8 @@ FreeBMPackage ( FreePool (BmmCallbackInfo->LoadContext); FreePool (BmmCallbackInfo); - mBmmCallbackInfo = NULL; - + mBmmCallbackInfo = NULL; + return; } diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h index 098692fa53..bdd22c8e75 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h @@ -1,7 +1,7 @@ /** @file Header file for boot maintenance module. -Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -473,7 +473,7 @@ BOpt_GetBootOptions ( @return EFI_SUCESS The functin completes successfully. @retval EFI_OUT_OF_RESOURCES Not enough memory to compete the operation. - + **/ EFI_STATUS @@ -717,11 +717,11 @@ ChangeVariableDevicePath ( /** Update the multi-instance device path of Terminal Device based on - the global TerminalMenu. If ChangeTernimal is TRUE, the terminal + the global TerminalMenu. If ChangeTernimal is TRUE, the terminal device path in the Terminal Device in TerminalMenu is also updated. @param DevicePath The multi-instance device path. - @param ChangeTerminal TRUE, then device path in the Terminal Device + @param ChangeTerminal TRUE, then device path in the Terminal Device in TerminalMenu is also updated; FALSE, no update. @return EFI_SUCCESS The function completes successfully. @@ -737,8 +737,8 @@ ChangeTerminalDevicePath ( // Variable operation by menu selection // /** - This function create a currently loaded Boot Option from - the BMM. It then appends this Boot Option to the end of + This function create a currently loaded Boot Option from + the BMM. It then appends this Boot Option to the end of the "BootOrder" list. It also append this Boot Opotion to the end of BootOptionMenu. @@ -760,9 +760,9 @@ Var_UpdateBootOption ( After deleting this boot option, call Var_ChangeBootOrder to make sure BootOrder is in valid state. - @retval EFI_SUCCESS If all boot load option EFI Variables corresponding to + @retval EFI_SUCCESS If all boot load option EFI Variables corresponding to BM_LOAD_CONTEXT marked for deletion is deleted - @return Others If failed to update the "BootOrder" variable after deletion. + @return Others If failed to update the "BootOrder" variable after deletion. **/ EFI_STATUS @@ -786,8 +786,8 @@ Var_ChangeBootOrder ( ); /** - This function create a currently loaded Drive Option from - the BMM. It then appends this Driver Option to the end of + This function create a currently loaded Drive Option from + the BMM. It then appends this Driver Option to the end of the "DriverOrder" list. It append this Driver Opotion to the end of DriverOptionMenu. @@ -876,7 +876,7 @@ Var_UpdateErrorOutOption ( ); /** - Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new BaudRate, Data Bits, + Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new BaudRate, Data Bits, parity and stop Bits set. **/ @@ -886,7 +886,7 @@ Var_UpdateAllConsoleOption ( ); /** - This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM, + This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM, this EFI Variable is deleted. It also update the BMM context data specified the "BootNext" value. @@ -902,7 +902,7 @@ Var_UpdateBootNext ( ); /** - This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh + This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh BootOptionMenu with the new "BootOrder" list. @param CallbackData The BMM context data. @@ -980,7 +980,7 @@ RefreshUpdateData ( /** Clean up the dynamic opcode at label and form specified by - both LabelId. + both LabelId. @param LabelId It is both the Form ID and Label ID for opcode deletion. @@ -1177,7 +1177,7 @@ EfiReallocatePool ( @param VarName A Null-terminated Unicode string that is the name of the vendor's variable. - + @param VarGuid A unique identifier for the vendor. @retval EFI_SUCCESS The variable was found and removed @@ -1242,7 +1242,7 @@ CreateMenuStringToken ( ); /** - Get a string from the Data Hub record based on + Get a string from the Data Hub record based on a device path. @param DevPath The device Path. @@ -1450,7 +1450,7 @@ FileExplorerCallback ( @param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. @param[in] Configuration A null-terminated Unicode string in - format. + format. @param[out] Progress A pointer to a string filled in with the offset of the most recent '&' before the first failing name / value pair (or the @@ -1460,7 +1460,7 @@ FileExplorerCallback ( successful. @retval EFI_SUCCESS The results have been distributed or are - awaiting distribution. + awaiting distribution. @retval EFI_OUT_OF_RESOURCES Not enough memory to store the parts of the results that must be stored awaiting possible future @@ -1513,12 +1513,12 @@ EfiLibGetVariable ( ); /** - Get option number according to Boot#### and BootOrder variable. + Get option number according to Boot#### and BootOrder variable. The value is saved as #### + 1. @param CallbackData The BMM context data. **/ -VOID +VOID GetBootOrder ( IN BMM_CALLBACK_DATA *CallbackData ); @@ -1527,9 +1527,9 @@ GetBootOrder ( Get driver option order from globalc DriverOptionMenu. @param CallbackData The BMM context data. - + **/ -VOID +VOID GetDriverOrder ( IN BMM_CALLBACK_DATA *CallbackData ); @@ -1562,7 +1562,7 @@ VOID GetLegacyDeviceOrder ( IN BMM_CALLBACK_DATA *CallbackData ); - + /** Initialize console input device check box to ConsoleInCheck[MAX_MENU_NUMBER] @@ -1570,12 +1570,12 @@ GetLegacyDeviceOrder ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleInCheck ( IN BMM_CALLBACK_DATA *CallbackData ); - + /** Initialize console output device check box to ConsoleOutCheck[MAX_MENU_NUMBER] @@ -1583,8 +1583,8 @@ GetConsoleInCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleOutCheck ( IN BMM_CALLBACK_DATA *CallbackData ); @@ -1596,8 +1596,8 @@ GetConsoleOutCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleErrCheck ( IN BMM_CALLBACK_DATA *CallbackData ); @@ -1609,8 +1609,8 @@ GetConsoleErrCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetTerminalAttribute ( IN BMM_CALLBACK_DATA *CallbackData ); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c index 6233a1145a..895f13f214 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c @@ -5,7 +5,7 @@ Boot option manipulation -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -872,7 +872,7 @@ BOpt_GetBootOptions ( EFI_DEVICE_PATH_PROTOCOL *DevicePath; UINTN MenuCount; UINT8 *Ptr; - + MenuCount = 0; BootOrderListSize = 0; BootNextSize = 0; @@ -893,7 +893,7 @@ BOpt_GetBootOptions ( if (BootOrderList == NULL) { return EFI_NOT_FOUND; } - + // // Get the BootNext from the Var // @@ -1007,7 +1007,7 @@ BOpt_GetBootOptions ( NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr; LoadOptionPtr += sizeof (UINT16); - + StringSize = StrSize((UINT16*)LoadOptionPtr); NewLoadContext->Description = AllocateCopyPool (StrSize((UINT16*)LoadOptionPtr), LoadOptionPtr); @@ -1099,7 +1099,7 @@ BOpt_AppendFileName ( Str = AllocateZeroPool (MaxLen * sizeof (CHAR16)); ASSERT (Str != NULL); - TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16)); + TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16)); ASSERT (TmpStr != NULL); StrCatS (Str, MaxLen, Str1); @@ -1120,7 +1120,7 @@ BOpt_AppendFileName ( // // - // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings + // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings // that overlap. // StrCpyS (TmpStr, MaxLen, Ptr + 3); @@ -1132,7 +1132,7 @@ BOpt_AppendFileName ( // // - // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings + // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings // that overlap. // StrCpyS (TmpStr, MaxLen, Ptr + 2); @@ -1146,7 +1146,7 @@ BOpt_AppendFileName ( } FreePool (TmpStr); - + return Str; } @@ -1497,7 +1497,7 @@ BOpt_GetDriverOptions ( if (DriverOrderList == NULL) { return EFI_NOT_FOUND; } - + for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) { UnicodeSPrint ( DriverString, @@ -1676,20 +1676,20 @@ GetLegacyDeviceOrder ( UINTN Index; UINTN OptionIndex; UINT16 PageIdList[5]; - UINTN PageNum; + UINTN PageNum; UINTN VarSize; - UINT8 *VarData; - UINT8 *WorkingVarData; + UINT8 *VarData; + UINT8 *WorkingVarData; LEGACY_DEV_ORDER_ENTRY *DevOrder; - UINT16 VarDevOrder; - UINT8 *DisMap; + UINT16 VarDevOrder; + UINT8 *DisMap; BM_MENU_OPTION *OptionMenu; BBS_TYPE BbsType; UINT8 *LegacyOrder; - UINT8 *OldData; + UINT8 *OldData; UINTN Pos; UINTN Bit; - + ASSERT (CallbackData != NULL); PageIdList[0] = FORM_SET_FD_ORDER_ID; @@ -1711,7 +1711,7 @@ GetLegacyDeviceOrder ( for (Index = 0; Index < PageNum; Index++) { switch (PageIdList[Index]) { - + case FORM_SET_FD_ORDER_ID: OptionMenu = (BM_MENU_OPTION *) &LegacyFDMenu; BbsType = BBS_FLOPPY; @@ -1725,14 +1725,14 @@ GetLegacyDeviceOrder ( LegacyOrder = CallbackData->BmmFakeNvData.LegacyHD; OldData = CallbackData->BmmOldFakeNVData.LegacyHD; break; - + case FORM_SET_CD_ORDER_ID: OptionMenu = (BM_MENU_OPTION *) &LegacyCDMenu; BbsType = BBS_CDROM; LegacyOrder = CallbackData->BmmFakeNvData.LegacyCD; OldData = CallbackData->BmmOldFakeNVData.LegacyCD; break; - + case FORM_SET_NET_ORDER_ID: OptionMenu = (BM_MENU_OPTION *) &LegacyNETMenu; BbsType = BBS_EMBED_NETWORK; @@ -1748,7 +1748,7 @@ GetLegacyDeviceOrder ( OldData = CallbackData->BmmOldFakeNVData.LegacyBEV; break; } - + if (NULL != VarData) { WorkingVarData = VarData; DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData; @@ -1756,11 +1756,11 @@ GetLegacyDeviceOrder ( if (DevOrder->BbsType == BbsType) { break; } - + WorkingVarData = (UINT8 *)((UINTN)WorkingVarData + sizeof (BBS_TYPE)); WorkingVarData += *(UINT16 *) WorkingVarData; DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData; - } + } for (OptionIndex = 0; OptionIndex < OptionMenu->MenuNumber; OptionIndex++) { VarDevOrder = *(UINT16 *) ((UINTN) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + OptionIndex * sizeof (UINT16)); if (0xFF00 == (VarDevOrder & 0xFF00)) { @@ -1771,17 +1771,17 @@ GetLegacyDeviceOrder ( } else { LegacyOrder[OptionIndex] = (UINT8) (VarDevOrder & 0xFF); } - } + } CopyMem (OldData, LegacyOrder, 100); } - } + } } /** Get driver option order from globalc DriverOptionMenu. @param CallbackData The BMM context data. - + **/ VOID GetDriverOrder ( diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c index 126feeb9ae..964d8850ef 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c @@ -1,7 +1,7 @@ /** @file handles console redirection from boot manager -Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -32,7 +32,7 @@ UART_FLOW_CONTROL_DEVICE_PATH mFlowControlDevicePath = Check the device path node whether it's the Flow Control node or not. @param[in] FlowControl The device path node to be checked. - + @retval TRUE It's the Flow Control node. @retval FALSE It's not. @@ -85,11 +85,11 @@ UpdateComAttributeFromVariable ( /** Update the multi-instance device path of Terminal Device based on - the global TerminalMenu. If ChangeTernimal is TRUE, the terminal + the global TerminalMenu. If ChangeTernimal is TRUE, the terminal device path in the Terminal Device in TerminalMenu is also updated. @param DevicePath The multi-instance device path. - @param ChangeTerminal TRUE, then device path in the Terminal Device + @param ChangeTerminal TRUE, then device path in the Terminal Device in TerminalMenu is also updated; FALSE, no update. @return EFI_SUCCESS The function completes successfully. @@ -760,7 +760,7 @@ UpdateComAttributeFromVariable ( and BM_CONSOLE_ERR_CONTEXT_SELECT. @retval EFI_UNSUPPORTED The type passed in is not in the 3 types defined. - @retval EFI_NOT_FOUND If the EFI Variable defined in UEFI spec with name "ConOutDev", + @retval EFI_NOT_FOUND If the EFI Variable defined in UEFI spec with name "ConOutDev", "ConInDev" or "ConErrDev" doesn't exists. @retval EFI_OUT_OF_RESOURCES Not enough resource to complete the operations. @retval EFI_SUCCESS Function completes successfully. @@ -1057,24 +1057,24 @@ GetConsoleOutMode ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleInCheck ( IN BMM_CALLBACK_DATA *CallbackData ) { UINT16 Index; - BM_MENU_ENTRY *NewMenuEntry; + BM_MENU_ENTRY *NewMenuEntry; UINT8 *ConInCheck; BM_CONSOLE_CONTEXT *NewConsoleContext; - + ASSERT (CallbackData != NULL); - + ConInCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0]; for (Index = 0; ((Index < ConsoleInpMenu.MenuNumber) && \ - (Index < MAX_MENU_NUMBER)) ; Index++) { + (Index < MAX_MENU_NUMBER)) ; Index++) { NewMenuEntry = BOpt_GetMenuEntry (&ConsoleInpMenu, Index); - NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; + NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; ConInCheck[Index] = NewConsoleContext->IsActive; } } @@ -1086,27 +1086,27 @@ GetConsoleInCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleOutCheck ( IN BMM_CALLBACK_DATA *CallbackData ) { UINT16 Index; - BM_MENU_ENTRY *NewMenuEntry; + BM_MENU_ENTRY *NewMenuEntry; UINT8 *ConOutCheck; BM_CONSOLE_CONTEXT *NewConsoleContext; - + ASSERT (CallbackData != NULL); ConOutCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0]; for (Index = 0; ((Index < ConsoleOutMenu.MenuNumber) && \ - (Index < MAX_MENU_NUMBER)) ; Index++) { + (Index < MAX_MENU_NUMBER)) ; Index++) { NewMenuEntry = BOpt_GetMenuEntry (&ConsoleOutMenu, Index); - NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; + NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; ConOutCheck[Index] = NewConsoleContext->IsActive; } } - + /** Initialize standard error output device check box to ConsoleErrCheck[MAX_MENU_NUMBER] @@ -1114,23 +1114,23 @@ GetConsoleOutCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetConsoleErrCheck ( IN BMM_CALLBACK_DATA *CallbackData ) { UINT16 Index; - BM_MENU_ENTRY *NewMenuEntry; + BM_MENU_ENTRY *NewMenuEntry; UINT8 *ConErrCheck; BM_CONSOLE_CONTEXT *NewConsoleContext; - + ASSERT (CallbackData != NULL); ConErrCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0]; for (Index = 0; ((Index < ConsoleErrMenu.MenuNumber) && \ - (Index < MAX_MENU_NUMBER)) ; Index++) { + (Index < MAX_MENU_NUMBER)) ; Index++) { NewMenuEntry = BOpt_GetMenuEntry (&ConsoleErrMenu, Index); - NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; + NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; ConErrCheck[Index] = NewConsoleContext->IsActive; } } @@ -1142,23 +1142,23 @@ GetConsoleErrCheck ( @param CallbackData The BMM context data. -**/ -VOID +**/ +VOID GetTerminalAttribute ( IN BMM_CALLBACK_DATA *CallbackData ) { BMM_FAKE_NV_DATA *CurrentFakeNVMap; BM_MENU_ENTRY *NewMenuEntry; - BM_TERMINAL_CONTEXT *NewTerminalContext; - UINT16 TerminalIndex; + BM_TERMINAL_CONTEXT *NewTerminalContext; + UINT16 TerminalIndex; UINT8 AttributeIndex; ASSERT (CallbackData != NULL); - - CurrentFakeNVMap = &CallbackData->BmmFakeNvData; + + CurrentFakeNVMap = &CallbackData->BmmFakeNvData; for (TerminalIndex = 0; ((TerminalIndex < TerminalMenu.MenuNumber) && \ - (TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) { + (TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) { NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, TerminalIndex); NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext; for (AttributeIndex = 0; AttributeIndex < sizeof (BaudRateList) / sizeof (BaudRateList [0]); AttributeIndex++) { @@ -1172,27 +1172,27 @@ GetTerminalAttribute ( NewTerminalContext->DataBitsIndex = AttributeIndex; break; } - } - + } + for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (ParityList); AttributeIndex++) { if (NewTerminalContext->Parity == (UINT64) (ParityList[AttributeIndex].Value)) { NewTerminalContext->ParityIndex = AttributeIndex; break; } - } - + } + for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (StopBitsList); AttributeIndex++) { if (NewTerminalContext->StopBits == (UINT64) (StopBitsList[AttributeIndex].Value)) { NewTerminalContext->StopBitsIndex = AttributeIndex; break; } - } + } CurrentFakeNVMap->COMBaudRate[TerminalIndex] = NewTerminalContext->BaudRateIndex; CurrentFakeNVMap->COMDataRate[TerminalIndex] = NewTerminalContext->DataBitsIndex; CurrentFakeNVMap->COMStopBits[TerminalIndex] = NewTerminalContext->StopBitsIndex; - CurrentFakeNVMap->COMParity[TerminalIndex] = NewTerminalContext->ParityIndex; + CurrentFakeNVMap->COMParity[TerminalIndex] = NewTerminalContext->ParityIndex; CurrentFakeNVMap->COMTerminalType[TerminalIndex] = NewTerminalContext->TerminalType; CurrentFakeNVMap->COMFlowControl[TerminalIndex] = NewTerminalContext->FlowControl; - } + } } diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr index 056694ebef..6a326f6c1c 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr @@ -1,16 +1,16 @@ ///** @file -// +// // File Explorer Formset -// -// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ #include "FormGuid.h" @@ -124,4 +124,4 @@ formset endform; -endformset; \ No newline at end of file +endformset; diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c index 910edf6b8d..99c1dc19ea 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c @@ -1,7 +1,7 @@ /** @file File explorer related functions. -Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -236,7 +236,7 @@ UpdateFileExplorer ( @param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. @param[in] Configuration A null-terminated Unicode string in - format. + format. @param[out] Progress A pointer to a string filled in with the offset of the most recent '&' before the first failing name / value pair (or the @@ -246,7 +246,7 @@ UpdateFileExplorer ( successful. @retval EFI_SUCCESS The results have been distributed or are - awaiting distribution. + awaiting distribution. @retval EFI_OUT_OF_RESOURCES Not enough memory to store the parts of the results that must be stored awaiting possible future @@ -289,8 +289,8 @@ FileExplorerRouteConfig ( } Status = gBS->LocateProtocol ( - &gEfiHiiConfigRoutingProtocolGuid, - NULL, + &gEfiHiiConfigRoutingProtocolGuid, + NULL, (VOID**) &ConfigRouting ); if (EFI_ERROR (Status)) { @@ -393,7 +393,7 @@ FileExplorerCallback ( // return EFI_UNSUPPORTED; } - + Status = EFI_SUCCESS; Private = FE_CALLBACK_DATA_FROM_THIS (This); @@ -407,7 +407,7 @@ FileExplorerCallback ( if ((Value == NULL) || (ActionRequest == NULL)) { return EFI_INVALID_PARAMETER; } - + if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) { NvRamMap->BootOptionChanged = FALSE; *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT; @@ -451,7 +451,7 @@ FileExplorerCallback ( if (Value == NULL) { return EFI_INVALID_PARAMETER; } - + if (QuestionId >= FILE_OPTION_GOTO_OFFSET) { // // function will always return FALSE, no need to check here. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c index bdf26141d8..1edf8a8ca4 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c @@ -1,7 +1,7 @@ /** @file Dynamically update the pages. -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -25,7 +25,7 @@ RefreshUpdateData ( { // // Free current updated date - // + // if (mStartOpCodeHandle != NULL) { HiiFreeOpCodeHandle (mStartOpCodeHandle); } @@ -46,7 +46,7 @@ RefreshUpdateData ( /** Add a "Go back to main page" tag in front of the form when there are no "Apply changes" and "Discard changes" tags in the end of the form. - + @param CallbackData The BMM context data. **/ @@ -131,7 +131,7 @@ UpdatePageEnd ( } /** - Clean up the dynamic opcode at label and form specified by both LabelId. + Clean up the dynamic opcode at label and form specified by both LabelId. @param LabelId It is both the Form ID and Label ID for opcode deletion. @param CallbackData The BMM context data. @@ -345,7 +345,7 @@ UpdateDrvDelPage ( UpdatePageStart (CallbackData); CreateMenuStringToken (CallbackData, CallbackData->BmmHiiHandle, &DriverOptionMenu); - + ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.DriverOptionDel) / sizeof (CallbackData->BmmFakeNvData.DriverOptionDel[0]))); for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) { NewMenuEntry = BOpt_GetMenuEntry (&DriverOptionMenu, Index); @@ -380,7 +380,7 @@ UpdateDrvDelPage ( } /** - Prepare the page to allow user to add description for + Prepare the page to allow user to add description for a Driver Option. @param CallbackData The BMM context data. @@ -552,11 +552,11 @@ UpdateOrderPage ( UpdatePageStart (CallbackData); CreateMenuStringToken (CallbackData, CallbackData->BmmHiiHandle, OptionMenu); - + OptionOrder = NULL; QuestionId = 0; VarOffset = 0; - switch (UpdatePageId) { + switch (UpdatePageId) { case FORM_BOOT_CHG_ID: // @@ -587,12 +587,12 @@ UpdateOrderPage ( QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID; VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET; break; - } + } ASSERT (OptionOrder != NULL); OptionsOpCodeHandle = HiiAllocateOpCodeHandle (); ASSERT (OptionsOpCodeHandle != NULL); - + NewMenuEntry = NULL; for (OptionIndex = 0; (OptionIndex < MAX_MENU_NUMBER && OptionOrder[OptionIndex] != 0); OptionIndex++) { BootOptionFound = FALSE; @@ -613,21 +613,21 @@ UpdateOrderPage ( ); } } - + if (OptionMenu->MenuNumber > 0) { - HiiCreateOrderedListOpCode ( - mStartOpCodeHandle, // Container for dynamic created opcodes - QuestionId, // Question ID - VARSTORE_ID_BOOT_MAINT, // VarStore ID - VarOffset, // Offset in Buffer Storage - STRING_TOKEN (STR_CHANGE_ORDER), // Question prompt text - STRING_TOKEN (STR_CHANGE_ORDER), // Question help text - 0, // Question flag + HiiCreateOrderedListOpCode ( + mStartOpCodeHandle, // Container for dynamic created opcodes + QuestionId, // Question ID + VARSTORE_ID_BOOT_MAINT, // VarStore ID + VarOffset, // Offset in Buffer Storage + STRING_TOKEN (STR_CHANGE_ORDER), // Question prompt text + STRING_TOKEN (STR_CHANGE_ORDER), // Question help text + 0, // Question flag 0, // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET - EFI_IFR_TYPE_NUM_SIZE_32, // Data type of Question value - 100, // Maximum container - OptionsOpCodeHandle, // Option Opcode list - NULL // Default Opcode is NULL + EFI_IFR_TYPE_NUM_SIZE_32, // Data type of Question value + 100, // Maximum container + OptionsOpCodeHandle, // Option Opcode list + NULL // Default Opcode is NULL ); } @@ -706,7 +706,7 @@ UpdateBootNextPage ( EFI_IFR_TYPE_NUM_SIZE_16, Index ); - } + } HiiCreateOneOfOpCode ( mStartOpCodeHandle, @@ -765,7 +765,7 @@ UpdateTimeOutPage ( 0, DefaultOpCodeHandle ); - + HiiFreeOpCodeHandle (DefaultOpCodeHandle); //CallbackData->BmmFakeNvData.BootTimeOut = BootTimeOut; @@ -840,7 +840,7 @@ UpdateConModePage ( if (EFI_ERROR (Status)) { continue; } - + // // Build mode string Column x Row // @@ -956,7 +956,7 @@ UpdateTerminalPage ( OptionsOpCodeHandle, NULL ); - + HiiFreeOpCodeHandle (OptionsOpCodeHandle); OptionsOpCodeHandle = HiiAllocateOpCodeHandle (); ASSERT (OptionsOpCodeHandle != NULL); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c index 414367cf23..ea798fab9d 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c @@ -1,7 +1,7 @@ /** @file Variable operation that will be used by bootmaint -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -19,10 +19,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. After deleting this boot option, call Var_ChangeBootOrder to make sure BootOrder is in valid state. - @retval EFI_SUCCESS If all boot load option EFI Variables corresponding to + @retval EFI_SUCCESS If all boot load option EFI Variables corresponding to BM_LOAD_CONTEXT marked for deletion is deleted. @retval EFI_NOT_FOUND If can not find the boot option want to be deleted. - @return Others If failed to update the "BootOrder" variable after deletion. + @return Others If failed to update the "BootOrder" variable after deletion. **/ EFI_STATUS @@ -86,7 +86,7 @@ Var_DelBootOption ( scratch by content from BootOptionMenu is needed. - + @retval EFI_SUCCESS The boot order is updated successfully. @return EFI_STATUS other than EFI_SUCCESS if failed to @@ -313,7 +313,7 @@ Var_ChangeDriverOrder ( } /** - Update the device path of "ConOut", "ConIn" and "ErrOut" + Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new BaudRate, Data Bits, parity and Stop Bits set. @@ -383,7 +383,7 @@ Var_UpdateAllConsoleOption ( This function clear the EFI variable defined by ConsoleName and gEfiGlobalVariableGuid. It then build the multi-instance device - path by appending the device path of the Console (In/Out/Err) instance + path by appending the device path of the Console (In/Out/Err) instance in ConsoleMenu. Then it scan all corresponding console device by scanning Terminal (built from device supporting Serial I/O instances) devices in TerminalMenu. At last, it save a EFI variable specifed @@ -447,7 +447,7 @@ Var_UpdateConsoleOption ( ) { Vendor.Header.Type = MESSAGING_DEVICE_PATH; Vendor.Header.SubType = MSG_VENDOR_DP; - + ASSERT (NewTerminalContext->TerminalType < (ARRAY_SIZE (TerminalTypeGuid))); CopyMem ( &Vendor.Guid, @@ -520,7 +520,7 @@ Var_UpdateConsoleOutOption ( console device. @retval EFI_SUCCESS The function complete successfully. - @return The EFI variable can not be saved. See gRT->SetVariable for detail return information. + @return The EFI variable can not be saved. See gRT->SetVariable for detail return information. **/ EFI_STATUS Var_UpdateErrorOutOption ( @@ -531,8 +531,8 @@ Var_UpdateErrorOutOption ( } /** - This function create a currently loaded Drive Option from - the BMM. It then appends this Driver Option to the end of + This function create a currently loaded Drive Option from + the BMM. It then appends this Driver Option to the end of the "DriverOrder" list. It append this Driver Opotion to the end of DriverOptionMenu. @@ -726,8 +726,8 @@ Var_UpdateDriverOption ( } /** - This function create a currently loaded Boot Option from - the BMM. It then appends this Boot Option to the end of + This function create a currently loaded Boot Option from + the BMM. It then appends this Boot Option to the end of the "BootOrder" list. It also append this Boot Opotion to the end of BootOptionMenu. @@ -911,7 +911,7 @@ Var_UpdateBootOption ( } /** - This function update the "BootNext" EFI Variable. If there is + This function update the "BootNext" EFI Variable. If there is no "BootNext" specified in BMM, this EFI Variable is deleted. It also update the BMM context data specified the "BootNext" vaule. @@ -919,7 +919,7 @@ Var_UpdateBootOption ( @param CallbackData The BMM context data. @retval EFI_SUCCESS The function complete successfully. - @return The EFI variable can be saved. See gRT->SetVariable + @return The EFI variable can be saved. See gRT->SetVariable for detail return information. **/ @@ -1105,7 +1105,7 @@ Var_UpdateDriverOrder ( // Changing the content without increasing its size with current variable implementation shouldn't fail. // ASSERT_EFI_ERROR (Status); - + BOpt_FreeMenu (&DriverOptionMenu); BOpt_GetDriverOptions (CallbackData); return EFI_SUCCESS; diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c index 9ee063859c..90aa8f59cc 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c @@ -1,7 +1,7 @@ /** @file The platform boot manager reference implementation -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -44,7 +44,7 @@ HII_VENDOR_DEVICE_PATH mBootManagerHiiVendorDevicePath = { { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -187,10 +187,10 @@ InitializeBootManager ( /** This function invokes Boot Manager. If all devices have not a chance to be connected, - the connect all will be triggered. It then enumerate all boot options. If + the connect all will be triggered. It then enumerate all boot options. If a boot option from the Boot Manager page is selected, Boot Manager will boot from this boot option. - + **/ VOID CallBootManager ( @@ -294,7 +294,7 @@ CallBootManager ( NeedEndOp = FALSE; HiiCreateEndOpCode (StartOpCodeHandle); } - + if (IsLegacyOption && DeviceType != ((BBS_BBS_DEVICE_PATH *) Option->DevicePath)->DeviceType) { if (NeedEndOp) { HiiCreateEndOpCode (StartOpCodeHandle); @@ -314,7 +314,7 @@ CallBootManager ( } ASSERT (Option->Description != NULL); - + Token = HiiSetString (HiiHandle, 0, Option->Description, NULL); TempStr = DevicePathToStr (Option->DevicePath); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h index e26147183a..1928b3c0f9 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h @@ -1,7 +1,7 @@ /** @file The platform boot manager reference implement -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -90,10 +90,10 @@ InitializeBootManager ( /** This function invokes Boot Manager. If all devices have not a chance to be connected, - the connect all will be triggered. It then enumerate all boot options. If + the connect all will be triggered. It then enumerate all boot options. If a boot option from the Boot Manager page is selected, Boot Manager will boot from this boot option. - + **/ VOID CallBootManager ( diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni index fbf128bc34..bbf1f6b9d0 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for BdsPlatform formset. -// -// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c index 6c7fc7ced4..c144d228ae 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c @@ -1,7 +1,7 @@ /** @file BDS routines to handle capsules. -Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -51,7 +51,7 @@ BdsProcessCapsules ( UINT32 CacheNumber; VOID **CapsulePtr; VOID **CapsulePtrCache; - EFI_GUID *CapsuleGuidCache; + EFI_GUID *CapsuleGuidCache; BOOLEAN NeedReset; CapsuleNumber = 0; @@ -70,7 +70,7 @@ BdsProcessCapsules ( DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update.\n")); return EFI_INVALID_PARAMETER; } - + Status = EFI_SUCCESS; // // Find all capsule images from hob @@ -80,7 +80,7 @@ BdsProcessCapsules ( CapsuleTotalNumber ++; HobPointer.Raw = GET_NEXT_HOB (HobPointer); } - + if (CapsuleTotalNumber == 0) { // // We didn't find a hob, so had no errors. @@ -92,7 +92,7 @@ BdsProcessCapsules ( PlatformBdsLockNonUpdatableFlash (); return EFI_SUCCESS; } - + // // Init temp Capsule Data table. // @@ -102,7 +102,7 @@ BdsProcessCapsules ( ASSERT (CapsulePtrCache != NULL); CapsuleGuidCache = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID) * CapsuleTotalNumber); ASSERT (CapsuleGuidCache != NULL); - + // // Find all capsule images from hob // @@ -119,12 +119,12 @@ BdsProcessCapsules ( // // Capsules who have CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE always are used for operating - // System to have information persist across a system reset. EFI System Table must + // System to have information persist across a system reset. EFI System Table must // point to an array of capsules that contains the same CapsuleGuid value. And agents - // searching for this type capsule will look in EFI System Table and search for the + // searching for this type capsule will look in EFI System Table and search for the // capsule's Guid and associated pointer to retrieve the data. Two steps below describes - // how to sorting the capsules by the unique guid and install the array to EFI System Table. - // Firstly, Loop for all coalesced capsules, record unique CapsuleGuids and cache them in an + // how to sorting the capsules by the unique guid and install the array to EFI System Table. + // Firstly, Loop for all coalesced capsules, record unique CapsuleGuids and cache them in an // array for later sorting capsules by CapsuleGuid. // for (Index = 0; Index < CapsuleTotalNumber; Index++) { @@ -132,7 +132,7 @@ BdsProcessCapsules ( if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0) { // // For each capsule, we compare it with known CapsuleGuid in the CacheArray. - // If already has the Guid, skip it. Whereas, record it in the CacheArray as + // If already has the Guid, skip it. Whereas, record it in the CacheArray as // an additional one. // CacheIndex = 0; @@ -159,7 +159,7 @@ BdsProcessCapsules ( // CacheIndex = 0; while (CacheIndex < CacheNumber) { - CapsuleNumber = 0; + CapsuleNumber = 0; for (Index = 0; Index < CapsuleTotalNumber; Index++) { CapsuleHeader = (EFI_CAPSULE_HEADER*) CapsulePtr [Index]; if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0) { @@ -172,7 +172,7 @@ BdsProcessCapsules ( } } if (CapsuleNumber != 0) { - Size = sizeof(EFI_CAPSULE_TABLE) + (CapsuleNumber - 1) * sizeof(VOID*); + Size = sizeof(EFI_CAPSULE_TABLE) + (CapsuleNumber - 1) * sizeof(VOID*); CapsuleTable = AllocateRuntimePool (Size); ASSERT (CapsuleTable != NULL); CapsuleTable->CapsuleArrayNumber = CapsuleNumber; @@ -185,7 +185,7 @@ BdsProcessCapsules ( // // Besides ones with CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE flag, all capsules left are - // recognized by platform with CapsuleGuid. For general platform driver, UpdateFlash + // recognized by platform with CapsuleGuid. For general platform driver, UpdateFlash // type is commonly supported, so here only deal with encapsuled FVs capsule. Additional // type capsule transaction could be extended. It depends on platform policy. // @@ -220,7 +220,7 @@ BdsProcessCapsules ( } PlatformBdsLockNonUpdatableFlash (); - + // // Free the allocated temp memory space. // diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 5103c7e5d1..c4dcf157a5 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -1,7 +1,7 @@ /** @file The platform device manager reference implementation -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -43,7 +43,7 @@ EFI_STRING mSelectedMacAddrString; // // Which form Id need to be show. // -EFI_FORM_ID mNextShowFormId = DEVICE_MANAGER_FORM_ID; +EFI_FORM_ID mNextShowFormId = DEVICE_MANAGER_FORM_ID; // // The Mac Address show in the NETWORK_DEVICE_LIST_FORM_ID @@ -74,7 +74,7 @@ HII_VENDOR_DEVICE_PATH mDeviceManagerHiiVendorDevicePath = { { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -96,7 +96,7 @@ HII_VENDOR_DEVICE_PATH mDriverHealthHiiVendorDevicePath = { { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, - { + { (UINT8) (END_DEVICE_PATH_LENGTH), (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8) } @@ -240,7 +240,7 @@ ExtractDisplayedHiiFormFromHiiHandle ( UINT8 ClassGuidNum; ASSERT (Handle != NULL); - ASSERT (SetupClassGuid != NULL); + ASSERT (SetupClassGuid != NULL); ASSERT (FormSetTitle != NULL); ASSERT (FormSetHelp != NULL); @@ -263,7 +263,7 @@ ExtractDisplayedHiiFormFromHiiHandle ( // The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0. // ASSERT (Status == EFI_BUFFER_TOO_SMALL); - + HiiPackageList = AllocatePool (BufferSize); ASSERT (HiiPackageList != NULL); @@ -326,7 +326,7 @@ ExtractDisplayedHiiFormFromHiiHandle ( } } } - + // // Go to next package // @@ -341,12 +341,12 @@ ExtractDisplayedHiiFormFromHiiHandle ( /** Get the mac address string from the device path. if the device path has the vlan, get the vanid also. - - @param MacAddressNode Device path begin with mac address + + @param MacAddressNode Device path begin with mac address @param PBuffer Output string buffer contain mac address. **/ -BOOLEAN +BOOLEAN GetMacAddressString( IN MAC_ADDR_DEVICE_PATH *MacAddressNode, OUT CHAR16 **PBuffer @@ -382,7 +382,7 @@ GetMacAddressString( *PBuffer = String; StrCpyS (String, BufferLen / sizeof (CHAR16), L"MAC:"); String += 4; - + // // Convert the MAC address into a unicode string. // @@ -400,7 +400,7 @@ GetMacAddressString( *String++ = L':'; } } - + // // If VLAN is configured, it will need extra 5 characters like "\0005". // Plus one unicode character for the null-terminator. @@ -442,7 +442,7 @@ GetMacAddressString( @retval EFI_SUCCESS Add the item is successful. @return Other values if failed to Add the item. **/ -BOOLEAN +BOOLEAN AddIdToMacDeviceList ( IN EFI_STRING MacAddrString ) @@ -488,13 +488,13 @@ AddIdToMacDeviceList ( } else { TempDeviceList = (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen); } - + if (TempDeviceList == NULL) { return FALSE; } - TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId; + TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId; TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET); - + mMacDeviceList.NodeList = TempDeviceList; } mMacDeviceList.CurListLen ++; @@ -511,9 +511,9 @@ AddIdToMacDeviceList ( @param *Node Input device which need to be check. @param *NeedAddItem Whether need to add the menu in the network device list. - + @retval TRUE Has mac address device path. - @retval FALSE NOT Has mac address device path. + @retval FALSE NOT Has mac address device path. **/ BOOLEAN @@ -525,7 +525,7 @@ IsMacAddressDevicePath ( EFI_DEVICE_PATH_PROTOCOL *DevicePath; CHAR16 *Buffer; BOOLEAN ReturnVal; - + ASSERT (Node != NULL); *NeedAddItem = FALSE; ReturnVal = FALSE; @@ -540,12 +540,12 @@ IsMacAddressDevicePath ( if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (DevicePath) == MSG_MAC_ADDR_DP)) { ReturnVal = TRUE; - + if (DEVICE_MANAGER_FORM_ID == mNextShowFormId) { *NeedAddItem = TRUE; break; - } - + } + if (!GetMacAddressString((MAC_ADDR_DEVICE_PATH*)DevicePath, &Buffer)) { break; } @@ -559,7 +559,7 @@ IsMacAddressDevicePath ( if (NETWORK_DEVICE_LIST_FORM_ID == mNextShowFormId) { // - // Same handle may has two network child handle, so the questionid + // Same handle may has two network child handle, so the questionid // has the offset of SAME_HANDLE_KEY_OFFSET. // if (AddIdToMacDeviceList (Buffer)) { @@ -567,7 +567,7 @@ IsMacAddressDevicePath ( } break; } - } + } DevicePath = NextDevicePathNode (DevicePath); } @@ -588,7 +588,7 @@ IsMacAddressDevicePath ( @return FALSE Do not need to add the menu about the network. **/ -BOOLEAN +BOOLEAN IsNeedAddNetworkMenu ( IN EFI_HII_HANDLE Handle, OUT UINTN *ItemCount @@ -596,7 +596,7 @@ IsNeedAddNetworkMenu ( { EFI_STATUS Status; UINTN EntryCount; - UINTN Index; + UINTN Index; EFI_HANDLE DriverHandle; EFI_HANDLE ControllerHandle; EFI_DEVICE_PATH_PROTOCOL *DevicePath; @@ -625,9 +625,9 @@ IsNeedAddNetworkMenu ( } TmpDevicePath = DevicePath; - // + // // Check whether this device path include mac address device path. - // If this path has mac address path, get the value whether need + // If this path has mac address path, get the value whether need // add this info to the menu and return. // Else check more about the child handle devcie path. // @@ -649,7 +649,7 @@ IsNeedAddNetworkMenu ( } if (!IsDevicePathEnd (TmpDevicePath)) { - return FALSE; + return FALSE; } // @@ -688,7 +688,7 @@ IsNeedAddNetworkMenu ( continue; } - // + // // Check whether this device path include mac address device path. // if (!IsMacAddressDevicePath(ChildDevicePath, &IsNeedAdd)) { @@ -708,7 +708,7 @@ IsNeedAddNetworkMenu ( } else { // // If need to update other form, return whether need to add to the menu. - // + // goto Done; } } @@ -717,9 +717,9 @@ IsNeedAddNetworkMenu ( Done: if (OpenInfoBuffer != NULL) { - FreePool (OpenInfoBuffer); + FreePool (OpenInfoBuffer); } - return IsNeedAdd; + return IsNeedAdd; } /** @@ -749,7 +749,7 @@ GetHiiHandleCount ( @param HiiHandles The input HiiHandle array. @param GuidLists The input form set guid lists. @param ArrayCount The input array count, new array will be arraycount + 1 size. - @param Offset The current used HiiHandle's Offset. + @param Offset The current used HiiHandle's Offset. @param FormSetGuid The new found formset guid. **/ @@ -793,7 +793,7 @@ AdjustArrayData ( This function create the dynamic content for device manager. It includes section header for all class of devices, one-of opcode to set VBIOS. - + @retval EFI_SUCCESS Operation is successful. @return Other values if failed to clean up the dynamic content from HII database. @@ -883,7 +883,7 @@ CallDeviceManager ( NewStringLen += (StrLen(String) + 2) * 2; NewStringTitle = AllocatePool (NewStringLen); UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString); - HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL); + HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL); FreePool (String); FreePool (NewStringTitle); } @@ -941,9 +941,9 @@ CallDeviceManager ( } // - // One HiiHandle has more than one formset can be shown, + // One HiiHandle has more than one formset can be shown, // Insert a new pair of HiiHandle + Guid to the HiiHandles and GuidLists list. - // + // if (SkipCount > 0) { AdjustArrayData (&HiiHandles, &GuidLists, HandleNum, Index + 1, FormSetGuid); HandleNum ++; @@ -968,7 +968,7 @@ CallDeviceManager ( // // Network device process - // + // if (IsNeedAddNetworkMenu (HiiHandles[Index], &AddItemCount)) { if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) { // @@ -1015,7 +1015,7 @@ CallDeviceManager ( } } else { // - // + // // Not network device process, only need to show at device manger form. // if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) { @@ -1128,7 +1128,7 @@ CallDeviceManager ( } // - // Driver Health item chose. + // Driver Health item chose. // if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) { CallDriverHealth (); @@ -1152,7 +1152,7 @@ CallDeviceManager ( // In this case, go from the network device list to the specify device. // if ((gCallbackKey < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET ) && (gCallbackKey >= NETWORK_DEVICE_LIST_KEY_OFFSET)) { - mNextShowFormId = NETWORK_DEVICE_FORM_ID; + mNextShowFormId = NETWORK_DEVICE_FORM_ID; gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER; goto Done; } @@ -1237,10 +1237,10 @@ DriverHealthCallback ( } /** - Collect and display the platform's driver health relative information, allow user to do interactive + Collect and display the platform's driver health relative information, allow user to do interactive operation while the platform is unhealthy. - This function display a form which divided into two parts. The one list all modules which has installed + This function display a form which divided into two parts. The one list all modules which has installed driver health protocol. The list usually contain driver name, controller name, and it's health info. While the driver name can't be retrieved, will use device path as backup. The other part of the form provide a choice to the user to repair all platform. @@ -1251,7 +1251,7 @@ CallDriverHealth ( VOID ) { - EFI_STATUS Status; + EFI_STATUS Status; EFI_HII_HANDLE HiiHandle; EFI_BROWSER_ACTION_REQUEST ActionRequest; EFI_IFR_GUID_LABEL *StartLabel; @@ -1278,7 +1278,7 @@ CallDriverHealth ( UINTN StringSize; Index = 0; - DriverHealthInfo = NULL; + DriverHealthInfo = NULL; DriverDevicePath = NULL; IsControllerNameEmpty = FALSE; InitializeListHead (&DriverHealthList); @@ -1352,8 +1352,8 @@ CallDriverHealth ( Link = GetFirstNode (&DriverHealthList); - while (!IsNull (&DriverHealthList, Link)) { - DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link); + while (!IsNull (&DriverHealthList, Link)) { + DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link); Status = DriverHealthGetDriverName (DriverHealthInfo->DriverHandle, &DriverName); if (EFI_ERROR (Status)) { @@ -1366,9 +1366,9 @@ CallDriverHealth ( StringSize = StrSize (DriverName); Status = DriverHealthGetControllerName ( - DriverHealthInfo->DriverHandle, - DriverHealthInfo->ControllerHandle, - DriverHealthInfo->ChildHandle, + DriverHealthInfo->DriverHandle, + DriverHealthInfo->ControllerHandle, + DriverHealthInfo->ChildHandle, &ControllerName ); @@ -1379,24 +1379,24 @@ CallDriverHealth ( } else { IsControllerNameEmpty = TRUE; } - + // // Add the message of the Module itself provided after the string item. // if ((DriverHealthInfo->MessageList != NULL) && (DriverHealthInfo->MessageList->StringId != 0)) { TmpString = HiiGetString ( - DriverHealthInfo->MessageList->HiiHandle, - DriverHealthInfo->MessageList->StringId, + DriverHealthInfo->MessageList->HiiHandle, + DriverHealthInfo->MessageList->StringId, NULL ); ASSERT (TmpString != NULL); - + StringSize += StrLen (L" ") * sizeof(CHAR16); StringSize += StrLen (TmpString) * sizeof(CHAR16); String = (EFI_STRING) AllocateZeroPool (StringSize); ASSERT (String != NULL); - + StrCpyS (String, StringSize / sizeof(CHAR16), DriverName); if (!IsControllerNameEmpty) { StrCatS (String, StringSize / sizeof(CHAR16), L" "); @@ -1436,7 +1436,7 @@ CallDriverHealth ( String = (EFI_STRING) AllocateZeroPool (StringSize); ASSERT (String != NULL); - + StrCpyS (String, StringSize / sizeof (CHAR16), DriverName); if (!IsControllerNameEmpty) { StrCatS (String, StringSize / sizeof (CHAR16), L" "); @@ -1464,14 +1464,14 @@ CallDriverHealth ( Index++; Link = GetNextNode (&DriverHealthList, Link); } - + // // Add End Opcode for Subtitle - // + // HiiCreateEndOpCode (StartOpCodeHandle); HiiCreateSubTitleOpCode (StartOpCodeHandleRepair, STRING_TOKEN (STR_DRIVER_HEALTH_REPAIR_ALL), 0, 0, 1); - TokenHelp = HiiSetString (HiiHandle, 0, GetStringById( STRING_TOKEN (STR_DH_REPAIR_ALL_HELP)), NULL); + TokenHelp = HiiSetString (HiiHandle, 0, GetStringById( STRING_TOKEN (STR_DH_REPAIR_ALL_HELP)), NULL); if (PlaformHealthStatusCheck ()) { // @@ -1541,7 +1541,7 @@ CallDriverHealth ( // We will have returned from processing a callback - user either hit ESC to exit, or selected // a target to display. // Process the diver health status states here. - // + // if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY) { ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE; @@ -1552,7 +1552,7 @@ CallDriverHealth ( // // Got the item relative node in the List // - if (Index == (gCallbackKey - DRIVER_HEALTH_KEY_OFFSET)) { + if (Index == (gCallbackKey - DRIVER_HEALTH_KEY_OFFSET)) { DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link); // // Process the driver's healthy status for the specify module @@ -1560,7 +1560,7 @@ CallDriverHealth ( RebootRequired = FALSE; ProcessSingleControllerHealth ( DriverHealthInfo->DriverHealth, - DriverHealthInfo->ControllerHandle, + DriverHealthInfo->ControllerHandle, DriverHealthInfo->ChildHandle, DriverHealthInfo->HealthStatus, &(DriverHealthInfo->MessageList), @@ -1579,9 +1579,9 @@ CallDriverHealth ( if (ActionRequest == EFI_BROWSER_ACTION_REQUEST_RESET) { EnableResetRequired (); } - + // - // Force return to the form of Driver Health in Device Manager + // Force return to the form of Driver Health in Device Manager // gCallbackKey = DRIVER_HEALTH_RETURN_KEY; } @@ -1591,12 +1591,12 @@ CallDriverHealth ( // if (gCallbackKey == DRIVER_HEALTH_REPAIR_ALL_KEY) { ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE; - + PlatformRepairAll (&DriverHealthList); gCallbackKey = DRIVER_HEALTH_RETURN_KEY; } - + // // Remove driver health packagelist from HII database. // @@ -1615,13 +1615,13 @@ CallDriverHealth ( if (DriverHealthInfo->MessageList != NULL) { FreePool(DriverHealthInfo->MessageList); FreePool (DriverHealthInfo); - } + } } HiiFreeOpCodeHandle (StartOpCodeHandle); - HiiFreeOpCodeHandle (EndOpCodeHandle); + HiiFreeOpCodeHandle (EndOpCodeHandle); HiiFreeOpCodeHandle (StartOpCodeHandleRepair); - HiiFreeOpCodeHandle (EndOpCodeHandleRepair); + HiiFreeOpCodeHandle (EndOpCodeHandleRepair); if (gCallbackKey == DRIVER_HEALTH_RETURN_KEY) { // @@ -1639,11 +1639,11 @@ CallDriverHealth ( This function called by CheckAllControllersHealthStatus () function in order to process a specify contoller's health state. - @param DriverHealthList A Pointer to the list contain all of the platform driver health information. + @param DriverHealthList A Pointer to the list contain all of the platform driver health information. @param DriverHandle The handle of driver. @param ControllerHandle The class guid specifies which form set will be displayed. - @param ChildHandle The handle of the child controller to retrieve the health - status on. This is an optional parameter that may be NULL. + @param ChildHandle The handle of the child controller to retrieve the health + status on. This is an optional parameter that may be NULL. @param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance. @param HealthStatus The health status of the controller. @@ -1740,7 +1740,7 @@ GetSingleControllerHealthStatus ( return EFI_OUT_OF_RESOURCES; } - DriverHealthInfo->Signature = DEVICE_MANAGER_DRIVER_HEALTH_INFO_SIGNATURE; + DriverHealthInfo->Signature = DEVICE_MANAGER_DRIVER_HEALTH_INFO_SIGNATURE; DriverHealthInfo->DriverHandle = DriverHandle; DriverHealthInfo->ControllerHandle = ControllerHandle; DriverHealthInfo->ChildHandle = ChildHandle; @@ -1755,12 +1755,12 @@ GetSingleControllerHealthStatus ( } /** - Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database, - and queries each EFI Driver Health Protocol to determine if one or more of the controllers - managed by each EFI Driver Health Protocol instance are not healthy. + Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database, + and queries each EFI Driver Health Protocol to determine if one or more of the controllers + managed by each EFI Driver Health Protocol instance are not healthy. @param DriverHealthList A Pointer to the list contain all of the platform driver health - information. + information. @retval EFI_NOT_FOUND No controller in the platform install Driver Health Protocol. @retval EFI_SUCCESS All the controllers in the platform are healthy. @@ -1772,7 +1772,7 @@ GetAllControllersHealthStatus ( IN OUT LIST_ENTRY *DriverHealthList ) { - EFI_STATUS Status; + EFI_STATUS Status; UINTN NumHandles; EFI_HANDLE *DriverHealthHandles; EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth; @@ -1782,7 +1782,7 @@ GetAllControllersHealthStatus ( UINTN HandleCount; UINTN ControllerIndex; UINTN ChildIndex; - + // // Initialize local variables // @@ -1810,7 +1810,7 @@ GetAllControllersHealthStatus ( if (EFI_ERROR (Status) || DriverHealthHandles == NULL) { // - // If the list of Driver Health Protocol handles can not be retrieved, then + // If the list of Driver Health Protocol handles can not be retrieved, then // return EFI_OUT_OF_RESOURCES // return EFI_OUT_OF_RESOURCES; @@ -1831,7 +1831,7 @@ GetAllControllersHealthStatus ( // // Retrieve the Driver Health Protocol from DriverHandle // - Status = gBS->HandleProtocol ( + Status = gBS->HandleProtocol ( DriverHealthHandles[DriverHealthIndex], &gEfiDriverHealthProtocolGuid, (VOID **)&DriverHealth @@ -1858,7 +1858,7 @@ GetAllControllersHealthStatus ( } // - // If all the controllers managed by this Driver Health Protocol are healthy, then skip to the next + // If all the controllers managed by this Driver Health Protocol are healthy, then skip to the next // Driver Health Protocol handle // if (HealthStatus == EfiDriverHealthStatusHealthy) { @@ -1882,7 +1882,7 @@ GetAllControllersHealthStatus ( ); if (EFI_ERROR (Status) || Handles == NULL) { // - // If all the handles in the handle database can not be retrieved, then + // If all the handles in the handle database can not be retrieved, then // return EFI_OUT_OF_RESOURCES // Status = EFI_OUT_OF_RESOURCES; @@ -1959,7 +1959,7 @@ Done: /** - Check the healthy status of the platform, this function will return immediately while found one driver + Check the healthy status of the platform, this function will return immediately while found one driver in the platform are not healthy. @retval FALSE at least one driver in the platform are not healthy. @@ -2002,13 +2002,13 @@ PlaformHealthStatusCheck ( } // // Assume all modules are healthy. - // + // AllHealthy = TRUE; // // Found one or more Handles. // - if (!EFI_ERROR (Status)) { + if (!EFI_ERROR (Status)) { for (Index = 0; Index < NoHandles; Index++) { Status = gBS->HandleProtocol ( DriverHealthHandles[Index], @@ -2033,7 +2033,7 @@ PlaformHealthStatusCheck ( // // Return immediately one driver's status not in healthy. // - return FALSE; + return FALSE; } } } @@ -2042,20 +2042,20 @@ PlaformHealthStatusCheck ( } /** - Processes a single controller using the EFI Driver Health Protocol associated with + Processes a single controller using the EFI Driver Health Protocol associated with that controller. This algorithm continues to query the GetHealthStatus() service until - one of the legal terminal states of the EFI Driver Health Protocol is reached. This may + one of the legal terminal states of the EFI Driver Health Protocol is reached. This may require the processing of HII Messages, HII Form, and invocation of repair operations. @param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance. @param ControllerHandle The class guid specifies which form set will be displayed. - @param ChildHandle The handle of the child controller to retrieve the health - status on. This is an optional parameter that may be NULL. + @param ChildHandle The handle of the child controller to retrieve the health + status on. This is an optional parameter that may be NULL. @param HealthStatus The health status of the controller. - @param MessageList An array of warning or error messages associated - with the controller specified by ControllerHandle and + @param MessageList An array of warning or error messages associated + with the controller specified by ControllerHandle and ChildHandle. This is an optional parameter that may be NULL. - @param FormHiiHandle The HII handle for an HII form associated with the + @param FormHiiHandle The HII handle for an HII form associated with the controller specified by ControllerHandle and ChildHandle. @param RebootRequired Indicate whether a reboot is required to repair the controller. **/ @@ -2072,11 +2072,11 @@ ProcessSingleControllerHealth ( { EFI_STATUS Status; EFI_DRIVER_HEALTH_STATUS LocalHealthStatus; - + LocalHealthStatus = HealthStatus; // // If the module need to be repaired or reconfiguration, will process it until - // reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair + // reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair // will be in (Health, Failed, Configuration Required). // while(LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired || @@ -2091,9 +2091,9 @@ ProcessSingleControllerHealth ( ); } // - // Via a form of the driver need to do configuration provided to process of status in + // Via a form of the driver need to do configuration provided to process of status in // EfiDriverHealthStatusConfigurationRequired. The status after configuration should be in - // (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required). + // (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required). // if (LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired) { if (FormHiiHandle != NULL) { @@ -2127,9 +2127,9 @@ ProcessSingleControllerHealth ( if (*MessageList != NULL) { ProcessMessages (*MessageList); - } + } } - + // // Health status in {Healthy, Failed} may also have Messages need to process // @@ -2144,7 +2144,7 @@ ProcessSingleControllerHealth ( if (LocalHealthStatus == EfiDriverHealthStatusRebootRequired) { *RebootRequired = TRUE; } - + // // Do reconnect if need. // @@ -2165,11 +2165,11 @@ ProcessSingleControllerHealth ( /** Reports the progress of a repair operation. - @param[in] Value A value between 0 and Limit that identifies the current + @param[in] Value A value between 0 and Limit that identifies the current progress of the repair operation. @param[in] Limit The maximum value of Value for the current repair operation. - For example, a driver that wants to specify progress in + For example, a driver that wants to specify progress in percent would use a Limit value of 100. @retval EFI_SUCCESS The progress of a repair operation is reported successfully. @@ -2197,7 +2197,7 @@ RepairNotify ( Processes a set of messages returned by the GetHealthStatus () service of the EFI Driver Health Protocol - @param MessageList The MessageList point to messages need to processed. + @param MessageList The MessageList point to messages need to processed. **/ VOID @@ -2219,9 +2219,9 @@ ProcessMessages ( ); if (MessageString != NULL) { // - // User can customize the output. Just simply print out the MessageString like below. + // User can customize the output. Just simply print out the MessageString like below. // Also can use the HiiHandle to display message on the front page. - // + // // Print(L"%s\n",MessageString); // gBS->Stall (100000); } @@ -2233,7 +2233,7 @@ ProcessMessages ( Repair the whole platform. This function is the main entry for user choose "Repair All" in the front page. - It will try to do recovery job till all the driver health protocol installed modules + It will try to do recovery job till all the driver health protocol installed modules reach a terminal state. @param DriverHealthList A Pointer to the list contain all of the platform driver health @@ -2244,7 +2244,7 @@ VOID PlatformRepairAll ( IN LIST_ENTRY *DriverHealthList ) -{ +{ DRIVER_HEALTH_INFO *DriverHealthInfo; LIST_ENTRY *Link; BOOLEAN RebootRequired; @@ -2263,7 +2263,7 @@ PlatformRepairAll ( // ASSERT (DriverHealthInfo != NULL); - ProcessSingleControllerHealth ( + ProcessSingleControllerHealth ( DriverHealthInfo->DriverHealth, DriverHealthInfo->ControllerHandle, DriverHealthInfo->ChildHandle, @@ -2281,22 +2281,22 @@ PlatformRepairAll ( /** - Select the best matching language according to front page policy for best user experience. - - This function supports both ISO 639-2 and RFC 4646 language codes, but language - code types may not be mixed in a single call to this function. + Select the best matching language according to front page policy for best user experience. + + This function supports both ISO 639-2 and RFC 4646 language codes, but language + code types may not be mixed in a single call to this function. @param SupportedLanguages A pointer to a Null-terminated ASCII string that - contains a set of language codes in the format + contains a set of language codes in the format specified by Iso639Language. @param Iso639Language If TRUE, then all language codes are assumed to be in ISO 639-2 format. If FALSE, then all language codes are assumed to be in RFC 4646 language format. @retval NULL The best matching language could not be found in SupportedLanguages. - @retval NULL There are not enough resources available to return the best matching + @retval NULL There are not enough resources available to return the best matching language. - @retval Other A pointer to a Null-terminated ASCII string that is the best matching + @retval Other A pointer to a Null-terminated ASCII string that is the best matching language in SupportedLanguages. **/ CHAR8 * @@ -2334,7 +2334,7 @@ DriverHealthSelectBestLanguage ( @param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param ComponentName A pointer to the Component Name (2) protocol interface. - @param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the + @param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the located Component Name (2) instance. @retval EFI_SUCCESS The Component Name (2) protocol instance is successfully located and we find @@ -2411,8 +2411,8 @@ GetDriverNameWorker ( EFI_COMPONENT_NAME_PROTOCOL *ComponentName; // - // Retrieve Component Name (2) protocol instance on the driver binding handle and - // find the best language this instance supports. + // Retrieve Component Name (2) protocol instance on the driver binding handle and + // find the best language this instance supports. // Status = GetComponentNameWorker ( ProtocolGuid, @@ -2423,7 +2423,7 @@ GetDriverNameWorker ( if (EFI_ERROR (Status)) { return Status; } - + // // Get the driver name from Component Name (2) protocol instance on the driver binging handle. // @@ -2433,7 +2433,7 @@ GetDriverNameWorker ( DriverName ); FreePool (BestLanguage); - + return Status; } @@ -2442,7 +2442,7 @@ GetDriverNameWorker ( This function gets driver name from Component Name 2 protocol interface and Component Name protocol interface in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the driver name. If the attempt fails, it then gets the driver name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param DriverName A pointer to the Unicode string to return. This Unicode string is the name @@ -2483,7 +2483,7 @@ DriverHealthGetDriverName ( This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @@ -2516,8 +2516,8 @@ GetControllerNameWorker ( EFI_COMPONENT_NAME_PROTOCOL *ComponentName; // - // Retrieve Component Name (2) protocol instance on the driver binding handle and - // find the best language this instance supports. + // Retrieve Component Name (2) protocol instance on the driver binding handle and + // find the best language this instance supports. // Status = GetComponentNameWorker ( ProtocolGuid, @@ -2547,9 +2547,9 @@ GetControllerNameWorker ( /** This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface - in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. + in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param ControllerHandle The handle of a controller that the driver specified by This is managing. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h index 95bde8de5a..d48bd8249f 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h @@ -1,7 +1,7 @@ /** @file The platform device manager reference implement -Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -75,7 +75,7 @@ typedef struct { EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth; /// - /// Driver health messages of the specify Driver + /// Driver health messages of the specify Driver /// EFI_DRIVER_HEALTH_HII_MESSAGE *MessageList; @@ -192,7 +192,7 @@ InitializeDeviceManager ( This function create the dynamic content for device manager. It includes section header for all class of devices, one-of opcode to set VBIOS. - + @retval EFI_SUCCESS Operation is successful. @retval Other values if failed to clean up the dynamic content from HII database. @@ -210,11 +210,11 @@ CallDeviceManager ( This function called by CheckAllControllersHealthStatus () function in order to process a specify contoller's health state. - @param DriverHealthList A Pointer to the list contain all of the platform driver health information. + @param DriverHealthList A Pointer to the list contain all of the platform driver health information. @param DriverHandle The handle of driver. @param ControllerHandle The class guid specifies which form set will be displayed. - @param ChildHandle The handle of the child controller to retrieve the health - status on. This is an optional parameter that may be NULL. + @param ChildHandle The handle of the child controller to retrieve the health + status on. This is an optional parameter that may be NULL. @param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance. @param HealthStatus The health status of the controller. @@ -237,9 +237,9 @@ GetSingleControllerHealthStatus ( ); /** - Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database, - and queries each EFI Driver Health Protocol to determine if one or more of the controllers - managed by each EFI Driver Health Protocol instance are not healthy. + Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database, + and queries each EFI Driver Health Protocol to determine if one or more of the controllers + managed by each EFI Driver Health Protocol instance are not healthy. @param DriverHealthList A Pointer to the list contain all of the platform driver health information. @@ -255,7 +255,7 @@ GetAllControllersHealthStatus ( ); /** - Check the healthy status of the platform, this function will return immediately while found one driver + Check the healthy status of the platform, this function will return immediately while found one driver in the platform are not healthy. @retval FALSE at least one driver in the platform are not healthy. @@ -271,7 +271,7 @@ PlaformHealthStatusCheck ( Repair the whole platform. This function is the main entry for user choose "Repair All" in the front page. - It will try to do recovery job till all the driver health protocol installed modules + It will try to do recovery job till all the driver health protocol installed modules reach a terminal state. @param DriverHealthList A Pointer to the list contain all of the platform driver health @@ -284,20 +284,20 @@ PlatformRepairAll ( ); /** - Processes a single controller using the EFI Driver Health Protocol associated with + Processes a single controller using the EFI Driver Health Protocol associated with that controller. This algorithm continues to query the GetHealthStatus() service until - one of the legal terminal states of the EFI Driver Health Protocol is reached. This may + one of the legal terminal states of the EFI Driver Health Protocol is reached. This may require the processing of HII Messages, HII Form, and invocation of repair operations. @param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance. @param ControllerHandle The class guid specifies which form set will be displayed. - @param ChildHandle The handle of the child controller to retrieve the health - status on. This is an optional parameter that may be NULL. + @param ChildHandle The handle of the child controller to retrieve the health + status on. This is an optional parameter that may be NULL. @param HealthStatus The health status of the controller. - @param MessageList An array of warning or error messages associated - with the controller specified by ControllerHandle and + @param MessageList An array of warning or error messages associated + with the controller specified by ControllerHandle and ChildHandle. This is an optional parameter that may be NULL. - @param FormHiiHandle The HII handle for an HII form associated with the + @param FormHiiHandle The HII handle for an HII form associated with the controller specified by ControllerHandle and ChildHandle. @param RebootRequired Indicate whether a reboot is required to repair the controller. **/ @@ -315,11 +315,11 @@ ProcessSingleControllerHealth ( /** Reports the progress of a repair operation. - @param[in] Value A value between 0 and Limit that identifies the current + @param[in] Value A value between 0 and Limit that identifies the current progress of the repair operation. @param[in] Limit The maximum value of Value for the current repair operation. - For example, a driver that wants to specify progress in + For example, a driver that wants to specify progress in percent would use a Limit value of 100. @retval EFI_SUCCESS The progress of a repair operation is reported successfully. @@ -336,7 +336,7 @@ RepairNotify ( Processes a set of messages returned by the GetHealthStatus () service of the EFI Driver Health Protocol - @param MessageList The MessageList point to messages need to processed. + @param MessageList The MessageList point to messages need to processed. **/ VOID @@ -346,10 +346,10 @@ ProcessMessages ( /** - Collect and display the platform's driver health relative information, allow user to do interactive + Collect and display the platform's driver health relative information, allow user to do interactive operation while the platform is unhealthy. - This function display a form which divided into two parts. The one list all modules which has installed + This function display a form which divided into two parts. The one list all modules which has installed driver health protocol. The list usually contain driver name, controller name, and it's health info. While the driver name can't be retrieved, will use device path as backup. The other part of the form provide a choice to the user to repair all platform. @@ -362,22 +362,22 @@ CallDriverHealth ( /** - Select the best matching language according to front page policy for best user experience. - - This function supports both ISO 639-2 and RFC 4646 language codes, but language - code types may not be mixed in a single call to this function. + Select the best matching language according to front page policy for best user experience. + + This function supports both ISO 639-2 and RFC 4646 language codes, but language + code types may not be mixed in a single call to this function. @param SupportedLanguages A pointer to a Null-terminated ASCII string that - contains a set of language codes in the format + contains a set of language codes in the format specified by Iso639Language. @param Iso639Language If TRUE, then all language codes are assumed to be in ISO 639-2 format. If FALSE, then all language codes are assumed to be in RFC 4646 language format. @retval NULL The best matching language could not be found in SupportedLanguages. - @retval NULL There are not enough resources available to return the best matching + @retval NULL There are not enough resources available to return the best matching language. - @retval Other A pointer to a Null-terminated ASCII string that is the best matching + @retval Other A pointer to a Null-terminated ASCII string that is the best matching language in SupportedLanguages. **/ CHAR8 * @@ -394,7 +394,7 @@ DriverHealthSelectBestLanguage ( @param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param ComponentName A pointer to the Component Name (2) protocol interface. - @param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the + @param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the located Component Name (2) instance. @retval EFI_SUCCESS The Component Name (2) protocol instance is successfully located and we find @@ -440,7 +440,7 @@ GetDriverNameWorker ( This function gets driver name from Component Name 2 protocol interface and Component Name protocol interface in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the driver name. If the attempt fails, it then gets the driver name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param DriverName A pointer to the Unicode string to return. This Unicode string is the name @@ -462,7 +462,7 @@ DriverHealthGetDriverName ( This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @@ -492,9 +492,9 @@ GetControllerNameWorker ( /** This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface - in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. + in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name. If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward - compatibility support. + compatibility support. @param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved. @param ControllerHandle The handle of a controller that the driver specified by This is managing. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni index 8d1b10b301..39d89535cc 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for the Device Manager. -// -// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# @@ -49,13 +49,13 @@ #string STR_DH_STATUS_LIST #language en-US "All Driver Health Status List" #language fr-FR "All Driver Health Status List" #string STR_DRIVER_HEALTH_REPAIR_ALL #language en-US "Repair All" - #language fr-FR "Repair All" + #language fr-FR "Repair All" #string STR_DH_REPAIR_ALL_TITLE #language en-US "Repair the whole platform" #language fr-FR "Repair the whole platform" #string STR_DH_REPAIR_ALL_HELP #language en-US "Repair the whole platform until all modules reach terminal status" #language fr-FR "Repair the whole platform until all modules reach terminal status" #string STR_DH_REPAIR_SINGLE_TITLE #language en-US "Item cannot get name" - #language fr-FR "Item cannot get name" + #language fr-FR "Item cannot get name" #string STR_DH_REPAIR_SINGLE_HELP #language en-US "Repair single driver with specify controller" #language fr-FR "Repair single driver with specify controller" diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c index 2163710cc9..bdf63eabbf 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c @@ -1,7 +1,7 @@ /** @file FrontPage routines to handle the callbacks and browser calls -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -189,7 +189,7 @@ FrontPageCallback ( // return EFI_UNSUPPORTED; } - + gCallbackKey = QuestionId; if (Action == EFI_BROWSER_ACTION_CHANGED) { @@ -210,7 +210,7 @@ FrontPageCallback ( // Allocate working buffer for RFC 4646 language in supported LanguageString. // Lang = AllocatePool (AsciiStrSize (mLanguageString)); - ASSERT (Lang != NULL); + ASSERT (Lang != NULL); Index = 0; LangCode = mLanguageString; @@ -279,7 +279,7 @@ FrontPageCallback ( } } - return EFI_SUCCESS; + return EFI_SUCCESS; } /** @@ -415,7 +415,7 @@ InitializeFrontPage ( if (gFrontPagePrivate.LanguageToken == NULL) { // // Count the language list number. - // + // LangCode = mLanguageString; Lang = AllocatePool (AsciiStrSize (mLanguageString)); ASSERT (Lang != NULL); @@ -739,7 +739,7 @@ UpdateFrontPageStrings ( SMBIOS_TABLE_TYPE19 *Type19Record; EFI_SMBIOS_TABLE_HEADER *Record; UINT64 InstalledMemory; - + InstalledMemory = 0; // @@ -906,7 +906,7 @@ ShowProgress ( SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff); SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0); SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff); - + TmpStr = GetStringById (STRING_TOKEN (STR_START_BOOT_OPTION)); if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { @@ -917,7 +917,7 @@ ShowProgress ( PlatformBdsShowProgress (Foreground, Background, TmpStr, Color, 0, 0); } } - + TimeoutRemain = TimeoutDefault; while (TimeoutRemain != 0) { @@ -928,7 +928,7 @@ ShowProgress ( break; } TimeoutRemain--; - + if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { // // Show progress @@ -945,7 +945,7 @@ ShowProgress ( } } } - + if (TmpStr != NULL) { gBS->FreePool (TmpStr); } @@ -997,7 +997,7 @@ PlatformBdsEnterFrontPage ( ) { EFI_STATUS Status; - EFI_STATUS StatusHotkey; + EFI_STATUS StatusHotkey; EFI_BOOT_LOGO_PROTOCOL *BootLogo; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut; @@ -1020,7 +1020,7 @@ PlatformBdsEnterFrontPage ( if (!mModeInitialized) { // - // After the console is ready, get current video resolution + // After the console is ready, get current video resolution // and text mode before launching setup at first time. // Status = gBS->HandleProtocol ( @@ -1031,7 +1031,7 @@ PlatformBdsEnterFrontPage ( if (EFI_ERROR (Status)) { GraphicsOutput = NULL; } - + Status = gBS->HandleProtocol ( gST->ConsoleOutHandle, &gEfiSimpleTextOutProtocolGuid, @@ -1039,7 +1039,7 @@ PlatformBdsEnterFrontPage ( ); if (EFI_ERROR (Status)) { SimpleTextOut = NULL; - } + } if (GraphicsOutput != NULL) { // @@ -1062,9 +1062,9 @@ PlatformBdsEnterFrontPage ( // // Get user defined text mode for setup. - // + // mSetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution); - mSetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution); + mSetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution); mSetupTextModeColumn = PcdGet32 (PcdSetupConOutColumn); mSetupTextModeRow = PcdGet32 (PcdSetupConOutRow); @@ -1091,7 +1091,7 @@ PlatformBdsEnterFrontPage ( if (!EFI_ERROR(Status) && ((OsIndication & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0)) { // // Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS - // + // OsIndication &= ~((UINT64)EFI_OS_INDICATIONS_BOOT_TO_FW_UI); Status = gRT->SetVariable ( L"OsIndications", @@ -1128,7 +1128,7 @@ PlatformBdsEnterFrontPage ( if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(Status) || !EFI_ERROR(StatusHotkey)){ // // Ensure screen is clear when switch Console from Graphics mode to Text mode - // Skip it in normal boot + // Skip it in normal boot // gST->ConOut->EnableCursor (gST->ConOut, TRUE); gST->ConOut->ClearScreen (gST->ConOut); @@ -1152,8 +1152,8 @@ PlatformBdsEnterFrontPage ( } // - // Install BM HiiPackages. - // Keep BootMaint HiiPackage, so that it can be covered by global setting. + // Install BM HiiPackages. + // Keep BootMaint HiiPackage, so that it can be covered by global setting. // InitBMPackage (); @@ -1163,7 +1163,7 @@ PlatformBdsEnterFrontPage ( // Set proper video resolution and text mode for setup // BdsSetConsoleMode (TRUE); - + InitializeFrontPage (FALSE); // @@ -1272,9 +1272,9 @@ Exit: /** This function will change video resolution and text mode - according to defined setup mode or defined boot mode + according to defined setup mode or defined boot mode - @param IsSetupMode Indicate mode is changed to setup mode or boot mode. + @param IsSetupMode Indicate mode is changed to setup mode or boot mode. @retval EFI_SUCCESS Mode is changed successfully. @retval Others Mode failed to be changed. @@ -1302,13 +1302,13 @@ BdsSetConsoleMode ( EFI_STATUS Status; UINTN Index; UINTN CurrentColumn; - UINTN CurrentRow; + UINTN CurrentRow; MaxGopMode = 0; MaxTextMode = 0; // - // Get current video resolution and text mode + // Get current video resolution and text mode // Status = gBS->HandleProtocol ( gST->ConsoleOutHandle, @@ -1326,7 +1326,7 @@ BdsSetConsoleMode ( ); if (EFI_ERROR (Status)) { SimpleTextOut = NULL; - } + } if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) { return EFI_UNSUPPORTED; @@ -1347,12 +1347,12 @@ BdsSetConsoleMode ( NewHorizontalResolution = mBootHorizontalResolution; NewVerticalResolution = mBootVerticalResolution; NewColumns = mBootTextModeColumn; - NewRows = mBootTextModeRow; + NewRows = mBootTextModeRow; } - + if (GraphicsOutput != NULL) { MaxGopMode = GraphicsOutput->Mode->MaxMode; - } + } if (SimpleTextOut != NULL) { MaxTextMode = SimpleTextOut->Mode->MaxMode; @@ -1456,8 +1456,8 @@ BdsSetConsoleMode ( ASSERT_EFI_ERROR (Status); Status = PcdSet32S (PcdConOutRow, NewRows); ASSERT_EFI_ERROR (Status); - - + + // // Video mode is changed, so restart graphics console driver and higher level driver. // Reconnect graphics console driver and higher level driver. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h index a7b1c5bca0..bc2c0612d0 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h @@ -1,7 +1,7 @@ /** @file FrontPage routines to handle the callbacks and browser calls -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -236,9 +236,9 @@ PlatformBdsEnterFrontPage ( /** This function will change video resolution and text mode - according to defined setup mode or defined boot mode + according to defined setup mode or defined boot mode - @param IsSetupMode Indicate mode is changed to setup mode or boot mode. + @param IsSetupMode Indicate mode is changed to setup mode or boot mode. @retval EFI_SUCCESS Mode is changed successfully. @retval Others Mode failed to be changed. diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni index 84f8fb4770..82e71f7d0a 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for BdsPlatform formset. -// -// Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c index e061991ea2..8e33062a54 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c @@ -2,7 +2,7 @@ Provides a way for 3rd party applications to register themselves for launch by the Boot Manager based on hot key -Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -73,15 +73,15 @@ EFI_STATUS HotkeyBoot ( VOID ) -{ +{ EFI_STATUS Status; UINTN ExitDataSize; CHAR16 *ExitData; if (mHotkeyBootOption == NULL) { return EFI_NOT_FOUND; - } - + } + BdsLibConnectDevicePath (mHotkeyBootOption->DevicePath); // @@ -162,7 +162,7 @@ HotkeyCallback ( HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey]; if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) && (KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) && - (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ? + (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ? (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE ) ) { @@ -421,7 +421,7 @@ IsKeyOptionVariable ( ) { UINTN Index; - + if (!CompareGuid (Guid, &gEfiGlobalVariableGuid) || (StrSize (Name) != sizeof (L"Key####")) || (StrnCmp (Name, L"Key", 3) != 0) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/HwErrRecSupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/HwErrRecSupport.c index ddb2f93980..94c72cf984 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/HwErrRecSupport.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/HwErrRecSupport.c @@ -2,7 +2,7 @@ Set the level of support for Hardware Error Record Persistence that is implemented by the platform. -Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -28,9 +28,9 @@ InitializeHwErrRecSupport ( { EFI_STATUS Status; UINT16 HardwareErrorRecordLevel; - + HardwareErrorRecordLevel = PcdGet16 (PcdHardwareErrorRecordLevel); - + if (HardwareErrorRecordLevel != 0) { // // If level value equal 0, no need set to 0 to variable area because UEFI specification diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c index 39455e44da..bb67880e97 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c @@ -1,7 +1,7 @@ /** @file Language settings -Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -343,7 +343,7 @@ IsLangInSupportedLangCodes( IN CHAR8 *SupportedLang, IN CHAR8 *Lang, IN BOOLEAN Iso639Language - ) + ) { UINTN Index; UINTN CompareLength; @@ -375,8 +375,8 @@ IsLangInSupportedLangCodes( // Determine the length of the next language code in SupportedLang // for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++); - - if ((CompareLength == LanguageLength) && + + if ((CompareLength == LanguageLength) && (AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) { // // Successfully find the Lang string in SupportedLang string. @@ -404,7 +404,7 @@ VOID InitializeLangVariable ( IN CHAR16 *LangName, IN CHAR8 *SupportedLang, - IN CHAR8 *DefaultLang, + IN CHAR8 *DefaultLang, IN BOOLEAN Iso639Language ) { diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c index 118808201d..28853d23dd 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c @@ -1,7 +1,7 @@ /** @file Perform the platform memory test -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -282,7 +282,7 @@ BdsMemoryTest ( FreePool (Pos); return EFI_SUCCESS; } - + if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { TmpStr = GetStringById (STRING_TOKEN (STR_ESC_TO_SKIP_MEM_TEST)); @@ -310,7 +310,7 @@ BdsMemoryTest ( ASSERT (0); } - + if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { TempData = (UINT32) DivU64x32 (TotalMemorySize, 16); TestPercent = (UINTN) DivU64x32 ( @@ -326,7 +326,7 @@ BdsMemoryTest ( // StrnCatS ( StrPercent, - sizeof (StrPercent) / sizeof (CHAR16), + sizeof (StrPercent) / sizeof (CHAR16), TmpStr, sizeof (StrPercent) / sizeof (CHAR16) - StrLen (StrPercent) - 1 ); @@ -412,11 +412,11 @@ Done: 100, (UINTN) PreviousValue ); - + } else { DEBUG ((EFI_D_INFO, "%d bytes of system memory tested OK\r\n", TotalMemorySize)); } - + FreePool (Pos); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni index c0ada9535a..bfd202ce23 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni @@ -1,16 +1,16 @@ ///** @file -// +// // String definitions for BdsPlatform formset. -// -// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+// +// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// +// //**/ /=# @@ -52,4 +52,4 @@ #language fr-FR "le Système rencontre les erreurs de mémoire" #string STR_START_BOOT_OPTION #language en-US "Start boot option" #language fr-FR "l'option de botte de Début" - \ No newline at end of file + diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c index d637decb94..d1d8951947 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c @@ -1,14 +1,14 @@ /** @file - UEFI Component Name(2) protocol implementation for VGA Class Driver. - -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + UEFI Component Name(2) protocol implementation for VGA Class Driver. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c index 2d672797fa..a9da74c792 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c @@ -1,14 +1,14 @@ /** @file VGA Class Driver that managers VGA devices and produces Simple Text Output Protocol. -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -310,7 +310,7 @@ UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = { @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. **/ @@ -341,7 +341,7 @@ InitializeVgaClass( /** Internal worker function to program CRTC register via PCI I/O Protocol. - + @param VgaClassDev device instance object @param Address Address of register to write @param Data Data to write to register. @@ -375,12 +375,12 @@ WriteCrtc ( /** Internal worker function to set cursor's position to VgaClass device - + @param VgaClassDev Private data structure for device instance. @param Column Colomn of position to set cursor to. @param Row Row of position to set cursor to. @param MaxColumn Max value of column. - + **/ VOID SetVideoCursorPosition ( @@ -461,7 +461,7 @@ LibIsValidTextGraphics ( /** Internal worker function to check whether input value is an ASCII char. - + @param Char Character to check. @retval TRUE Input value is an ASCII char. @@ -482,7 +482,7 @@ IsValidAscii ( /** Internal worker function to check whether input value is a unicode control char. - + @param Char Character to check. @retval TRUE Input value is a unicode control char. @@ -712,7 +712,7 @@ ErrorExit: /** Starts the device controller. - + This function implments EFI_DRIVER_BINDING_PROTOCOL.Stop(). It stops this driver on Controller. Support stopping any child handles created by this driver. @@ -798,7 +798,7 @@ VgaClassDriverBindingStop ( This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset(). It resets the text output device hardware. The cursor position is set to (0, 0), and the screen is cleared to the default background color for the output device. - + @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param ExtendedVerification Indicates that the driver may perform a more exhaustive verification operation of the device during reset. @@ -837,7 +837,7 @@ VgaClassReset ( /** Writes a Unicode string to the output device. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString(). It writes a Unicode string to the output device. This is the most basic output mechanism on an output device. @@ -977,7 +977,7 @@ VgaClassOutputString ( /** Verifies that all characters in a Unicode string can be output to the target device. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.TestString(). It verifies that all characters in a Unicode string can be output to the target device. @@ -1009,13 +1009,13 @@ VgaClassTestString ( /** Clears the output device(s) display to the currently selected background color. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.ClearScreen(). The ClearScreen() function clears the output device(s) display to the currently selected background color. The cursor position is set to (0, 0). @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. - + @retval EFI_SUCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The output device is not in a valid text mode. @@ -1063,7 +1063,7 @@ VgaClassClearScreen ( /** Sets the background and foreground colors for theOutputString() and ClearScreen() functions. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute(). It sets the background and foreground colors for the OutputString() and ClearScreen() functions. The color mask can be set even when the device is in an invalid text mode. @@ -1074,7 +1074,7 @@ VgaClassClearScreen ( @param Attribute The attribute to set. Bits 0..3 are the foreground color, and bits 4..6 are the background color. - + @retval EFI_SUCCESS The requested attributes were set. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @@ -1096,15 +1096,15 @@ VgaClassSetAttribute ( /** Sets the current coordinates of the cursor position. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetCursorPosition(). It sets the current coordinates of the cursor position. The upper left corner of the screen is defined as coordinate (0, 0). - + @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param Column Column of position to set the cursor to. @param Row Row of position to set the cursor to. - + @retval EFI_SUCCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The output device is not in a valid text mode, or the cursor @@ -1150,14 +1150,14 @@ VgaClassSetCursorPosition ( /** Makes the cursor visible or invisible. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.EnableCursor(). It makes the cursor visible or invisible. @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param Visible If TRUE, the cursor is set to be visible. If FALSE, the cursor is set to be invisible. - + @retval EFI_SUCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request or the device does not support changing the cursor mode. @@ -1208,7 +1208,7 @@ VgaClassEnableCursor ( @param ModeNumber The mode number to return information on. @param Columns Columen in current mode number @param Rows Row in current mode number. - + @retval EFI_SUCCESS The requested mode information was returned. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The mode number was not valid. @@ -1251,7 +1251,7 @@ VgaClassQueryMode ( /** Sets the output device(s) to a specified mode. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode(). It sets the output device(s) to the requested mode. On success the device is in the geometry for the requested mode, @@ -1259,7 +1259,7 @@ VgaClassQueryMode ( @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param ModeNumber The text mode to set. - + @retval EFI_SUCCESS The requested text mode was set. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The mode number was not valid. diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h index 8ecd4c068b..84a8b17978 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h @@ -1,14 +1,14 @@ /** @file Internal include file of the VGA Class Driver. -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -132,7 +132,7 @@ VgaClassDriverBindingStart ( /** Starts the device controller. - + This function implments EFI_DRIVER_BINDING_PROTOCOL.Stop(). It stops this driver on Controller. Support stopping any child handles created by this driver. @@ -278,7 +278,7 @@ VgaClassComponentNameGetControllerName ( This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset(). It resets the text output device hardware. The cursor position is set to (0, 0), and the screen is cleared to the default background color for the output device. - + @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param ExtendedVerification Indicates that the driver may perform a more exhaustive verification operation of the device during reset. @@ -296,7 +296,7 @@ VgaClassReset ( /** Writes a Unicode string to the output device. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString(). It writes a Unicode string to the output device. This is the most basic output mechanism on an output device. @@ -319,7 +319,7 @@ VgaClassOutputString ( /** Verifies that all characters in a Unicode string can be output to the target device. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.TestString(). It verifies that all characters in a Unicode string can be output to the target device. @@ -340,13 +340,13 @@ VgaClassTestString ( /** Clears the output device(s) display to the currently selected background color. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.ClearScreen(). The ClearScreen() function clears the output device(s) display to the currently selected background color. The cursor position is set to (0, 0). @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. - + @retval EFI_SUCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The output device is not in a valid text mode. @@ -360,7 +360,7 @@ VgaClassClearScreen ( /** Sets the background and foreground colors for theOutputString() and ClearScreen() functions. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute(). It sets the background and foreground colors for the OutputString() and ClearScreen() functions. The color mask can be set even when the device is in an invalid text mode. @@ -371,7 +371,7 @@ VgaClassClearScreen ( @param Attribute The attribute to set. Bits 0..3 are the foreground color, and bits 4..6 are the background color. - + @retval EFI_SUCCESS The requested attributes were set. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @@ -385,15 +385,15 @@ VgaClassSetAttribute ( /** Sets the current coordinates of the cursor position. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetCursorPosition(). It sets the current coordinates of the cursor position. The upper left corner of the screen is defined as coordinate (0, 0). - + @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param Column Column of position to set the cursor to. @param Row Row of position to set the cursor to. - + @retval EFI_SUCCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The output device is not in a valid text mode, or the cursor @@ -410,14 +410,14 @@ VgaClassSetCursorPosition ( /** Makes the cursor visible or invisible. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.EnableCursor(). It makes the cursor visible or invisible. @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param Visible If TRUE, the cursor is set to be visible. If FALSE, the cursor is set to be invisible. - + @retval EFI_SUCESS The operation completed successfully. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request or the device does not support changing the cursor mode. @@ -443,7 +443,7 @@ VgaClassEnableCursor ( @param ModeNumber The mode number to return information on. @param Columns Columen in current mode number @param Rows Row in current mode number. - + @retval EFI_SUCCESS The requested mode information was returned. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The mode number was not valid. @@ -460,7 +460,7 @@ VgaClassQueryMode ( /** Sets the output device(s) to a specified mode. - + This function implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode(). It sets the output device(s) to the requested mode. On success the device is in the geometry for the requested mode, @@ -468,7 +468,7 @@ VgaClassQueryMode ( @param This Pointer to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL instance. @param ModeNumber The text mode to set. - + @retval EFI_SUCCESS The requested text mode was set. @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. @retval EFI_UNSUPPORTED The mode number was not valid. diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf index 2faba9d6f7..882f3d0595 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf @@ -1,15 +1,15 @@ ## @file # VGA Class Driver that managers VGA devices and produces Simple Text Output Protocol. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # # ## @@ -28,9 +28,9 @@ # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -# DRIVER_BINDING = gVgaClassDriverBinding +# DRIVER_BINDING = gVgaClassDriverBinding # COMPONENT_NAME = gVgaClassComponentName -# COMPONENT_NAME2 = gVgaClassComponentName2 +# COMPONENT_NAME2 = gVgaClassComponentName2 # [Sources] diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.uni b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.uni index b019ae789a..0e9fce0c54 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.uni +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.uni @@ -3,13 +3,13 @@ // // The VGA Class Driver that manages VGA devices and produces Simple Text Output Protocol. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxeExtra.uni b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxeExtra.uni index 16dcb9e012..8a8cd66f63 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // VgaClassDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "VGA Class DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c index 9474606e20..4c94b22507 100644 --- a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c +++ b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c @@ -1,16 +1,16 @@ /** @file Uses the services of the I/O Library to produce the CPU I/O Protocol -Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -74,16 +74,16 @@ UINT8 mOutStride[] = { /** Check parameters to a CPU I/O Protocol service request. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - + @param[in] MmioOperation TRUE for an MMIO operation, FALSE for I/O Port operation. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[in] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -92,7 +92,7 @@ UINT8 mOutStride[] = { @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -137,7 +137,7 @@ CpuIoCheckParameter ( if (!MmioOperation && (Width == EfiCpuIoWidthUint64)) { return EFI_INVALID_PARAMETER; } - + // // Check to see if Address is aligned // @@ -146,18 +146,18 @@ CpuIoCheckParameter ( } // - // Check to see if any address associated with this transfer exceeds the maximum + // Check to see if any address associated with this transfer exceeds the maximum // allowed address. The maximum address implied by the parameters passed in is // Address + Size * Count. If the following condition is met, then the transfer // is not supported. // // Address + Size * Count > (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS) + 1 // - // Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count + // Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count // can also be the maximum integer value supported by the CPU, this range // check must be adjusted to avoid all overflow conditions. - // - // The following form of the range check is equivalent but assumes that + // + // The following form of the range check is equivalent but assumes that // MAX_ADDRESS and MAX_IO_PORT_ADDRESS are of the form (2^n - 1). // Limit = (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS); @@ -165,7 +165,7 @@ CpuIoCheckParameter ( if (Address > Limit) { return EFI_UNSUPPORTED; } - } else { + } else { MaxCount = RShiftU64 (Limit, Width); if (MaxCount < (Count - 1)) { return EFI_UNSUPPORTED; @@ -189,30 +189,30 @@ CpuIoCheckParameter ( /** Reads memory-mapped registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[out] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -221,7 +221,7 @@ CpuIoCheckParameter ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -269,30 +269,30 @@ CpuMemoryServiceRead ( /** Writes memory-mapped registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[in] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -301,7 +301,7 @@ CpuMemoryServiceRead ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -349,30 +349,30 @@ CpuMemoryServiceWrite ( /** Reads I/O registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[out] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -381,7 +381,7 @@ CpuMemoryServiceWrite ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -453,30 +453,30 @@ CpuIoServiceRead ( /** Write I/O registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[in] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -485,9 +485,9 @@ CpuIoServiceRead ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. - + **/ EFI_STATUS EFIAPI @@ -553,16 +553,16 @@ CpuIoServiceWrite ( IoWrite32 ((UINTN)Address, *((UINT32 *)Uint8Buffer)); } } - + return EFI_SUCCESS; } /** The user Entry Point for module CpuIo. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. diff --git a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.h b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.h index 6eba9c09e7..4c52ed0008 100644 --- a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.h +++ b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.h @@ -1,7 +1,7 @@ /** @file Internal include file of CPU I/O DXE Driver. - Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -30,30 +30,30 @@ /** Reads memory-mapped registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[out] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -62,7 +62,7 @@ @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -79,30 +79,30 @@ CpuMemoryServiceRead ( /** Writes memory-mapped registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[in] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -111,7 +111,7 @@ CpuMemoryServiceRead ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -128,30 +128,30 @@ CpuMemoryServiceWrite ( /** Reads I/O registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[out] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -160,7 +160,7 @@ CpuMemoryServiceWrite ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. **/ @@ -177,30 +177,30 @@ CpuIoServiceRead ( /** Write I/O registers. - The I/O operations are carried out exactly as requested. The caller is responsible - for satisfying any alignment and I/O width restrictions that a PI System on a - platform might require. For example on some platforms, width requests of - EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will + The I/O operations are carried out exactly as requested. The caller is responsible + for satisfying any alignment and I/O width restrictions that a PI System on a + platform might require. For example on some platforms, width requests of + EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will be handled by the driver. - - If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, - or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for + + If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, + or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for each of the Count operations that is performed. - - If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, - EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, + EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times on the same Address. - - If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, - EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is - incremented for each of the Count operations that is performed. The read or + + If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, + EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is + incremented for each of the Count operations that is performed. The read or write operation is performed Count times from the first element of Buffer. - + @param[in] This A pointer to the EFI_CPU_IO_PROTOCOL instance. @param[in] Width Signifies the width of the I/O or Memory operation. - @param[in] Address The base address of the I/O operation. - @param[in] Count The number of I/O operations to perform. The number of + @param[in] Address The base address of the I/O operation. + @param[in] Count The number of I/O operations to perform. The number of bytes moved is Width size * Count, starting at Address. @param[in] Buffer For read operations, the destination buffer to store the results. For write operations, the source buffer from which to write data. @@ -209,9 +209,9 @@ CpuIoServiceRead ( @retval EFI_INVALID_PARAMETER Width is invalid for this PI system. @retval EFI_INVALID_PARAMETER Buffer is NULL. @retval EFI_UNSUPPORTED The Buffer is not aligned for the given Width. - @retval EFI_UNSUPPORTED The address range specified by Address, Width, + @retval EFI_UNSUPPORTED The address range specified by Address, Width, and Count is not valid for this PI system. - + **/ EFI_STATUS EFIAPI diff --git a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxeExtra.uni b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxeExtra.uni index af1ae5df1b..4a9a7d273f 100644 --- a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // CpuIoDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Processor I/O DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c index 9a193d5ff0..b7d2f75ba2 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c @@ -1,15 +1,15 @@ /** @file This code produces the Data Hub protocol. It preloads the data hub with status information copied in from PEI HOBs. - -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -32,7 +32,7 @@ DATA_HUB_INSTANCE mPrivateData; @param RawDataSize Size of Data Log data in bytes @retval EFI_SUCCESS If data was logged - @retval EFI_OUT_OF_RESOURCES If data was not logged due to lack of system + @retval EFI_OUT_OF_RESOURCES If data was not logged due to lack of system resources. **/ EFI_STATUS @@ -68,7 +68,7 @@ DataHubLogData ( // RecordSize = sizeof (EFI_DATA_RECORD_HEADER) + RawDataSize; TotalSize = sizeof (EFI_DATA_ENTRY) + RecordSize; - + // // First try to get log time at TPL level <= TPL_CALLBACK. // @@ -149,7 +149,7 @@ DataHubLogData ( } /** - Search the Head doubly linked list for the passed in MTC. Return the + Search the Head doubly linked list for the passed in MTC. Return the matching element in Head and the MTC on the next entry. @param Head Head of Data Log linked list. @@ -157,7 +157,7 @@ DataHubLogData ( ClassFilter. @param PtrCurrentMTC On IN contians MTC to search for. On OUT contians next MTC in the data log list or zero if at end of the list. - + @retval EFI_DATA_LOG_ENTRY Return pointer to data log data from Head list. @retval NULL If no data record exists. @@ -257,20 +257,20 @@ FindFilterDriverByEvent ( Get a previously logged data record and the MonotonicCount for the next available Record. This allows all records or all records later than a give MonotonicCount to be returned. If an optional FilterDriverEvent - is passed in with a MonotonicCout of zero return the first record - not yet read by the filter driver. If FilterDriverEvent is NULL and + is passed in with a MonotonicCout of zero return the first record + not yet read by the filter driver. If FilterDriverEvent is NULL and MonotonicCount is zero return the first data record. @param This Pointer to the EFI_DATA_HUB_PROTOCOL instance. @param MonotonicCount Specifies the Record to return. On input, zero means return the first record. On output, contains the next record to available. Zero indicates no more records. - @param FilterDriverEvent If FilterDriverEvent is not passed in a MonotonicCount - of zero, it means to return the first data record. - If FilterDriverEvent is passed in, then a MonotonicCount - of zero means to return the first data not yet read by + @param FilterDriverEvent If FilterDriverEvent is not passed in a MonotonicCount + of zero, it means to return the first data record. + If FilterDriverEvent is passed in, then a MonotonicCount + of zero means to return the first data not yet read by FilterDriverEvent. - @param Record Returns a dynamically allocated memory buffer with a data + @param Record Returns a dynamically allocated memory buffer with a data record that matches MonotonicCount. @retval EFI_SUCCESS Data was returned in Record. @@ -312,7 +312,7 @@ DataHubGetNextRecord ( } return EFI_SUCCESS; } - + // // For events the beginning is the last unread record. This info is // stored in the instance structure, so we must look up the event @@ -332,16 +332,16 @@ DataHubGetNextRecord ( // // Retrieve the next record or the first record. - // - if (*MonotonicCount != 0 || FilterDriver->GetNextMonotonicCount == 0) { + // + if (*MonotonicCount != 0 || FilterDriver->GetNextMonotonicCount == 0) { *Record = GetNextDataRecord (&Private->DataListHead, ClassFilter, MonotonicCount); if (*Record == NULL) { return EFI_NOT_FOUND; } - + if (*MonotonicCount != 0) { // - // If this was not the last record then update the count associated with the filter + // If this was not the last record then update the count associated with the filter // FilterDriver->GetNextMonotonicCount = *MonotonicCount; } else { @@ -352,13 +352,13 @@ DataHubGetNextRecord ( } return EFI_SUCCESS; } - + // - // This is a request to read the first record that has not been read yet. + // This is a request to read the first record that has not been read yet. // Set MonotoicCount to the last record successfuly read // *MonotonicCount = FilterDriver->GetNextMonotonicCount; - + // // Retrieve the last record successfuly read again, but do not return it since // it has already been returned before. @@ -367,51 +367,51 @@ DataHubGetNextRecord ( if (*Record == NULL) { return EFI_NOT_FOUND; } - + if (*MonotonicCount != 0) { // - // Update the count associated with the filter + // Update the count associated with the filter // FilterDriver->GetNextMonotonicCount = *MonotonicCount; // - // Retrieve the record after the last record successfuly read - // + // Retrieve the record after the last record successfuly read + // *Record = GetNextDataRecord (&Private->DataListHead, ClassFilter, MonotonicCount); if (*Record == NULL) { return EFI_NOT_FOUND; } } - + return EFI_SUCCESS; } /** - This function registers the data hub filter driver that is represented + This function registers the data hub filter driver that is represented by FilterEvent. Only one instance of each FilterEvent can be registered. - After the FilterEvent is registered, it will be signaled so it can sync - with data records that have been recorded prior to the FilterEvent being + After the FilterEvent is registered, it will be signaled so it can sync + with data records that have been recorded prior to the FilterEvent being registered. - + @param This Pointer to The EFI_DATA_HUB_PROTOCOL instance. - @param FilterEvent The EFI_EVENT to signal whenever data that matches + @param FilterEvent The EFI_EVENT to signal whenever data that matches FilterClass is logged in the system. - @param FilterTpl The maximum EFI_TPL at which FilterEvent can be - signaled. It is strongly recommended that you use the + @param FilterTpl The maximum EFI_TPL at which FilterEvent can be + signaled. It is strongly recommended that you use the lowest EFI_TPL possible. - @param FilterClass FilterEvent will be signaled whenever a bit in - EFI_DATA_RECORD_HEADER.DataRecordClass is also set in - FilterClass. If FilterClass is zero, no class-based + @param FilterClass FilterEvent will be signaled whenever a bit in + EFI_DATA_RECORD_HEADER.DataRecordClass is also set in + FilterClass. If FilterClass is zero, no class-based filtering will be performed. - @param FilterDataRecordGuid FilterEvent will be signaled whenever FilterDataRecordGuid - matches EFI_DATA_RECORD_HEADER.DataRecordGuid. If - FilterDataRecordGuid is NULL, then no GUID-based filtering - will be performed. + @param FilterDataRecordGuid FilterEvent will be signaled whenever FilterDataRecordGuid + matches EFI_DATA_RECORD_HEADER.DataRecordGuid. If + FilterDataRecordGuid is NULL, then no GUID-based filtering + will be performed. @retval EFI_SUCCESS The filter driver event was registered. - @retval EFI_ALREADY_STARTED FilterEvent was previously registered and cannot be + @retval EFI_ALREADY_STARTED FilterEvent was previously registered and cannot be registered again. - @retval EFI_OUT_OF_RESOURCES The filter driver event was not registered due to lack of + @retval EFI_OUT_OF_RESOURCES The filter driver event was not registered due to lack of system resources. **/ @@ -480,12 +480,12 @@ DataHubRegisterFilterDriver ( } /** - Remove a Filter Driver, so it no longer gets called when data + Remove a Filter Driver, so it no longer gets called when data information is logged. @param This Protocol instance structure - @param FilterEvent Event that represents a filter driver that is to be + @param FilterEvent Event that represents a filter driver that is to be Unregistered. @retval EFI_SUCCESS If FilterEvent was unregistered @@ -526,7 +526,7 @@ DataHubUnregisterFilterDriver ( /** - Driver's Entry point routine that install Driver to produce Data Hub protocol. + Driver's Entry point routine that install Driver to produce Data Hub protocol. @param ImageHandle Module's image handle @param SystemTable Pointer of EFI_SYSTEM_TABLE diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h index 7770c438da..9b3f3997bc 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h @@ -1,15 +1,15 @@ /** @file - This code supports a the private implementation + This code supports a the private implementation of the Data Hub protocol - -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf index 0b93f719bb..02d533cfb2 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf @@ -20,8 +20,8 @@ # Management Interface (IPMI).The alternative to a data-hub-like architecture is to require all # drivers to be aware of all reporting formats. # For more information, please ref http://www.intel.com/technology/framework/ -# -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxeExtra.uni b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxeExtra.uni index 8c973db27a..ae938b1bd9 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // DataHubDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Data Hub DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c index f64c5411db..d400cda007 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c +++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c @@ -2,7 +2,7 @@ Data Hub filter driver that takes DEBUG () info from Data Hub and writes it to StdErr if it exists. -Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -65,7 +65,7 @@ DataHubStdErrEventHandler ( if (gST->StdErr == NULL) { return ; } - + // // Mtc of zero means return the next record that has not been read by the // event handler. diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxeExtra.uni b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxeExtra.uni index 487291b831..06a183a9a7 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // DataHubStdErrDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Data Hub stderr DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwPadFile.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwPadFile.c index 8d53d879bd..fcc9e74011 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwPadFile.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwPadFile.c @@ -1,7 +1,7 @@ /** @file Implements functions to pad firmware file. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -219,7 +219,7 @@ FvCreatePadFileInFreeSpace ( /** Fill pad file header within firmware cache. - + @param PadFileHeader The start of the Pad File Buffer. @param PadFileLength The length of the pad file including the header. @@ -264,7 +264,7 @@ FvFillPadFile ( /** Create entire FFS file. - + @param FileHeader Starting Address of a Buffer that hold the FFS File image. @param FfsFileBuffer The source buffer that contains the File Data. @param BufferSize The length of FfsFileBuffer. @@ -662,7 +662,7 @@ FreeFfsBuffer ( @param ActualFileSize The array of actual file size. @param PadSize The array of leading pad file size for each FFS File @param FfsBuffer The array of Ffs Buffer pointer. - @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, + @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, used to get name, attributes, type, etc. @retval EFI_SUCCESS Add the input multiple files into PAD file area. @@ -868,7 +868,7 @@ FvCreateMultipleFilesInsidePadFile ( @param ActualFileSize The array of actual file size. @param PadSize The array of leading pad file size for each FFS File @param FfsBuffer The array of Ffs Buffer pointer. - @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, + @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, used to get name, attributes, type, etc. @retval EFI_SUCCESS Add the input multiple files into PAD file area. @@ -993,7 +993,7 @@ FvCreateMultipleFilesInsideFreeSpace ( @param FvDevice Firmware Volume Device. @param NumOfFiles Total File number to be written. - @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, + @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, used to get name, attributes, type, etc @param FileOperation The array of operation for each file. diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVol.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVol.c index 91fcd47212..9a031bab14 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVol.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVol.c @@ -4,7 +4,7 @@ Layers on top of Firmware Block protocol to produce a file abstraction of FV based files. - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -789,7 +789,7 @@ FwVolDriverInit ( } else { FreePool (FvDevice); } - + DEBUG ((EFI_D_INFO, "Reinstall FV protocol as writable - %r\n", Status)); ASSERT_EFI_ERROR (Status); } else { @@ -807,7 +807,7 @@ FwVolDriverInit ( } else { FreePool (FvDevice); } - + DEBUG ((EFI_D_INFO, "Install FV protocol as writable - %r\n", Status)); ASSERT_EFI_ERROR (Status); } @@ -822,7 +822,7 @@ Done: if (InstallFlag) { return EFI_SUCCESS; } - + // // No FV protocol install/reinstall successfully. // EFI_NOT_FOUND should return to ensure this image will be unloaded. diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolAttrib.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolAttrib.c index 0e4ddf8bea..b2664b5972 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolAttrib.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolAttrib.c @@ -2,7 +2,7 @@ Implements get/set firmware volume attributes. - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -65,7 +65,7 @@ FvGetVolumeAttributes ( unsuccessful return, FvAttributes is not modified and the firmware volume settings are not changed. - + @retval EFI_SUCCESS The requested firmware volume attributes were set and the resulting EFI_FV_ATTRIBUTES is returned in diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDriver.h b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDriver.h index b14a488ead..40ac3785bc 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDriver.h +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDriver.h @@ -1,7 +1,7 @@ /** @file Common defines and definitions for a FwVolDxe driver. - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -129,7 +129,7 @@ FvGetVolumeAttributes ( unsuccessful return, FvAttributes is not modified and the firmware volume settings are not changed. - + @retval EFI_SUCCESS The requested firmware volume attributes were set and the resulting EFI_FV_ATTRIBUTES is returned in @@ -598,7 +598,7 @@ FvCreateNewFileInsidePadFile ( @param FvDevice Firmware Volume Device. @param NumOfFiles Total File number to be written. - @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, + @param FileData The array of EFI_FV_WRITE_FILE_DATA structure, used to get name, attributes, type, etc @param FileOperation The array of operation for each file. diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.uni b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.uni index fb77667395..b2b242bd32 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.uni +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.uni @@ -4,13 +4,13 @@ // This driver produces Firmware Volume2 protocol with full services // (read/write, get/set) based on Firmware Volume Block protocol. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxeExtra.uni b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxeExtra.uni index 9af2689ec3..0e1ed76422 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // FwVolDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Flash Storage DXE Driver v2" diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolWrite.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolWrite.c index e95b75326c..adb910e960 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolWrite.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolWrite.c @@ -1,7 +1,7 @@ /** @file Implements write firmware file. - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -710,7 +710,7 @@ FvcWrite ( UINTN RemainingLength; UINTN WriteLength; UINT8 *TmpBuffer; - + LOffset = 0; RemainingLength = CalculateRemainingLength (FvDevice, Offset, &Lba, &LOffset); if ((UINTN) (*NumBytes) > RemainingLength) { @@ -1463,8 +1463,8 @@ FvWriteFile ( if (FileData[Index1].Type == EFI_FV_FILETYPE_FFS_PAD) { // - // According to PI spec, on EFI_FV_FILETYPE_FFS_PAD: - // "Standard firmware file system services will not return the handle of any pad files, + // According to PI spec, on EFI_FV_FILETYPE_FFS_PAD: + // "Standard firmware file system services will not return the handle of any pad files, // nor will they permit explicit creation of such files." // return EFI_INVALID_PARAMETER; diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/FlashUpdate.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/FlashUpdate.c index 56514c9855..c2a746c6a9 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/FlashUpdate.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/FlashUpdate.c @@ -1,7 +1,7 @@ /** @file Functions in this file will program the image into flash area. - Copyright (c) 2002 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2002 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -450,9 +450,9 @@ FaultTolerantUpdateOnWholeFv ( Offset = 0; UpdateBuffer = ImageBuffer; CopyMem ( - (VOID *) &PrivateData.FileGuid, - (VOID *) &ConfigData->FileGuid, - sizeof (EFI_GUID) + (VOID *) &PrivateData.FileGuid, + (VOID *) &ConfigData->FileGuid, + sizeof (EFI_GUID) ); while (TRUE) { @@ -1006,9 +1006,9 @@ FaultTolerantUpdateOnPartFv ( PtrMap = BlockMap; Image = ImageBuffer; CopyMem ( - (VOID *) &PrivateData.FileGuid, - (VOID *) &ConfigData->FileGuid, - sizeof (EFI_GUID) + (VOID *) &PrivateData.FileGuid, + (VOID *) &ConfigData->FileGuid, + sizeof (EFI_GUID) ); while (TotalSize > 0) { diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/ParseUpdateProfile.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/ParseUpdateProfile.c index 023506e6ee..45c7061ff2 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/ParseUpdateProfile.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/ParseUpdateProfile.c @@ -3,7 +3,7 @@ configuration file and pass the information to the update driver so that the driver can perform updates accordingly. - Copyright (c) 2002 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2002 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -622,7 +622,7 @@ UpdateValueToString ( } /** - Convert the input value to a ascii string, + Convert the input value to a ascii string, and concatenates this string to the input string. @param Str Pointer to a Null-terminated ASCII string. @@ -786,7 +786,7 @@ UpdateStringToGuid ( /** Pre process config data buffer into Section entry list and Comment entry list. - + @param DataBuffer Config raw file buffer. @param BufferSize Size of raw buffer. @param SectionHead Pointer to the section entry list. diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c index e1f1b023dc..26058b3e4d 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c @@ -3,7 +3,7 @@ for the image to be programmed, and the flash area that is going to be programed. - Copyright (c) 2002 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2002 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -22,7 +22,7 @@ EFI_HII_HANDLE gHiiHandle; /** Update the whole FV, or certain files in the FV. - + @param ConfigData Pointer to the config data on updating file. @param ImageBuffer Image buffer to be updated. @param ImageSize Image size. @@ -89,7 +89,7 @@ PerformUpdateOnFirmwareVolume ( // Status = FvbProtocol->GetAttributes (FvbProtocol, &Attributes); if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) { - continue; + continue; } Status = FvbProtocol->GetPhysicalAddress ( @@ -197,7 +197,7 @@ PerformUpdateOnFlashArea ( Print (TmpStr, FlashAddress, ((UINT64)SizeLeft + FlashAddress)); FreePool (TmpStr); } - + // // Locate all Fvb protocol // @@ -242,7 +242,7 @@ PerformUpdateOnFlashArea ( // Status = FvbProtocol->GetAttributes (FvbProtocol, &Attributes); if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) { - continue; + continue; } Status = FvbProtocol->GetPhysicalAddress ( @@ -326,7 +326,7 @@ PerformUpdateOnFlashArea ( if (EFI_ERROR (Status)) { return Status; } - + // // Check if we are done with the update // @@ -540,7 +540,7 @@ ProcessUpdateImage ( FvAlignment = 1 << ((FwVolHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16); // // FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value. - // + // if (FvAlignment < 8) { FvAlignment = 8; } @@ -583,7 +583,7 @@ ProcessUpdateImage ( /** Find the image in the same FV and program it in a target Firmware Volume device. After update image, it will reset system and no return. - + @param ImageHandle A handle for the image that is initializing this driver @param SystemTable A pointer to the EFI system table @@ -602,7 +602,7 @@ InitializeUpdateDriver ( EFI_LOADED_IMAGE_PROTOCOL *LoadedImageProtocol; EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVolProtocol; EFI_FIRMWARE_VOLUME2_PROTOCOL *DataFwVolProtocol; - MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FwVolFilePathNode; + MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FwVolFilePathNode; MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *AlignedDevPathNode; EFI_DEVICE_PATH_PROTOCOL *FilePathNode; EFI_SECTION_TYPE SectionType; @@ -815,7 +815,7 @@ InitializeUpdateDriver ( UpdateConfigData ); // - // Shall updates be serialized so that if an update is not successfully completed, + // Shall updates be serialized so that if an update is not successfully completed, // the remaining updates won't be performed. // if (EFI_ERROR (Status)) { diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf index d83a1ecb57..39f7d1922b 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf @@ -1,11 +1,11 @@ ## @file # Update Driver for Capulse update. # -# This driver is intended to be put in a capsule (FV). If all goes well, -# then it should be dispatched from the capsule FV, then find the image +# This driver is intended to be put in a capsule (FV). If all goes well, +# then it should be dispatched from the capsule FV, then find the image # in the same FV and program it in a target Firmware Volume device. # -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are # licensed and made available under the terms and conditions of the BSD License diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.uni b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.uni index dd240520da..0fdee02b3f 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.uni +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.uni @@ -5,13 +5,13 @@ // then it should be dispatched from the capsule FV, then find the image // in the same FV and program it in a target Firmware Volume device. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxeExtra.uni b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxeExtra.uni index 8336074989..65a1233d6a 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // UpdateDriverDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials are // licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Firmware Update DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegion.c b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegion.c index e432cf4403..747b3d9066 100644 --- a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegion.c +++ b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegion.c @@ -1,13 +1,13 @@ /** @file Produces the Legacy Region Protocol. - This generic implementation of the Legacy Region Protocol does not actually - perform any lock/unlock operations. This module may be used on platforms - that do not provide HW locking of the legacy memory regions. It can also + This generic implementation of the Legacy Region Protocol does not actually + perform any lock/unlock operations. This module may be used on platforms + that do not provide HW locking of the legacy memory regions. It can also be used as a template driver for implementing the Legacy Region Protocol on a platform that does support HW locking of the legacy memory regions. -Copyright (c) 2009, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -135,9 +135,9 @@ EFI_LEGACY_REGION_PROTOCOL mLegacyRegion = { /** The user Entry Point for module LegacyRegionDxe. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] ImageHandle The firmware allocated handle for the EFI image. @param[in] SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. @@ -150,12 +150,12 @@ LegacyRegionInstall ( ) { EFI_STATUS Status; - + // // Make sure the Legacy Region Protocol is not already installed in the system // ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiLegacyRegionProtocolGuid); - + // // Install the protocol on a new handle. // diff --git a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf index f8e5639dec..2e1956e878 100644 --- a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf +++ b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf @@ -1,18 +1,18 @@ ## @file # Produces Framework Legacy Region Protocol. # -# This generic implementation of the Legacy Region Protocol does not actually -# perform any lock/unlock operations. This module may be used on platforms -# that do not provide HW locking of the legacy memory regions. It can also +# This generic implementation of the Legacy Region Protocol does not actually +# perform any lock/unlock operations. This module may be used on platforms +# that do not provide HW locking of the legacy memory regions. It can also # be used as a template driver for implementing the Legacy Region Protocol on # a platform that does support HW locking of the legacy memory regions. # -# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # diff --git a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.uni b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.uni index 385e2701b5..4cf7c6b56c 100644 --- a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.uni +++ b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.uni @@ -7,13 +7,13 @@ // be used as a template driver for implementing the Legacy Region Protocol on // a platform that does support HW locking of the legacy memory regions. // -// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxeExtra.uni b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxeExtra.uni index f94ed593c9..614ab7d784 100644 --- a/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // LegacyRegionDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Legacy Region DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c index cacac486bb..fd4db26e0d 100644 --- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c +++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c @@ -1,33 +1,33 @@ /** @file Section Extraction Protocol implementation. - + Stream database is implemented as a linked list of section streams, where each stream contains a linked list of children, which may be leaves or - encapsulations. - + encapsulations. + Children that are encapsulations generate new stream entries - when they are created. Streams can also be created by calls to + when they are created. Streams can also be created by calls to SEP->OpenSectionStream(). - + The database is only created far enough to return the requested data from any given stream, or to determine that the requested data is not found. - + If a GUIDed encapsulation is encountered, there are three possiblilites. - + 1) A support protocol is found, in which the stream is simply processed with the support protocol. - + 2) A support protocol is not found, but the data is available to be read without processing. In this case, the database is built up through the recursions to return the data, and a RPN event is set that will enable the stream in question to be refreshed if and when the required section - extraction protocol is published.This insures the AuthenticationStatus + extraction protocol is published.This insures the AuthenticationStatus does not become stale in the cache. - + 3) A support protocol is not found, and the data is not available to be read without it. This results in EFI_PROTOCOL_ERROR. -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -77,7 +77,7 @@ typedef struct { UINTN EncapsulatedStreamHandle; EFI_GUID *EncapsulationGuid; // - // If the section REQUIRES an extraction protocol, register for RPN + // If the section REQUIRES an extraction protocol, register for RPN // when the required GUIDed extraction protocol becomes available. // EFI_EVENT Event; @@ -157,22 +157,22 @@ OpenSectionStream ( @param AuthenticationStatus Indicates the authentication status of the retrieved section. - + @retval EFI_SUCCESS Section was retrieved successfully - @retval EFI_PROTOCOL_ERROR A GUID defined section was encountered in the section + @retval EFI_PROTOCOL_ERROR A GUID defined section was encountered in the section stream with its EFI_GUIDED_SECTION_PROCESSING_REQUIRED - bit set, but there was no corresponding GUIDed Section - Extraction Protocol in the handle database. *Buffer is + bit set, but there was no corresponding GUIDed Section + Extraction Protocol in the handle database. *Buffer is unmodified. @retval EFI_NOT_FOUND An error was encountered when parsing the SectionStream. - This indicates the SectionStream is not correctly + This indicates the SectionStream is not correctly formatted. @retval EFI_NOT_FOUND The requested section does not exist. - @retval EFI_OUT_OF_RESOURCES The system has insufficient resources to process the + @retval EFI_OUT_OF_RESOURCES The system has insufficient resources to process the request. @retval EFI_INVALID_PARAMETER The SectionStreamHandle does not exist. - @retval EFI_WARN_TOO_SMALL The size of the caller allocated input buffer is - insufficient to contain the requested section. The + @retval EFI_WARN_TOO_SMALL The size of the caller allocated input buffer is + insufficient to contain the requested section. The input buffer is filled and contents are section contents are truncated. @@ -218,18 +218,18 @@ LIST_ENTRY mStreamRoot = INITIALIZE_LIST_HEAD_VARIABLE (mStreamRoot); EFI_HANDLE mSectionExtractionHandle = NULL; -EFI_SECTION_EXTRACTION_PROTOCOL mSectionExtraction = { - OpenSectionStream, - GetSection, +EFI_SECTION_EXTRACTION_PROTOCOL mSectionExtraction = { + OpenSectionStream, + GetSection, CloseSectionStream }; /** - Entry point of the section extraction code. Initializes an instance of the + Entry point of the section extraction code. Initializes an instance of the section extraction interface and installs it on a new handle. @param ImageHandle A handle for the image that is initializing this driver - @param SystemTable A pointer to the EFI system table + @param SystemTable A pointer to the EFI system table @retval EFI_SUCCESS Driver initialized successfully @retval EFI_OUT_OF_RESOURCES Could not allocate needed resources @@ -281,7 +281,7 @@ IsValidSectionStream ( TotalLength = 0; SectionHeader = (EFI_COMMON_SECTION_HEADER *)SectionStream; - + while (TotalLength < SectionStreamLength) { if (IS_SECTION2 (SectionHeader)) { SectionLength = SECTION2_SIZE (SectionHeader); @@ -291,14 +291,14 @@ IsValidSectionStream ( TotalLength += SectionLength; if (TotalLength == SectionStreamLength) { - return TRUE; + return TRUE; } // // Move to the next byte following the section... // SectionHeader = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) SectionHeader + SectionLength); - + // // Figure out where the next section begins // @@ -331,13 +331,13 @@ OpenSectionStreamEx ( IN UINTN SectionStreamLength, IN VOID *SectionStream, IN BOOLEAN AllocateBuffer, - IN UINT32 AuthenticationStatus, + IN UINT32 AuthenticationStatus, OUT UINTN *SectionStreamHandle ) { FRAMEWORK_SECTION_STREAM_NODE *NewStream; EFI_TPL OldTpl; - + // // Allocate a new stream // @@ -345,14 +345,14 @@ OpenSectionStreamEx ( if (NewStream == NULL) { return EFI_OUT_OF_RESOURCES; } - - if (AllocateBuffer) { + + if (AllocateBuffer) { // // if we're here, we're double buffering, allocate the buffer and copy the // data in // if (SectionStreamLength > 0) { - NewStream->StreamBuffer = AllocatePool (SectionStreamLength); + NewStream->StreamBuffer = AllocatePool (SectionStreamLength); if (NewStream->StreamBuffer == NULL) { FreePool (NewStream); return EFI_OUT_OF_RESOURCES; @@ -375,7 +375,7 @@ OpenSectionStreamEx ( // NewStream->StreamBuffer = SectionStream; } - + // // Initialize the rest of the section stream // @@ -384,7 +384,7 @@ OpenSectionStreamEx ( NewStream->StreamLength = SectionStreamLength; InitializeListHead (&NewStream->Children); NewStream->AuthenticationStatus = AuthenticationStatus; - + // // Add new stream to stream list // @@ -393,7 +393,7 @@ OpenSectionStreamEx ( gBS->RestoreTPL (OldTpl); *SectionStreamHandle = NewStream->StreamHandle; - + return EFI_SUCCESS; } @@ -428,9 +428,9 @@ OpenSectionStream ( if (!IsValidSectionStream (SectionStream, SectionStreamLength)) { return EFI_INVALID_PARAMETER; } - - return OpenSectionStreamEx ( - SectionStreamLength, + + return OpenSectionStreamEx ( + SectionStreamLength, SectionStream, TRUE, 0, @@ -460,7 +460,7 @@ ChildIsType ( ) { EFI_GUID_DEFINED_SECTION *GuidedSection; - + if (SearchType == EFI_SECTION_ALL) { return TRUE; } @@ -549,7 +549,7 @@ CreateProtocolNotifyEvent ( @return TRUE The GuidedSectionGuid could be identified, and the pointer to the Guided Section Extraction Protocol will be returned to *GuidedSectionExtraction. - @return FALSE The GuidedSectionGuid could not be identified, or + @return FALSE The GuidedSectionGuid could not be identified, or the Guided Section Extraction Protocol has not been installed yet. **/ @@ -588,7 +588,7 @@ VerifyGuidedSectionGuid ( } /** - RPN callback function. + RPN callback function. 1. Initialize the section stream when the GUIDED_SECTION_EXTRACTION_PROTOCOL is installed. 2. Removes a stale section stream and re-initializes it with an updated AuthenticationStatus. @@ -611,7 +611,7 @@ NotifyGuidedExtraction ( UINTN NewStreamBufferSize; UINT32 AuthenticationStatus; RPN_EVENT_CONTEXT *Context; - + Context = RpnContext; Status = EFI_SUCCESS; if (Context->ChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) { @@ -619,14 +619,14 @@ NotifyGuidedExtraction ( } if (!EFI_ERROR (Status)) { // - // The stream is not initialized, open it. + // The stream is not initialized, open it. // Or the stream closed successfully, so re-open the stream with correct AuthenticationStatus. // - - GuidedHeader = (EFI_GUID_DEFINED_SECTION *) + + GuidedHeader = (EFI_GUID_DEFINED_SECTION *) (Context->ParentStream->StreamBuffer + Context->ChildNode->OffsetInStream); ASSERT (GuidedHeader->CommonHeader.Type == EFI_SECTION_GUID_DEFINED); - + if (!VerifyGuidedSectionGuid (Context->ChildNode->EncapsulationGuid, &GuidedExtraction)) { return; } @@ -658,11 +658,11 @@ NotifyGuidedExtraction ( // already been closed by someone, so just destroy the event and be done with // it. // - + gBS->CloseEvent (Event); Context->ChildNode->Event = NULL; FreePool (Context); -} +} /** Worker function. Constructor for RPN event if needed to keep AuthenticationStatus @@ -679,16 +679,16 @@ CreateGuidedExtractionRpnEvent ( ) { RPN_EVENT_CONTEXT *Context; - + // // Allocate new event structure and context // Context = AllocatePool (sizeof (RPN_EVENT_CONTEXT)); ASSERT (Context != NULL); - + Context->ChildNode = ChildNode; Context->ParentStream = ParentStream; - + Context->ChildNode->Event = CreateProtocolNotifyEvent ( Context->ChildNode->EncapsulationGuid, TPL_NOTIFY, @@ -740,7 +740,7 @@ CreateChildNode ( UINT32 UncompressedLength; UINT8 CompressionType; UINT16 GuidedSectionAttributes; - + FRAMEWORK_SECTION_CHILD_NODE *Node; SectionHeader = (EFI_COMMON_SECTION_HEADER *) (Stream->StreamBuffer + ChildOffset); @@ -753,7 +753,7 @@ CreateChildNode ( if (Node == NULL) { return EFI_OUT_OF_RESOURCES; } - + // // Now initialize it // @@ -767,7 +767,7 @@ CreateChildNode ( Node->OffsetInStream = ChildOffset; Node->EncapsulatedStreamHandle = NULL_STREAM_HANDLE; Node->EncapsulationGuid = NULL; - + // // If it's an encapsulating section, then create the new section stream also // @@ -805,7 +805,7 @@ CreateChildNode ( FreePool (Node); return EFI_OUT_OF_RESOURCES; } - + if (CompressionType == EFI_NOT_COMPRESSED) { // // stream is not actually compressed, just encapsulated. So just copy it. @@ -814,15 +814,15 @@ CreateChildNode ( } else if (CompressionType == EFI_STANDARD_COMPRESSION) { // // Only support the EFI_SATNDARD_COMPRESSION algorithm. - // + // // // Decompress the stream // Status = gBS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID **)&Decompress); - + ASSERT_EFI_ERROR (Status); - + Status = Decompress->GetInfo ( Decompress, CompressionSource, @@ -855,7 +855,7 @@ CreateChildNode ( ScratchBuffer, ScratchSize ); - FreePool (ScratchBuffer); + FreePool (ScratchBuffer); if (EFI_ERROR (Status)) { FreePool (Node); FreePool (NewStreamBuffer); @@ -866,7 +866,7 @@ CreateChildNode ( NewStreamBuffer = NULL; NewStreamBufferSize = 0; } - + Status = OpenSectionStreamEx ( NewStreamBufferSize, NewStreamBuffer, @@ -906,9 +906,9 @@ CreateChildNode ( FreePool (*ChildNode); return EFI_PROTOCOL_ERROR; } - + // - // Make sure we initialize the new stream with the correct + // Make sure we initialize the new stream with the correct // authentication status for both aggregate and local status fields. // if ((GuidedSectionAttributes & EFI_GUIDED_SECTION_AUTH_STATUS_VALID) == EFI_GUIDED_SECTION_AUTH_STATUS_VALID) { @@ -923,7 +923,7 @@ CreateChildNode ( // AuthenticationStatus = Stream->AuthenticationStatus; } - + Status = OpenSectionStreamEx ( NewStreamBufferSize, NewStreamBuffer, @@ -942,8 +942,8 @@ CreateChildNode ( // if ((GuidedSectionAttributes & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) == EFI_GUIDED_SECTION_PROCESSING_REQUIRED) { // - // If the section REQUIRES an extraction protocol, register for RPN - // when the required GUIDed extraction protocol becomes available. + // If the section REQUIRES an extraction protocol, register for RPN + // when the required GUIDed extraction protocol becomes available. // AuthenticationStatus = 0; CreateGuidedExtractionRpnEvent (Stream, Node); @@ -954,11 +954,11 @@ CreateChildNode ( AuthenticationStatus = Stream->AuthenticationStatus; if ((GuidedSectionAttributes & EFI_GUIDED_SECTION_AUTH_STATUS_VALID) == EFI_GUIDED_SECTION_AUTH_STATUS_VALID) { // - // The local status of the new stream is contained in + // The local status of the new stream is contained in // AuthenticaionStatus. This value needs to be ORed into the // Aggregate bits also... // - + // // Clear out and initialize the local status // @@ -969,7 +969,7 @@ CreateChildNode ( // AuthenticationStatus |= AuthenticationStatus >> 16; } - + if (IS_SECTION2 (GuidedHeader)) { Status = OpenSectionStreamEx ( SECTION2_SIZE (GuidedHeader) - ((EFI_GUID_DEFINED_SECTION2 *) GuidedHeader)->DataOffset, @@ -993,8 +993,8 @@ CreateChildNode ( } } } - - if ((AuthenticationStatus & EFI_LOCAL_AUTH_STATUS_ALL) == + + if ((AuthenticationStatus & EFI_LOCAL_AUTH_STATUS_ALL) == (EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED | EFI_LOCAL_AUTH_STATUS_NOT_TESTED)) { // // Need to register for RPN for when the required GUIDed extraction @@ -1004,17 +1004,17 @@ CreateChildNode ( // CreateGuidedExtractionRpnEvent (Stream, Node); } - + break; default: - + // // Nothing to do if it's a leaf // break; } - + // // Last, add the new child node to the stream // @@ -1064,15 +1064,15 @@ FindChildNode ( UINT32 NextChildOffset; EFI_STATUS ErrorStatus; EFI_STATUS Status; - + CurrentChildNode = NULL; ErrorStatus = EFI_NOT_FOUND; - + if (SourceStream->StreamLength == 0) { return EFI_NOT_FOUND; } - - if (IsListEmpty (&SourceStream->Children) && + + if (IsListEmpty (&SourceStream->Children) && SourceStream->StreamLength >= sizeof (EFI_COMMON_SECTION_HEADER)) { // // This occurs when a section stream exists, but no child sections @@ -1086,7 +1086,7 @@ FindChildNode ( return Status; } } - + // // At least one child has been parsed out of the section stream. So, walk // through the sections that have already been parsed out looking for the @@ -1113,7 +1113,7 @@ FindChildNode ( return EFI_SUCCESS; } } - + if (CurrentChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) { // // If the current node is an encapsulating node, recurse into it... @@ -1147,7 +1147,7 @@ FindChildNode ( // ErrorStatus = EFI_PROTOCOL_ERROR; } - + if (!IsNodeAtEnd (&SourceStream->Children, &CurrentChildNode->Link)) { // // We haven't found the child node we're interested in yet, but there's @@ -1199,9 +1199,9 @@ FindStreamNode ( IN UINTN SearchHandle, OUT FRAMEWORK_SECTION_STREAM_NODE **FoundStream ) -{ +{ FRAMEWORK_SECTION_STREAM_NODE *StreamNode; - + if (!IsListEmpty (&mStreamRoot)) { StreamNode = STREAM_NODE_FROM_LINK (GetFirstNode (&mStreamRoot)); for (;;) { @@ -1215,10 +1215,10 @@ FindStreamNode ( } } } - + return EFI_NOT_FOUND; } - + /** SEP member function. Retrieves requested section from section stream. @@ -1242,22 +1242,22 @@ FindStreamNode ( @param AuthenticationStatus Indicates the authentication status of the retrieved section. - + @retval EFI_SUCCESS Section was retrieved successfully - @retval EFI_PROTOCOL_ERROR A GUID defined section was encountered in the section + @retval EFI_PROTOCOL_ERROR A GUID defined section was encountered in the section stream with its EFI_GUIDED_SECTION_PROCESSING_REQUIRED - bit set, but there was no corresponding GUIDed Section - Extraction Protocol in the handle database. *Buffer is + bit set, but there was no corresponding GUIDed Section + Extraction Protocol in the handle database. *Buffer is unmodified. @retval EFI_NOT_FOUND An error was encountered when parsing the SectionStream. - This indicates the SectionStream is not correctly + This indicates the SectionStream is not correctly formatted. @retval EFI_NOT_FOUND The requested section does not exist. - @retval EFI_OUT_OF_RESOURCES The system has insufficient resources to process the + @retval EFI_OUT_OF_RESOURCES The system has insufficient resources to process the request. @retval EFI_INVALID_PARAMETER The SectionStreamHandle does not exist. - @retval EFI_WARN_TOO_SMALL The size of the caller allocated input buffer is - insufficient to contain the requested section. The + @retval EFI_WARN_TOO_SMALL The size of the caller allocated input buffer is + insufficient to contain the requested section. The input buffer is filled and contents are section contents are truncated. @@ -1286,12 +1286,12 @@ GetSection ( UINT8 *CopyBuffer; UINTN SectionSize; EFI_COMMON_SECTION_HEADER *Section; - + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Instance = SectionInstance + 1; ChildStreamNode = NULL; - + // // Locate target stream // @@ -1300,7 +1300,7 @@ GetSection ( Status = EFI_INVALID_PARAMETER; goto GetSection_Done; } - + // // Found the stream, now locate and return the appropriate section // @@ -1316,12 +1316,12 @@ GetSection ( // There's a requested section type, so go find it and return it... // Status = FindChildNode ( - StreamNode, - *SectionType, - &Instance, + StreamNode, + *SectionType, + &Instance, SectionDefinitionGuid, &ChildNode, - &ChildStreamNode, + &ChildStreamNode, &ExtractedAuthenticationStatus ); if (EFI_ERROR (Status)) { @@ -1339,9 +1339,9 @@ GetSection ( CopyBuffer = (UINT8 *) Section + sizeof (EFI_COMMON_SECTION_HEADER); } *AuthenticationStatus = ExtractedAuthenticationStatus; - } - - SectionSize = CopySize; + } + + SectionSize = CopySize; if (*Buffer != NULL) { // // Caller allocated buffer. Fill to size and return required size... @@ -1362,7 +1362,7 @@ GetSection ( } CopyMem (*Buffer, CopyBuffer, CopySize); *BufferSize = SectionSize; - + GetSection_Done: gBS->RestoreTPL (OldTpl); return Status; @@ -1384,7 +1384,7 @@ FreeChildNode ( // Remove the child from it's list // RemoveEntryList (&ChildNode->Link); - + if (ChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) { // // If it's an encapsulating section, we close the resulting section stream. @@ -1401,7 +1401,7 @@ FreeChildNode ( // Last, free the child node itself // FreePool (ChildNode); -} +} /** SEP member function. Deletes an existing section stream @@ -1427,9 +1427,9 @@ CloseSectionStream ( EFI_STATUS Status; LIST_ENTRY *Link; FRAMEWORK_SECTION_CHILD_NODE *ChildNode; - + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); - + // // Locate target stream // @@ -1450,7 +1450,7 @@ CloseSectionStream ( } else { Status = EFI_INVALID_PARAMETER; } - + gBS->RestoreTPL (OldTpl); return Status; } diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf index ab0bd63076..29ab566b89 100644 --- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf +++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf @@ -4,16 +4,16 @@ # The section is implemented as a linked list of section streams, # where each stream contains a linked list of children, which may be leaves or # encapsulations. Encapsulation section will further generate new section stream entries. -# -# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+# +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# ## [Defines] @@ -23,7 +23,7 @@ FILE_GUID = 801ADCA0-815E-46a4-84F7-657F53621A57 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - ENTRY_POINT = SectionExtractionEntryPoint + ENTRY_POINT = SectionExtractionEntryPoint # The following information is for reference only and not required by the build tools. # diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni index ecbd251b12..1496f6fb90 100644 --- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni +++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni @@ -5,13 +5,13 @@ // where each stream contains a linked list of children, which may be leaves or // encapsulations. Encapsulation section will further generate new section stream entries. // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni index c53ee6bdfb..d0f5caa9d5 100644 --- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // SectionExtractionDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -13,8 +13,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Firmware Storage Extraction DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DataHubStatusCodeWorker.c index 5b42395dbd..a1f86301d4 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DataHubStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DataHubStatusCodeWorker.c @@ -1,7 +1,7 @@ /** @file Data Hub status code worker. - Copyright (c) 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -62,7 +62,7 @@ AcquireRecordBuffer ( if (CurrentTpl > TPL_NOTIFY) { // // Memory management should work at <=TPL_NOTIFY - // + // gBS->RestoreTPL (CurrentTpl); return NULL; } @@ -132,7 +132,7 @@ RetrieveRecord ( /** Release given record and return it to free record buffer. - + @param RecordData Pointer to the record to release. **/ @@ -348,8 +348,8 @@ DataHubStatusCodeInitializeWorker ( EFI_STATUS Status; Status = gBS->LocateProtocol ( - &gEfiDataHubProtocolGuid, - NULL, + &gEfiDataHubProtocolGuid, + NULL, (VOID **) &mDataHubProtocol ); if (EFI_ERROR (Status)) { diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.c b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.c index ee7bdd36af..5db8d814ac 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.c @@ -2,7 +2,7 @@ Status Code Handler Driver which produces datahub handler and hook it onto the DXE status code router. - Copyright (c) 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -45,7 +45,7 @@ UnregisterBootTimeHandlers ( @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. **/ diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf index 1a576772a3..82f9d1a081 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf +++ b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf @@ -1,7 +1,7 @@ ## @file # Status Code Handler Driver which produces datahub handler. # -# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -19,7 +19,7 @@ MODULE_UNI_FILE = DatahubStatusCodeHandlerDxe.uni FILE_GUID = 863D214F-0920-437B-8CAD-88EA83A24E97 MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 + VERSION_STRING = 1.0 ENTRY_POINT = DatahubStatusCodeHandlerDxeEntry # @@ -32,13 +32,13 @@ DatahubStatusCodeHandlerDxe.h DatahubStatusCodeHandlerDxe.c DataHubStatusCodeWorker.c - + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + [LibraryClasses] BaseLib MemoryAllocationLib @@ -50,12 +50,12 @@ DebugLib SynchronizationLib BaseMemoryLib - + [Guids] gEfiEventExitBootServicesGuid ## CONSUMES ## Event gEfiDataHubStatusCodeRecordGuid ## PRODUCES ## UNDEFINED # DataRecord Guid gEfiStatusCodeDataTypeDebugGuid ## SOMETIMES_PRODUCES ## UNDEFINED # Record data type - + [Protocols] gEfiRscHandlerProtocolGuid ## CONSUMES gEfiDataHubProtocolGuid ## CONSUMES diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxeExtra.uni b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxeExtra.uni index 15c62b419f..d69948600e 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // DatahubStatusCodeHandlerDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Data Hub Status Code DXE Driver" diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c index f0b36f23a2..00c2b302bf 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c @@ -1,7 +1,7 @@ /** @file PEI memory status code worker. - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -81,7 +81,7 @@ MemoryStatusCodeReportWorker ( MEMORY_STATUSCODE_RECORD *Record; // - // Find GUID'ed HOBs to locate current record buffer. + // Find GUID'ed HOBs to locate current record buffer. // Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid); ASSERT (Hob.Raw != NULL); diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.c index 5b17df3862..2a09237620 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.c @@ -1,7 +1,7 @@ /** @file Status code PEIM which produces Status Code PPI. - Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -95,7 +95,7 @@ ReportDispatcher ( /** Entry point of Status Code PEIM. - + This function is the entry point of this Status Code PEIM. It initializes supported status code devices according to PCD settings, and installs Status Code PPI. diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePeiExtra.uni b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePeiExtra.uni index f321048582..764849bf5f 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePeiExtra.uni +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePeiExtra.uni @@ -1,7 +1,7 @@ // /** @file // StatusCodePei Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Status Code PEI Module" diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/DataHubStatusCodeWorker.c index ffee2f9c2a..0c48d6cd19 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/DataHubStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/DataHubStatusCodeWorker.c @@ -1,7 +1,7 @@ /** @file Data Hub status code worker. - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -62,7 +62,7 @@ AcquireRecordBuffer ( if (CurrentTpl > TPL_NOTIFY) { // // Memory management should work at <=TPL_NOTIFY - // + // gBS->RestoreTPL (CurrentTpl); return NULL; } @@ -132,7 +132,7 @@ RetrieveRecord ( /** Release given record and return it to free record buffer. - + @param RecordData Pointer to the record to release. **/ @@ -212,7 +212,7 @@ DataHubStatusCodeReportWorker ( return Status; } } - + Record = AcquireRecordBuffer (); if (Record == NULL) { // @@ -362,8 +362,8 @@ DataHubStatusCodeInitializeWorker ( EFI_STATUS Status; Status = gBS->LocateProtocol ( - &gEfiDataHubProtocolGuid, - NULL, + &gEfiDataHubProtocolGuid, + NULL, (VOID **) &mDataHubProtocol ); if (EFI_ERROR (Status)) { diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c index 2a26e19e65..733fea05fd 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c @@ -1,14 +1,14 @@ /** @file Runtime memory status code worker. - Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -18,7 +18,7 @@ RUNTIME_MEMORY_STATUSCODE_HEADER *mRtMemoryStatusCodeTable; /** Initialize runtime memory status code table as initialization for runtime memory status code worker - + @retval EFI_SUCCESS Runtime memory status code table successfully initialized. **/ @@ -38,7 +38,7 @@ RtMemoryStatusCodeInitializeWorker ( mRtMemoryStatusCodeTable->RecordIndex = 0; mRtMemoryStatusCodeTable->NumberOfRecords = 0; - mRtMemoryStatusCodeTable->MaxRecordsNumber = + mRtMemoryStatusCodeTable->MaxRecordsNumber = (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD); return EFI_SUCCESS; @@ -46,16 +46,16 @@ RtMemoryStatusCodeInitializeWorker ( /** - Report status code into runtime memory. If the runtime pool is full, roll back to the + Report status code into runtime memory. If the runtime pool is full, roll back to the first record and overwrite it. - + @param CodeType Indicates the type of status code being reported. @param Value Describes the current status of a hardware or software entity. This included information about the class and subclass that is used to classify the entity as well as an operation. @param Instance The enumeration of a hardware or software entity within the system. Valid instance numbers start with 1. - + @retval EFI_SUCCESS Status code successfully recorded in runtime memory status code table. **/ diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c index e1d02630e7..90908ff9c6 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c @@ -1,14 +1,14 @@ /** @file Serial I/O status code reporting worker. - Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -16,7 +16,7 @@ /** Convert status code value and extended data to readable ASCII string, send string to serial I/O device. - + @param CodeType Indicates the type of status code being reported. @param Value Describes the current status of a hardware or software entity. This included information about the class and subclass that is used to @@ -72,9 +72,9 @@ SerialStatusCodeReportWorker ( // Print DEBUG() information into output buffer. // CharCount = AsciiBSPrint ( - Buffer, - sizeof (Buffer), - Format, + Buffer, + sizeof (Buffer), + Format, Marker ); } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) { @@ -82,14 +82,14 @@ SerialStatusCodeReportWorker ( // Print ERROR information into output buffer. // CharCount = AsciiSPrint ( - Buffer, - sizeof (Buffer), - "ERROR: C%08x:V%08x I%x", - CodeType, - Value, + Buffer, + sizeof (Buffer), + "ERROR: C%08x:V%08x I%x", + CodeType, + Value, Instance ); - + if (CallerId != NULL) { CharCount += AsciiSPrint ( &Buffer[CharCount], @@ -118,10 +118,10 @@ SerialStatusCodeReportWorker ( // Print PROGRESS information into output buffer. // CharCount = AsciiSPrint ( - Buffer, - sizeof (Buffer), - "PROGRESS CODE: V%08x I%x\n\r", - Value, + Buffer, + sizeof (Buffer), + "PROGRESS CODE: V%08x I%x\n\r", + Value, Instance ); } else if (Data != NULL && @@ -141,11 +141,11 @@ SerialStatusCodeReportWorker ( // Code type is not defined. // CharCount = AsciiSPrint ( - Buffer, - sizeof (Buffer), - "Undefined: C%08x:V%08x I%x\n\r", - CodeType, - Value, + Buffer, + sizeof (Buffer), + "Undefined: C%08x:V%08x I%x\n\r", + CodeType, + Value, Instance ); } diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c index 6435e1f727..991fd1b610 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c @@ -1,7 +1,7 @@ /** @file Status code driver for IA32/X64/EBC architecture. - Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -38,7 +38,7 @@ UINT32 mStatusCodeNestStatus = 0; @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The entry point is executed successfully. **/ @@ -192,9 +192,9 @@ VirtualAddressChangeCallBack ( } /** - Dispatch initialization request to sub status code devices based on + Dispatch initialization request to sub status code devices based on customized feature flags. - + **/ VOID InitializationDispatcherWorker ( @@ -236,11 +236,11 @@ InitializationDispatcherWorker ( } // - // Replay Status code which saved in GUID'ed HOB to all supported devices. + // Replay Status code which saved in GUID'ed HOB to all supported devices. // if (FeaturePcdGet (PcdStatusCodeReplayIn)) { - // - // Journal GUID'ed HOBs to find all record entry, if found, + // + // Journal GUID'ed HOBs to find all record entry, if found, // then output record to support replay device. // Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid); diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h index ae20f5b226..b01e2bcbdd 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h @@ -1,7 +1,7 @@ /** @file Internal include file of Status Code Runtime DXE Driver. - Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -87,9 +87,9 @@ ReportDispatcher ( ); /** - Dispatch initialization request to sub status code devices based on + Dispatch initialization request to sub status code devices based on customized feature flags. - + **/ VOID InitializationDispatcherWorker ( @@ -99,7 +99,7 @@ InitializationDispatcherWorker ( /** Locates Serial I/O Protocol as initialization for serial status code worker. - + @retval EFI_SUCCESS Serial I/O Protocol is successfully located. **/ @@ -111,7 +111,7 @@ EfiSerialStatusCodeInitializeWorker ( /** Convert status code value and extended data to readable ASCII string, send string to serial I/O device. - + @param CodeType Indicates the type of status code being reported. @param Value Describes the current status of a hardware or software entity. This included information about the class and subclass that is used to @@ -139,7 +139,7 @@ SerialStatusCodeReportWorker ( /** Initialize runtime memory status code table as initialization for runtime memory status code worker - + @retval EFI_SUCCESS Runtime memory status code table successfully initialized. **/ @@ -149,16 +149,16 @@ RtMemoryStatusCodeInitializeWorker ( ); /** - Report status code into runtime memory. If the runtime pool is full, roll back to the + Report status code into runtime memory. If the runtime pool is full, roll back to the first record and overwrite it. - + @param CodeType Indicates the type of status code being reported. @param Value Describes the current status of a hardware or software entity. This included information about the class and subclass that is used to classify the entity as well as an operation. @param Instance The enumeration of a hardware or software entity within the system. Valid instance numbers start with 1. - + @retval EFI_SUCCESS Status code successfully recorded in runtime memory status code table. **/ diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxeExtra.uni b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxeExtra.uni index 2cc9aa33ef..8b94cf2a78 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxeExtra.uni +++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file // StatusCodeRuntimeDxe Localized Strings and Content // -// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,8 +12,8 @@ // // **/ -#string STR_PROPERTIES_MODULE_NAME -#language en-US +#string STR_PROPERTIES_MODULE_NAME +#language en-US "Status Code Runtime DXE Driver"