From 233e4e0512c46198530c29bd1ec401d8638135ff Mon Sep 17 00:00:00 2001 From: laranjeiro Date: Thu, 8 Jul 2010 09:55:03 +0000 Subject: cesar/cp/beacon: make cp_beacon_fill_shared_memory public Add function stub too. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7287 017c9cb6-072f-447c-8318-d5b54f68fe89 --- cesar/cp/beacon/beacon.h | 8 ++++++++ cesar/cp/beacon/inc/beacon.h | 12 ------------ cesar/cp/beacon/stub/src/beacon.c | 9 +++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cesar/cp/beacon/beacon.h b/cesar/cp/beacon/beacon.h index f3ebbe001c..e4aa55c2ba 100644 --- a/cesar/cp/beacon/beacon.h +++ b/cesar/cp/beacon/beacon.h @@ -188,6 +188,14 @@ cp_beacon_reconfigure_timer (cp_t *ctx, bool cco); bool cp_beacon_any_countdown_active (cp_t *ctx); +/** + * Store all beacon parameters necessary for bsu in the next memory storage. + * \param ctx the control plane context. + * \return the pointer to the memory storage where are the new data. + */ +bsu_beacon_t * +cp_beacon_fill_share_memory (cp_t *ctx); + END_DECLS #endif /* cp_beacon_beacon_h */ diff --git a/cesar/cp/beacon/inc/beacon.h b/cesar/cp/beacon/inc/beacon.h index a65e072664..90a7dde105 100644 --- a/cesar/cp/beacon/inc/beacon.h +++ b/cesar/cp/beacon/inc/beacon.h @@ -169,16 +169,4 @@ struct cp_beacon_t u32 last_countdown_date; }; -BEGIN_DECLS - -/** - * Store all beacon parameters necessary for bsu in the next memory storage. - * \param ctx the control plane context. - * \return the pointer to the memory storage where are the new data. - */ -bsu_beacon_t * -cp_beacon_fill_share_memory (cp_t *ctx); - -END_DECLS - #endif /* cp_beacon_inc_beacon_h */ diff --git a/cesar/cp/beacon/stub/src/beacon.c b/cesar/cp/beacon/stub/src/beacon.c index 65197e41a2..53e2056c88 100644 --- a/cesar/cp/beacon/stub/src/beacon.c +++ b/cesar/cp/beacon/stub/src/beacon.c @@ -129,3 +129,12 @@ cp_beacon_discover_uninit (cp_t *ctx) __attribute__ ((weak)); void cp_beacon_discover_uninit (cp_t *ctx) {}; + +bsu_beacon_t * +cp_beacon_fill_share_memory (cp_t *ctx) __attribute__ ((weak)); + +bsu_beacon_t * +cp_beacon_fill_share_memory (cp_t *ctx) +{ + return INVALID_PTR; +}; -- cgit v1.2.3