UsbHcMem.c

Timestamp:

Aug 14, 2024 1:16:30 PM (4 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable-202405 and make it build on aarch64, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

trunk/src/VBox/Devices/EFI/FirmwareNew
- Property svn:mergeinfo changed from (toggle deleted branches)
  /vendor/edk2/current 103735-103757,103769-103776,129194-159268
  to (toggle deleted branches)
  /vendor/edk2/current 103735-103757,103769-103776,129194-164365

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c

-              r99404
+              r105670
   @param  Mem            The pointer to host memory.
   @param  Size           The size of the memory region.
+  @param  Alignment      Alignment the size to USBHC_MEM_UNIT bytes.
   @return                The pci memory address
 …
   IN USBHC_MEM_POOL  *Pool,
   IN VOID            *Mem,
+  IN UINTN           Size
+  IN UINTN           Size,
+  IN BOOLEAN         Alignment
+  )
+{
 …
   UINTN                 Offset;
+  Head      = Pool->Head;
+  AllocSize = USBHC_MEM_ROUND (Size);
+  Head = Pool->Head;
+  if (Alignment) {
+    AllocSize = USBHC_MEM_ROUND (Size);
+  } else {
+    AllocSize = Size;
+  }
   if (Mem == NULL) {
 …
   @param  Mem            The pointer to pci memory.
   @param  Size           The size of the memory region.
+  @param  Alignment      Alignment the size to USBHC_MEM_UNIT bytes.
   @return                The host memory address
 …
   IN USBHC_MEM_POOL  *Pool,
   IN VOID            *Mem,
+  IN UINTN           Size
+  IN UINTN           Size,
+  IN BOOLEAN         Alignment
+  )
+{
 …
   UINTN                 Offset;
+  Head      = Pool->Head;
+  AllocSize = USBHC_MEM_ROUND (Size);
+  Head = Pool->Head;
+  if (Alignment) {
+    AllocSize = USBHC_MEM_ROUND (Size);
+  } else {
+    AllocSize = Size;
+  }
   if (Mem == NULL) {

Note: See TracChangeset for help on using the changeset viewer.