i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm2835: Adjust mailbox base register

Browse Source
This commit is contained in:
Alexander von Gluck IV
2015-03-10 22:07:38 -05:00
parent f90ec6bffc
commit 2fc1ec2238
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ ArchMailboxArmBCM2835::Read(uint8 channel, uint32& value)
inline auto& inline auto&
ArchMailboxArmBCM2835::GetRegister(unsigned reg) ArchMailboxArmBCM2835::GetRegister(unsigned reg)
{ {
auto addr = fBase + ARM_CTRL_0_MAILBOX_BASE + reg; auto addr = fBase + reg;
return *reinterpret_cast<std::atomic<uint32_t>*>(addr); return *reinterpret_cast<std::atomic<uint32_t>*>(addr);
} }
src/system/boot/platform/u-boot/arch/arm/arch_mailbox.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ arch_mailbox_init()
{ {
#if defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836) #if defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836)
extern ArchMailbox *arch_get_mailbox_arm_bcm2835(addr_t base); 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 #endif
return B_OK; return B_OK;
} }