From 2b2b8160048295130abe02dafc44c232968d40b0 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 8 Jun 2015 12:05:14 +0300
Subject: [PATCH] Frame listeners are disabled in tiny mode

---
 libuavcan/include/uavcan/transport/dispatcher.hpp |  9 +++++++++
 libuavcan/src/transport/uc_dispatcher.cpp         | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/libuavcan/include/uavcan/transport/dispatcher.hpp b/libuavcan/include/uavcan/transport/dispatcher.hpp
index bf615a1665..99cee5b0a8 100644
--- a/libuavcan/include/uavcan/transport/dispatcher.hpp
+++ b/libuavcan/include/uavcan/transport/dispatcher.hpp
@@ -20,6 +20,7 @@ namespace uavcan
 
 class UAVCAN_EXPORT Dispatcher;
 
+#if !UAVCAN_TINY
 /**
  * Inherit this class to receive notifications about all TX CAN frames that were transmitted with the loopback flag.
  */
@@ -71,6 +72,7 @@ public:
      */
     virtual void handleRxFrame(const CanRxFrame& frame, CanIOFlags flags) = 0;
 };
+#endif
 
 /**
  * This class performs low-level CAN frame routing.
@@ -116,13 +118,16 @@ class UAVCAN_EXPORT Dispatcher : Noncopyable
     ListenerRegistry lsrv_req_;
     ListenerRegistry lsrv_resp_;
 
+#if !UAVCAN_TINY
     LoopbackFrameListenerRegistry loopback_listeners_;
     IRxFrameListener* rx_listener_;
+#endif
 
     NodeID self_node_id_;
     bool self_node_id_is_set_;
 
     void handleFrame(const CanRxFrame& can_frame);
+
     void handleLoopbackFrame(const CanRxFrame& can_frame);
 
     void notifyRxFrameListener(const CanRxFrame& can_frame, CanIOFlags flags);
@@ -132,7 +137,9 @@ public:
         : canio_(driver, allocator, sysclock)
         , sysclock_(sysclock)
         , outgoing_transfer_reg_(otr)
+#if !UAVCAN_TINY
         , rx_listener_(NULL)
+#endif
         , self_node_id_(NodeID::Broadcast)  // Default
         , self_node_id_is_set_(false)
     { }
@@ -196,6 +203,7 @@ public:
 
     IOutgoingTransferRegistry& getOutgoingTransferRegistry() { return outgoing_transfer_reg_; }
 
+#if !UAVCAN_TINY
     LoopbackFrameListenerRegistry& getLoopbackFrameListenerRegistry() { return loopback_listeners_; }
 
     IRxFrameListener* getRxFrameListener() const { return rx_listener_; }
@@ -205,6 +213,7 @@ public:
         UAVCAN_ASSERT(listener != NULL);
         rx_listener_ = listener;
     }
+#endif
 
     /**
      * Node ID can be set only once.
diff --git a/libuavcan/src/transport/uc_dispatcher.cpp b/libuavcan/src/transport/uc_dispatcher.cpp
index 1c124256fd..95af932075 100644
--- a/libuavcan/src/transport/uc_dispatcher.cpp
+++ b/libuavcan/src/transport/uc_dispatcher.cpp
@@ -8,6 +8,7 @@
 
 namespace uavcan
 {
+#if !UAVCAN_TINY
 /*
  * LoopbackFrameListenerBase
  */
@@ -66,6 +67,7 @@ void LoopbackFrameListenerRegistry::invokeListeners(RxFrame& frame)
         p = next;
     }
 }
+#endif
 
 /*
  * Dispatcher::ListenerRegister
@@ -186,6 +188,15 @@ void Dispatcher::handleFrame(const CanRxFrame& can_frame)
     }
 }
 
+#if UAVCAN_TINY
+void Dispatcher::handleLoopbackFrame(const CanRxFrame&)
+{
+}
+
+void Dispatcher::notifyRxFrameListener(const CanRxFrame&, CanIOFlags)
+{
+}
+#else
 void Dispatcher::handleLoopbackFrame(const CanRxFrame& can_frame)
 {
     RxFrame frame;
@@ -206,6 +217,7 @@ void Dispatcher::notifyRxFrameListener(const CanRxFrame& can_frame, CanIOFlags f
         rx_listener_->handleRxFrame(can_frame, flags);
     }
 }
+#endif
 
 int Dispatcher::spin(MonotonicTime deadline)
 {