Clean up for GCC and Intel ICC build.

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

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index f5ec52d988e52e5ec8cc278d1fcb8387bbf658fd..b7c66fec831cc6917190d74117a56166ab5633f4 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -720,7 +720,7 @@ UsbEnumerateNewDev (
     //\r
     if (Parent->Speed == EFI_USB_SPEED_HIGH) {\r
       Child->Translator.TranslatorHubAddress  = Parent->Address;\r
-      Child->Translator.TranslatorPortNumber  = Port + 1;\r
+      Child->Translator.TranslatorPortNumber  = (UINT8) (Port + 1);\r
 \r
     } else {\r
       Child->Translator = Parent->Translator;\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index cd3e72eeebec12f986fc46bc3dc7d3703ac8db8d..e7a0c28412324e51d35ff83a9e1c2026b419132d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -35,8 +35,10 @@ STATIC USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = {
     {\r
       MESSAGING_DEVICE_PATH,\r
       MSG_USB_CLASS_DP,\r
-      (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)\r
+      {\r
+        (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),\r
+        (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)\r
+      }\r
     },\r
     0xffff, // VendorId\r
     0xffff, // ProductId\r
@@ -48,8 +50,10 @@ STATIC USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    END_DEVICE_PATH_LENGTH,\r
-    0\r
+    {\r
+      END_DEVICE_PATH_LENGTH,\r
+      0\r
+    }\r
   }\r
 };\r
 \r