Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

[mirror_edk2.git] / MdeModulePkg / Bus / Scsi / ScsiBusDxe / ScsiBus.c

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 12d060048903a2ba53ee7f98c3d6c666faa24bf7..d77758d648c590261a582c9283343614c0232d54 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1,6 +1,8 @@
-/*++\r
+/** @file\r
+  SCSI Bus driver that layers on every SCSI Pass Thru and\r
+  Extended SCSI Pass Thru protocol in the system.\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -9,18 +11,10 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-\r
-    scsibus.c\r
-\r
-Abstract:\r
-\r
-\r
-Revision History\r
---*/\r
+**/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/ScsiPassThru.h>\r
@@ -56,36 +50,30 @@ EFI_DRIVER_BINDING_PROTOCOL gSCSIBusDriverBinding = {
 // structure in the SCSIBusDriverBindingStop(). Then we can\r
 // Close all opened protocols and release this structure.\r
 //\r
-STATIC EFI_GUID  mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;\r
+EFI_GUID  mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;\r
 \r
-STATIC VOID  *WorkingBuffer;\r
+VOID  *WorkingBuffer;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ScsiioToPassThruPacket (\r
   IN      EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet,\r
   IN OUT  EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *CommandPacket\r
-  )\r
-;\r
+  );\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 PassThruToScsiioPacket (\r
   IN     EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ScsiPacket,\r
   IN OUT EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet\r
-  )\r
-;\r
-STATIC\r
+  );\r
 VOID\r
 EFIAPI\r
 NotifyFunction (\r
   EFI_EVENT  Event,\r
   VOID       *Context\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   The user Entry Point for module ScsiBus. The user code starts with this function.\r
@@ -1188,7 +1176,7 @@ Returns:
     }\r
   }\r
 \r
-  if (0x1e >= InquiryData.Peripheral_Type >= 0xa) {\r
+  if (0x1e >= InquiryData.Peripheral_Type && InquiryData.Peripheral_Type >= 0xa) {\r
     return FALSE;\r
   }\r
 \r
@@ -1210,7 +1198,6 @@ Returns:
 }\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ScsiioToPassThruPacket (\r
@@ -1264,7 +1251,6 @@ Returns:
 }\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 PassThruToScsiioPacket (\r
@@ -1311,7 +1297,6 @@ Returns:
 \r
 \r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 NotifyFunction (\r