From 125c31a827cbb3cb96d9fe3f08f301950912420e Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 14 May 2012 20:47:55 -0500 Subject: [PATCH] pl011: Make memory reads and writes 32-bits --- headers/private/kernel/arch/arm/uart_pl011.h | 4 ++-- src/system/kernel/arch/arm/uart_pl011.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headers/private/kernel/arch/arm/uart_pl011.h b/headers/private/kernel/arch/arm/uart_pl011.h index 470f40b507..79d9c8c29b 100644 --- a/headers/private/kernel/arch/arm/uart_pl011.h +++ b/headers/private/kernel/arch/arm/uart_pl011.h @@ -162,8 +162,8 @@ public: void FlushRx(); private: - void WriteUart(uint32 reg, unsigned char data); - unsigned char ReadUart(uint32 reg); + void WriteUart(uint32 reg, uint32 data); + uint32 ReadUart(uint32 reg); bool fUARTEnabled; addr_t fUARTBase; diff --git a/src/system/kernel/arch/arm/uart_pl011.cpp b/src/system/kernel/arch/arm/uart_pl011.cpp index 3bcab84153..7eb6132114 100644 --- a/src/system/kernel/arch/arm/uart_pl011.cpp +++ b/src/system/kernel/arch/arm/uart_pl011.cpp @@ -63,16 +63,16 @@ UartPL011::~UartPL011() void -UartPL011::WriteUart(uint32 reg, unsigned char data) +UartPL011::WriteUart(uint32 reg, uint32 data) { - *(volatile unsigned char *)(fUARTBase + reg) = data; + *(volatile uint32*)(fUARTBase + reg) = data; } -unsigned char +uint32 UartPL011::ReadUart(uint32 reg) { - return *(volatile unsigned char *)(fUARTBase + reg); + return *(volatile uint32*)(fUARTBase + reg); }