Support ICC build .

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

8 files changed, 13 insertions, 13 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 816587db8d..7104914e93 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -77,7 +77,7 @@ enum {
   //

   EHC_TPL                      = TPL_NOTIFY,

 

-  USB2_HC_DEV_SIGNATURE        = EFI_SIGNATURE_32 ('e', 'h', 'c', 'i'),

+  USB2_HC_DEV_SIGNATURE        = EFI_SIGNATURE_32 ('e', 'h', 'c', 'i')

 };

 

 //

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index e7b4447def..cd92f6dd84 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -87,7 +87,7 @@ enum {
   //

   UHCI_TPL                 = TPL_NOTIFY,

 

-  USB_HC_DEV_SIGNATURE          = EFI_SIGNATURE_32 ('u', 'h', 'c', 'i'),

+  USB_HC_DEV_SIGNATURE          = EFI_SIGNATURE_32 ('u', 'h', 'c', 'i')

 };

 

 #pragma pack(1)

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 8a69ca6ece..171a780d0c 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -604,11 +604,11 @@ UsbOnHubInterrupt (
 #define USB_HUB_MAP_SIZE  5

 

 USB_CHANGE_FEATURE_MAP  mHubFeatureMap[USB_HUB_MAP_SIZE] = {

-  {USB_PORT_STAT_C_CONNECTION,  USB_HUB_C_PORT_CONNECT},

-  {USB_PORT_STAT_C_ENABLE,      USB_HUB_C_PORT_ENABLE},

-  {USB_PORT_STAT_C_SUSPEND,     USB_HUB_C_PORT_SUSPEND},

-  {USB_PORT_STAT_C_OVERCURRENT, USB_HUB_C_PORT_OVER_CURRENT},

-  {USB_PORT_STAT_C_RESET,       USB_HUB_C_PORT_RESET},

+  {USB_PORT_STAT_C_CONNECTION,  EfiUsbPortConnectChange},

+  {USB_PORT_STAT_C_ENABLE,      EfiUsbPortEnableChange},

+  {USB_PORT_STAT_C_SUSPEND,     EfiUsbPortSuspendChange},

+  {USB_PORT_STAT_C_OVERCURRENT, EfiUsbPortOverCurrentChange},

+  {USB_PORT_STAT_C_RESET,       EfiUsbPortResetChange},

 };

 

 #define USB_ROOT_HUB_MAP_SIZE 5

@@ -822,7 +822,7 @@ UsbHubClearPortChange (
     Map = &mHubFeatureMap[Index];

 

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

-      UsbHubCtrlClearPortFeature (HubIf->Device, Port, Map->Feature);

+      UsbHubCtrlClearPortFeature (HubIf->Device, Port, (UINT16) Map->Feature);

     }

   }

 }

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
index 36b6a43482..e31ba27586 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
@@ -94,7 +94,7 @@ enum {
   // Host software return timeout if port status doesn't change 

   // after 500ms(LOOP * STALL = 100 * 5ms), set by experience

   //

-  USB_WAIT_PORT_STS_CHANGE_LOOP   = 100,

+  USB_WAIT_PORT_STS_CHANGE_LOOP   = 100

 };

 

 #pragma pack(1)

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index 136276a515..7cdbba51cf 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
@@ -100,7 +100,7 @@ enum {
   // most of commands, So we set 5s as timeout here.

   // 

   //

-  USB_BOOT_GENERAL_CMD_TIMEOUT    = 5 * USB_MASS_1_SECOND,

+  USB_BOOT_GENERAL_CMD_TIMEOUT    = 5 * USB_MASS_1_SECOND

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
index 341ffd0931..b6b87b931b 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
@@ -60,7 +60,7 @@ enum {
   //

   USB_BOT_SEND_CBW_TIMEOUT     = 3 * USB_MASS_1_SECOND,

   USB_BOT_RECV_CSW_TIMEOUT     = 3 * USB_MASS_1_SECOND,

-  USB_BOT_RESET_DEVICE_TIMEOUT = 3 * USB_MASS_1_SECOND,

+  USB_BOT_RESET_DEVICE_TIMEOUT = 3 * USB_MASS_1_SECOND

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index 7933c71bf0..3d63c02fd2 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
@@ -42,7 +42,7 @@ enum {
   //

   // Usb Cbi transport timeout, set by experience

   //

-  USB_CBI_RESET_DEVICE_TIMEOUT  = 1 * USB_MASS_1_SECOND,

+  USB_CBI_RESET_DEVICE_TIMEOUT  = 1 * USB_MASS_1_SECOND

 };

 

 //

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 732861c3ec..e3952e40a4 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
@@ -39,7 +39,7 @@ enum {
   //

   USB_MASS_TPL          = TPL_NOTIFY,

   

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

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

 };

 

 struct _USB_MASS_DEVICE {