From 2fc1ec2238a8ec1e2c5724503c90ddaff376d37c Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 10 Mar 2015 22:07:38 -0500 Subject: [PATCH] bcm2835: Adjust mailbox base register --- src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp | 2 +- src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp b/src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp index fa0abb64cc..42f5764205 100644 --- a/src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp +++ b/src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp @@ -79,7 +79,7 @@ ArchMailboxArmBCM2835::Read(uint8 channel, uint32& value) inline auto& ArchMailboxArmBCM2835::GetRegister(unsigned reg) { - auto addr = fBase + ARM_CTRL_0_MAILBOX_BASE + reg; + auto addr = fBase + reg; return *reinterpret_cast*>(addr); } diff --git a/src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp b/src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp index 81eeab0c17..418dffc5dc 100644 --- a/src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp +++ b/src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp @@ -20,7 +20,7 @@ arch_mailbox_init() { #if defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836) extern ArchMailbox *arch_get_mailbox_arm_bcm2835(addr_t base); - gMailbox = arch_get_mailbox_arm_bcm2835(DEVICE_BASE); + gMailbox = arch_get_mailbox_arm_bcm2835(DEVICE_BASE + ARM_CTRL_0_MAILBOX_BASE); #endif return B_OK; }