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

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbMassStorage / Dxe / UsbMassStorageHelper.c

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