1. Sync definition of EFI_DEBUG_IMAGE_INFO with UEFI spec

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbBot / Dxe / bot.c

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
index 37b316f875d74556a5bb00f325f21af54b3817d3..fef5de9387124b68b8f999a54c03574d073de3c3 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
@@ -21,44 +21,6 @@ Abstract:
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTDebugLevel  = EFI_D_INFO;\r
 GLOBAL_REMOVE_IF_UNREFERENCED UINT32     gBOTErrorLevel  = EFI_D_INFO;\r
-//\r
-// Function prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-UsbBotDriverEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  );\r
-\r
-//\r
-// Bot Driver Binding Protocol\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-BotDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
-  );\r
-\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL   gUsbBotDriverBinding = {\r
   BotDriverBindingSupported,\r
@@ -124,6 +86,7 @@ BotMassStorageReset (
   IN  BOOLEAN                   ExtendedVerification\r
   );\r
 \r
+STATIC\r
 VOID\r
 BotReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
@@ -441,8 +404,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 +425,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
@@ -648,17 +608,7 @@ BotCommandPhase (
   cbw.dCBWSignature           = CBWSIG;\r
   cbw.dCBWTag                 = 0x01;\r
   cbw.dCBWDataTransferLength  = DataTransferLength;\r
-  switch (Direction) {\r
-  case EfiUsbDataOut:\r
-  case EfiUsbNoData:\r
-    cbw.bmCBWFlags            = 0;\r
-    break;\r
-  case EfiUsbDataIn:\r
-    cbw.bmCBWFlags            = 0x80;\r
-    break;\r
-  default:\r
-    break;\r
-  }\r
+  cbw.bmCBWFlags              = (UINT8) ((Direction == EfiUsbDataIn) ? 0x80 : 0);\r
   cbw.bCBWCBLength            = CommandSize;\r
 \r
   CopyMem (cbw.CBWCB, Command, CommandSize);\r
@@ -982,6 +932,7 @@ BotMassStorageReset (
   return Status;\r
 }\r
 \r
+STATIC\r
 VOID\r
 BotReportStatusCode (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r