summaryrefslogtreecommitdiff
path: root/cesar/mac/sar
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-10-19 08:07:47 +0200
committerNélio Laranjeiro2012-10-22 14:40:24 +0200
commit650637ae30911fae7cf04e0168f4333cb4134e00 (patch)
treedc2415ca2ff007ad07973f9ea71421a0b691d219 /cesar/mac/sar
parentfb8255d2d814a1d9d7250c8af87e75f694733b53 (diff)
cesar: use CALLBACK macro to register callbacks, refs #3414
Diffstat (limited to 'cesar/mac/sar')
-rw-r--r--cesar/mac/sar/src/sar.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/cesar/mac/sar/src/sar.c b/cesar/mac/sar/src/sar.c
index 3ee536bec6..9a14320b9d 100644
--- a/cesar/mac/sar/src/sar.c
+++ b/cesar/mac/sar/src/sar.c
@@ -95,12 +95,13 @@ sar_init (mac_store_t *mac_store, pbproc_t *pbproc, ca_t *ca,
/* Buffer manager. */
ctx->bufmgr = bufmgr;
bufmgr_client_register (
- bufmgr, (bufmgr_callback_t) sar_buffer_available, ctx);
+ bufmgr, (bufmgr_callback_t) CALLBACK (sar_buffer_available), ctx);
/* reassembly */
slist_init (ctx->reassembly.jobs_pending_list., bare);
/* pbproc */
ctx->pbproc_ctx = pbproc;
- pbproc_init_cb (pbproc, ctx, sar_mpdu_process, sar_beacon_receive);
+ pbproc_init_cb (pbproc, ctx, CALLBACK (sar_mpdu_process),
+ CALLBACK (sar_beacon_receive));
/* Init the bridgedma context by giving the functions to call back when
* a job had been bridge. */
ctx->bridgedma_ctx = phy_bridgedma_init (ctx, NULL, NULL);
@@ -109,15 +110,15 @@ sar_init (mac_store_t *mac_store, pbproc_t *pbproc, ca_t *ca,
/** Trace system. */
sar_trace_init(ctx);
/* Initialize sequence checker. */
- lib_seq_check_init (&ctx->seq, sar_lib_seq_check_cb, ctx);
+ lib_seq_check_init (&ctx->seq, CALLBACK (sar_lib_seq_check_cb), ctx);
sar_stats_init (&ctx->stats);
#if CONFIG_SAR_PB_STATS
sar_pb_stats_init (&ctx->pb_stats);
- lib_stats_set_stat_callback ("SAR_PB_STATS_LOAD",
- (lib_stats_cb_r_t) sar_pb_stats_load_read_cb,
- (lib_stats_cb_w_t) sar_pb_stats_load_write_cb,
- LIB_STATS_1_BYTE,
- LIB_STATS_DEBUG);
+ lib_stats_set_stat_callback (
+ "SAR_PB_STATS_LOAD",
+ (lib_stats_cb_r_t) CALLBACK (sar_pb_stats_load_read_cb),
+ (lib_stats_cb_w_t) CALLBACK (sar_pb_stats_load_write_cb),
+ LIB_STATS_1_BYTE, LIB_STATS_DEBUG);
#endif
lib_rnd_init (&ctx->rnd_gen, seed ^ 0x19257164);