From 4140a6635b4784db9d0125e96d521d01053eca2c Mon Sep 17 00:00:00 2001
From: rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 11 Feb 2010 02:33:16 +0000
Subject: Coding style fix and minor improvements.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9977 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c | 14 +++++++-------
 .../UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h   | 12 ++++++------
 MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c                | 14 +++++++-------
 MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h                | 12 ++++++------
 4 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'MdeModulePkg/Bus/Usb')

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;
 
-- 
cgit v1.2.3