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

2 files changed, 9 insertions, 5 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index f5ec52d988..b7c66fec83 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -720,7 +720,7 @@ UsbEnumerateNewDev (
     //

     if (Parent->Speed == EFI_USB_SPEED_HIGH) {

       Child->Translator.TranslatorHubAddress  = Parent->Address;

-      Child->Translator.TranslatorPortNumber  = Port + 1;

+      Child->Translator.TranslatorPortNumber  = (UINT8) (Port + 1);

 

     } else {

       Child->Translator = Parent->Translator;

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index cd3e72eeeb..e7a0c28412 100644
--- 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 = {
     {

       MESSAGING_DEVICE_PATH,

       MSG_USB_CLASS_DP,

-      (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),

-      (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)

+      {

+        (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),

+        (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)

+      }

     },

     0xffff, // VendorId

     0xffff, // ProductId

@@ -48,8 +50,10 @@ STATIC USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = {
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    END_DEVICE_PATH_LENGTH,

-    0

+    {

+      END_DEVICE_PATH_LENGTH,

+      0

+    }

   }

 };