diff options
| author | Liming Gao <liming.gao@intel.com> | 2018-06-27 21:08:52 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-06-28 11:19:45 +0800 |
| commit | d1102dba7210b95e41d06c2338a22ba6af248645 (patch) | |
| tree | 8b4af076b5d6f2aa7f35563d4defcca4d4bfdd87 /MdeModulePkg/Bus/Usb | |
| parent | ca79bab7af4770c5eb578f6d495af01705aedb79 (diff) | |
| download | edk2-d1102dba7210b95e41d06c2338a22ba6af248645.zip edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.gz edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.bz2 | |
MdeModulePkg: 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 <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus/Usb')
59 files changed, 393 insertions, 393 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c index 55c4a53..e483660 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c @@ -1,8 +1,8 @@ /** @file
BOT Transportation implementation.
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h index 07235c3..8127556 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h @@ -1,8 +1,8 @@ /** @file
BOT Transportation implementation.
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -173,7 +173,7 @@ PeiUsbRead10 ( IN UINTN NumberOfBlocks
);
-/**
+/**
Check if there is media according to sense data.
@param SenseData Pointer to sense data.
@@ -189,7 +189,7 @@ IsNoMedia ( IN UINTN SenseCounts
);
-/**
+/**
Check if there is media error according to sense data.
@param SenseData Pointer to sense data.
@@ -205,7 +205,7 @@ IsMediaError ( IN UINTN SenseCounts
);
-/**
+/**
Check if media is changed according to sense data.
@param SenseData Pointer to sense data.
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c index 72bde75..6873350 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c @@ -1,8 +1,8 @@ /** @file
Pei USB ATATPI command implementations.
-Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -475,7 +475,7 @@ PeiUsbRead10 ( return Status;
}
-/**
+/**
Check if there is media according to sense data.
@param SenseData Pointer to sense data.
@@ -526,7 +526,7 @@ IsNoMedia ( return NoMedia;
}
-/**
+/**
Check if there is media error according to sense data.
@param SenseData Pointer to sense data.
@@ -603,7 +603,7 @@ IsMediaError ( return Error;
}
-/**
+/**
Check if media is changed according to sense data.
@param SenseData Pointer to sense data.
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c index 46c1a06..4f20c71 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c @@ -1,8 +1,8 @@ /** @file
Common Libarary for PEI USB.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h index eafccfd..6d39b76 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h @@ -1,8 +1,8 @@ /** @file
Common Libarary for PEI USB.
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define USB_DEV_SET_FEATURE_REQ_TYPE_D 0x00 // Receiver : Device
#define USB_DEV_SET_FEATURE_REQ_TYPE_I 0x01 // Receiver : Interface
#define USB_DEV_SET_FEATURE_REQ_TYPE_E 0x02 // Receiver : Endpoint
-
+
#define USB_DEV_SET_ADDRESS 0x05
#define USB_DEV_SET_ADDRESS_REQ_TYPE 0x00
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni index 30d49d5..2477a14 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni @@ -3,14 +3,14 @@ //
// The USB mass storage device PEIM driver is used to support recovery from USB devices.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni index 3e6eb63..402a6ee 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbBotPei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB PEI Module for Recovery"
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c index 5e18306..d53727d 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c @@ -1,7 +1,7 @@ /** @file
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -69,8 +69,8 @@ PeiBotDetectMedia ( );
/**
- Initializes the Usb Bot.
-
+ Initializes the Usb Bot.
+
@param FileHandle Handle of the file being invoked.
@param PeiServices Describes the list of possible PEI Services.
@@ -119,8 +119,8 @@ PeimInitializeUsbBot ( }
/**
- UsbIo installation notification function.
-
+ UsbIo installation notification function.
+
This function finds out all the current USB IO PPIs in the system and add them
into private data.
@@ -292,16 +292,16 @@ InitUsbBot ( /**
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.
@@ -326,27 +326,27 @@ BotGetNumberOfBlockDevices ( /**
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.
**/
@@ -393,31 +393,31 @@ BotGetMediaInfo ( /**
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
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h index 3ae8c67..692147e 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h @@ -1,8 +1,8 @@ /** @file
Usb BOT Peim definition.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -34,16 +34,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
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.
@@ -61,27 +61,27 @@ BotGetNumberOfBlockDevices ( /**
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.
**/
@@ -97,31 +97,31 @@ BotGetMediaInfo ( /**
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
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h index c62b99d..ec2c4ff 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h @@ -1,8 +1,8 @@ /** @file
Usb Peim definition.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c index 7c58fe8..26821c2 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c @@ -2,7 +2,7 @@ Usb Bus Driver Binding and Bus IO Protocol.
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -862,7 +862,7 @@ UsbIoPortReset ( Dev->Address = DevAddress;
gBS->Stall (USB_SET_DEVICE_ADDRESS_STALL);
-
+
if (EFI_ERROR (Status)) {
//
// It may fail due to device disconnection or other reasons.
@@ -1036,7 +1036,7 @@ UsbBusBuildProtocol ( RootIf->Signature = USB_INTERFACE_SIGNATURE;
RootIf->Device = RootHub;
RootIf->DevicePath = UsbBus->DevicePath;
-
+
//
// Report Status Code here since we will enumerate the USB devices
//
@@ -1045,7 +1045,7 @@ UsbBusBuildProtocol ( (EFI_IO_BUS_USB | EFI_IOB_PC_DETECT),
UsbBus->DevicePath
);
-
+
Status = mUsbRootHubApi.Init (RootIf);
if (EFI_ERROR (Status)) {
@@ -1157,7 +1157,7 @@ UsbBusControllerDriverSupported ( //
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)) {
@@ -1166,13 +1166,13 @@ UsbBusControllerDriverSupported ( // check its validation
//
DevicePathNode.DevPath = RemainingDevicePath;
-
+
if ((DevicePathNode.DevPath->Type != MESSAGING_DEVICE_PATH) ||
(DevicePathNode.DevPath->SubType != MSG_USB_DP &&
DevicePathNode.DevPath->SubType != MSG_USB_CLASS_DP
&& DevicePathNode.DevPath->SubType != MSG_USB_WWID_DP
)) {
-
+
return EFI_UNSUPPORTED;
}
}
@@ -1208,7 +1208,7 @@ UsbBusControllerDriverSupported ( if (Status == EFI_ALREADY_STARTED) {
return EFI_SUCCESS;
}
-
+
if (EFI_ERROR (Status)) {
return Status;
}
@@ -1235,7 +1235,7 @@ UsbBusControllerDriverSupported ( Controller
);
}
-
+
//
// Open the EFI Device Path protocol needed to perform the supported test
//
@@ -1362,7 +1362,7 @@ UsbBusControllerDriverStart ( //
// If RemainingDevicePath is the End of Device Path Node,
// skip enumerate any device and return EFI_SUCESSS
- //
+ //
return EFI_SUCCESS;
}
}
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h index 9ede83a..be82e25 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h @@ -2,7 +2,7 @@ Usb Bus Driver Binding and Bus IO Protocol.
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -123,7 +123,7 @@ typedef struct _USB_HUB_API USB_HUB_API; //
// Send general device request timeout.
-//
+//
// The USB Specification 2.0, section 11.24.1 recommends a value of
// 50 milliseconds. We use a value of 500 milliseconds to work
// around slower hubs and devices.
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf index b7b30cc..30d59ad 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf @@ -1,7 +1,7 @@ ## @file
# The Usb Bus Dxe driver is used to enumerate and manage all attached usb devices.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# 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 ARM AARCH64
#
-# DRIVER_BINDING = mUsbBusDriverBinding
+# DRIVER_BINDING = mUsbBusDriverBinding
# COMPONENT_NAME = mUsbBusComponentName
# COMPONENT_NAME2 = mUsbBusComponentName2
#
@@ -66,7 +66,7 @@ gEfiUsbIoProtocolGuid ## BY_START
## TO_START
## BY_START
- gEfiDevicePathProtocolGuid
+ gEfiDevicePathProtocolGuid
gEfiUsb2HcProtocolGuid ## TO_START
gEfiUsbHcProtocolGuid ## TO_START
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni index f147a0d..1339fb1 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni @@ -3,13 +3,13 @@ //
// The USB Bus DXE driver is used to enumerate and manage all attached USB devices.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni index 6b92980..c625654 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbBusDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Bus DXE Driver"
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c index fba60da..061e462 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c @@ -2,7 +2,7 @@ Manage Usb Descriptor List
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -361,7 +361,7 @@ UsbParseConfigDesc ( Len -= Consumed;
//
- // Make allowances for devices that return extra data at the
+ // Make allowances for devices that return extra data at the
// end of their config descriptors
//
while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {
@@ -689,7 +689,7 @@ UsbBuildLangTable ( Max = (Desc->Length - 2) / 2;
Max = MIN(Max, USB_MAX_LANG_ID);
-
+
Point = Desc->String;
for (Index = 0; Index < Max; Index++) {
UsbDev->LangId[Index] = *Point;
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c index 62645d9..13edbee 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c @@ -2,7 +2,7 @@ Usb bus enumeration support.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -33,9 +33,9 @@ UsbGetEndpointDesc ( USB_ENDPOINT_DESC *EpDesc;
UINT8 Index;
UINT8 NumEndpoints;
-
+
NumEndpoints = UsbIf->IfSetting->Desc.NumEndpoints;
-
+
for (Index = 0; Index < NumEndpoints; Index++) {
EpDesc = UsbIf->IfSetting->Endpoints[Index];
@@ -279,7 +279,7 @@ UsbConnectDriver ( // twisted TPL used. It should be no problem for us to connect
// or disconnect at CALLBACK.
//
-
+
//
// Only recursively wanted usb child device
//
@@ -493,13 +493,13 @@ UsbDisconnectDriver ( if (!EFI_ERROR (Status)) {
UsbIf->IsManaged = FALSE;
}
-
+
DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d, %d\n", (UINT32)UsbGetCurrentTpl(), Status));
ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);
gBS->RaiseTPL (OldTpl);
}
-
+
return Status;
}
@@ -524,7 +524,7 @@ UsbRemoveConfig ( // Remove each interface of the device
//
ReturnStatus = EFI_SUCCESS;
- for (Index = 0; Index < Device->NumOfInterface; Index++) {
+ for (Index = 0; Index < Device->NumOfInterface; Index++) {
ASSERT (Index < USB_MAX_INTERFACE);
UsbIf = Device->Interfaces[Index];
@@ -683,11 +683,11 @@ UsbEnumerateNewDev ( Parent = HubIf->Device;
Bus = Parent->Bus;
- HubApi = HubIf->HubApi;
+ HubApi = HubIf->HubApi;
Address = Bus->MaxDevices;
gBS->Stall (USB_WAIT_PORT_STABLE_STALL);
-
+
//
// Hub resets the device for at least 10 milliseconds.
// Host learns device speed. If device is of low/full speed
@@ -698,7 +698,7 @@ UsbEnumerateNewDev ( Status = HubApi->ResetPort (HubIf, Port);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "UsbEnumerateNewDev: failed to reset port %d - %r\n", Port, Status));
-
+
return Status;
}
DEBUG (( EFI_D_INFO, "UsbEnumerateNewDev: hub port %d is reset\n", Port));
@@ -927,60 +927,60 @@ UsbEnumeratePort ( // connect/disconnect. Other three events are: ENABLE, SUSPEND, RESET.
// ENABLE/RESET is used to reset port. SUSPEND isn't supported.
//
-
- if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {
+
+ if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {
if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {
//
// Case1:
- // Both OverCurrent and OverCurrentChange set, means over current occurs,
+ // Both OverCurrent and OverCurrentChange set, means over current occurs,
// which probably is caused by short circuit. It has to wait system hardware
// to perform recovery.
//
DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: Critical Over Current\n", Port));
return EFI_DEVICE_ERROR;
-
- }
+
+ }
//
// Case2:
- // Only OverCurrentChange set, means system has been recoveried from
+ // Only OverCurrentChange set, means system has been recoveried from
// over current. As a result, all ports are nearly power-off, so
- // it's necessary to detach and enumerate all ports again.
+ // it's necessary to detach and enumerate all ports again.
//
- DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Current\n", Port));
+ DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Current\n", Port));
}
- if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE)) {
+ if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE)) {
//
// Case3:
// 1.1 roothub port reg doesn't reflect over-current state, while its counterpart
- // on 2.0 roothub does. When over-current has influence on 1.1 device, the port
+ // on 2.0 roothub does. When over-current has influence on 1.1 device, the port
// would be disabled, so it's also necessary to detach and enumerate again.
//
DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over Current\n", Port));
}
-
+
if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {
//
// Case4:
- // Device connected or disconnected normally.
+ // Device connected or disconnected normally.
//
DEBUG ((EFI_D_INFO, "UsbEnumeratePort: Device Connect/Disconnect Normally\n", Port));
}
- //
+ //
// Following as the above cases, it's safety to remove and create again.
//
Child = UsbFindChild (HubIf, Port);
-
+
if (Child != NULL) {
DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device at port %d removed from root hub %p\n", Port, HubIf));
UsbRemoveDevice (Child);
}
-
+
if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_CONNECTION)) {
//
- // Now, new device connected, enumerate and configure the device
+ // Now, new device connected, enumerate and configure the device
//
DEBUG (( EFI_D_INFO, "UsbEnumeratePort: new device connected at port %d\n", Port));
if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_RESET)) {
@@ -988,11 +988,11 @@ UsbEnumeratePort ( } else {
Status = UsbEnumerateNewDev (HubIf, Port, TRUE);
}
-
+
} else {
DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device disconnected event on port %d\n", Port));
}
-
+
HubApi->ClearPortChange (HubIf, Port);
return Status;
}
@@ -1017,7 +1017,7 @@ UsbHubEnumeration ( UINT8 Bit;
UINT8 Index;
USB_DEVICE *Child;
-
+
ASSERT (Context != NULL);
HubIf = (USB_INTERFACE *) Context;
@@ -1082,7 +1082,7 @@ UsbRootHubEnumeration ( DEBUG (( EFI_D_INFO, "UsbEnumeratePort: The device disconnect fails at port %d from root hub %p, try again\n", Index, RootHub));
UsbRemoveDevice (Child);
}
-
+
UsbEnumeratePort (RootHub, Index);
}
}
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c index a962f76..2ce5726 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c @@ -2,7 +2,7 @@ Unified interface for RootHub and Hub.
-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -716,10 +716,10 @@ UsbHubInit ( Depth = (UINT16)(HubIf->Device->Tier - 1);
DEBUG ((EFI_D_INFO, "UsbHubInit: Set Hub Depth as 0x%x\n", Depth));
UsbHubCtrlSetHubDepth (HubIf->Device, Depth);
-
+
for (Index = 0; Index < HubDesc->NumPorts; Index++) {
UsbHubCtrlSetPortFeature (HubIf->Device, Index, USB_HUB_PORT_REMOTE_WAKE_MASK);
- }
+ }
} else {
//
// Feed power to all the hub ports. It should be ok
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h index fe9f1f7..4cf8f1f 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h @@ -96,7 +96,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define USB_HUB_SUBCLASS_CODE 0x00
//
-// Host software return timeout if port status doesn't change
+// Host software return timeout if port status doesn't change
// after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience
//
#define USB_WAIT_PORT_STS_CHANGE_LOOP 5000
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c index 75d9b03..e9b5fef 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c @@ -2,7 +2,7 @@ Wrapper function for usb host controller interface.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -1163,7 +1163,7 @@ UsbBusAddWantedUsbIoDP ( DevicePathPtr = DuplicateDevicePath ((EFI_DEVICE_PATH_PROTOCOL *) &mAllUsbClassDevicePath);
} else if (!IsDevicePathEnd (RemainingDevicePath)) {
//
- // If RemainingDevicePath isn't the End of Device Path Node,
+ // If RemainingDevicePath isn't the End of Device Path Node,
// Create new Usb device path according to the usb part in remaining device path
//
DevicePathPtr = GetUsbDPFromFullDP (RemainingDevicePath);
@@ -1171,7 +1171,7 @@ UsbBusAddWantedUsbIoDP ( //
// If RemainingDevicePath is the End of Device Path Node,
// skip enumerate any device and return EFI_SUCESSS
- //
+ //
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c index ac930ee..8066025 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c @@ -2,7 +2,7 @@ Usb Hub Request Support In PEI Phase
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-
+
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
@@ -440,7 +440,7 @@ PeiDoHubConfig ( HubDescriptor = (EFI_USB_HUB_DESCRIPTOR *) HubDescBuffer;
//
- // Get the hub descriptor
+ // Get the hub descriptor
//
Status = PeiUsbHubReadDesc (
PeiServices,
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h index 341f6f3..385a14e 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h @@ -2,7 +2,7 @@ Constants definitions for Usb Hub Peim
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-
+
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/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c index 42be13a..c5e599e 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c @@ -1,8 +1,8 @@ /** @file
Common Libarary for PEI USB
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
+
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/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h index 1ace89f..35f47a3 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h @@ -1,8 +1,8 @@ /** @file
Common Libarary for PEI USB
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
+
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/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf index 734619a..0d81bf8 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf @@ -1,7 +1,7 @@ ## @file
# The Usb Bus Peim driver is used to support recovery from usb device.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions
@@ -54,7 +54,7 @@ [Pcd]
gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue ## CONSUMES
-
+
[Ppis]
gPeiUsbIoPpiGuid ## PRODUCES
gPeiUsbHostControllerPpiGuid ## SOMETIMES_CONSUMES
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni index bd18fdb..672c676 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni @@ -3,14 +3,14 @@ //
// The USB Bus PEIM driver is used to support recovery from USB devices.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni index a84da95..4b784a3 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbBusPei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Bus PEI Module for Recovery"
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c index d13a7ee..5c65940 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c @@ -1,8 +1,8 @@ /** @file
The module is used to implement Usb Io PPI interfaces.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
+
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
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Submits control transfer to a target USB device.
-
+
@param PeiServices The pointer of EFI_PEI_SERVICES.
@param This The pointer of PEI_USB_IO_PPI.
@param Request USB device request to send.
@@ -132,11 +132,11 @@ PeiUsbControlTransfer ( /**
Submits bulk transfer to a bulk endpoint of a USB device.
-
+
@param PeiServices The pointer of EFI_PEI_SERVICES.
@param This The pointer of PEI_USB_IO_PPI.
@param DeviceEndpoint Endpoint number and its direction in bit 7.
- @param Data A pointer to the buffer of data to transmit
+ @param Data A pointer to the buffer of data to transmit
from or receive into.
@param DataLength The lenght of the data buffer.
@param Timeout Indicates the maximum time, in millisecond, which the
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c index a4bb4d7..10d5232 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c @@ -1,8 +1,8 @@ /** @file
The module to produce Usb Bus PPI.
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+
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
@@ -37,7 +37,7 @@ EFI_PEI_PPI_DESCRIPTOR mUsbIoPpiList = { /**
The enumeration routine to detect device change.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param UsbHcPpi The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.
@param Usb2HcPpi The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.
@@ -56,7 +56,7 @@ PeiUsbEnumeration ( /**
Configure new detected usb device.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param PeiUsbDevice The pointer of PEI_USB_DEVICE instance.
@param Port The port to be configured.
@@ -77,7 +77,7 @@ PeiConfigureUsbDevice ( /**
Get all configurations from a detected usb device.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param PeiUsbDevice The pointer of PEI_USB_DEVICE instance.
@@ -94,7 +94,7 @@ PeiUsbGetAllConfiguration ( /**
Get the start position of next wanted descriptor.
-
+
@param Buffer Buffer containing data to parse.
@param Length Buffer length.
@param DescType Descriptor type.
@@ -116,7 +116,7 @@ GetExpectedDescriptor ( /**
The entrypoint of the module, it will enumerate all HCs.
-
+
@param FileHandle Handle of the file being invoked.
@param PeiServices Describes the list of possible PEI Services.
@@ -142,7 +142,7 @@ PeimInitializeUsb ( }
//
- // gPeiUsbHostControllerPpiGuid and gPeiUsb2HostControllerPpiGuid should not
+ // gPeiUsbHostControllerPpiGuid and gPeiUsb2HostControllerPpiGuid should not
// be produced at the same time
//
Index = 0;
@@ -176,18 +176,18 @@ PeimInitializeUsb ( Index,
NULL,
(VOID **) &Usb2HcPpi
- );
+ );
if (EFI_ERROR (Status)) {
//
// No more host controller, break out
//
break;
- }
- PeiUsbEnumeration ((EFI_PEI_SERVICES **) PeiServices, NULL, Usb2HcPpi);
+ }
+ PeiUsbEnumeration ((EFI_PEI_SERVICES **) PeiServices, NULL, Usb2HcPpi);
Index++;
}
}
-
+
if (Index == 0) {
return EFI_UNSUPPORTED;
}
@@ -198,7 +198,7 @@ PeimInitializeUsb ( /**
The Hub Enumeration just scans the hub ports one time. It also
doesn't support hot-plug.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param PeiUsbDevice The pointer of PEI_USB_DEVICE instance.
@param CurrentAddress The DeviceAddress of usb device.
@@ -289,13 +289,13 @@ PeiHubEnumeration ( NewPeiUsbDevice->IsHub = 0x0;
NewPeiUsbDevice->DownStreamPortNo = 0x0;
- if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||
+ if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||
((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {
//
- // If the port already has reset change flag and is connected and enabled, skip the port reset logic.
+ // If the port already has reset change flag and is connected and enabled, skip the port reset logic.
//
PeiResetHubPort (PeiServices, UsbIoPpi, (UINT8)(Index + 1));
-
+
PeiHubGetPortStatus (
PeiServices,
UsbIoPpi,
@@ -406,7 +406,7 @@ PeiHubEnumeration ( /**
The enumeration routine to detect device change.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param UsbHcPpi The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.
@param Usb2HcPpi The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.
@@ -440,7 +440,7 @@ PeiUsbEnumeration ( PeiServices,
Usb2HcPpi,
(UINT8 *) &NumOfRootPort
- );
+ );
} else if (UsbHcPpi != NULL) {
UsbHcPpi->GetRootHubPortNumber (
PeiServices,
@@ -464,7 +464,7 @@ PeiUsbEnumeration ( Usb2HcPpi,
(UINT8) Index,
&PortStatus
- );
+ );
} else {
UsbHcPpi->GetRootHubPortStatus (
PeiServices,
@@ -515,10 +515,10 @@ PeiUsbEnumeration ( PeiUsbDevice->IsHub = 0x0;
PeiUsbDevice->DownStreamPortNo = 0x0;
- if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||
+ if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||
((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {
//
- // If the port already has reset change flag and is connected and enabled, skip the port reset logic.
+ // If the port already has reset change flag and is connected and enabled, skip the port reset logic.
//
ResetRootPort (
PeiServices,
@@ -550,7 +550,7 @@ PeiUsbEnumeration ( Usb2HcPpi,
(UINT8) Index,
EfiUsbPortResetChange
- );
+ );
} else {
UsbHcPpi->ClearRootHubPortFeature (
PeiServices,
@@ -650,7 +650,7 @@ PeiUsbEnumeration ( /**
Configure new detected usb device.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param PeiUsbDevice The pointer of PEI_USB_DEVICE instance.
@param Port The port to be configured.
@@ -767,7 +767,7 @@ PeiConfigureUsbDevice ( /**
Get all configurations from a detected usb device.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param PeiUsbDevice The pointer of PEI_USB_DEVICE instance.
@@ -920,7 +920,7 @@ PeiUsbGetAllConfiguration ( /**
Get the start position of next wanted descriptor.
-
+
@param Buffer Buffer containing data to parse.
@param Length Buffer length.
@param DescType Descriptor type.
@@ -998,7 +998,7 @@ GetExpectedDescriptor ( /**
Send reset signal over the given root hub port.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param UsbHcPpi The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.
@param Usb2HcPpi The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.
@@ -1022,7 +1022,7 @@ ResetRootPort ( if (Usb2HcPpi != NULL) {
MicroSecondDelay (200 * 1000);
-
+
//
// reset root port
//
@@ -1032,12 +1032,12 @@ ResetRootPort ( PortNum,
EfiUsbPortReset
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));
return;
}
-
+
//
// Drive the reset signal for at least 50ms. Check USB 2.0 Spec
// section 7.1.7.5 for timing requirements.
@@ -1053,7 +1053,7 @@ ResetRootPort ( PortNum,
EfiUsbPortReset
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));
return;
@@ -1073,7 +1073,7 @@ ResetRootPort ( Usb2HcPpi,
PortNum,
&PortStatus
- );
+ );
if (EFI_ERROR (Status)) {
return;
}
@@ -1103,7 +1103,7 @@ ResetRootPort ( PortNum,
EfiUsbPortConnectChange
);
-
+
//
// Set port enable
//
@@ -1113,18 +1113,18 @@ ResetRootPort ( PortNum,
EfiUsbPortEnable
);
-
+
Usb2HcPpi->ClearRootHubPortFeature (
PeiServices,
Usb2HcPpi,
PortNum,
EfiUsbPortEnableChange
);
-
+
MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);
} else {
MicroSecondDelay (200 * 1000);
-
+
//
// reset root port
//
@@ -1134,18 +1134,18 @@ ResetRootPort ( PortNum,
EfiUsbPortReset
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));
return;
}
-
+
//
// Drive the reset signal for at least 50ms. Check USB 2.0 Spec
// section 7.1.7.5 for timing requirements.
//
MicroSecondDelay (USB_SET_ROOT_PORT_RESET_STALL);
-
+
//
// clear reset root port
//
@@ -1155,12 +1155,12 @@ ResetRootPort ( PortNum,
EfiUsbPortReset
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));
return;
}
-
+
MicroSecondDelay (USB_CLR_ROOT_PORT_RESET_STALL);
//
@@ -1175,7 +1175,7 @@ ResetRootPort ( UsbHcPpi,
PortNum,
&PortStatus
- );
+ );
if (EFI_ERROR (Status)) {
return;
}
@@ -1205,7 +1205,7 @@ ResetRootPort ( PortNum,
EfiUsbPortConnectChange
);
-
+
//
// Set port enable
//
@@ -1215,14 +1215,14 @@ ResetRootPort ( PortNum,
EfiUsbPortEnable
);
-
+
UsbHcPpi->ClearRootHubPortFeature (
PeiServices,
UsbHcPpi,
PortNum,
EfiUsbPortEnableChange
);
-
+
MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);
}
return;
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h index dff8eeb..1610974 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h @@ -1,8 +1,8 @@ /** @file
Usb Peim definition.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>
-
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
+
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
@@ -88,7 +88,7 @@ typedef struct { #define USB_WAIT_PORT_STS_CHANGE_STALL (100)
//
-// Host software return timeout if port status doesn't change
+// Host software return timeout if port status doesn't change
// after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience
//
#define USB_WAIT_PORT_STS_CHANGE_LOOP 5000
@@ -112,7 +112,7 @@ typedef struct { /**
Submits control transfer to a target USB device.
-
+
@param PeiServices The pointer of EFI_PEI_SERVICES.
@param This The pointer of PEI_USB_IO_PPI.
@param Request USB device request to send.
@@ -144,11 +144,11 @@ PeiUsbControlTransfer ( /**
Submits bulk transfer to a bulk endpoint of a USB device.
-
+
@param PeiServices The pointer of EFI_PEI_SERVICES.
@param This The pointer of PEI_USB_IO_PPI.
@param DeviceEndpoint Endpoint number and its direction in bit 7.
- @param Data A pointer to the buffer of data to transmit
+ @param Data A pointer to the buffer of data to transmit
from or receive into.
@param DataLength The lenght of the data buffer.
@param Timeout Indicates the maximum time, in millisecond, which the
@@ -233,7 +233,7 @@ PeiUsbPortReset ( /**
Send reset signal over the given root hub port.
-
+
@param PeiServices Describes the list of possible PEI Services.
@param UsbHcPpi The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.
@param Usb2HcPpi The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c index 722350f..40f8399 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c @@ -765,9 +765,9 @@ USBKeyboardWaitForKey ( //
// Enter critical section
- //
+ //
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
-
+
//
// WaitforKey doesn't suppor the partial key.
// Considering if the partial keystroke is enabled, there maybe a partial
@@ -1223,7 +1223,7 @@ KeyNotifyProcessHandler ( while (TRUE) {
//
// Enter critical section
- //
+ //
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Status = Dequeue (&UsbKeyboardDevice->EfiKeyQueueForNotify, &KeyData, sizeof (KeyData));
//
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf index 7939a18..41f0d9a 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf @@ -12,7 +12,7 @@ # 2. Universal Serial Bus HID Usage Tables, ver 1.12
# 3. UEFI Specification, v2.1
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -39,7 +39,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC ARM AARCH64
#
-# DRIVER_BINDING = gUsbKeyboardDriverBinding
+# DRIVER_BINDING = gUsbKeyboardDriverBinding
# COMPONENT_NAME = gUsbKeyboardComponentName
# COMPONENT_NAME2 = gUsbKeyboardComponentName2
#
@@ -87,7 +87,7 @@ # Otherwise, USB keyboard module tries to use its carried default layout.
#
gEfiHiiDatabaseProtocolGuid ## SOMETIMES_CONSUMES
-
+
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## CONSUMES
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni index 7dcbf12..9bf6c3e 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni @@ -12,13 +12,13 @@ // 2. Universal Serial Bus HID Usage Tables, ver 1.12
// 3. UEFI Specification, v2.1
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni index 6a76634..fe4c747 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbKbDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Keyboard DXE Driver"
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h index ebfb254..7dd7871 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h @@ -1,8 +1,8 @@ /** @file
- Definition of USB Mass Storage Class and its value, USB Mass Transport Protocol,
+ Definition of USB Mass Storage Class and its value, USB Mass Transport Protocol,
and other common definitions.
-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c index 3bf6e6a..dd5950c 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c @@ -224,7 +224,7 @@ UsbBootExecCmd ( If the device isn't ready, wait for it. If the device is ready
and error occurs, retry the command again until it exceeds the
limit of retrial times.
-
+
@param UsbMass The device to issue commands to
@param Cmd The command to execute
@param CmdLen The length of the command
@@ -412,7 +412,7 @@ UsbBootInquiry ( @retval EFI_SUCCESS The disk geometry is successfully retrieved.
@retval EFI_NOT_READY The returned block size is zero.
@retval Other READ CAPACITY 16 bytes command execution failed.
-
+
**/
EFI_STATUS
UsbBootReadCapacity16 (
@@ -442,7 +442,7 @@ UsbBootReadCapacity16 ( ZeroMem ((CapacityCmd + 2), 8);
CapacityCmd[13] = sizeof (CapacityData);
-
+
Status = UsbBootExecCmdWithRetry (
UsbMass,
CapacityCmd,
@@ -464,13 +464,13 @@ UsbBootReadCapacity16 ( Media->LastBlock = SwapBytes64 (ReadUnaligned64 ((CONST UINT64 *) &(CapacityData.LastLba7)));
BlockSize = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) &(CapacityData.BlockSize3)));
-
+
Media->LowestAlignedLba = (CapacityData.LowestAlignLogic2 << 8) |
CapacityData.LowestAlignLogic1;
Media->LogicalBlocksPerPhysicalBlock = (1 << CapacityData.LogicPerPhysical);
if (BlockSize == 0) {
//
- // Get sense data
+ // Get sense data
//
return UsbBootRequestSense (UsbMass);
} else {
@@ -494,7 +494,7 @@ UsbBootReadCapacity16 ( @retval EFI_SUCCESS The disk geometry is successfully retrieved.
@retval EFI_NOT_READY The returned block size is zero.
@retval Other READ CAPACITY command execution failed.
-
+
**/
EFI_STATUS
UsbBootReadCapacity (
@@ -538,7 +538,7 @@ UsbBootReadCapacity ( BlockSize = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) CapacityData.BlockLen));
if (BlockSize == 0) {
//
- // Get sense data
+ // Get sense data
//
return UsbBootRequestSense (UsbMass);
} else {
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h index f8a0708..d4042e3 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h @@ -2,7 +2,7 @@ Definition of the command set of USB Mass Storage Specification
for Bootability, Revision 1.0.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // INQUIRY/REQUEST_SENSE are "No Timeout Commands" as specified
// by Multi-Media Commands (MMC) set.
// Others are "Group 1 Timeout Commands". That is,
-// they should be retried if driver is ready.
+// they should be retried if driver is ready.
//
#define USB_BOOT_INQUIRY_OPCODE 0x12
#define USB_BOOT_REQUEST_SENSE_OPCODE 0x03
@@ -82,17 +82,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
// Mass command timeout, refers to specification[USB20-9.2.6.1]
//
-// USB2.0 Spec define the up-limit timeout 5s for all command. USB floppy,
-// USB CD-Rom and iPod devices are much slower than USB key when reponse
+// USB2.0 Spec define the up-limit timeout 5s for all command. USB floppy,
+// USB CD-Rom and iPod devices are much slower than USB key when reponse
// most of commands, So we set 5s as timeout here.
-//
+//
#define USB_BOOT_GENERAL_CMD_TIMEOUT (5 * USB_MASS_1_SECOND)
//
// The required commands are INQUIRY, READ CAPACITY, TEST UNIT READY,
// READ10, WRITE10, and REQUEST SENSE. The BLOCK_IO protocol uses LBA
// so it isn't necessary to issue MODE SENSE / READ FORMAT CAPACITY
-// command to retrieve the disk gemotrics.
+// command to retrieve the disk gemotrics.
//
#pragma pack(1)
typedef struct {
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c index 477bfa7..3bd18b2 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c @@ -2,7 +2,7 @@ Implementation of the USB mass storage Bulk-Only Transport protocol,
according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -272,7 +272,7 @@ UsbBotDataTransfer ( );
if (EFI_ERROR (Status)) {
if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {
- DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));
+ DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));
DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: DataIn Stall\n"));
UsbClearEndpointStall (UsbBot->UsbIo, Endpoint->EndpointAddress);
} else if (USB_IS_ERROR (Result, EFI_USB_ERR_NAK)) {
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h index 502c670..9bc007f 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h @@ -3,7 +3,7 @@ based on the "Universal Serial Bus Mass Storage Class Bulk-Only
Transport" Revision 1.0, September 31, 1999.
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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 @@ extern USB_MASS_TRANSPORT mUsbBotTransport; //
// Usb Bot wait device reset complete, set by experience
-//
+//
#define USB_BOT_RESET_DEVICE_STALL (100 * USB_MASS_1_MILLISECOND)
//
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c index 3f6201d..44e377b 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c @@ -4,7 +4,7 @@ Notice: it is being obsoleted by the standard body in favor of the BOT
(Bulk-Only Transport).
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -147,7 +147,7 @@ UsbCbiInit ( } else {
FreePool (UsbCbi);
}
-
+
return EFI_SUCCESS;
ON_ERROR:
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h index b414a46..70be929 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h @@ -2,7 +2,7 @@ Defination for the USB mass storage Control/Bulk/Interrupt (CBI) transport,
according to USB Mass Storage Class Control/Bulk/Interrupt (CBI) Transport, Revision 1.1.
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -27,7 +27,7 @@ extern USB_MASS_TRANSPORT mUsbCbi1Transport; #define USB_CBI_MAX_RETRY 3
//
// Time to wait for USB CBI reset to complete, set by experience
-//
+//
#define USB_CBI_RESET_DEVICE_STALL (50 * USB_MASS_1_MILLISECOND)
//
// USB CBI transport timeout, set by experience
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c index 1fa8543..e0f9b4b 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c @@ -1,7 +1,7 @@ /** @file
This file is used to implement the EFI_DISK_INFO_PROTOCOL interface.
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
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_DISK_INFO_PROTOCOL gUsbDiskInfoProtocolTemplate = { Initialize the installation of DiskInfo protocol.
This function prepares for the installation of DiskInfo protocol on the child handle.
- By default, it installs DiskInfo protocol with USB interface GUID.
+ By default, it installs DiskInfo protocol with USB interface GUID.
@param[in] UsbMass The pointer of USB_MASS_DEVICE.
@@ -42,7 +42,7 @@ InitializeDiskInfo ( /**
Provides inquiry information for the controller type.
-
+
This function is used to get inquiry data. Data format
of Identify data is defined by the Interface GUID.
@@ -51,9 +51,9 @@ InitializeDiskInfo ( @param[in, out] 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 InquiryDataSize 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 InquiryDataSize not big enough
**/
EFI_STATUS
@@ -85,16 +85,16 @@ UsbDiskInfoInquiry ( This function is used to get identify data. Data format
of Identify data is defined by the Interface GUID.
- @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL
+ @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL
instance.
@param[in, out] IdentifyData Pointer to a buffer for the identify data.
@param[in, out] 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
@@ -110,8 +110,8 @@ UsbDiskInfoIdentify ( /**
Provides sense data information for the controller type.
-
- This function is used to get sense data.
+
+ This function is used to get sense data.
Data format of Sense data is defined by the Interface GUID.
@param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@@ -141,7 +141,7 @@ UsbDiskInfoSenseData ( /**
This function is used to get controller information.
- @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
+ @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@param[out] IdeChannel Pointer to the Ide Channel number. Primary or secondary.
@param[out] IdeDevice Pointer to the Ide Device number. Master or slave.
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h index e0a32ca..c206040 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h @@ -1,7 +1,7 @@ /** @file
Header file for EFI_DISK_INFO_PROTOCOL interface.
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
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,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Initialize the installation of DiskInfo protocol.
This function prepares for the installation of DiskInfo protocol on the child handle.
- By default, it installs DiskInfo protocol with USB interface GUID.
+ By default, it installs DiskInfo protocol with USB interface GUID.
@param UsbMass The pointer of USB_MASS_DEVICE.
@@ -32,7 +32,7 @@ InitializeDiskInfo ( /**
Provides inquiry information for the controller type.
-
+
This function is used to get inquiry data. Data format
of Identify data is defined by the Interface GUID.
@@ -41,9 +41,9 @@ InitializeDiskInfo ( @param[in, out] 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 InquiryDataSize 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 InquiryDataSize not big enough
**/
EFI_STATUS
@@ -60,16 +60,16 @@ UsbDiskInfoInquiry ( This function is used to get identify data. Data format
of Identify data is defined by the Interface GUID.
- @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL
+ @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL
instance.
@param[in, out] IdentifyData Pointer to a buffer for the identify data.
@param[in, out] 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
@@ -82,8 +82,8 @@ UsbDiskInfoIdentify ( /**
Provides sense data information for the controller type.
-
- This function is used to get sense data.
+
+ This function is used to get sense data.
Data format of Sense data is defined by the Interface GUID.
@param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@@ -110,7 +110,7 @@ UsbDiskInfoSenseData ( /**
This function is used to get controller information.
- @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
+ @param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@param[out] IdeChannel Pointer to the Ide Channel number. Primary or secondary.
@param[out] IdeDevice Pointer to the Ide Device number. Master or slave.
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c index 448bcc2..62bf3c5 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define USB_MASS_TRANSPORT_COUNT 3
//
-// Array of USB transport interfaces.
+// Array of USB transport interfaces.
//
USB_MASS_TRANSPORT *mUsbMassTransport[USB_MASS_TRANSPORT_COUNT] = {
&mUsbCbi0Transport,
@@ -36,7 +36,7 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = { /**
Reset the block device.
- This function implements EFI_BLOCK_IO_PROTOCOL.Reset().
+ This function implements EFI_BLOCK_IO_PROTOCOL.Reset().
It resets the block device hardware.
ExtendedVerification is ignored in this implementation.
@@ -76,7 +76,7 @@ UsbMassReset ( /**
Reads the requested number of blocks from the device.
- This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().
+ This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().
It reads the requested number of blocks from the device.
All the blocks are read, or an error is returned.
@@ -191,7 +191,7 @@ ON_EXIT: /**
Writes a specified number of blocks to the device.
- This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().
+ This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().
It writes a specified number of blocks to the device.
All blocks are written, or an error is returned.
@@ -295,7 +295,7 @@ UsbMassWriteBlocks ( Status = UsbBootWriteBlocks16 (UsbMass, Lba, TotalBlock, Buffer);
} else {
Status = UsbBootWriteBlocks (UsbMass, (UINT32) Lba, TotalBlock, Buffer);
- }
+ }
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "UsbMassWriteBlocks: UsbBootWriteBlocks (%r) -> Reset\n", Status));
@@ -402,7 +402,7 @@ UsbMassInitTransport ( EFI_USB_INTERFACE_DESCRIPTOR Interface;
UINT8 Index;
EFI_STATUS Status;
-
+
Status = gBS->OpenProtocol (
Controller,
&gEfiUsbIoProtocolGuid,
@@ -415,12 +415,12 @@ UsbMassInitTransport ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
Status = UsbIo->UsbGetInterfaceDescriptor (UsbIo, &Interface);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
-
+
Status = EFI_UNSUPPORTED;
//
@@ -443,7 +443,7 @@ UsbMassInitTransport ( }
//
- // For BOT device, try to get its max LUN.
+ // For BOT device, try to get its max LUN.
// If max LUN is 0, then it is a non-lun device.
// Otherwise, it is a multi-lun device.
//
@@ -458,7 +458,7 @@ ON_EXIT: This->DriverBindingHandle,
Controller
);
- return Status;
+ return Status;
}
/**
@@ -495,14 +495,14 @@ UsbMassInitMultiLun ( ASSERT (MaxLun > 0);
ReturnStatus = EFI_NOT_FOUND;
- for (Index = 0; Index <= MaxLun; Index++) {
+ for (Index = 0; Index <= MaxLun; Index++) {
DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Start to initialize No.%d logic unit\n", Index));
-
+
UsbIo = NULL;
UsbMass = AllocateZeroPool (sizeof (USB_MASS_DEVICE));
ASSERT (UsbMass != NULL);
-
+
UsbMass->Signature = USB_MASS_SIGNATURE;
UsbMass->UsbIo = UsbIo;
UsbMass->BlockIo.Media = &UsbMass->BlockIoMedia;
@@ -514,7 +514,7 @@ UsbMassInitMultiLun ( UsbMass->Transport = Transport;
UsbMass->Context = Context;
UsbMass->Lun = Index;
-
+
//
// Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.
//
@@ -531,11 +531,11 @@ UsbMassInitMultiLun ( LunNode.Header.Type = MESSAGING_DEVICE_PATH;
LunNode.Header.SubType = MSG_DEVICE_LOGICAL_UNIT_DP;
LunNode.Lun = UsbMass->Lun;
-
+
SetDevicePathNodeLength (&LunNode.Header, sizeof (LunNode));
-
+
UsbMass->DevicePath = AppendDevicePathNode (DevicePath, &LunNode.Header);
-
+
if (UsbMass->DevicePath == NULL) {
DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: failed to create device logic unit device path\n"));
Status = EFI_OUT_OF_RESOURCES;
@@ -558,7 +558,7 @@ UsbMassInitMultiLun ( &UsbMass->DiskInfo,
NULL
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: InstallMultipleProtocolInterfaces (%r)\n", Status));
FreePool (UsbMass->DevicePath);
@@ -597,7 +597,7 @@ UsbMassInitMultiLun ( ReturnStatus = EFI_SUCCESS;
DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Success to initialize No.%d logic unit\n", Index));
}
-
+
return ReturnStatus;
}
@@ -642,7 +642,7 @@ UsbMassInitNonLun ( DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: OpenUsbIoProtocol By Driver (%r)\n", Status));
goto ON_ERROR;
}
-
+
UsbMass->Signature = USB_MASS_SIGNATURE;
UsbMass->Controller = Controller;
UsbMass->UsbIo = UsbIo;
@@ -654,7 +654,7 @@ UsbMassInitNonLun ( UsbMass->OpticalStorage = FALSE;
UsbMass->Transport = Transport;
UsbMass->Context = Context;
-
+
//
// Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.
//
@@ -663,7 +663,7 @@ UsbMassInitNonLun ( DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: UsbMassInitMedia (%r)\n", Status));
goto ON_ERROR;
}
-
+
InitializeDiskInfo (UsbMass);
Status = gBS->InstallMultipleProtocolInterfaces (
@@ -692,7 +692,7 @@ ON_ERROR: Controller
);
}
- return Status;
+ return Status;
}
@@ -804,7 +804,7 @@ USBMassDriverBindingStart ( VOID *Context;
UINT8 MaxLun;
EFI_STATUS Status;
- EFI_USB_IO_PROTOCOL *UsbIo;
+ EFI_USB_IO_PROTOCOL *UsbIo;
EFI_TPL OldTpl;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
@@ -824,7 +824,7 @@ USBMassDriverBindingStart ( // Initialize data for device that does not support multiple LUNSs.
//
Status = UsbMassInitNonLun (This, Controller, Transport, Context);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: UsbMassInitNonLun (%r)\n", Status));
}
} else {
@@ -839,7 +839,7 @@ USBMassDriverBindingStart ( Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenDevicePathProtocol By Driver (%r)\n", Status));
goto Exit;
@@ -853,7 +853,7 @@ USBMassDriverBindingStart ( Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenUsbIoProtocol By Driver (%r)\n", Status));
gBS->CloseProtocol (
@@ -941,7 +941,7 @@ USBMassDriverBindingStop ( Controller,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
-
+
if (EFI_ERROR(Status)) {
//
// This is a 2nd type handle(multi-lun root), it needs to close devicepath
@@ -962,13 +962,13 @@ USBMassDriverBindingStop ( DEBUG ((EFI_D_INFO, "Success to stop multi-lun root handle\n"));
return EFI_SUCCESS;
}
-
+
//
// This is a 1st type handle(non-multi-lun), which only needs to uninstall
// Block I/O Protocol, close USB I/O Protocol and free mass device.
//
UsbMass = USB_MASS_DEVICE_FROM_BLOCK_IO (BlockIo);
-
+
//
// Uninstall Block I/O protocol from the device handle,
// then call the transport protocol to stop itself.
@@ -984,24 +984,24 @@ USBMassDriverBindingStop ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
gBS->CloseProtocol (
Controller,
&gEfiUsbIoProtocolGuid,
This->DriverBindingHandle,
Controller
);
-
+
UsbMass->Transport->CleanUp (UsbMass->Context);
FreePool (UsbMass);
-
+
DEBUG ((EFI_D_INFO, "Success to stop non-multi-lun root handle\n"));
return EFI_SUCCESS;
- }
+ }
//
// This is a 3rd type handle(multi-lun), which needs uninstall
- // Block I/O Protocol and Device Path Protocol, close USB I/O Protocol and
+ // Block I/O Protocol and Device Path Protocol, close USB I/O Protocol and
// free mass device for all children.
//
AllChildrenStopped = TRUE;
@@ -1030,7 +1030,7 @@ USBMassDriverBindingStop ( This->DriverBindingHandle,
ChildHandleBuffer[Index]
);
-
+
Status = gBS->UninstallMultipleProtocolInterfaces (
ChildHandleBuffer[Index],
&gEfiDevicePathProtocolGuid,
@@ -1041,14 +1041,14 @@ USBMassDriverBindingStop ( &UsbMass->DiskInfo,
NULL
);
-
+
if (EFI_ERROR (Status)) {
//
// Fail to uninstall Block I/O Protocol and Device Path Protocol, so re-open USB I/O Protocol by child.
//
AllChildrenStopped = FALSE;
DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", (UINT32)Index));
-
+
gBS->OpenProtocol (
Controller,
&gEfiUsbIoProtocolGuid,
@@ -1071,7 +1071,7 @@ USBMassDriverBindingStop ( if (!AllChildrenStopped) {
return EFI_DEVICE_ERROR;
}
-
+
DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", (UINT32) NumberOfChildren));
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h index 0f013c1..b17d88e 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h @@ -2,7 +2,7 @@ Definitions of functions for Driver Binding Protocol and Block I/O Protocol,
and other internal definitions.
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -107,7 +107,7 @@ USBMassDriverBindingStop ( /**
Reset the block device.
- This function implements EFI_BLOCK_IO_PROTOCOL.Reset().
+ This function implements EFI_BLOCK_IO_PROTOCOL.Reset().
It resets the block device hardware.
ExtendedVerification is ignored in this implementation.
@@ -129,7 +129,7 @@ UsbMassReset ( /**
Reads the requested number of blocks from the device.
- This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().
+ This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().
It reads the requested number of blocks from the device.
All the blocks are read, or an error is returned.
@@ -163,7 +163,7 @@ UsbMassReadBlocks ( /**
Writes a specified number of blocks to the device.
- This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().
+ This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().
It writes a specified number of blocks to the device.
All blocks are written, or an error is returned.
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf index 26d15c7..1fdd434 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf @@ -13,7 +13,7 @@ # 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.
# 4. UEFI Specification, v2.1
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -40,7 +40,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gUSBMassDriverBinding
+# DRIVER_BINDING = gUSBMassDriverBinding
# COMPONENT_NAME = gUsbMassStorageComponentName
# COMPONENT_NAME2 = gUsbMassStorageComponentName2
#
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni index 80960be..b29a4bf 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni @@ -13,13 +13,13 @@ // 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.
// 4. UEFI Specification, v2.1
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni index 4e09a8d..c3cba65 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbMassStorageDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Mass Storage DXE Driver"
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c index 9fe9244..965195c 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c @@ -1,7 +1,7 @@ /** @file
USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -91,7 +91,7 @@ USBMouseAbsolutePointerDriverBindingSupported ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
//
// Use the USB I/O Protocol interface to check whether Controller is
// a mouse device that can be managed by this driver.
@@ -100,14 +100,14 @@ USBMouseAbsolutePointerDriverBindingSupported ( if (!IsUsbMouse (UsbIo)) {
Status = EFI_UNSUPPORTED;
}
-
+
gBS->CloseProtocol (
Controller,
&gEfiUsbIoProtocolGuid,
This->DriverBindingHandle,
Controller
);
-
+
return Status;
}
@@ -161,12 +161,12 @@ USBMouseAbsolutePointerDriverBindingStart ( (VOID **) &UsbIo,
This->DriverBindingHandle,
Controller,
- EFI_OPEN_PROTOCOL_BY_DRIVER
+ EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status)) {
goto ErrorExit1;
}
-
+
UsbMouseAbsolutePointerDevice = AllocateZeroPool (sizeof (USB_MOUSE_ABSOLUTE_POINTER_DEV));
ASSERT (UsbMouseAbsolutePointerDevice != NULL);
@@ -271,8 +271,8 @@ USBMouseAbsolutePointerDriverBindingStart ( // Initialize and install EFI Absolute Pointer Protocol.
//
UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.GetState = GetMouseAbsolutePointerState;
- UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Reset = UsbMouseAbsolutePointerReset;
- UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Mode = &UsbMouseAbsolutePointerDevice->Mode;
+ UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Reset = UsbMouseAbsolutePointerReset;
+ UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Mode = &UsbMouseAbsolutePointerDevice->Mode;
Status = gBS->CreateEvent (
EVT_NOTIFY_WAIT,
@@ -470,7 +470,7 @@ USBMouseAbsolutePointerDriverBindingStop ( // Free all resources.
//
gBS->CloseEvent (UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.WaitForInput);
-
+
if (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent != NULL) {
gBS->CloseEvent (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent);
UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent = NULL;
@@ -596,7 +596,7 @@ InitializeUsbMouseDevice ( Total = 0;
Start = FALSE;
- Head = (USB_DESC_HEAD *)Buf;
+ Head = (USB_DESC_HEAD *)Buf;
MouseHidDesc = NULL;
//
@@ -784,7 +784,7 @@ OnMouseInterruptComplete ( //
// Delete & Submit this interrupt again
- // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.
+ // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.
//
UsbIo->UsbAsyncInterruptTransfer (
UsbIo,
@@ -856,15 +856,15 @@ OnMouseInterruptComplete ( /**
Retrieves the current state of a pointer device.
- @param This A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.
+ @param This A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.
@param MouseState A pointer to the state information on the pointer device.
@retval EFI_SUCCESS The state of the pointer device was returned in State.
@retval EFI_NOT_READY The state of the pointer device has not changed since the last call to
- GetState().
+ GetState().
@retval EFI_DEVICE_ERROR A device error occurred while attempting to retrieve the pointer device's
- current state.
- @retval EFI_INVALID_PARAMETER State is NULL.
+ current state.
+ @retval EFI_INVALID_PARAMETER State is NULL.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h index 08b8d56..b1ea7d2 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h @@ -1,7 +1,7 @@ /** @file
Helper routine and corresponding data struct used by USB Mouse Absolute Pointer Driver.
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -311,15 +311,15 @@ UsbMouseAbsolutePointerComponentNameGetControllerName ( /**
Retrieves the current state of a pointer device.
- @param This A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.
+ @param This A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.
@param MouseState A pointer to the state information on the pointer device.
@retval EFI_SUCCESS The state of the pointer device was returned in State.
@retval EFI_NOT_READY The state of the pointer device has not changed since the last call to
- GetState().
+ GetState().
@retval EFI_DEVICE_ERROR A device error occurred while attempting to retrieve the pointer device's
- current state.
- @retval EFI_INVALID_PARAMETER State is NULL.
+ current state.
+ @retval EFI_INVALID_PARAMETER State is NULL.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf index af10382..10e74b9 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf @@ -9,7 +9,7 @@ # 1. Universal Serial Bus HID Firmware Specification, ver 1.11
# 2. UEFI Specification, v2.1
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -36,7 +36,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gUsbMouseAbsolutePointerDriverBinding
+# DRIVER_BINDING = gUsbMouseAbsolutePointerDriverBinding
# COMPONENT_NAME = gUsbMouseAbsolutePointerComponentName
# COMPONENT_NAME2 = gUsbMouseAbsolutePointerComponentName2
#
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni index f3d1b1d..3270213 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni @@ -9,13 +9,13 @@ // 1. Universal Serial Bus HID Firmware Specification, ver 1.11
// 2. UEFI Specification, v2.1
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni index ea9f4d9..ab9b12a 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbMouseAbsolutePointerDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Tablet Pointer DXE Driver"
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c index ec6a420..2594b7b 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c @@ -1,7 +1,7 @@ /** @file
Helper functions to parse HID report descriptor and items.
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -160,7 +160,7 @@ GetItemData ( There are three item types: Main, Global, and Local.
This function parses these types of HID items according
to tag info.
-
+
@param UsbMouse The instance of USB_MOUSE_DEV
@param HidItem The HID item to parse
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c index 0ad5616..9324994 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c @@ -1,7 +1,7 @@ /** @file
USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -335,7 +335,7 @@ USBMouseDriverBindingStart ( );
goto ErrorExit;
}
-
+
UsbMouseDevice->ControllerNameTable = NULL;
AddUnicodeString2 (
"eng",
@@ -596,7 +596,7 @@ InitializeUsbMouseDevice ( Total = 0;
Start = FALSE;
- Head = (USB_DESC_HEAD *)Buf;
+ Head = (USB_DESC_HEAD *)Buf;
MouseHidDesc = NULL;
//
@@ -782,7 +782,7 @@ OnMouseInterruptComplete ( //
// Delete & Submit this interrupt again
- // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.
+ // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.
//
UsbIo->UsbAsyncInterruptTransfer (
UsbIo,
@@ -839,16 +839,16 @@ OnMouseInterruptComplete ( /**
Retrieves the current state of a pointer device.
-
- @param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
+
+ @param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
@param MouseState A pointer to the state information on the pointer device.
-
+
@retval EFI_SUCCESS The state of the pointer device was returned in State.
@retval EFI_NOT_READY The state of the pointer device has not changed since the last call to
- GetState().
+ GetState().
@retval EFI_DEVICE_ERROR A device error occurred while attempting to retrieve the pointer device's
- current state.
- @retval EFI_INVALID_PARAMETER MouseState is NULL.
+ current state.
+ @retval EFI_INVALID_PARAMETER MouseState is NULL.
**/
EFI_STATUS
@@ -892,13 +892,13 @@ GetMouseState ( }
-/**
+/**
Resets the pointer device hardware.
-
+
@param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
@param ExtendedVerification Indicates that the driver may perform a more exhaustive
verification operation of the device during reset.
-
+
@retval EFI_SUCCESS The device was reset.
@retval EFI_DEVICE_ERROR The device is not functioning correctly and could not be reset.
@@ -937,7 +937,7 @@ UsbMouseReset ( @param Event Event to be signaled when there's input from mouse.
@param Context Points to USB_MOUSE_DEV instance.
-
+
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h index 0dab9de..b0484d9 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h @@ -1,7 +1,7 @@ /** @file
Helper routine and corresponding data struct used by USB Mouse Driver.
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -310,16 +310,16 @@ UsbMouseComponentNameGetControllerName ( /**
Retrieves the current state of a pointer device.
-
- @param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
+
+ @param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
@param MouseState A pointer to the state information on the pointer device.
-
+
@retval EFI_SUCCESS The state of the pointer device was returned in State.
@retval EFI_NOT_READY The state of the pointer device has not changed since the last call to
- GetState().
+ GetState().
@retval EFI_DEVICE_ERROR A device error occurred while attempting to retrieve the pointer device's
- current state.
- @retval EFI_INVALID_PARAMETER MouseState is NULL.
+ current state.
+ @retval EFI_INVALID_PARAMETER MouseState is NULL.
**/
EFI_STATUS
@@ -329,13 +329,13 @@ GetMouseState ( OUT EFI_SIMPLE_POINTER_STATE *MouseState
);
-/**
+/**
Resets the pointer device hardware.
-
+
@param This A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.
@param ExtendedVerification Indicates that the driver may perform a more exhaustive
verification operation of the device during reset.
-
+
@retval EFI_SUCCESS The device was reset.
@retval EFI_DEVICE_ERROR The device is not functioning correctly and could not be reset.
@@ -352,7 +352,7 @@ UsbMouseReset ( @param Event Event to be signaled when there's input from mouse.
@param Context Points to USB_MOUSE_DEV instance.
-
+
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf index 13d8859..5bea024 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf @@ -9,7 +9,7 @@ # 1. Universal Serial Bus HID Firmware Specification, ver 1.11
# 2. UEFI Specification, v2.1
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -36,7 +36,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gUsbMouseDriverBinding
+# DRIVER_BINDING = gUsbMouseDriverBinding
# COMPONENT_NAME = gUsbMouseComponentName
# COMPONENT_NAME2 = gUsbMouseComponentName2
#
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni index a7313ce..8d04b8e 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni @@ -9,13 +9,13 @@ // 1. Universal Serial Bus HID Firmware Specification, ver 1.11
// 2. UEFI Specification, v2.1
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni index 49769a9..28f3ea3 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UsbMouseDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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
"USB Mouse DXE Driver"
|