From e285d806b36c7a0342de32b27381d024758fef3e Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 18 Mar 2014 14:33:12 +0100 Subject: [PATCH] uart/omap4: prevent copy of non-copyable objects Follow up fix for commit 0b7ea4abab + minor whitespace changes. Ref #1093 --- os/src/drivers/uart/omap4/main.cc | 2 +- os/src/drivers/uart/omap4/omap_uart.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os/src/drivers/uart/omap4/main.cc b/os/src/drivers/uart/omap4/main.cc index 47a60da5dd..c53c579b77 100644 --- a/os/src/drivers/uart/omap4/main.cc +++ b/os/src/drivers/uart/omap4/main.cc @@ -49,7 +49,7 @@ int main(int argc, char **argv) } Uart::Driver *create(unsigned index, unsigned baudrate, - Uart::Char_avail_callback &callback) + Uart::Char_avail_callback &callback) { if (index > UARTS_NUM) throw Uart::Driver_factory::Not_available(); diff --git a/os/src/drivers/uart/omap4/omap_uart.h b/os/src/drivers/uart/omap4/omap_uart.h index 1ce321edc2..1aaecd1c68 100644 --- a/os/src/drivers/uart/omap4/omap_uart.h +++ b/os/src/drivers/uart/omap4/omap_uart.h @@ -29,7 +29,7 @@ class Omap_uart : public Genode::Tl16c750_base, public Uart::Driver, public Genode::Irq_handler { private: - Genode::Attached_io_mem_dataspace _uart_mmio; + Genode::Attached_io_mem_dataspace &_uart_mmio; Uart::Char_avail_callback &_char_avail_callback;