[haiku-commits] haiku: hrev51763 - in src/add-ons/kernel: busses/usb bus_managers/usb

  • From: jerome.duval@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 15 Jan 2018 13:56:23 -0500 (EST)

hrev51763 adds 1 changeset to branch 'master'
old head: ce029df2d84e142b46f05b86125748c6e6eb3911
new head: 05a859ebd7c524fa6c5d33fc203f97abdde25537
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=05a859ebd7c5+%5Ece029df2d84e

----------------------------------------------------------------------------

05a859ebd7c5: usb: map registers or allocate area for the kernel only.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev51763
Commit:      05a859ebd7c524fa6c5d33fc203f97abdde25537
URL:         http://cgit.haiku-os.org/haiku/commit/?id=05a859ebd7c5
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sun Jan 14 20:33:38 2018 UTC

----------------------------------------------------------------------------

4 files changed, 5 insertions(+), 4 deletions(-)
src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp | 3 ++-
src/add-ons/kernel/busses/usb/ehci.cpp                          | 2 +-
src/add-ons/kernel/busses/usb/ohci.cpp                          | 2 +-
src/add-ons/kernel/busses/usb/xhci.cpp                          | 2 +-

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp 
b/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp
index 721073be4a..1948ef1100 100644
--- a/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp
@@ -77,7 +77,8 @@ PhysicalMemoryAllocator::PhysicalMemoryAllocator(const char 
*name,
        roundedSize = (roundedSize + B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1);
 
        fArea = create_area(fName, &fLogicalBase, B_ANY_KERNEL_ADDRESS,
-               roundedSize, B_32_BIT_CONTIGUOUS, B_READ_AREA | B_WRITE_AREA);
+               roundedSize, B_32_BIT_CONTIGUOUS,
+               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA);
        if (fArea < B_OK) {
                TRACE_ERROR(("PMA: failed to create memory area\n"));
                return;
diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp 
b/src/add-ons/kernel/busses/usb/ehci.cpp
index 977951a0a0..c12c1d89f4 100644
--- a/src/add-ons/kernel/busses/usb/ehci.cpp
+++ b/src/add-ons/kernel/busses/usb/ehci.cpp
@@ -225,7 +225,7 @@ EHCI::EHCI(pci_info *info, Stack *stack)
 
        fRegisterArea = map_physical_memory("EHCI memory mapped registers",
                physicalAddress, mapSize, B_ANY_KERNEL_BLOCK_ADDRESS,
-               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_READ_AREA | 
B_WRITE_AREA,
+               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
                (void **)&fCapabilityRegisters);
        if (fRegisterArea < 0) {
                TRACE_ERROR("failed to map register memory\n");
diff --git a/src/add-ons/kernel/busses/usb/ohci.cpp 
b/src/add-ons/kernel/busses/usb/ohci.cpp
index 77bc6a43e4..2b2b076bec 100644
--- a/src/add-ons/kernel/busses/usb/ohci.cpp
+++ b/src/add-ons/kernel/busses/usb/ohci.cpp
@@ -108,7 +108,7 @@ OHCI::OHCI(pci_info *info, Stack *stack)
        TRACE_ALWAYS("iospace offset: 0x%" B_PRIx32 "\n", offset);
        fRegisterArea = map_physical_memory("OHCI memory mapped registers",
                offset, B_PAGE_SIZE, B_ANY_KERNEL_BLOCK_ADDRESS,
-               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_READ_AREA | 
B_WRITE_AREA,
+               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
                (void **)&fOperationalRegisters);
        if (fRegisterArea < B_OK) {
                TRACE_ERROR("failed to map register memory\n");
diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp 
b/src/add-ons/kernel/busses/usb/xhci.cpp
index 089cfaf1ee..6fd0c00e6f 100644
--- a/src/add-ons/kernel/busses/usb/xhci.cpp
+++ b/src/add-ons/kernel/busses/usb/xhci.cpp
@@ -173,7 +173,7 @@ XHCI::XHCI(pci_info *info, Stack *stack)
 
        fRegisterArea = map_physical_memory("XHCI memory mapped registers",
                physicalAddressAligned, mapSize, B_ANY_KERNEL_BLOCK_ADDRESS,
-               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_READ_AREA | 
B_WRITE_AREA,
+               B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
                (void **)&fCapabilityRegisters);
        if (fRegisterArea < B_OK) {
                TRACE("failed to map register memory\n");


Other related posts:

  • » [haiku-commits] haiku: hrev51763 - in src/add-ons/kernel: busses/usb bus_managers/usb - jerome . duval