summaryrefslogtreecommitdiff
path: root/cesar/tools/sniffer_phy
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/tools/sniffer_phy
parentfb8255d2d814a1d9d7250c8af87e75f694733b53 (diff)
cesar: use CALLBACK macro to register callbacks, refs #3414
Diffstat (limited to 'cesar/tools/sniffer_phy')
-rw-r--r--cesar/tools/sniffer_phy/src/lhle.c10
-rw-r--r--cesar/tools/sniffer_phy/src/lowlevel.c11
-rw-r--r--cesar/tools/sniffer_phy/src/mme.c3
3 files changed, 15 insertions, 9 deletions
diff --git a/cesar/tools/sniffer_phy/src/lhle.c b/cesar/tools/sniffer_phy/src/lhle.c
index 1913b6b2ef..4a86a6d9a7 100644
--- a/cesar/tools/sniffer_phy/src/lhle.c
+++ b/cesar/tools/sniffer_phy/src/lhle.c
@@ -127,10 +127,12 @@ lhle_init (sniffer_phy_t *ctx)
{
/* Initialise and activate IPMBox. */
ctx->lhle.ipmbox = ipmbox_init ();
- ipmbox_register_rx_data_cb (ctx->lhle.ipmbox, ctx, lhle_ipmbox_recv_data);
- ipmbox_register_rx_mbx_cb (ctx->lhle.ipmbox, ctx, lhle_ipmbox_recv_mbx);
- ipmbox_register_empty_buf_cb (ctx->lhle.ipmbox, ctx,
- lhle_ipmbox_empty_buf);
+ ipmbox_register_rx_data_cb (
+ ctx->lhle.ipmbox, ctx, CALLBACK (lhle_ipmbox_recv_data);
+ ipmbox_register_rx_mbx_cb (
+ ctx->lhle.ipmbox, ctx, CALLBACK (lhle_ipmbox_recv_mbx));
+ ipmbox_register_empty_buf_cb (
+ ctx->lhle.ipmbox, ctx, CALLBACK (lhle_ipmbox_empty_buf));
ipmbox_activate (ctx->lhle.ipmbox, true);
#if HLE_TOOLS
/* Initialise hle/tools. */
diff --git a/cesar/tools/sniffer_phy/src/lowlevel.c b/cesar/tools/sniffer_phy/src/lowlevel.c
index 8efbc9bf50..784692b8e9 100644
--- a/cesar/tools/sniffer_phy/src/lowlevel.c
+++ b/cesar/tools/sniffer_phy/src/lowlevel.c
@@ -270,10 +270,13 @@ lowlevel_init (sniffer_phy_t *ctx)
tonemask_default (ctx->lowlevel.tonemask_info->tonemask);
tonemask_update (ctx->lowlevel.tonemask_info);
/* Initialise Phy. */
- ctx->lowlevel.phy = phy_init (ctx, lowlevel_rx_fc_cb, lowlevel_access_cb,
- lowlevel_access_conf_cb, lowlevel_pbdma_cb,
- lowlevel_tx_false_alarm_cb,
- lowlevel_deferred_cb);
+ ctx->lowlevel.phy = phy_init (ctx,
+ CALLBACK (lowlevel_rx_fc_cb),
+ CALLBACK (lowlevel_access_cb),
+ CALLBACK (lowlevel_access_conf_cb),
+ CALLBACK (lowlevel_pbdma_cb),
+ CALLBACK (lowlevel_tx_false_alarm_cb),
+ CALLBACK (lowlevel_deferred_cb));
/* Allocate pool. */
blk_t *first, *last;
first = blk_alloc_desc_range (LOWLEVEL_POOL_SIZE, &last);
diff --git a/cesar/tools/sniffer_phy/src/mme.c b/cesar/tools/sniffer_phy/src/mme.c
index be671760cd..71f4cacbe6 100644
--- a/cesar/tools/sniffer_phy/src/mme.c
+++ b/cesar/tools/sniffer_phy/src/mme.c
@@ -302,7 +302,8 @@ mme_handle (sniffer_phy_t *ctx, const u8 *buffer, uint length)
/* Setup MME buffer. */
mme_buffer_t mme;
bitstream_read_init (&mme.bitstream, buffer, length);
- bitstream_init_buffer_cb (&mme.bitstream, mme_handle_underflow, &mme);
+ bitstream_init_buffer_cb (&mme.bitstream, CALLBACK (mme_handle_underflow),
+ &mme);
mme.buffer = NULL;
/* Decode. */
mme_handle_decode (ctx, &mme);