clean up the un-suitable ';' location when declaring the functions.

[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 2ad32d2b086c459b608b4e2738fb4a894449e393..f59116733e9fe1151a24724981260c80fea83b2a 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
@@ -66,8 +60,7 @@ EFIAPI
 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
@@ -76,16 +69,14 @@ EFIAPI
 PassThruToScsiioPacket (\r
   IN     EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ScsiPacket,\r
   IN OUT EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet\r
-  )\r
-;\r
+  );\r
 STATIC\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
@@ -109,14 +100,13 @@ InitializeScsiBus(
   //\r
   // Install driver model protocol(s).\r
   //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
+  Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r
              &gSCSIBusDriverBinding,\r
              ImageHandle,\r
              &gScsiBusComponentName,\r
-             NULL,\r
-             NULL\r
+             &gScsiBusComponentName2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1189,7 +1179,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