Update MDE and EdkModule packages for ICC build with /W4 /WX /Ox switches, for some...

[mirror_edk2.git] / EdkModulePkg / Bus / Scsi / ScsiBus / Dxe / ScsiBus.c

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
index 3aa31a812f07d491039f14e518594908587efb17..3c79e473a3a19d0caad22aeb63d053d1ad7626ea 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
@@ -19,38 +19,13 @@ Abstract:
 Revision History\r
 --*/\r
 \r
-#include "scsibus.h"\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-SCSIBusDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
-  );\r
+#include "ScsiBus.h"\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL gSCSIBusDriverBinding = {\r
   SCSIBusDriverBindingSupported,\r
   SCSIBusDriverBindingStart,\r
   SCSIBusDriverBindingStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -362,11 +337,12 @@ ScsiGetDeviceType (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ScsiGetDeviceLocation (\r
   IN  EFI_SCSI_IO_PROTOCOL    *This,\r
-  OUT UINT8                   **Target,\r
+  OUT UINT32                  *Target,\r
   OUT UINT64                  *Lun\r
   )\r
 /*++\r
@@ -393,7 +369,7 @@ ScsiGetDeviceLocation (
 \r
   ScsiIoDevice  = SCSI_IO_DEV_FROM_THIS (This);\r
 \r
-  *Target       = (UINT8 *) (UINTN) ScsiIoDevice->Pun;\r
+  *Target       = ScsiIoDevice->Pun;\r
   *Lun          = ScsiIoDevice->Lun;\r
 \r
   return EFI_SUCCESS;\r