Author: bonefish Date: 2010-06-21 18:47:29 +0200 (Mon, 21 Jun 2010) New Revision: 37201 Changeset: http://dev.haiku-os.org/changeset/37201/haiku Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp Log: Force allocation of physical memory < 4 GB until the related TODOs are fixed. Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp =================================================================== --- haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp 2010-06-21 16:46:19 UTC (rev 37200) +++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp 2010-06-21 16:47:29 UTC (rev 37201) @@ -75,7 +75,9 @@ roundedSize = (roundedSize + B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1); fArea = create_area(fName, &fLogicalBase, B_ANY_KERNEL_ADDRESS, - roundedSize, B_CONTIGUOUS, B_READ_AREA | B_WRITE_AREA); + roundedSize, B_32_BIT_MEMORY, B_READ_AREA | B_WRITE_AREA); + // TODO: Use B_CONTIGUOUS when the TODOs regarding 64 bit physical + // addresses are fixed (if possible). if (fArea < B_OK) { TRACE_ERROR(("PMA: failed to create memory area\n")); return; Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp =================================================================== --- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp 2010-06-21 16:46:19 UTC (rev 37200) +++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp 2010-06-21 16:47:29 UTC (rev 37201) @@ -300,7 +300,9 @@ void *logAddress; size = (size + B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1); area_id area = create_area(name, &logAddress, B_ANY_KERNEL_ADDRESS, size, - B_CONTIGUOUS, 0); + B_32_BIT_MEMORY, 0); + // TODO: Use B_CONTIGUOUS when the TODOs regarding 64 bit physical + // addresses are fixed (if possible). if (area < B_OK) { TRACE_ERROR("couldn't allocate area %s\n", name);