Support ICC build .

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

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 816587db8d97fe75583a0ec64705aa8f62adb9de..7104914e9365e5d732be0d3893270e02e39b2989 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -77,7 +77,7 @@ enum {
   //\r
   EHC_TPL                      = TPL_NOTIFY,\r
 \r
   //\r
   EHC_TPL                      = TPL_NOTIFY,\r
 \r

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

 };\r
 \r
 //\r
 };\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index e7b4447def9953b1faaf933b0ed2215a6a233cd1..cd92f6dd848b7e3b1318e37e1ae2467375301575 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -87,7 +87,7 @@ enum {
   //\r
   UHCI_TPL                 = TPL_NOTIFY,\r
 \r
   //\r
   UHCI_TPL                 = TPL_NOTIFY,\r
 \r

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

 };\r
 \r
 #pragma pack(1)\r
 };\r
 \r
 #pragma pack(1)\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 8a69ca6ecedb5fe3e5f29ec5d31349c657d02919..171a780d0ccba1bf4b144342091187672578fbf6 100644 (file)
--- 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\r
 \r
 USB_CHANGE_FEATURE_MAP  mHubFeatureMap[USB_HUB_MAP_SIZE] = {\r
 #define USB_HUB_MAP_SIZE  5\r
 \r
 USB_CHANGE_FEATURE_MAP  mHubFeatureMap[USB_HUB_MAP_SIZE] = {\r

-  {USB_PORT_STAT_C_CONNECTION,  USB_HUB_C_PORT_CONNECT},\r
-  {USB_PORT_STAT_C_ENABLE,      USB_HUB_C_PORT_ENABLE},\r
-  {USB_PORT_STAT_C_SUSPEND,     USB_HUB_C_PORT_SUSPEND},\r
-  {USB_PORT_STAT_C_OVERCURRENT, USB_HUB_C_PORT_OVER_CURRENT},\r
-  {USB_PORT_STAT_C_RESET,       USB_HUB_C_PORT_RESET},\r
+  {USB_PORT_STAT_C_CONNECTION,  EfiUsbPortConnectChange},\r
+  {USB_PORT_STAT_C_ENABLE,      EfiUsbPortEnableChange},\r
+  {USB_PORT_STAT_C_SUSPEND,     EfiUsbPortSuspendChange},\r
+  {USB_PORT_STAT_C_OVERCURRENT, EfiUsbPortOverCurrentChange},\r
+  {USB_PORT_STAT_C_RESET,       EfiUsbPortResetChange},\r

 };\r
 \r
 #define USB_ROOT_HUB_MAP_SIZE 5\r
 };\r
 \r
 #define USB_ROOT_HUB_MAP_SIZE 5\r


@@ -822,7 +822,7 @@ UsbHubClearPortChange (
     Map = &mHubFeatureMap[Index];\r
 \r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, Map->ChangedBit)) {\r
     Map = &mHubFeatureMap[Index];\r
 \r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, Map->ChangedBit)) {\r

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

     }\r
   }\r
 }\r
     }\r
   }\r
 }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
index 36b6a434827d61996eee284ad45011a72dc72318..e31ba27586b6de7b75ff8904eab84eb04abde155 100644 (file)
--- 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 \r
   // after 500ms(LOOP * STALL = 100 * 5ms), set by experience\r
   //\r
   // Host software return timeout if port status doesn't change \r
   // after 500ms(LOOP * STALL = 100 * 5ms), set by experience\r
   //\r

-  USB_WAIT_PORT_STS_CHANGE_LOOP   = 100,\r
+  USB_WAIT_PORT_STS_CHANGE_LOOP   = 100\r

 };\r
 \r
 #pragma pack(1)\r
 };\r
 \r
 #pragma pack(1)\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index 136276a51588ecd2b44a7dd29b1a9c5ba223dfb7..7cdbba51cfc9a271d82ae611f68cb291f278bf55 100644 (file)
--- 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.\r
   // \r
   //\r
   // most of commands, So we set 5s as timeout here.\r
   // \r
   //\r

-  USB_BOOT_GENERAL_CMD_TIMEOUT    = 5 * USB_MASS_1_SECOND,\r
+  USB_BOOT_GENERAL_CMD_TIMEOUT    = 5 * USB_MASS_1_SECOND\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
index 341ffd093150964cafc74c0145d7cc6e5a493c0b..b6b87b931b8904a883a8da883bf3cc9bba3eca25 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
@@ -60,7 +60,7 @@ enum {
   //\r
   USB_BOT_SEND_CBW_TIMEOUT     = 3 * USB_MASS_1_SECOND,\r
   USB_BOT_RECV_CSW_TIMEOUT     = 3 * USB_MASS_1_SECOND,\r
   //\r
   USB_BOT_SEND_CBW_TIMEOUT     = 3 * USB_MASS_1_SECOND,\r
   USB_BOT_RECV_CSW_TIMEOUT     = 3 * USB_MASS_1_SECOND,\r

-  USB_BOT_RESET_DEVICE_TIMEOUT = 3 * USB_MASS_1_SECOND,\r
+  USB_BOT_RESET_DEVICE_TIMEOUT = 3 * USB_MASS_1_SECOND\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index 7933c71bf0316c7c03e7fb9a8542f0eb20ee0397..3d63c02fd20e1ea2c09d0d95c715fbd41f2a5281 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
@@ -42,7 +42,7 @@ enum {
   //\r
   // Usb Cbi transport timeout, set by experience\r
   //\r
   //\r
   // Usb Cbi transport timeout, set by experience\r
   //\r

-  USB_CBI_RESET_DEVICE_TIMEOUT  = 1 * USB_MASS_1_SECOND,\r
+  USB_CBI_RESET_DEVICE_TIMEOUT  = 1 * USB_MASS_1_SECOND\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 732861c3ec4790ecee1955ce95aa4dd6fd7f9de2..e3952e40a4f778963f732ef0589312979dda32dc 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
@@ -39,7 +39,7 @@ enum {
   //\r
   USB_MASS_TPL          = TPL_NOTIFY,\r
   \r
   //\r
   USB_MASS_TPL          = TPL_NOTIFY,\r
   \r

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

 };\r
 \r
 struct _USB_MASS_DEVICE {\r
 };\r
 \r
 struct _USB_MASS_DEVICE {\r