1. Fixed tools_def.template to meet ICC build for IA32

2. Modified some source files to meet ICC build for IA32 and IPF.

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

18 files changed, 56 insertions, 68 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
index bdecfcf973..14f3c7feb0 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
@@ -26,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _USB_DESCRIPTOR_H_

 

 enum {

-  USB_MAX_INTERFACE_SETTING  = 8,

+  USB_MAX_INTERFACE_SETTING  = 8

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 95ad8701af..9fbaf6b417 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -888,7 +888,7 @@ UsbEnumeratePort (
     // If overcurrent condition is cleared, enable the port again

     //

     if (!USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {

-      HubApi->SetPortFeature (HubIf, Port, USB_HUB_PORT_POWER);

+      HubApi->SetPortFeature (HubIf, Port, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_POWER);

     }

 

   } else if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
index e14b2d753c..3c22a0c447 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
@@ -100,7 +100,7 @@ EFI_STATUS
   IN USB_INTERFACE        *UsbIf

   );

 

-typedef struct _USB_HUB_API{

+struct _USB_HUB_API{

   USB_HUB_INIT                Init;

   USB_HUB_GET_PORT_STATUS     GetPortStatus;

   USB_HUB_CLEAR_PORT_CHANGE   ClearPortChange;

@@ -108,7 +108,7 @@ typedef struct _USB_HUB_API{
   USB_HUB_CLEAR_PORT_FEATURE  ClearPortFeature;

   USB_HUB_RESET_PORT          ResetPort;

   USB_HUB_RELEASE             Release;

-} USB_HUB_API;

+};

 

 USB_ENDPOINT_DESC*

 UsbGetEndpointDesc (

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 25332f432f..cb54f03747 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -98,7 +98,7 @@ UsbHubCtrlClearPortFeature (
              USB_HUB_TARGET_PORT,

              USB_HUB_REQ_CLEAR_FEATURE,

              Feature,

-             Port + 1,

+             (UINT16) (Port + 1),

              NULL,

              0

              );

@@ -140,8 +140,8 @@ UsbHubCtrlClearTTBuffer (
   //

   // Check USB2.0 spec page 424 for wValue's encoding

   //

-  Value = (EpNum & 0x0F) | (DevAddr << 4) |

-          ((EpType & 0x03) << 11) | ((EpNum & 0x80) << 15);

+  Value = (UINT16) ((EpNum & 0x0F) | (DevAddr << 4) |

+          ((EpType & 0x03) << 11) | ((EpNum & 0x80) << 15));

 

   Status = UsbCtrlRequest (

              HubDev,

@@ -150,7 +150,7 @@ UsbHubCtrlClearTTBuffer (
              USB_HUB_TARGET_PORT,

              USB_HUB_REQ_CLEAR_TT,

              Value,

-             Port + 1,

+             (UINT16) (Port + 1),

              NULL,

              0

              );

@@ -265,7 +265,7 @@ UsbHubCtrlGetPortStatus (
              USB_HUB_TARGET_PORT,

              USB_HUB_REQ_GET_STATUS,

              0,

-             Port + 1,

+             (UINT16) (Port + 1),

              State,

              4

              );

@@ -300,7 +300,7 @@ UsbHubCtrlResetTT (
              USB_HUB_TARGET_HUB,

              USB_HUB_REQ_RESET_TT,

              0,

-             Port + 1,

+             (UINT16) (Port + 1),

              NULL,

              0

              );

@@ -376,7 +376,7 @@ UsbHubCtrlSetPortFeature (
              USB_HUB_TARGET_PORT,

              USB_HUB_REQ_SET_FEATURE,

              Feature,

-             Port + 1,

+             (UINT16) (Port + 1),

              NULL,

              0

              );

@@ -744,7 +744,7 @@ UsbHubInit (
   // for both gang/individual powered hubs.

   //

   for (Index = 0; Index < HubDesc.NumPorts; Index++) {

-    UsbHubCtrlSetPortFeature (HubIf->Device, Index, USB_HUB_PORT_POWER);

+    UsbHubCtrlSetPortFeature (HubIf->Device, Index, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_POWER);

   }

 

   gBS->Stall (HubDesc.PwrOn2PwrGood * 2 * USB_STALL_1_MS);

@@ -852,7 +852,7 @@ UsbHubSetPortFeature (
 {

   EFI_STATUS              Status;

 

-  Status = UsbHubCtrlSetPortFeature (HubIf->Device, Port, Feature);

+  Status = UsbHubCtrlSetPortFeature (HubIf->Device, Port, (UINT8) Feature);

 

   return Status;

 }

@@ -879,7 +879,7 @@ UsbHubClearPortFeature (
 {

   EFI_STATUS              Status;

 

-  Status = UsbHubCtrlClearPortFeature (HubIf->Device, Port, Feature);

+  Status = UsbHubCtrlClearPortFeature (HubIf->Device, Port, (UINT8) Feature);

 

   return Status;

 }

@@ -907,7 +907,7 @@ UsbHubResetPort (
   UINTN                   Index;

   EFI_STATUS              Status;

 

-  Status  = UsbHubSetPortFeature (HubIf, Port, USB_HUB_PORT_RESET);

+  Status  = UsbHubSetPortFeature (HubIf, Port, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_RESET);

 

   if (EFI_ERROR (Status)) {

     return Status;

@@ -1121,7 +1121,7 @@ UsbRootHubClearPortChange (
     Map = &mRootHubFeatureMap[Index];

 

     if (USB_BIT_IS_SET (PortState.PortChangeStatus, Map->ChangedBit)) {

-      UsbHcClearRootHubPortFeature (HubIf->Device->Bus, Port, Map->Feature);

+      UsbHcClearRootHubPortFeature (HubIf->Device->Bus, Port, (EFI_USB_PORT_FEATURE) Map->Feature);

     }

   }

 }

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
index 0238ea0184..a5bcbb2623 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
@@ -25,6 +25,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _USB_HUB_H_

 #define _USB_HUB_H_

 

+#include <IndustryStandard/Usb.h>

+

 #define USB_ENDPOINT_ADDR(EpAddr) ((EpAddr) & 0x7F)

 #define USB_ENDPOINT_TYPE(Desc)   ((Desc)->Attributes & USB_ENDPOINT_TYPE_MASK)

 

@@ -89,7 +91,7 @@ enum {
   USB_HUB_SUBCLASS_CODE       = 0x00,

 

 

-  USB_HUB_LOOP                = 50,

+  USB_HUB_LOOP                = 50

 };

 

 #pragma pack(1)

@@ -110,7 +112,7 @@ typedef struct {
 

 typedef struct {

   UINT16                ChangedBit;

-  EFI_USB_PORT_FEATURE  Feature;

+  UINT8                 Feature;

 } USB_CHANGE_FEATURE_MAP;

 

 

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 216f948ff8..28d73daffe 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -518,7 +518,7 @@ UsbHcSyncInterruptTransfer (
                                UsbResult

                                );

   } else {

-    IsSlowDevice = (EFI_USB_SPEED_LOW == DevSpeed) ? TRUE : FALSE;

+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DevSpeed) ? TRUE : FALSE);

     Status = UsbBus->UsbHc->SyncInterruptTransfer (

                               UsbBus->UsbHc,

                               DevAddr,

@@ -634,7 +634,7 @@ UsbOpenHostProtoByChild (
     Status = gBS->OpenProtocol (

                     Bus->HostHandle,

                     &gEfiUsb2HcProtocolGuid,

-                    &Usb2Hc,

+                    (VOID **) &Usb2Hc,

                     mUsbBusDriverBinding.DriverBindingHandle,

                     Child,

                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

@@ -644,7 +644,7 @@ UsbOpenHostProtoByChild (
     Status = gBS->OpenProtocol (

                     Bus->HostHandle,

                     &gEfiUsbHcProtocolGuid,

-                    &UsbHc,

+                    (VOID **) &UsbHc,

                     mUsbBusDriverBinding.DriverBindingHandle,

                     Child,

                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
index 2ecc2c8e50..7407a36c19 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
@@ -83,7 +83,7 @@ enum {
   USB_BUS_TPL               = TPL_NOTIFY,

 

   USB_INTERFACE_SIGNATURE   = EFI_SIGNATURE_32 ('U', 'S', 'B', 'I'),

-  USB_BUS_SIGNATURE         = EFI_SIGNATURE_32 ('U', 'S', 'B', 'B'),

+  USB_BUS_SIGNATURE         = EFI_SIGNATURE_32 ('U', 'S', 'B', 'B')

 };

 

 #define USB_BIT(a)                  ((UINTN)(1 << (a)))

@@ -110,7 +110,7 @@ typedef struct _EFI_USB_BUS_PROTOCOL {
 // Stands for the real USB device. Each device may

 // has several seperately working interfaces.

 //

-typedef struct _USB_DEVICE {

+struct _USB_DEVICE {

   USB_BUS                   *Bus;

 

   //

@@ -140,12 +140,12 @@ typedef struct _USB_DEVICE {
   UINT8                     ParentAddr;

   USB_INTERFACE             *ParentIf;

   UINT8                     ParentPort;       // Start at 0

-} USB_DEVICE;

+};

 

 //

 // Stands for different functions of USB device

 //

-typedef struct _USB_INTERFACE {

+struct _USB_INTERFACE {

   UINTN                     Signature;

   USB_DEVICE                *Device;

   USB_INTERFACE_DESC        *IfDesc;

@@ -179,12 +179,12 @@ typedef struct _USB_INTERFACE {
   // connected to EHCI.

   //

   UINT8                     MaxSpeed;

-} USB_INTERFACE;

+};

 

 //

 // Stands for the current USB Bus

 //

-typedef struct _USB_BUS {

+struct _USB_BUS {

   UINTN                     Signature;

   EFI_USB_BUS_PROTOCOL      BusId;

 

@@ -201,7 +201,7 @@ typedef struct _USB_BUS {
   // for root hub. Device with address i is at Devices[i].

   //

   USB_DEVICE                *Devices[USB_MAX_DEVICES];

-} USB_BUS;

+};

 

 extern EFI_USB_IO_PROTOCOL           mUsbIoProtocol;

 extern EFI_DRIVER_BINDING_PROTOCOL   mUsbBusDriverBinding;

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
index 3ea788cdad..a4a19e4b9c 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
@@ -174,7 +174,7 @@ USBKeyboardDriverBindingSupported (
   OpenStatus = gBS->OpenProtocol (

                       Controller,

                       &gEfiUsbIoProtocolGuid,

-                      &UsbIo,

+                      (VOID **) &UsbIo,

                       This->DriverBindingHandle,

                       Controller,

                       EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -244,7 +244,7 @@ USBKeyboardDriverBindingStart (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiUsbIoProtocolGuid,

-                  &UsbIo,

+                  (VOID **) &UsbIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -500,12 +500,11 @@ USBKeyboardDriverBindingStop (
   EFI_STATUS                  Status;

   EFI_SIMPLE_TEXT_INPUT_PROTOCOL *SimpleInput;

   USB_KB_DEV                  *UsbKeyboardDevice;

-  EFI_USB_IO_PROTOCOL         *UsbIo;

 

   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiSimpleTextInProtocolGuid,

-                  &SimpleInput,

+                  (VOID **) &SimpleInput,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -526,7 +525,6 @@ USBKeyboardDriverBindingStop (
         Controller

         );

 

-  UsbIo = UsbKeyboardDevice->UsbIo;

   //

   // Uninstall the Asyn Interrupt Transfer from this device

   // will disable the key data input from this device

@@ -605,12 +603,9 @@ USBKeyboardReset (
 {

   EFI_STATUS          Status;

   USB_KB_DEV          *UsbKeyboardDevice;

-  EFI_USB_IO_PROTOCOL *UsbIo;

 

   UsbKeyboardDevice = USB_KB_DEV_FROM_THIS (This);

 

-  UsbIo             = UsbKeyboardDevice->UsbIo;

-

   KbdReportStatusCode (

     UsbKeyboardDevice->DevicePath,

     EFI_PROGRESS_CODE,

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
index 41286d6866..44914afb54 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
@@ -206,9 +206,6 @@ InitUSBKeyboard (
   UINT8               Duration;

   EFI_STATUS          Status;

   UINT32              TransferResult;

-  EFI_USB_IO_PROTOCOL *UsbIo;

-

-  UsbIo = UsbKeyboardDevice->UsbIo;

 

   KbdReportStatusCode (

     UsbKeyboardDevice->DevicePath,

@@ -361,19 +358,16 @@ KeyboardHandler (
   UINT8               Index;

   UINT8               Index2;

   BOOLEAN             Down;

-  EFI_STATUS          Status;

   BOOLEAN             KeyRelease;

   BOOLEAN             KeyPress;

   UINT8               SavedTail;

   USB_KEY             UsbKey;

   UINT8               NewRepeatKey;

   UINT32              UsbStatus;

-  UINT8               *DataPtr;

 

   ASSERT (Context);

 

   NewRepeatKey      = 0;

-  DataPtr           = (UINT8 *) Data;

   UsbKeyboardDevice = (USB_KB_DEV *) Context;

   UsbIo             = UsbKeyboardDevice->UsbIo;

 

@@ -413,7 +407,7 @@ KeyboardHandler (
     // Delete & Submit this interrupt again

     //

 

-    Status = UsbIo->UsbAsyncInterruptTransfer (

+    UsbIo->UsbAsyncInterruptTransfer (

                       UsbIo,

                       UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,

                       FALSE,

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index c48dee5a7b..8fcbed7884 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
@@ -84,7 +84,7 @@ enum {
 

   USB_MASS_CMD_SUCCESS    = 0,

   USB_MASS_CMD_FAIL,

-  USB_MASS_CMD_PERSISTENT,

+  USB_MASS_CMD_PERSISTENT

 };

 

 typedef

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 80fdf47055..e9b0a2a72a 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -89,7 +89,7 @@ UsbBootPutUint16 (
   IN UINT16                  Data16

   )

 {

-  Data16 = USB_BOOT_SWAP16 (Data16);

+  Data16 = (UINT16) (USB_BOOT_SWAP16 (Data16));

   CopyMem (Buf, &Data16, sizeof (UINT16));

 }

 

@@ -125,7 +125,7 @@ UsbBootRequestSense (
   ZeroMem (&SenseData, sizeof (USB_BOOT_REQUEST_SENSE_DATA));

 

   SenseCmd.OpCode   = USB_BOOT_REQUEST_SENSE_OPCODE;

-  SenseCmd.Lun      = USB_BOOT_LUN (UsbMass->Lun);

+  SenseCmd.Lun      = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

   SenseCmd.AllocLen = sizeof (USB_BOOT_REQUEST_SENSE_DATA);

 

   Status = Transport->ExecCommand (

@@ -364,7 +364,7 @@ UsbBootIsUnitReady (
   ZeroMem (&TestCmd, sizeof (USB_BOOT_TEST_UNIT_READY_CMD));

 

   TestCmd.OpCode  = USB_BOOT_TEST_UNIT_READY_OPCODE;

-  TestCmd.Lun     = USB_BOOT_LUN (UsbMass->Lun);

+  TestCmd.Lun     = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

 

   return UsbBootExecCmdWithRetry (

            UsbMass,

@@ -407,7 +407,7 @@ UsbBootInquiry (
   ZeroMem (&InquiryData, sizeof (USB_BOOT_INQUIRY_DATA));

 

   InquiryCmd.OpCode   = USB_BOOT_INQUIRY_OPCODE;

-  InquiryCmd.Lun      = USB_BOOT_LUN (UsbMass->Lun);

+  InquiryCmd.Lun      = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

   InquiryCmd.AllocLen = sizeof (InquiryData);

 

   Status = UsbBootExecCmdWithRetry (

@@ -423,8 +423,8 @@ UsbBootInquiry (
     return Status;

   }

 

-  UsbMass->Pdt          = USB_BOOT_PDT (InquiryData.Pdt);

-  Media->RemovableMedia = USB_BOOT_REMOVABLE (InquiryData.Removable);

+  UsbMass->Pdt          = (UINT8) (USB_BOOT_PDT (InquiryData.Pdt));

+  Media->RemovableMedia = (BOOLEAN) (USB_BOOT_REMOVABLE (InquiryData.Removable));

   //

   // Default value 512 Bytes, in case no media present at first time

   //

@@ -466,7 +466,7 @@ UsbBootReadCapacity (
   ZeroMem (&CapacityData, sizeof (USB_BOOT_READ_CAPACITY_DATA));

 

   CapacityCmd.OpCode = USB_BOOT_READ_CAPACITY_OPCODE;

-  CapacityCmd.Lun    = USB_BOOT_LUN (UsbMass->Lun);

+  CapacityCmd.Lun    = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

 

   Status = UsbBootExecCmdWithRetry (

              UsbMass,

@@ -742,7 +742,7 @@ UsbBootReadBlocks (
     ZeroMem (&ReadCmd, sizeof (USB_BOOT_READ10_CMD));

 

     ReadCmd.OpCode  = USB_BOOT_READ10_OPCODE;

-    ReadCmd.Lun     = USB_BOOT_LUN (UsbMass->Lun);

+    ReadCmd.Lun     = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

     UsbBootPutUint32 (ReadCmd.Lba, Lba);

     UsbBootPutUint16 (ReadCmd.TransferLen, Count);

 

@@ -822,7 +822,7 @@ UsbBootWriteBlocks (
     ZeroMem (&WriteCmd, sizeof (USB_BOOT_WRITE10_CMD));

 

     WriteCmd.OpCode = USB_BOOT_WRITE10_OPCODE;

-    WriteCmd.Lun    = USB_BOOT_LUN (UsbMass->Lun);

+    WriteCmd.Lun    = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));

     UsbBootPutUint32 (WriteCmd.Lba, Lba);

     UsbBootPutUint16 (WriteCmd.TransferLen, Count);

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index cee70be412..dc4b43faae 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
@@ -101,7 +101,7 @@ enum {
   USB_PDT_DIRECT_ACCESS           = 0x00,       // Direct access device

   USB_PDT_CDROM                   = 0x05,       // CDROM

   USB_PDT_OPTICAL                 = 0x07,       // Non-CD optical disks

-  USB_PDT_SIMPLE_DIRECT           = 0x0E,       // Simplified direct access device

+  USB_PDT_SIMPLE_DIRECT           = 0x0E        // Simplified direct access device

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 0d6cca167b..939ba394cf 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -182,7 +182,7 @@ UsbBotSendCommand (
   Cbw.Signature = USB_BOT_CBW_SIGNATURE;

   Cbw.Tag       = UsbBot->CbwTag;

   Cbw.DataLen   = TransLen;

-  Cbw.Flag      = ((DataDir == EfiUsbDataIn) ? 0x80 : 0);

+  Cbw.Flag      = (UINT8) ((DataDir == EfiUsbDataIn) ? 0x80 : 0);

   Cbw.Lun       = 0;

   Cbw.CmdLen    = CmdLen;

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
index e11e9c5108..8ccc48be23 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
@@ -60,7 +60,7 @@ enum {
   //

   USB_BOT_CBW_TIMEOUT      = 1 * USB_MASS_STALL_1_S,

   USB_BOT_CSW_TIMEOUT      = 1 * USB_MASS_STALL_1_S,

-  USB_BOT_RESET_TIMEOUT    = 3 * USB_MASS_STALL_1_S,

+  USB_BOT_RESET_TIMEOUT    = 3 * USB_MASS_STALL_1_S

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index d4a9f700ad..61954e6be9 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
@@ -37,7 +37,7 @@ enum {
   //

   // Usb Cbi transfer timeout

   //

-  USB_CBI_RESET_TIMEOUT         = 1 * USB_MASS_STALL_1_S,

+  USB_CBI_RESET_TIMEOUT         = 1 * USB_MASS_STALL_1_S

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index a7c3e82f98..33c3755c97 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -344,7 +344,7 @@ USBMassDriverBindingSupported (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiUsbIoProtocolGuid,

-                  &UsbIo,

+                  (VOID **) &UsbIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -421,7 +421,7 @@ USBMassDriverBindingStart (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiUsbIoProtocolGuid,

-                  &UsbIo,

+                  (VOID **) &UsbIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -547,7 +547,7 @@ USBMassDriverBindingStop (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiBlockIoProtocolGuid,

-                  &BlockIo,

+                  (VOID **) &BlockIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 39bc87ca9e..140a990335 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
@@ -33,10 +33,10 @@ typedef struct _USB_MASS_DEVICE USB_MASS_DEVICE;
 #include "UsbMassBoot.h"

 

 enum {

-  USB_MASS_SIGNATURE= EFI_SIGNATURE_32 ('U', 's', 'b', 'K'),

+  USB_MASS_SIGNATURE= EFI_SIGNATURE_32 ('U', 's', 'b', 'K')

 };

 

-typedef struct _USB_MASS_DEVICE {

+struct _USB_MASS_DEVICE {

   UINT32                Signature;

   EFI_HANDLE            Controller;

   EFI_USB_IO_PROTOCOL   *UsbIo;

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
index a4c9e77660..01c37c19a6 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
@@ -208,7 +208,7 @@ USBMouseDriverBindingSupported (
   OpenStatus = gBS->OpenProtocol (

                       Controller,

                       &gEfiUsbIoProtocolGuid,

-                      &UsbIo,

+                      (VOID **) &UsbIo,

                       This->DriverBindingHandle,

                       Controller,

                       EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -279,7 +279,7 @@ USBMouseDriverBindingStart (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiUsbIoProtocolGuid,

-                  &UsbIo,

+                  (VOID **) &UsbIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -513,7 +513,7 @@ USBMouseDriverBindingStop (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiSimplePointerProtocolGuid,

-                  &SimplePointerProtocol,

+                  (VOID **) &SimplePointerProtocol,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -944,12 +944,9 @@ UsbMouseReset (
   )

 {

   USB_MOUSE_DEV       *UsbMouseDevice;

-  EFI_USB_IO_PROTOCOL *UsbIo;

 

   UsbMouseDevice  = USB_MOUSE_DEV_FROM_MOUSE_PROTOCOL (This);

 

-  UsbIo           = UsbMouseDevice->UsbIo;

-

   MouseReportStatusCode (

     UsbMouseDevice->DevicePath,

     EFI_PROGRESS_CODE,