summaryrefslogtreecommitdiff
path: root/ucoo/base
diff options
context:
space:
mode:
authorNicolas Schodet2015-05-15 12:05:06 +0200
committerNicolas Schodet2019-10-07 00:44:50 +0200
commit41fde87ed8d1fcd593777bdfae2fa9e65006d984 (patch)
tree48a82b5ba790741d1f0bcc97eb183ea4b045d7b0 /ucoo/base
parent751a7d2ba7a0fbb9c6dae2d91891f0cc74897a2a (diff)
build: add support for out of tree modules
Diffstat (limited to 'ucoo/base')
-rw-r--r--ucoo/base/proto/Config2
-rw-r--r--ucoo/base/proto/Module2
-rw-r--r--ucoo/base/proto/proto.cc4
-rw-r--r--ucoo/base/proto/proto.hh4
-rw-r--r--ucoo/base/proto/test/Makefile2
-rw-r--r--ucoo/base/stdio/Module2
-rw-r--r--ucoo/base/test/Config4
-rw-r--r--ucoo/base/test/Module2
-rw-r--r--ucoo/base/test/test.cc4
-rw-r--r--ucoo/base/test/test/Makefile2
10 files changed, 14 insertions, 14 deletions
diff --git a/ucoo/base/proto/Config b/ucoo/base/proto/Config
index 4edaa6b..82174c9 100644
--- a/ucoo/base/proto/Config
+++ b/ucoo/base/proto/Config
@@ -1,2 +1,2 @@
-[base/proto]
+[ucoo/base/proto]
args_max_size = 16
diff --git a/ucoo/base/proto/Module b/ucoo/base/proto/Module
index 68f866f..ff93e67 100644
--- a/ucoo/base/proto/Module
+++ b/ucoo/base/proto/Module
@@ -1 +1 @@
-base_proto_SOURCES = proto.cc
+ucoo_base_proto_SOURCES = proto.cc
diff --git a/ucoo/base/proto/proto.cc b/ucoo/base/proto/proto.cc
index 838a79b..20d87b3 100644
--- a/ucoo/base/proto/proto.cc
+++ b/ucoo/base/proto/proto.cc
@@ -213,7 +213,7 @@ void
Proto::accept_digit (int c)
{
// Test for argument list overflow.
- if (size_ >= UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE)
+ if (size_ >= CONFIG_UCOO_BASE_PROTO_ARGS_MAX_SIZE)
{
handler_.proto_handle (*this, '?', 0, 0);
step_ = IDLE;
@@ -243,7 +243,7 @@ void
Proto::accept_char (int c)
{
// Test for argument list overflow or unwanted char.
- if (size_ >= UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE || !std::isprint (c))
+ if (size_ >= CONFIG_UCOO_BASE_PROTO_ARGS_MAX_SIZE || !std::isprint (c))
{
handler_.proto_handle (*this, '?', 0, 0);
step_ = IDLE;
diff --git a/ucoo/base/proto/proto.hh b/ucoo/base/proto/proto.hh
index a4ee999..2b1e2e2 100644
--- a/ucoo/base/proto/proto.hh
+++ b/ucoo/base/proto/proto.hh
@@ -26,7 +26,7 @@
#include "ucoo/common.hh"
#include "ucoo/intf/stream.hh"
-#include "config/base/proto.hh"
+#include "config/ucoo/base/proto.hh"
namespace ucoo {
@@ -89,7 +89,7 @@ class Proto
/// Received message current size.
int size_;
/// Message arguments being received.
- uint8_t args_[UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE];
+ uint8_t args_[CONFIG_UCOO_BASE_PROTO_ARGS_MAX_SIZE];
/// Command being received.
char cmd_;
};
diff --git a/ucoo/base/proto/test/Makefile b/ucoo/base/proto/test/Makefile
index f02be13..8c093f0 100644
--- a/ucoo/base/proto/test/Makefile
+++ b/ucoo/base/proto/test/Makefile
@@ -4,6 +4,6 @@ TARGETS = host stm32f4
PROGS = test_proto
test_proto_SOURCES = test_proto.cc
-MODULES = base/proto base/test hal/usb
+MODULES = ucoo/base/proto ucoo/base/test ucoo/hal/usb
include $(BASE)/build/top.mk
diff --git a/ucoo/base/stdio/Module b/ucoo/base/stdio/Module
index f9cffeb..73f11f4 100644
--- a/ucoo/base/stdio/Module
+++ b/ucoo/base/stdio/Module
@@ -1 +1 @@
-base_stdio_SOURCES := stdio.cc
+ucoo_base_stdio_SOURCES := stdio.cc
diff --git a/ucoo/base/test/Config b/ucoo/base/test/Config
index 133808b..0269ef4 100644
--- a/ucoo/base/test/Config
+++ b/ucoo/base/test/Config
@@ -1,5 +1,5 @@
-[base/test]
+[ucoo/base/test]
wait = false
-[base/test:stm32]
+[ucoo/base/test:stm32]
wait = true
diff --git a/ucoo/base/test/Module b/ucoo/base/test/Module
index 9a3c77b..7a3c57e 100644
--- a/ucoo/base/test/Module
+++ b/ucoo/base/test/Module
@@ -1 +1 @@
-base_test_SOURCES := test.cc test.host.cc test.stm32.cc
+ucoo_base_test_SOURCES := test.cc test.host.cc test.stm32.cc
diff --git a/ucoo/base/test/test.cc b/ucoo/base/test/test.cc
index 4f2e8f0..3a04209 100644
--- a/ucoo/base/test/test.cc
+++ b/ucoo/base/test/test.cc
@@ -27,7 +27,7 @@
#include "ucoo/base/stdio/stdio.hh"
#include "ucoo/utils/delay.hh"
-#include "config/base/test.hh"
+#include "config/ucoo/base/test.hh"
#include <cstdarg>
@@ -38,7 +38,7 @@ TestSuite::TestSuite (const char *test_suite)
test_nb_ (0), fail_nb_ (0), in_test_ (false)
{
test_stream_setup ();
- if (UCOO_CONFIG_BASE_TEST_WAIT)
+ if (CONFIG_UCOO_BASE_TEST_WAIT)
{
Stream &s = test_stream ();
int n;
diff --git a/ucoo/base/test/test/Makefile b/ucoo/base/test/test/Makefile
index 610c71a..64e5021 100644
--- a/ucoo/base/test/test/Makefile
+++ b/ucoo/base/test/test/Makefile
@@ -4,6 +4,6 @@ TARGETS = host stm32f4
PROGS = test_test
test_test_SOURCES = test_test.cc
-MODULES = utils base/test hal/usb
+MODULES = ucoo/utils ucoo/base/test ucoo/hal/usb
include $(BASE)/build/top.mk