From 0f2b31b41e1984ec528fad795272349e4ef3e8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 1 Nov 2016 07:53:14 +0100 Subject: [PATCH] uorb: inline orb_advertise (directly calls orb_advertise_multi) reduces the stack depth --- src/modules/uORB/uORBManager.cpp | 6 ------ src/modules/uORB/uORBManager.hpp | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/modules/uORB/uORBManager.cpp b/src/modules/uORB/uORBManager.cpp index 4e6a0a81df..b4ad57901d 100644 --- a/src/modules/uORB/uORBManager.cpp +++ b/src/modules/uORB/uORBManager.cpp @@ -139,12 +139,6 @@ int uORB::Manager::orb_exists(const struct orb_metadata *meta, int instance) #endif } -orb_advert_t uORB::Manager::orb_advertise(const struct orb_metadata *meta, const void *data, unsigned int queue_size) -{ - //warnx("orb_advertise meta = %p", meta); - return orb_advertise_multi(meta, data, nullptr, ORB_PRIO_DEFAULT, queue_size); -} - orb_advert_t uORB::Manager::orb_advertise_multi(const struct orb_metadata *meta, const void *data, int *instance, int priority, unsigned int queue_size) { diff --git a/src/modules/uORB/uORBManager.hpp b/src/modules/uORB/uORBManager.hpp index 6c7c6245f3..18df99fa2f 100644 --- a/src/modules/uORB/uORBManager.hpp +++ b/src/modules/uORB/uORBManager.hpp @@ -112,7 +112,10 @@ public: * ORB_DEFINE with no corresponding ORB_DECLARE) * this function will return nullptr and set errno to ENOENT. */ - orb_advert_t orb_advertise(const struct orb_metadata *meta, const void *data, unsigned int queue_size = 1); + orb_advert_t orb_advertise(const struct orb_metadata *meta, const void *data, unsigned int queue_size = 1) + { + return orb_advertise_multi(meta, data, nullptr, ORB_PRIO_DEFAULT, queue_size); + } /** * Advertise as the publisher of a topic.