From 4191710febbf8ae426333515604ffa072d06a9a6 Mon Sep 17 00:00:00 2001
From: Riccardo Miccini <rimiccini@yahoo.it>
Date: Thu, 28 May 2015 17:53:19 +0200
Subject: [PATCH 1/3] no data type info provider for TINY

---
 libuavcan/include/uavcan/node/node.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libuavcan/include/uavcan/node/node.hpp b/libuavcan/include/uavcan/node/node.hpp
index 65b478b7a7..ac8ca8b6aa 100644
--- a/libuavcan/include/uavcan/node/node.hpp
+++ b/libuavcan/include/uavcan/node/node.hpp
@@ -13,10 +13,10 @@
 #include <uavcan/node/marshal_buffer.hpp>
 
 // High-level functionality available by default
-#include <uavcan/protocol/data_type_info_provider.hpp>
 #include <uavcan/protocol/node_status_provider.hpp>
 
 #if !UAVCAN_TINY
+#include <uavcan/protocol/data_type_info_provider.hpp>    //moved to save space
 # include <uavcan/protocol/logger.hpp>
 # include <uavcan/protocol/restart_request_server.hpp>
 # include <uavcan/protocol/transport_stats_provider.hpp>
@@ -77,9 +77,9 @@ class UAVCAN_EXPORT Node : public INode
     OutgoingTransferRegistry<OutgoingTransferRegistryStaticEntries> outgoing_trans_reg_;
     Scheduler scheduler_;
 
-    DataTypeInfoProvider proto_dtp_;
     NodeStatusProvider proto_nsp_;
 #if !UAVCAN_TINY
+    DataTypeInfoProvider proto_dtp_;    // moved to save space
     Logger proto_logger_;
     RestartRequestServer proto_rrs_;
     TransportStatsProvider proto_tsp_;
@@ -106,9 +106,9 @@ public:
     Node(ICanDriver& can_driver, ISystemClock& system_clock)
         : outgoing_trans_reg_(pool_allocator_)
         , scheduler_(can_driver, pool_allocator_, system_clock, outgoing_trans_reg_)
-        , proto_dtp_(*this)
         , proto_nsp_(*this)
 #if !UAVCAN_TINY
+        , proto_dtp_(*this)   // moved
         , proto_logger_(*this)
         , proto_rrs_(*this)
         , proto_tsp_(*this)
@@ -277,17 +277,17 @@ int Node<MemPoolSize_, OutgoingTransferRegistryStaticEntries, OutgoingTransferMa
     GlobalDataTypeRegistry::instance().freeze();
 
     int res = 0;
-    res = proto_dtp_.start();
-    if (res < 0)
-    {
-        goto fail;
-    }
     res = proto_nsp_.startAndPublish(priority);
     if (res < 0)
     {
         goto fail;
     }
 #if !UAVCAN_TINY
+    res = proto_dtp_.start();   // moved
+    if (res < 0)
+    {
+        goto fail;
+    }
     res = proto_logger_.init();
     if (res < 0)
     {

From cafa2498b986305a0c333462cb354662f057b9bd Mon Sep 17 00:00:00 2001
From: Riccardo Miccini <rimiccini@yahoo.it>
Date: Thu, 28 May 2015 18:00:03 +0200
Subject: [PATCH 2/3] no data type info provider for TINY

---
 libuavcan/include/uavcan/node/node.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libuavcan/include/uavcan/node/node.hpp b/libuavcan/include/uavcan/node/node.hpp
index ac8ca8b6aa..878a365082 100644
--- a/libuavcan/include/uavcan/node/node.hpp
+++ b/libuavcan/include/uavcan/node/node.hpp
@@ -16,7 +16,7 @@
 #include <uavcan/protocol/node_status_provider.hpp>
 
 #if !UAVCAN_TINY
-#include <uavcan/protocol/data_type_info_provider.hpp>    //moved to save space
+#include <uavcan/protocol/data_type_info_provider.hpp>
 # include <uavcan/protocol/logger.hpp>
 # include <uavcan/protocol/restart_request_server.hpp>
 # include <uavcan/protocol/transport_stats_provider.hpp>
@@ -79,7 +79,7 @@ class UAVCAN_EXPORT Node : public INode
 
     NodeStatusProvider proto_nsp_;
 #if !UAVCAN_TINY
-    DataTypeInfoProvider proto_dtp_;    // moved to save space
+    DataTypeInfoProvider proto_dtp_;
     Logger proto_logger_;
     RestartRequestServer proto_rrs_;
     TransportStatsProvider proto_tsp_;
@@ -108,7 +108,7 @@ public:
         , scheduler_(can_driver, pool_allocator_, system_clock, outgoing_trans_reg_)
         , proto_nsp_(*this)
 #if !UAVCAN_TINY
-        , proto_dtp_(*this)   // moved
+        , proto_dtp_(*this)
         , proto_logger_(*this)
         , proto_rrs_(*this)
         , proto_tsp_(*this)
@@ -283,7 +283,7 @@ int Node<MemPoolSize_, OutgoingTransferRegistryStaticEntries, OutgoingTransferMa
         goto fail;
     }
 #if !UAVCAN_TINY
-    res = proto_dtp_.start();   // moved
+    res = proto_dtp_.start();
     if (res < 0)
     {
         goto fail;

From 7ef306bd4e431b610a31a7f5e520db83fb52d20a Mon Sep 17 00:00:00 2001
From: Riccardo Miccini <rimiccini@yahoo.it>
Date: Thu, 28 May 2015 18:10:42 +0200
Subject: [PATCH 3/3] no data type info provider for TINY

---
 libuavcan/include/uavcan/node/node.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libuavcan/include/uavcan/node/node.hpp b/libuavcan/include/uavcan/node/node.hpp
index 878a365082..0197241f62 100644
--- a/libuavcan/include/uavcan/node/node.hpp
+++ b/libuavcan/include/uavcan/node/node.hpp
@@ -16,7 +16,7 @@
 #include <uavcan/protocol/node_status_provider.hpp>
 
 #if !UAVCAN_TINY
-#include <uavcan/protocol/data_type_info_provider.hpp>
+# include <uavcan/protocol/data_type_info_provider.hpp>
 # include <uavcan/protocol/logger.hpp>
 # include <uavcan/protocol/restart_request_server.hpp>
 # include <uavcan/protocol/transport_stats_provider.hpp>