MdeModulePkg/Usb: Replace macro USB_BOOT_IO_BLOCKS

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassBoot.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index b84bfd2d729034417dfe689f78119fdd5052ad36..3bf6e6a81f3c122dcfdc4819a26c4e365fea3d64 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -814,11 +814,13 @@ UsbBootReadBlocks (
   USB_BOOT_READ10_CMD       ReadCmd;\r
   EFI_STATUS                Status;\r
   UINT16                    Count;\r
+  UINT16                    CountMax;\r
   UINT32                    BlockSize;\r
   UINT32                    ByteSize;\r
   UINT32                    Timeout;\r
 \r
   BlockSize = UsbMass->BlockIoMedia.BlockSize;\r
+  CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize);\r
   Status    = EFI_SUCCESS;\r
 \r
   while (TotalBlock > 0) {\r
@@ -827,7 +829,7 @@ UsbBootReadBlocks (
     // on the device. We must split the total block because the READ10\r
     // command only has 16 bit transfer length (in the unit of block).\r
     //\r
-    Count     = (UINT16)((TotalBlock < USB_BOOT_IO_BLOCKS) ? TotalBlock : USB_BOOT_IO_BLOCKS);\r
+    Count     = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax);\r
     ByteSize  = (UINT32)Count * BlockSize;\r
 \r
     //\r
@@ -890,11 +892,13 @@ UsbBootWriteBlocks (
   USB_BOOT_WRITE10_CMD  WriteCmd;\r
   EFI_STATUS            Status;\r
   UINT16                Count;\r
+  UINT16                CountMax;\r
   UINT32                BlockSize;\r
   UINT32                ByteSize;\r
   UINT32                Timeout;\r
 \r
   BlockSize = UsbMass->BlockIoMedia.BlockSize;\r
+  CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize);\r
   Status    = EFI_SUCCESS;\r
 \r
   while (TotalBlock > 0) {\r
@@ -903,7 +907,7 @@ UsbBootWriteBlocks (
     // on the device. We must split the total block because the WRITE10\r
     // command only has 16 bit transfer length (in the unit of block).\r
     //\r
-    Count     = (UINT16)((TotalBlock < USB_BOOT_IO_BLOCKS) ? TotalBlock : USB_BOOT_IO_BLOCKS);\r
+    Count     = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax);\r
     ByteSize  = (UINT32)Count * BlockSize;\r
 \r
     //\r
@@ -966,18 +970,20 @@ UsbBootReadBlocks16 (
   UINT8                     ReadCmd[16];\r
   EFI_STATUS                Status;\r
   UINT16                    Count;\r
+  UINT16                    CountMax;\r
   UINT32                    BlockSize;\r
   UINT32                    ByteSize;\r
   UINT32                    Timeout;\r
 \r
   BlockSize = UsbMass->BlockIoMedia.BlockSize;\r
+  CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize);\r
   Status    = EFI_SUCCESS;\r
 \r
   while (TotalBlock > 0) {\r
     //\r
     // Split the total blocks into smaller pieces.\r
     //\r
-    Count     = (UINT16)((TotalBlock < USB_BOOT_IO_BLOCKS) ? TotalBlock : USB_BOOT_IO_BLOCKS);\r
+    Count     = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax);\r
     ByteSize  = (UINT32)Count * BlockSize;\r
 \r
     //\r
@@ -1040,18 +1046,20 @@ UsbBootWriteBlocks16 (
   UINT8                 WriteCmd[16];\r
   EFI_STATUS            Status;\r
   UINT16                Count;\r
+  UINT16                CountMax;\r
   UINT32                BlockSize;\r
   UINT32                ByteSize;\r
   UINT32                Timeout;\r
 \r
   BlockSize = UsbMass->BlockIoMedia.BlockSize;\r
+  CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize);\r
   Status    = EFI_SUCCESS;\r
 \r
   while (TotalBlock > 0) {\r
     //\r
     // Split the total blocks into smaller pieces.\r
     //\r
-    Count     = (UINT16)((TotalBlock < USB_BOOT_IO_BLOCKS) ? TotalBlock : USB_BOOT_IO_BLOCKS);\r
+    Count     = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax);\r
     ByteSize  = (UINT32)Count * BlockSize;\r
 \r
     //\r