Fix the comments to follow UEFI Spec regarding how to check an EFI_HANDLE is valid...

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassImpl.h

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 39d593da0c58d0f9b0cb837c3e27b4a0a6d0b34c..0f013c1ad749a9d6a1be013b73ec66e8241a0bf3 100644 (file)
--- 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,\r
   and other internal definitions.\r
 \r
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,16 +16,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _EFI_USBMASS_IMPL_H_\r
 #define _EFI_USBMASS_IMPL_H_\r
 \r
-#include "UsbMass.h"\r
-#include "UsbMassBot.h"\r
-#include "UsbMassCbi.h"\r
-#include "UsbMassBoot.h"\r
-\r
 #define  USB_MASS_SIGNATURE    SIGNATURE_32 ('U', 's', 'b', 'M')\r
 \r
 #define USB_MASS_DEVICE_FROM_BLOCK_IO(a) \\r
         CR (a, USB_MASS_DEVICE, BlockIo, USB_MASS_SIGNATURE)\r
 \r
+#define USB_MASS_DEVICE_FROM_DISK_INFO(a) \\r
+        CR (a, USB_MASS_DEVICE, DiskInfo, USB_MASS_SIGNATURE)\r
+\r
+\r
 extern EFI_COMPONENT_NAME_PROTOCOL   gUsbMassStorageComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gUsbMassStorageComponentName2;\r
 \r
@@ -309,7 +308,7 @@ UsbMassStorageGetDriverName (
                                 the language specified by Language for the\r
                                 driver specified by This was returned in\r
                                 DriverName.\r
-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.\r
+  @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid\r
                                 EFI_HANDLE.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r