Make MdeModulePkg GCC clean.

It also pass ICC+IPF and MYTOOLS+EBC build.

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

6 files changed, 9 insertions, 11 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 8d747d0648..795f545b77 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -284,7 +284,6 @@ UsbHubCtrlGetPortStatus (
   @retval Others                Failed to reset the port

 

 **/

-STATIC

 EFI_STATUS

 UsbHubCtrlResetTT (

   IN  USB_DEVICE          *HubDev,

@@ -319,7 +318,6 @@ UsbHubCtrlResetTT (
   @retval Others                Failed to set the feature

 

 **/

-STATIC

 EFI_STATUS

 UsbHubCtrlSetHubFeature (

   IN  USB_DEVICE          *HubDev,

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
index 09ae44533e..5fd8e763e3 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
@@ -84,7 +84,7 @@ enum {
 #define USB_BIT_IS_SET(Data, Bit)   ((BOOLEAN)(((Data) & (Bit)) == (Bit)))

 

 #define EFI_USB_BUS_PROTOCOL_GUID \

-          {0x2B2F68CC, 0x0CD2, 0x44cf, 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}

+          {0x2B2F68CC, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}}

 

 #define USB_INTERFACE_FROM_USBIO(a) \

           CR(a, USB_INTERFACE, UsbIo, USB_INTERFACE_SIGNATURE)

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
index a4a19e4b9c..f551c0a93b 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
@@ -98,7 +98,7 @@ USBKeyboardCheckForKey (
   );

 

 EFI_GUID  gEfiUsbKeyboardDriverGuid = {

-  0xa05f5f78, 0xfb3, 0x4d10, 0x90, 0x90, 0xac, 0x4, 0x6e, 0xeb, 0x7c, 0x3c

+  0xa05f5f78, 0xfb3, 0x4d10, {0x90, 0x90, 0xac, 0x4, 0x6e, 0xeb, 0x7c, 0x3c}

 };

 

 //

@@ -330,7 +330,7 @@ USBKeyboardDriverBindingStart (
       //

       // We only care interrupt endpoint here

       //

-      UsbKeyboardDevice->IntEndpointDescriptor  = EndpointDescriptor;

+      CopyMem(&UsbKeyboardDevice->IntEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));

       Found = TRUE;

     }

   }

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 939ba394cf..6c92da9c71 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -108,14 +108,14 @@ UsbBotInit (
        (UsbBot->BulkInEndpoint == NULL)) {

 

       UsbBot->BulkInEndpoint  = (EFI_USB_ENDPOINT_DESCRIPTOR *) (UsbBot + 1);

-      *UsbBot->BulkInEndpoint = EndPoint;

+      CopyMem(UsbBot->BulkInEndpoint, &EndPoint, sizeof (EndPoint));

     }

 

     if (USB_IS_OUT_ENDPOINT (EndPoint.EndpointAddress) &&

        (UsbBot->BulkOutEndpoint == NULL)) {

 

       UsbBot->BulkOutEndpoint   = (EFI_USB_ENDPOINT_DESCRIPTOR *) (UsbBot + 1) + 1;

-      *UsbBot->BulkOutEndpoint  = EndPoint;

+      CopyMem(UsbBot->BulkOutEndpoint, &EndPoint, sizeof(EndPoint));

     }

   }

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
index 1028e201c2..5c07c548b9 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
@@ -111,14 +111,14 @@ UsbCbiInit (
          (UsbCbi->BulkInEndpoint == NULL)) {

 

         UsbCbi->BulkInEndpoint  = (EFI_USB_ENDPOINT_DESCRIPTOR *) (UsbCbi + 1);

-        *UsbCbi->BulkInEndpoint = EndPoint;

+        CopyMem(UsbCbi->BulkInEndpoint, &EndPoint, sizeof (EndPoint));;

       }

 

       if (USB_IS_OUT_ENDPOINT (EndPoint.EndpointAddress) &&

          (UsbCbi->BulkOutEndpoint == NULL)) {

 

         UsbCbi->BulkOutEndpoint   = (EFI_USB_ENDPOINT_DESCRIPTOR *) (UsbCbi + 1) + 1;

-        *UsbCbi->BulkOutEndpoint  = EndPoint;

+        CopyMem(UsbCbi->BulkOutEndpoint, &EndPoint, sizeof (EndPoint));

       }

 

     } else if (USB_IS_INTERRUPT_ENDPOINT (EndPoint.Attributes)) {

@@ -129,7 +129,7 @@ UsbCbiInit (
           (UsbCbi->InterruptEndpoint == NULL)) {

 

         UsbCbi->InterruptEndpoint   = (EFI_USB_ENDPOINT_DESCRIPTOR *) (UsbCbi + 1) + 2;

-        *UsbCbi->InterruptEndpoint  = EndPoint;

+        CopyMem(UsbCbi->InterruptEndpoint, &EndPoint, sizeof (EndPoint));

       }

     }

   }

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
index 01c37c19a6..446e8eb443 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
@@ -77,7 +77,7 @@ USBMouseDriverBindingStop (
   );

 

 EFI_GUID  gEfiUsbMouseDriverGuid = {

-  0x290156b5, 0x6a05, 0x4ac0, 0xb8, 0x0, 0x51, 0x27, 0x55, 0xad, 0x14, 0x29

+  0x290156b5, 0x6a05, 0x4ac0, {0xb8, 0x0, 0x51, 0x27, 0x55, 0xad, 0x14, 0x29}

 };

 

 EFI_DRIVER_BINDING_PROTOCOL gUsbMouseDriverBinding = {