Make MDE and EdkModule packages avoid all Intel IPF compiler warnings except waning...

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

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
index 37b316f875d74556a5bb00f325f21af54b3817d3..fd830ec56eeeede9c2d4cfe7eef0a0e71cdebeb4 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
@@ -441,8 +441,6 @@ BotDriverBindingStop (
   EFI_USB_ATAPI_PROTOCOL  *BotAtapiProtocol;\r
   USB_BOT_DEVICE          *UsbBotDev;\r
 \r
-  EFI_USB_IO_PROTOCOL     *UsbIo;\r
-\r
   //\r
   // Get our context back.\r
   //\r
@@ -464,7 +462,6 @@ BotDriverBindingStop (
   // After installing Usb-Atapi protocol onto this handle\r
   // it will be called by upper layer drivers such as Fat\r
   //\r
-  UsbIo = UsbBotDev->UsbIo;\r
 \r
   BotReportStatusCode (\r
     UsbBotDev->DevicePath,\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
index 029d9cb4255bf06bb44b1210d1f27929e333d1e4..ffca53595e2a2bb091f12928cc86a226bf1ba739 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
@@ -84,14 +84,6 @@ ReportUsbStatusCode (
   IN EFI_STATUS_CODE_VALUE         Code\r
   );\r
 \r
-//\r
-// Supported function\r
-//\r
-VOID\r
-InitializeUsbIoInstance (\r
-  IN USB_IO_CONTROLLER_DEVICE     *UsbIoController\r
-  );\r
-\r
 STATIC\r
 USB_IO_CONTROLLER_DEVICE    *\r
 CreateUsbIoControllerDevice (\r
@@ -213,7 +205,7 @@ UsbAllocateAddress (
         //\r
         // Found one, covert to address, and mark it use\r
         //\r
-        AddressPool[ByteIndex] |= (1 << BitIndex);\r
+        AddressPool[ByteIndex] = (UINT8) (AddressPool[ByteIndex] | (1 << BitIndex));\r
         return (UINT8) (ByteIndex * 8 + BitIndex);\r
       }\r
     }\r
@@ -251,7 +243,7 @@ UsbFreeAddress (
   WhichByte = (UINT8) (DevAddress / 8);\r
   WhichBit  = (UINT8) (DevAddress & 0x7);\r
 \r
-  AddressPool[WhichByte] &= (~(1 << WhichBit));\r
+  AddressPool[WhichByte] = (UINT8) (AddressPool[WhichByte] & (~(1 << WhichBit)));\r
 }\r
 \r
 EFI_STATUS\r
@@ -2277,7 +2269,7 @@ ParentPortReset (
     ResetRootPort (ParentIoDev->BusController, HubPort, RetryTimes);\r
   } else {\r
     DEBUG ((gUSBDebugLevel, "Reset from Hub, Addr 0x%x\n", ParentIoDev->DeviceAddress));\r
-    ResetHubPort (ParentController, HubPort + 1);\r
+    ResetHubPort (ParentController, (UINT8) (HubPort + 1));\r
   }\r
   //\r
   // If we only need port reset, just return\r
@@ -2580,16 +2572,13 @@ IsDeviceDisconnected (
 --*/\r
 {\r
   USB_IO_DEVICE             *ParentIoDev;\r
-  USB_IO_DEVICE             *UsbIoDev;\r
   USB_IO_CONTROLLER_DEVICE  *ParentController;\r
   UINT8                     HubPort;\r
   EFI_STATUS                Status;\r
-  EFI_USB_IO_PROTOCOL       *UsbIo;\r
   EFI_USB_PORT_STATUS       PortStatus;\r
 \r
   ParentController  = UsbIoController->Parent;\r
   ParentIoDev       = ParentController->UsbDevice;\r
-  UsbIoDev          = UsbIoController->UsbDevice;\r
   HubPort           = UsbIoController->ParentPort;\r
 \r
   if (ParentIoDev->DeviceAddress == 1) {\r
@@ -2603,10 +2592,9 @@ IsDeviceDisconnected (
       );\r
 \r
   } else {\r
-    UsbIo = &UsbIoController->UsbIo;\r
     Status = HubGetPortStatus (\r
               &ParentController->UsbIo,\r
-              HubPort + 1,\r
+              (UINT8) (HubPort + 1),\r
               (UINT32 *) &PortStatus\r
               );\r
 \r
@@ -3308,7 +3296,7 @@ UsbVirtualHcControlTransfer (
                                           TransferResult\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->ControlTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r
@@ -3530,7 +3518,7 @@ UsbVirtualHcAsyncInterruptTransfer (
                                           Context\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->AsyncInterruptTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r
@@ -3639,7 +3627,7 @@ UsbVirtualHcSyncInterruptTransfer (
                                           TransferResult\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->SyncInterruptTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
index a5d4c2426cd47d2c5d793ceaa1f0f310b3cabc6f..4977d71695e28dbc3fe91fcbdbcf1004959035af 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
@@ -1111,4 +1111,45 @@ UsbVirtualHcAsyncIsochronousTransfer (
 --*/\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+UsbPortReset (\r
+  IN EFI_USB_IO_PROTOCOL     *This\r
+  )\r
+/*++\r
+\r
+  Routine Description:\r
+    Resets and reconfigures the USB controller.  This function will\r
+    work for all USB devices except USB Hub Controllers.\r
+\r
+  Arguments:\r
+    This          -   Indicates the calling context.\r
+\r
+  Returns:\r
+    EFI_SUCCESS\r
+    EFI_INVALID_PARAMETER\r
+    EFI_DEVICE_ERROR\r
+\r
+--*/\r
+;\r
+\r
+VOID\r
+InitializeUsbIoInstance (\r
+  IN USB_IO_CONTROLLER_DEVICE     *UsbIoController\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Initialize the instance of UsbIo controller\r
+\r
+Arguments:\r
+\r
+  UsbIoController - A pointer to controller structure of UsbIo\r
+\r
+Returns:\r
+\r
+--*/\r
+;\r
+\r
 #endif\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbio.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbio.c
index afd2e465415deb63050fec60150053466bc07ce0..4601767f642e026c9576180d5e84ff0f21e5f052 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbio.c
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbio.c
@@ -99,13 +99,6 @@ UsbAsyncIsochronousTransfer (
   IN        VOID                                *Context OPTIONAL\r
   );\r
 \r
-extern\r
-EFI_STATUS\r
-EFIAPI\r
-UsbPortReset (\r
-  IN EFI_USB_IO_PROTOCOL     *This\r
-  );\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c
index c81fbf299ea34542522825cce5293d28224149f1..c011349a78160774738fcc24efceb863e72fb765 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c
@@ -234,9 +234,7 @@ USBFloppyInquiry (
 {\r
   ATAPI_PACKET_COMMAND    Packet;\r
   EFI_STATUS              Status;\r
-  EFI_USB_ATAPI_PROTOCOL  *UsbAtapiInterface;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   //\r
   // prepare command packet for the Inquiry Packet Command.\r
@@ -309,10 +307,8 @@ USBFloppyRead10 (
   VOID                    *ptrBuffer;\r
   EFI_STATUS              Status;\r
   UINT16                  TimeOut;\r
-  EFI_USB_ATAPI_PROTOCOL  *UsbAtapiInterface;\r
   UINT8                   Index;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   //\r
   // prepare command packet for the Inquiry Packet Command.\r
@@ -387,6 +383,7 @@ USBFloppyRead10 (
   return Status;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 USBFloppyReadCapacity (\r
   IN  USB_FLOPPY_DEV    *UsbFloppyDevice\r
@@ -410,7 +407,6 @@ USBFloppyReadCapacity (
   //\r
   EFI_STATUS              Status;\r
   ATAPI_PACKET_COMMAND    Packet;\r
-  EFI_USB_ATAPI_PROTOCOL  *UsbAtapiInterface;\r
 \r
   //\r
   // used for capacity data returned from Usb Floppy\r
@@ -419,7 +415,6 @@ USBFloppyReadCapacity (
 \r
   ZeroMem (&Data, sizeof (Data));\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
   Packet.Inquiry.opcode = READ_CAPACITY;\r
@@ -473,7 +468,6 @@ USBFloppyReadFormatCapacity (
   //\r
   EFI_STATUS                Status;\r
   ATAPI_PACKET_COMMAND      Packet;\r
-  EFI_USB_ATAPI_PROTOCOL    *UsbAtapiInterface;\r
 \r
   //\r
   // used for capacity data returned from Usb Floppy\r
@@ -482,7 +476,6 @@ USBFloppyReadFormatCapacity (
 \r
   ZeroMem (&FormatData, sizeof (FormatData));\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
   Packet.ReadFormatCapacity.opcode                = READ_FORMAT_CAPACITY;\r
@@ -556,9 +549,7 @@ UsbFloppyRequestSense (
   UINT8                   *Ptr;\r
   BOOLEAN                 SenseReq;\r
   ATAPI_PACKET_COMMAND    Packet;\r
-  EFI_USB_ATAPI_PROTOCOL  *UsbAtapiInterface;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   *SenseCounts      = 0;\r
 \r
@@ -672,11 +663,9 @@ UsbFloppyTestUnitReady (
 {\r
   ATAPI_PACKET_COMMAND      Packet;\r
   EFI_STATUS                Status;\r
-  EFI_USB_ATAPI_PROTOCOL    *UsbAtapiInterface;\r
   UINT32                    RetryIndex;\r
   UINT32                    MaximumRetryTimes;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
   MaximumRetryTimes = 2;\r
   //\r
   // fill command packet\r
@@ -748,10 +737,8 @@ USBFloppyWrite10 (
   VOID                    *ptrBuffer;\r
   EFI_STATUS              Status;\r
   UINT16                  TimeOut;\r
-  EFI_USB_ATAPI_PROTOCOL  *UsbAtapiInterface;\r
   UINT8                   Index;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   //\r
   // prepare command packet for the Write10 Packet Command.\r
@@ -863,8 +850,6 @@ UsbFloppyDetectMedia (
   // a flag used to determine whether need to perform Read Capacity command.\r
   //\r
 \r
-  REQUEST_SENSE_DATA  *SensePtr;\r
-\r
   //\r
   // init\r
   //\r
@@ -884,8 +869,6 @@ UsbFloppyDetectMedia (
 \r
   if (!EFI_ERROR (Status)) {\r
 \r
-    SensePtr = UsbFloppyDevice->SenseData;\r
-\r
     //\r
     // No Media\r
     //\r
@@ -1124,7 +1107,6 @@ UsbFloppyModeSense5APage5 (
   //\r
   EFI_STATUS                Status;\r
   ATAPI_PACKET_COMMAND      Packet;\r
-  EFI_USB_ATAPI_PROTOCOL    *UsbAtapiInterface;\r
   UFI_MODE_PARAMETER_PAGE_5 ModePage5;\r
   EFI_LBA                   LastBlock;\r
   UINT32                    SectorsPerTrack;\r
@@ -1132,7 +1114,6 @@ UsbFloppyModeSense5APage5 (
   UINT32                    NumberOfHeads;\r
   UINT32                    DataBytesPerSector;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   ZeroMem (&ModePage5, sizeof (UFI_MODE_PARAMETER_PAGE_5));\r
 \r
@@ -1210,10 +1191,8 @@ UsbFloppyModeSense5APage1C (
   //\r
   EFI_STATUS                  Status;\r
   ATAPI_PACKET_COMMAND        Packet;\r
-  EFI_USB_ATAPI_PROTOCOL      *UsbAtapiInterface;\r
   UFI_MODE_PARAMETER_PAGE_1C  ModePage1C;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   ZeroMem (&ModePage1C, sizeof (UFI_MODE_PARAMETER_PAGE_1C));\r
 \r
@@ -1285,11 +1264,9 @@ UsbFloppyModeSense5APage3F (
   //\r
   EFI_STATUS                Status;\r
   ATAPI_PACKET_COMMAND      Packet;\r
-  EFI_USB_ATAPI_PROTOCOL    *UsbAtapiInterface;\r
   UFI_MODE_PARAMETER_HEADER Header;\r
   UINT32                    Size;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   Size              = sizeof (UFI_MODE_PARAMETER_HEADER);\r
 \r
@@ -1343,11 +1320,9 @@ UsbSCSIModeSense1APage3F (
   //\r
   EFI_STATUS                  Status;\r
   ATAPI_PACKET_COMMAND        Packet;\r
-  EFI_USB_ATAPI_PROTOCOL      *UsbAtapiInterface;\r
   SCSI_MODE_PARAMETER_HEADER6 Header;\r
   UINT32                      Size;\r
 \r
-  UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
 \r
   Size              = sizeof (SCSI_MODE_PARAMETER_HEADER6);\r
 \r

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
index 69b1a2b18e9c3aec3db2051f08c78d9e3e3ad37c..00e556ea21235fa852a2fb634ac98393fc76bad6 100644 (file)
--- a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
+++ b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
@@ -22,15 +22,6 @@ Abstract:
 \r
 --*/\r
 \r
-EFI_STATUS\r
-ConvertBmpToGopBlt (\r
-  IN  VOID      *BmpImage,\r
-  IN  UINTN     BmpImageSize,\r
-  IN OUT VOID   **GopBlt,\r
-  IN OUT UINTN  *GopBltSize,\r
-  OUT UINTN     *PixelHeight,\r
-  OUT UINTN     *PixelWidth\r
-  );\r
 \r
 EFI_STATUS\r
 GetGraphicsBitMapFromFV (\r
@@ -115,6 +106,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConvertBmpToGopBlt (\r
   IN  VOID      *BmpImage,\r
@@ -450,6 +442,7 @@ Returns:
     }\r
 \r
     Blt = NULL;\r
+    BltSize = 0;\r
     Status = ConvertBmpToGopBlt (\r
               ImageData,\r
               ImageSize,\r

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
index 283cdaa038540dab4320a0469755b4ea243bcdfb..279f4202b659cdcb9e2cc61db364bd359840b158 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
@@ -189,6 +189,7 @@ EbcInterpret (
   return (UINT64) VmContext.R[7];\r
 }\r
 \r
+STATIC\r
 UINT64\r
 ExecuteEbcImageEntryPoint (\r
   IN EFI_HANDLE           ImageHandle,\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 0d8d0de8f402c26c9547598497bc1a533dea6ad2..ed09b4e5aa27f7cf93854c3b018b26126f768ec8 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -48,7 +48,7 @@ IoOr8 (
   IN      UINT8                     OrData\r
   )\r
 {\r
-  return IoWrite8 (Port, IoRead8 (Port) | OrData);\r
+  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) | OrData));\r
 }\r
 \r
 /**\r
@@ -76,7 +76,7 @@ IoAnd8 (
   IN      UINT8                     AndData\r
   )\r
 {\r
-  return IoWrite8 (Port, IoRead8 (Port) & AndData);\r
+  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) & AndData));\r
 }\r
 \r
 /**\r
@@ -107,7 +107,7 @@ IoAndThenOr8 (
   IN      UINT8                     OrData\r
   )\r
 {\r
-  return IoWrite8 (Port, (IoRead8 (Port) & AndData) | OrData);\r
+  return IoWrite8 (Port, (UINT8) ((IoRead8 (Port) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -328,7 +328,7 @@ IoOr16 (
   IN      UINT16                    OrData\r
   )\r
 {\r
-  return IoWrite16 (Port, IoRead16 (Port) | OrData);\r
+  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) | OrData));\r
 }\r
 \r
 /**\r
@@ -356,7 +356,7 @@ IoAnd16 (
   IN      UINT16                    AndData\r
   )\r
 {\r
-  return IoWrite16 (Port, IoRead16 (Port) & AndData);\r
+  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) & AndData));\r
 }\r
 \r
 /**\r
@@ -387,7 +387,7 @@ IoAndThenOr16 (
   IN      UINT16                    OrData\r
   )\r
 {\r
-  return IoWrite16 (Port, (IoRead16 (Port) & AndData) | OrData);\r
+  return IoWrite16 (Port, (UINT16) ((IoRead16 (Port) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -1168,7 +1168,7 @@ MmioOr8 (
   IN      UINT8                     OrData\r
   )\r
 {\r
-  return MmioWrite8 (Address, MmioRead8 (Address) | OrData);\r
+  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) | OrData));\r
 }\r
 \r
 /**\r
@@ -1196,7 +1196,7 @@ MmioAnd8 (
   IN      UINT8                     AndData\r
   )\r
 {\r
-  return MmioWrite8 (Address, MmioRead8 (Address) & AndData);\r
+  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) & AndData));\r
 }\r
 \r
 /**\r
@@ -1228,7 +1228,7 @@ MmioAndThenOr8 (
   IN      UINT8                     OrData\r
   )\r
 {\r
-  return MmioWrite8 (Address, (MmioRead8 (Address) & AndData) | OrData);\r
+  return MmioWrite8 (Address, (UINT8) ((MmioRead8 (Address) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -1450,7 +1450,7 @@ MmioOr16 (
   IN      UINT16                    OrData\r
   )\r
 {\r
-  return MmioWrite16 (Address, MmioRead16 (Address) | OrData);\r
+  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) | OrData));\r
 }\r
 \r
 /**\r
@@ -1478,7 +1478,7 @@ MmioAnd16 (
   IN      UINT16                    AndData\r
   )\r
 {\r
-  return MmioWrite16 (Address, MmioRead16 (Address) & AndData);\r
+  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) & AndData));\r
 }\r
 \r
 /**\r
@@ -1510,7 +1510,7 @@ MmioAndThenOr16 (
   IN      UINT16                    OrData\r
   )\r
 {\r
-  return MmioWrite16 (Address, (MmioRead16 (Address) & AndData) | OrData);\r
+  return MmioWrite16 (Address, (UINT16) ((MmioRead16 (Address) & AndData) | OrData));\r
 }\r
 \r
 /**\r