From 41fde87ed8d1fcd593777bdfae2fa9e65006d984 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 15 May 2015 12:05:06 +0200 Subject: build: add support for out of tree modules --- ucoo/hal/uart/Config | 2 +- ucoo/hal/uart/Module | 2 +- ucoo/hal/uart/test/Config | 2 +- ucoo/hal/uart/test/Makefile | 4 ++-- ucoo/hal/uart/uart.stm32.hh | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ucoo/hal/uart') diff --git a/ucoo/hal/uart/Config b/ucoo/hal/uart/Config index 0a67d63..1229b76 100644 --- a/ucoo/hal/uart/Config +++ b/ucoo/hal/uart/Config @@ -1,4 +1,4 @@ -[hal/uart] +[ucoo/hal/uart] # Size of reception buffer. rx_buffer = 32 # Size of transmission buffer. diff --git a/ucoo/hal/uart/Module b/ucoo/hal/uart/Module index a9d185e..8b1bac2 100644 --- a/ucoo/hal/uart/Module +++ b/ucoo/hal/uart/Module @@ -1 +1 @@ -hal_uart_SOURCES = uart.stm32.cc +ucoo_hal_uart_SOURCES = uart.stm32.cc diff --git a/ucoo/hal/uart/test/Config b/ucoo/hal/uart/test/Config index 4fd7571..91c7ed5 100644 --- a/ucoo/hal/uart/test/Config +++ b/ucoo/hal/uart/test/Config @@ -1,4 +1,4 @@ -[hal/uart] +[ucoo/hal/uart] rx_buffer = 32 tx_buffer = 8 diff --git a/ucoo/hal/uart/test/Makefile b/ucoo/hal/uart/test/Makefile index 6989dd2..b1e9c71 100644 --- a/ucoo/hal/uart/test/Makefile +++ b/ucoo/hal/uart/test/Makefile @@ -6,7 +6,7 @@ stm32f4_PROGS = test_uart_disc test_uart_SOURCES = test_uart.cc test_uart_disc_SOURCES = test_uart_disc.cc -MODULES = hal/uart -test_uart_disc_MODULES = $(MODULES) base/test hal/usb +MODULES = ucoo/hal/uart +test_uart_disc_MODULES = $(MODULES) ucoo/base/test ucoo/hal/usb include $(BASE)/build/top.mk diff --git a/ucoo/hal/uart/uart.stm32.hh b/ucoo/hal/uart/uart.stm32.hh index 1dd3d54..7d74946 100644 --- a/ucoo/hal/uart/uart.stm32.hh +++ b/ucoo/hal/uart/uart.stm32.hh @@ -26,7 +26,7 @@ #include "ucoo/intf/stream.hh" #include "ucoo/utils/fifo.hh" -#include "config/hal/uart.hh" +#include "config/ucoo/hal/uart.hh" namespace ucoo { @@ -64,9 +64,9 @@ class Uart : public Stream /// UART number. int n_; /// RX FIFO, filled by interrupt handler. - Fifo rx_fifo_; + Fifo rx_fifo_; /// TX FIFO, emptied by interrupt handler. - Fifo tx_fifo_; + Fifo tx_fifo_; /// Error character, inserted in case of error. char error_char_; /// Is it enabled? -- cgit v1.2.3