ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-07 20:00:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OMAP4 uart driver compilation

Browse Source 
Fixes #630
This commit is contained in:
Ivan Loskutov 2013-01-23 17:31:05 +04:00 committed by Norman Feske
parent 4f69bd9fb8
commit 8eba4440eb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/include/platform/panda/uart_defs.h
View File

@ -15,7 +15,7 @@
#ifndef _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ #ifndef _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_
#define _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ #define _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_
#include <platform/panda/drivers/board.h> #include <platform/panda/drivers/board_base.h>
enum { enum {
/** Number of UARTs */ /** Number of UARTs */
@ -30,10 +30,10 @@ static struct Omap_uart_cfg {
Genode::size_t mmio_size; Genode::size_t mmio_size;
int irq_number; int irq_number;
} omap_uart_cfg[UARTS_NUM] = { } omap_uart_cfg[UARTS_NUM] = {
{ Genode::Board::TL16C750_1_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_1_IRQ + 32 }, { Genode::Board_base::TL16C750_1_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_1_IRQ + 32 },
{ Genode::Board::TL16C750_2_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_2_IRQ + 32 }, { Genode::Board_base::TL16C750_2_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_2_IRQ + 32 },
{ Genode::Board::TL16C750_3_MMIO_BASE, Genode::Board::TL16C750_MMIO_SIZE, Genode::Board::TL16C750_3_IRQ + 32 }, { Genode::Board_base::TL16C750_3_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::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_4_MMIO_BASE, Genode::Board_base::TL16C750_MMIO_SIZE, Genode::Board_base::TL16C750_4_IRQ + 32 },
}; };
#endif /* _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ */ #endif /* _INCLUDE__PLATFORM__PANDABOARD__UART_DEFS_H_ */

4
os/src/drivers/uart/omap4/omap_uart.h
View File

@ -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, Omap_uart(Genode::Attached_io_mem_dataspace *uart_mmio, int irq_number,
unsigned baud_rate, Uart::Char_avail_callback &callback) unsigned baud_rate, Uart::Char_avail_callback &callback)
: :
Tl16c750_base((Genode::addr_t)uart_mmio->local_addr<void>(), Genode::Board::TL16C750_CLOCK, baud_rate), Tl16c750_base((Genode::addr_t)uart_mmio->local_addr<void>(), Genode::Board_base::TL16C750_CLOCK, baud_rate),
_uart_mmio(*uart_mmio), _uart_mmio(*uart_mmio),
_char_avail_callback(callback), _char_avail_callback(callback),
_irq_activation(irq_number, *this, IRQ_STACK_SIZE) _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) 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(); _enable_rx_interrupt();
} }
}; };