Some codes have been altered and replaced by functions of memory allocation library.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7072 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 23 insertions, 39 deletions

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 7ee8c50728..654e5c042c 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -429,11 +429,11 @@ SCSIBusDriverBindingStart (
   }

   FreePool (ScsiTargetId);

   return EFI_SUCCESS;

-  

+

 ErrorExit:

   

   if (ScsiBusDev != NULL) {

-    gBS->FreePool (ScsiBusDev);

+    FreePool (ScsiBusDev);

   }

   

   if (ExtScsiSupport) {

@@ -854,13 +854,9 @@ ScsiExecuteSCSICommand (
                                           );

   } else {

 

-    Status = gBS->AllocatePool (

-                     EfiBootServicesData,

-                     sizeof(EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET),

-                     (VOID**)&mWorkingBuffer

-                     );

+    mWorkingBuffer = AllocatePool (sizeof(EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET));

 

-    if (EFI_ERROR (Status)) {

+    if (mWorkingBuffer == NULL) {

       return EFI_DEVICE_ERROR;

     }

 

@@ -900,7 +896,7 @@ ScsiExecuteSCSICommand (
                                           );

 

       if (EFI_ERROR(Status)) {

-        gBS->FreePool(mWorkingBuffer);

+        FreePool(mWorkingBuffer);

         gBS->CloseEvent(PacketEvent);

         return Status;

       }

@@ -1047,7 +1043,7 @@ ScsiScanCreateDevice (
                   NULL

                   );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ScsiIoDevice);

+    FreePool (ScsiIoDevice);

     return EFI_OUT_OF_RESOURCES;

   } else {

     if (ScsiBusDev->ExtScsiSupport) {

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 95d5c8c0a9..3c81e994bf 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -25,6 +25,7 @@ EFI_DRIVER_BINDING_PROTOCOL gScsiDiskDriverBinding = {
   NULL

 };

 

+

 /**

   The user Entry Point for module ScsiDisk.

 

@@ -160,17 +161,11 @@ ScsiDiskDriverBindingStart (
   UINT8                 MaxRetry;

   BOOLEAN               NeedRetry;

 

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (SCSI_DISK_DEV),

-                  (VOID **) &ScsiDiskDevice

-                  );

-  if (EFI_ERROR (Status)) {

-    return Status;

+  ScsiDiskDevice = (SCSI_DISK_DEV *) AllocateZeroPool (sizeof (SCSI_DISK_DEV));

+  if (ScsiDiskDevice == NULL) {

+    return EFI_OUT_OF_RESOURCES;

   }

 

-  ZeroMem (ScsiDiskDevice, sizeof (SCSI_DISK_DEV));

-

   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiScsiIoProtocolGuid,

@@ -180,7 +175,7 @@ ScsiDiskDriverBindingStart (
                   EFI_OPEN_PROTOCOL_BY_DRIVER

                   );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ScsiDiskDevice);

+    FreePool (ScsiDiskDevice);

     return Status;

   }

 

@@ -207,27 +202,20 @@ ScsiDiskDriverBindingStart (
   // The Sense Data Array's initial size is 6

   //

   ScsiDiskDevice->SenseDataNumber = 6;

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (EFI_SCSI_SENSE_DATA) * ScsiDiskDevice->SenseDataNumber,

-                  (VOID **) &(ScsiDiskDevice->SenseData)

-                  );

-  if (EFI_ERROR (Status)) {

+  ScsiDiskDevice->SenseData = (EFI_SCSI_SENSE_DATA *) AllocateZeroPool (

+                                 sizeof (EFI_SCSI_SENSE_DATA) * ScsiDiskDevice->SenseDataNumber

+                                 );

+  if (ScsiDiskDevice->SenseData == NULL) {

     gBS->CloseProtocol (

           Controller,

           &gEfiScsiIoProtocolGuid,

           This->DriverBindingHandle,

           Controller

           );

-    gBS->FreePool (ScsiDiskDevice);

-    return Status;

+    FreePool (ScsiDiskDevice);

+    return EFI_OUT_OF_RESOURCES;

   }

 

-  ZeroMem (

-    ScsiDiskDevice->SenseData,

-    sizeof (EFI_SCSI_SENSE_DATA) * ScsiDiskDevice->SenseDataNumber

-    );

-

   //

   // Retrieve device information

   //

@@ -239,14 +227,14 @@ ScsiDiskDriverBindingStart (
     }

 

     if (!NeedRetry) {

-      gBS->FreePool (ScsiDiskDevice->SenseData);

+      FreePool (ScsiDiskDevice->SenseData);

       gBS->CloseProtocol (

              Controller,

              &gEfiScsiIoProtocolGuid,

              This->DriverBindingHandle,

              Controller

              );

-      gBS->FreePool (ScsiDiskDevice);

+      FreePool (ScsiDiskDevice);

       return EFI_DEVICE_ERROR;

     }

   }

@@ -265,14 +253,14 @@ ScsiDiskDriverBindingStart (
   }

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ScsiDiskDevice->SenseData);

+    FreePool (ScsiDiskDevice->SenseData);

     gBS->CloseProtocol (

            Controller,

            &gEfiScsiIoProtocolGuid,

            This->DriverBindingHandle,

            Controller

            );

-    gBS->FreePool (ScsiDiskDevice);

+    FreePool (ScsiDiskDevice);

     return Status;

   }

 

@@ -2187,7 +2175,7 @@ ReleaseScsiDiskDeviceResources (
   }

 

   if (ScsiDiskDevice->SenseData != NULL) {

-    gBS->FreePool (ScsiDiskDevice->SenseData);

+    FreePool (ScsiDiskDevice->SenseData);

     ScsiDiskDevice->SenseData = NULL;

   }

 

@@ -2196,7 +2184,7 @@ ReleaseScsiDiskDeviceResources (
     ScsiDiskDevice->ControllerNameTable = NULL;

   }

 

-  gBS->FreePool (ScsiDiskDevice);

+  FreePool (ScsiDiskDevice);

 

   ScsiDiskDevice = NULL;

 }