From 8eba4440ebeea4f9ff27b7d8c029ba19c90d956c Mon Sep 17 00:00:00 2001 From: Ivan Loskutov Date: Wed, 23 Jan 2013 17:31:05 +0400 Subject: [PATCH] Fix OMAP4 uart driver compilation Fixes #630 --- os/include/platform/panda/uart_defs.h | 10 +++++----- os/src/drivers/uart/omap4/omap_uart.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/os/include/platform/panda/uart_defs.h b/os/include/platform/panda/uart_defs.h index 37112cc92..aa7bcdb9c 100644 --- a/os/include/platform/panda/uart_defs.h +++ b/os/include/platform/panda/uart_defs.h @@ -15,7 +15,7 @@ #ifndef _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ #define _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ -#include +#include enum { /** Number of UARTs */ @@ -30,10 +30,10 @@ static struct Omap_uart_cfg { Genode::size_t mmio_size; int irq_number; } omap_uart_cfg[UARTS_NUM] = { - { Genode::Board::TL16C750_1_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_1_IRQ + 32 }, - { Genode::Board::TL16C750_2_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_2_IRQ + 32 }, - { Genode::Board::TL16C750_3_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_3_IRQ + 32 }, - { Genode::Board::TL16C750_4_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_4_IRQ + 32 }, + { Genode::Board_base::TL16C750_1_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_1_IRQ + 32 }, + { Genode::Board_base::TL16C750_2_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_2_IRQ + 32 }, + { Genode::Board_base::TL16C750_3_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_3_IRQ + 32 }, + { Genode::Board_base::TL16C750_4_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_4_IRQ + 32 }, }; #endif /* _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ */ diff --git a/os/src/drivers/uart/omap4/omap_uart.h b/os/src/drivers/uart/omap4/omap_uart.h index 30ae1e9c1..1ce321edc 100644 --- a/os/src/drivers/uart/omap4/omap_uart.h +++ b/os/src/drivers/uart/omap4/omap_uart.h @@ -69,7 +69,7 @@ class Omap_uart : public Genode::Tl16c750_base, public Uart::Driver, public Geno Omap_uart(Genode::Attached_io_mem_dataspace *uart_mmio, int irq_number, unsigned baud_rate, Uart::Char_avail_callback &callback) : - Tl16c750_base((Genode::addr_t)uart_mmio->local_addr(), Genode::Board::TL16C750_CLOCK, baud_rate), + Tl16c750_base((Genode::addr_t)uart_mmio->local_addr(), Genode::Board_base::TL16C750_CLOCK, baud_rate), _uart_mmio(*uart_mmio), _char_avail_callback(callback), _irq_activation(irq_number, *this, IRQ_STACK_SIZE) @@ -99,7 +99,7 @@ class Omap_uart : public Genode::Tl16c750_base, public Uart::Driver, public Geno void baud_rate(int bits_per_second) { - _init(Genode::Board::TL16C750_CLOCK, bits_per_second); + _init(Genode::Board_base::TL16C750_CLOCK, bits_per_second); _enable_rx_interrupt(); } };