MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMouseDxe / MouseHid.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
index 84eb4ac1c5ed495e3736da3d171cea22ae0e9236..de44aec516e4c2a1d88f7732912938710a80e944 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
@@ -1,14 +1,8 @@
 /** @file\r
   Helper functions to parse HID report descriptor and items.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation\r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -92,7 +86,7 @@ GetNextHidItem (
       // 1-byte data\r
       //\r
       if ((EndPos - StartPos) >= 1) {\r
-        HidItem->Data.U8 = *StartPos++;\r
+        HidItem->Data.Uint8 = *StartPos++;\r
         return StartPos;\r
       }\r
 \r
@@ -101,7 +95,7 @@ GetNextHidItem (
       // 2-byte data\r
       //\r
       if ((EndPos - StartPos) >= 2) {\r
-        CopyMem (&HidItem->Data.U16, StartPos, sizeof (UINT16));\r
+        CopyMem (&HidItem->Data.Uint16, StartPos, sizeof (UINT16));\r
         StartPos += 2;\r
         return StartPos;\r
       }\r
@@ -112,7 +106,7 @@ GetNextHidItem (
       //\r
       HidItem->Size = 4;\r
       if ((EndPos - StartPos) >= 4) {\r
-        CopyMem (&HidItem->Data.U32, StartPos, sizeof (UINT32));\r
+        CopyMem (&HidItem->Data.Uint32, StartPos, sizeof (UINT32));\r
         StartPos += 4;\r
         return StartPos;\r
       }\r
@@ -145,11 +139,11 @@ GetItemData (
   //\r
   switch (HidItem->Size) {\r
   case 1:\r
-    return HidItem->Data.U8;\r
+    return HidItem->Data.Uint8;\r
   case 2:\r
-    return HidItem->Data.U16;\r
+    return HidItem->Data.Uint16;\r
   case 4:\r
-    return HidItem->Data.U32;\r
+    return HidItem->Data.Uint32;\r
   }\r
   return 0;\r
 }\r
@@ -160,7 +154,7 @@ GetItemData (
   There are three item types: Main, Global, and Local.\r
   This function parses these types of HID items according\r
   to tag info.\r
-  \r
+\r
   @param  UsbMouse          The instance of USB_MOUSE_DEV\r
   @param  HidItem           The HID item to parse\r
 \r