Coding style fix and minor improvements.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9977 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 47 insertions, 47 deletions

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 4b835fc27f..188963fc52 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1,7 +1,7 @@
 /** @file

   SCSI disk driver that layers on every SCSI IO protocol in the system.

 

-Copyright (c) 2006 - 2009, Intel Corporation. <BR>

+Copyright (c) 2006 - 2010, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -2372,9 +2372,9 @@ GetParentProtocol (
   This function is used by the IDE bus driver to get inquiry data.  Data format

   of Identify data is defined by the Interface GUID.

 

-  @param[in]     This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

-  @param[in,out] InquiryData       Pointer to a buffer for the inquiry data.

-  @param[in,out] InquiryDataSize   Pointer to the value for the inquiry data size.

+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

+  @param[in, out] InquiryData       Pointer to a buffer for the inquiry data.

+  @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 

@@ -2411,10 +2411,10 @@ ScsiDiskInfoInquiry (
   This function is used by the IDE bus driver to get identify data.  Data format

   of Identify data is defined by the Interface GUID.

 

-  @param[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

+  @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.

@@ -2458,10 +2458,10 @@ ScsiDiskInfoIdentify (
   This function is used by the IDE bus driver to get sense data. 

   Data format of Sense data is defined by the Interface GUID.

 

-  @param[in]     This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

-  @param[in,out] SenseData         Pointer to the SenseData.

-  @param[in,out] SenseDataSize     Size of SenseData in bytes.

-  @param[out]    SenseDataNumber   Pointer to the value for the sense data size.

+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

+  @param[in, out] SenseData         Pointer to the SenseData.

+  @param[in, out] SenseDataSize     Size of SenseData in bytes.

+  @param[out]     SenseDataNumber   Pointer to the value for the sense data size.

 

   @retval EFI_SUCCESS            The command was accepted without any errors.

   @retval EFI_NOT_FOUND          Device does not support this data class.

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
index 2a5c0d0667..06c10b7f07 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
@@ -1,7 +1,7 @@
 /** @file

   Header file for SCSI Disk Driver.

 

-Copyright (c) 2004 - 2009, Intel Corporation. <BR>

+Copyright (c) 2004 - 2010, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -406,9 +406,9 @@ ScsiDiskFlushBlocks (
   This function is used by the IDE bus driver to get inquiry data.  Data format

   of Identify data is defined by the Interface GUID.

 

-  @param[in]     This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

-  @param[in,out] InquiryData       Pointer to a buffer for the inquiry data.

-  @param[in,out] InquiryDataSize   Pointer to the value for the inquiry data size.

+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

+  @param[in, out] InquiryData       Pointer to a buffer for the inquiry data.

+  @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 

@@ -433,8 +433,8 @@ ScsiDiskInfoInquiry (
 

   @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

+  @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.

@@ -458,10 +458,10 @@ ScsiDiskInfoIdentify (
   This function is used by the IDE bus driver to get sense data. 

   Data format of Sense data is defined by the Interface GUID.

 

-  @param[in]     This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

-  @param[in,out] SenseData         Pointer to the SenseData.

-  @param[in,out] SenseDataSize     Size of SenseData in bytes.

-  @param[out]    SenseDataNumber   Pointer to the value for the sense data size.

+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.

+  @param[in, out] SenseData         Pointer to the SenseData.

+  @param[in, out] SenseDataSize     Size of SenseData in bytes.

+  @param[out]     SenseDataNumber   Pointer to the value for the sense data size.

 

   @retval EFI_SUCCESS            The command was accepted without any errors.

   @retval EFI_NOT_FOUND          Device does not support this data class.

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
index e0112dd427..fa75415362 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
@@ -1,7 +1,7 @@
 /** @file

   Helper functions to parse HID report descriptor and items.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -92,7 +92,7 @@ GetNextHidItem (
       // 1-byte data

       //

       if ((EndPos - StartPos) >= 1) {

-        HidItem->Data.U8 = *StartPos++;

+        HidItem->Data.Uint8 = *StartPos++;

         return StartPos;

       }

 

@@ -101,7 +101,7 @@ GetNextHidItem (
       // 2-byte data

       //

       if ((EndPos - StartPos) >= 2) {

-        CopyMem (&HidItem->Data.U16, StartPos, sizeof (UINT16));

+        CopyMem (&HidItem->Data.Uint16, StartPos, sizeof (UINT16));

         StartPos += 2;

         return StartPos;

       }

@@ -112,7 +112,7 @@ GetNextHidItem (
       //

       HidItem->Size = 4;

       if ((EndPos - StartPos) >= 4) {

-        CopyMem (&HidItem->Data.U32, StartPos, sizeof (UINT32));

+        CopyMem (&HidItem->Data.Uint32, StartPos, sizeof (UINT32));

         StartPos += 4;

         return StartPos;

       }

@@ -145,11 +145,11 @@ GetItemData (
   //

   switch (HidItem->Size) {

   case 1:

-    return HidItem->Data.U8;

+    return HidItem->Data.Uint8;

   case 2:

-    return HidItem->Data.U16;

+    return HidItem->Data.Uint16;

   case 4:

-    return HidItem->Data.U32;

+    return HidItem->Data.Uint32;

   }

   return 0;

 }

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 2faddd73d9..e24d3e9599 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -80,12 +80,12 @@ typedef struct {
 ///

 

 typedef union {

-  UINT8   U8;

-  UINT16  U16;

-  UINT32  U32;

-  INT8    I8;

-  INT16   I16;

-  INT32   I32;

+  UINT8   Uint8;

+  UINT16  Uint16;

+  UINT32  Uint32;

+  INT8    Int8;

+  INT16   Int16;

+  INT32   Int32;

   UINT8   *LongData;

 } HID_DATA;

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
index 84eb4ac1c5..da105ac25f 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 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -92,7 +92,7 @@ GetNextHidItem (
       // 1-byte data

       //

       if ((EndPos - StartPos) >= 1) {

-        HidItem->Data.U8 = *StartPos++;

+        HidItem->Data.Uint8 = *StartPos++;

         return StartPos;

       }

 

@@ -101,7 +101,7 @@ GetNextHidItem (
       // 2-byte data

       //

       if ((EndPos - StartPos) >= 2) {

-        CopyMem (&HidItem->Data.U16, StartPos, sizeof (UINT16));

+        CopyMem (&HidItem->Data.Uint16, StartPos, sizeof (UINT16));

         StartPos += 2;

         return StartPos;

       }

@@ -112,7 +112,7 @@ GetNextHidItem (
       //

       HidItem->Size = 4;

       if ((EndPos - StartPos) >= 4) {

-        CopyMem (&HidItem->Data.U32, StartPos, sizeof (UINT32));

+        CopyMem (&HidItem->Data.Uint32, StartPos, sizeof (UINT32));

         StartPos += 4;

         return StartPos;

       }

@@ -145,11 +145,11 @@ GetItemData (
   //

   switch (HidItem->Size) {

   case 1:

-    return HidItem->Data.U8;

+    return HidItem->Data.Uint8;

   case 2:

-    return HidItem->Data.U16;

+    return HidItem->Data.Uint16;

   case 4:

-    return HidItem->Data.U32;

+    return HidItem->Data.Uint32;

   }

   return 0;

 }

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 3af139d25c..d142ead0d8 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -80,12 +80,12 @@ typedef struct {
 ///

 

 typedef union {

-  UINT8   U8;

-  UINT16  U16;

-  UINT32  U32;

-  INT8    I8;

-  INT16   I16;

-  INT32   I32;

+  UINT8   Uint8;

+  UINT16  Uint16;

+  UINT32  Uint32;

+  INT8    Int8;

+  INT16   Int16;

+  INT32   Int32;

   UINT8   *LongData;

 } HID_DATA;