summaryrefslogtreecommitdiff
path: root/cesar
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
parentfb8255d2d814a1d9d7250c8af87e75f694733b53 (diff)
cesar: use CALLBACK macro to register callbacks, refs #3414
Diffstat (limited to 'cesar')
-rw-r--r--cesar/bsu/src/bsu.c7
-rw-r--r--cesar/bufmgr/src/bufmgr.c2
-rw-r--r--cesar/ce/fcall/src/fcall.c17
-rw-r--r--cesar/ce/rx/src/measure.c4
-rw-r--r--cesar/ce/rx/src/rx.c4
-rw-r--r--cesar/cl/mbx/src/mbx.c2
-rw-r--r--cesar/cl/src/cl.c12
-rw-r--r--cesar/cp/av/cco/action/src/cco_action.c2
-rw-r--r--cesar/cp/av/sta/mgr/src/sta_mgr.c4
-rw-r--r--cesar/cp/beacon/src/beacon.c8
-rw-r--r--cesar/cp/cco/bw/src/bw.c2
-rw-r--r--cesar/cp/cco/region/src/region.c2
-rw-r--r--cesar/cp/cl_interf/src/cl_interf.c2
-rw-r--r--cesar/cp/fsm/src/events.c6
-rw-r--r--cesar/cp/msg/src/msg.c19
-rw-r--r--cesar/cp/sta/mgr/src/net.c5
-rw-r--r--cesar/hal/phy/test/phy/src/basic.c13
-rw-r--r--cesar/hal/phy/test/phy/src/test_phy.c17
-rw-r--r--cesar/hal/timer/src/timer.c2
-rw-r--r--cesar/lib/src/restrack.c4
-rw-r--r--cesar/mac/pbproc/src/fsm.c10
-rw-r--r--cesar/mac/pbproc/src/fsm_rx_beacon.c2
-rw-r--r--cesar/mac/pbproc/src/fsm_rx_data.c10
-rw-r--r--cesar/mac/pbproc/src/fsm_rx_sound.c2
-rw-r--r--cesar/mac/pbproc/src/fsm_top.c4
-rw-r--r--cesar/mac/pbproc/src/fsm_tx_data.c14
-rw-r--r--cesar/mac/pbproc/src/fsm_tx_rts_cts.c4
-rw-r--r--cesar/mac/pbproc/src/fsm_tx_sound.c4
-rw-r--r--cesar/mac/pbproc/src/pbproc.c20
-rw-r--r--cesar/mac/sar/src/sar.c17
-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
33 files changed, 138 insertions, 107 deletions
diff --git a/cesar/bsu/src/bsu.c b/cesar/bsu/src/bsu.c
index 1516b9133f..c02c27f8d5 100644
--- a/cesar/bsu/src/bsu.c
+++ b/cesar/bsu/src/bsu.c
@@ -956,10 +956,11 @@ bsu_init (bsu_aclf_t *aclf, mac_config_t *mac_config, phy_t *phy,
ctx->poweron.beacon.vf.nm = MAC_NM_CSMA_ONLY;
bsu_ntb_init (&ctx->poweron.sync);
/* Initialise the SAR callback. */
- sar_init_beacon_cb (sar, ctx, (sar_beacon_cb_t) bsu_beacon_recv);
+ sar_init_beacon_cb (
+ sar, ctx, (sar_beacon_cb_t) CALLBACK (bsu_beacon_recv));
/* Initialise timer events. */
- hal_timer_instance_init (timer, &ctx->timer, ctx,
- bsu_timer_event_process);
+ hal_timer_instance_init (
+ timer, &ctx->timer, ctx, CALLBACK (bsu_timer_event_process));
ctx->activate = false;
ctx->is_sta = BSU_UPDATE_STA_TYPE_STA;
for (i = 0; i < COUNT (ctx->mfs_beacons); i++)
diff --git a/cesar/bufmgr/src/bufmgr.c b/cesar/bufmgr/src/bufmgr.c
index 73ff9d8e7b..989a0db2a3 100644
--- a/cesar/bufmgr/src/bufmgr.c
+++ b/cesar/bufmgr/src/bufmgr.c
@@ -166,7 +166,7 @@ bufmgr_init (ipmbox_t *ipmbox)
hal_arch_sem_init (&ctx->sem, 0);
/* Register a callback for empty_buf IT. */
ipmbox_register_empty_buf_cb (ipmbox, ctx,
- (ipmbox_empty_buf_cb_t) bufmgr_handle_new_buf);
+ (ipmbox_empty_buf_cb_t) CALLBACK (bufmgr_handle_new_buf));
bufmgr_trace_init (ctx);
return ctx;
}
diff --git a/cesar/ce/fcall/src/fcall.c b/cesar/ce/fcall/src/fcall.c
index 590a4633d9..fdaa02546c 100644
--- a/cesar/ce/fcall/src/fcall.c
+++ b/cesar/ce/fcall/src/fcall.c
@@ -46,14 +46,15 @@ ce_fcall_init (cesar_t *cesar)
fcall = my_station.fcall;
#endif
- dbg_check (
- fcall_register (fcall, "ce_configure_bl_nsr_margin",
- &ce_fcall_configure_bl_nsr_margin, cesar->ce_rx)
- == 0);
- dbg_check (
- fcall_register (fcall, "ce_configure_bl_ber_margin",
- &ce_fcall_configure_bl_ber_margin, cesar->ce_rx)
- == 0);
+ int ret;
+ ret = fcall_register (fcall, "ce_configure_bl_nsr_margin",
+ CALLBACK (ce_fcall_configure_bl_nsr_margin),
+ cesar->ce_rx);
+ dbg_check (ret == 0);
+ ret = fcall_register (fcall, "ce_configure_bl_ber_margin",
+ CALLBACK (ce_fcall_configure_bl_ber_margin),
+ cesar->ce_rx);
+ dbg_check (ret == 0);
}
int
diff --git a/cesar/ce/rx/src/measure.c b/cesar/ce/rx/src/measure.c
index 46a6df0964..dd24298a18 100644
--- a/cesar/ce/rx/src/measure.c
+++ b/cesar/ce/rx/src/measure.c
@@ -111,9 +111,9 @@ ce_rx_measure_init (ce_rx_t *ce_rx, sar_t *sar, pbproc_t *pbproc)
/* Initialize allocator for the mailbox. */
slab_cache_init (&ce_rx->measure_cache, "ce_rx_measure",
sizeof (ce_rx_measure_mbox_t),
- &ce_rx_measure_cache_destructor);
+ CALLBACK (ce_rx_measure_cache_destructor));
/* Register our callback to get measures. */
- sar_init_measurement_cb (sar, ce_rx_measure_sar_cb, ce_rx);
+ sar_init_measurement_cb (sar, CALLBACK (ce_rx_measure_sar_cb), ce_rx);
/* Ask the PBProc to give us the channel data. */
/* Create channel data configuration for the whole NOISE NRJ with the
diff --git a/cesar/ce/rx/src/rx.c b/cesar/ce/rx/src/rx.c
index b6dddc3851..e4d33eca28 100644
--- a/cesar/ce/rx/src/rx.c
+++ b/cesar/ce/rx/src/rx.c
@@ -187,7 +187,7 @@ ce_rx_init (mac_store_t *mac_store, sar_t *sar, pbproc_t *pbproc,
cyg_clock_to_counter (ce_rx.real_time_clock_handle,
&ce_rx.real_time_counter);
cyg_alarm_create (ce_rx.real_time_counter,
- ce_rx_timer_prevent_tone_map_expiration,
+ CALLBACK (ce_rx_timer_prevent_tone_map_expiration),
(cyg_addrword_t) &ce_rx,
&ce_rx.alarm_handler, &ce_rx.alarm);
@@ -199,7 +199,7 @@ ce_rx_init (mac_store_t *mac_store, sar_t *sar, pbproc_t *pbproc,
period);
/* Create the ECos thread. */
- cyg_thread_create (CE_RX_THREAD_PRIORITY, &ce_rx_thread,
+ cyg_thread_create (CE_RX_THREAD_PRIORITY, CALLBACK (ce_rx_thread),
(cyg_addrword_t) &ce_rx, CE_RX_THREAD_NAME,
ce_rx.thread_stack, CE_RX_THREAD_STACK_SIZE,
&ce_rx.thread_handler, &ce_rx.thread);
diff --git a/cesar/cl/mbx/src/mbx.c b/cesar/cl/mbx/src/mbx.c
index d0439b0893..4723c719ad 100644
--- a/cesar/cl/mbx/src/mbx.c
+++ b/cesar/cl/mbx/src/mbx.c
@@ -58,7 +58,7 @@ cl_mbx_init (ipmbox_t *ipmbox)
ctx->user_data = 0;
ctx->ipmbox = ipmbox;
ipmbox_register_rx_mbx_cb (
- ipmbox, ctx, (ipmbox_rx_cb_t) cl_mbx_ipmbox_mbx_recv);
+ ipmbox, ctx, (ipmbox_rx_cb_t) CALLBACK (cl_mbx_ipmbox_mbx_recv));
#if HLE_TOOLS
/* Initialise hle tools. */
ctx->hle_tools = hle_tools_init (ipmbox);
diff --git a/cesar/cl/src/cl.c b/cesar/cl/src/cl.c
index 374a0cfaae..f3aa688592 100644
--- a/cesar/cl/src/cl.c
+++ b/cesar/cl/src/cl.c
@@ -48,7 +48,7 @@ cl_init (mac_store_t *mac_store, sar_t *sar, mac_config_t *mac_config,
/* Initialize IPMbox. */
cl_global.ipmbox = ipmbox;
ipmbox_register_rx_data_cb (
- ipmbox, &cl_global, (ipmbox_rx_cb_t) cl_ipmbox_data_recv);
+ ipmbox, &cl_global, (ipmbox_rx_cb_t) CALLBACK (cl_ipmbox_data_recv));
/* Initialise Mbx cl sub module. */
cl_global.mbx = cl_mbx_init (ipmbox);
@@ -59,8 +59,8 @@ cl_init (mac_store_t *mac_store, sar_t *sar, mac_config_t *mac_config,
/* Initialize SAR */
cl_global.sar = sar;
sar_init_reassembly_callbacks (cl_global.sar,
- (sar_reassembly_cb_t) cl_sar_data_recv,
- (sar_reassembly_cb_t) cl_sar_mme_recv,
+ (sar_reassembly_cb_t) CALLBACK (cl_sar_data_recv),
+ (sar_reassembly_cb_t) CALLBACK (cl_sar_mme_recv),
&cl_global);
/* Initialize the cl_mactotei table */
@@ -82,8 +82,10 @@ cl_init (mac_store_t *mac_store, sar_t *sar, mac_config_t *mac_config,
CL_TRACE (INIT, phy_date ());
/* Initialize packet sequence check. */
- lib_seq_check_init (&ctx->seq_check_rx_ctx, cl_lib_seq_check_rx_cb, ctx);
- lib_seq_check_init (&ctx->seq_check_tx_ctx, cl_lib_seq_check_tx_cb, ctx);
+ lib_seq_check_init (
+ &ctx->seq_check_rx_ctx, CALLBACK (cl_lib_seq_check_rx_cb), ctx);
+ lib_seq_check_init (
+ &ctx->seq_check_tx_ctx, CALLBACK (cl_lib_seq_check_tx_cb), ctx);
/* Debug LEDs. */
GPIO_SETUP (LED_CL_RX, GPIO_DIRECTION_OUT);
diff --git a/cesar/cp/av/cco/action/src/cco_action.c b/cesar/cp/av/cco/action/src/cco_action.c
index 6ed05a7047..081fd5825d 100644
--- a/cesar/cp/av/cco/action/src/cco_action.c
+++ b/cesar/cp/av/cco/action/src/cco_action.c
@@ -300,7 +300,7 @@ cp_av_cco_action_init (cp_t *ctx)
/* Initialise the SET. */
heap_init (&ctx->cco_action.selection_heap,
- cp_av_cco_action_cco_selection__less);
+ CALLBACK (cp_av_cco_action_cco_selection__less));
/* Create default region. */
cp_av_cco_region_default (ctx);
}
diff --git a/cesar/cp/av/sta/mgr/src/sta_mgr.c b/cesar/cp/av/sta/mgr/src/sta_mgr.c
index cba9b9de25..9b4f99c1e4 100644
--- a/cesar/cp/av/sta/mgr/src/sta_mgr.c
+++ b/cesar/cp/av/sta/mgr/src/sta_mgr.c
@@ -48,10 +48,10 @@ cp_av_sta_mgr_init (cp_t *ctx)
slab_cache_init (&ctx->sta_mgr.sta_slab_cache,
"Station cache",
sizeof (cp_sta_private_t),
- (slab_object_destructor_t) cp_sta_uninit);
+ (slab_object_destructor_t) CALLBACK (cp_sta_uninit));
// Initialise the set of station sorted by mac addresses.
- set_init (&ctx->sta_mgr.stas, cp_sta_mgr_sta_mac_address_less);
+ set_init (&ctx->sta_mgr.stas, CALLBACK (cp_sta_mgr_sta_mac_address_less));
}
static void
diff --git a/cesar/cp/beacon/src/beacon.c b/cesar/cp/beacon/src/beacon.c
index b51be0b8d1..7ae35ec1c0 100644
--- a/cesar/cp/beacon/src/beacon.c
+++ b/cesar/cp/beacon/src/beacon.c
@@ -296,7 +296,7 @@ cp_beacon_sta_compute_schedules (cp_t *ctx, bsu_beacon_t *beacon)
set_t set_schedules;
cp_cco_bw_alloc_t *sched;
- set_init (&set_schedules, cp_cco_bw_alloc_less);
+ set_init (&set_schedules, CALLBACK (cp_cco_bw_alloc_less));
for (i = 0; i < beacon->bmis.nps.ns; i++)
{
@@ -334,7 +334,7 @@ cp_beacon_sta_compute_schedules (cp_t *ctx, bsu_beacon_t *beacon)
cp_cco_region_alloc_t *region;
set_t set_regions;
- set_init (&set_regions, cp_cco_region_alloc_less);
+ set_init (&set_regions, CALLBACK (cp_cco_region_alloc_less));
for (i = 0; i < beacon->bmis.region.nb; i++)
{
@@ -497,11 +497,11 @@ cp_beacon_init (cp_t *ctx)
// Initialise the instance of the leon timer.
hal_timer_instance_init (
ctx->hal_timer, &ctx->beacon.leon_timer, ctx,
- (hal_timer_instance_cb_t) cp_beacon_timer_expires);
+ (hal_timer_instance_cb_t) CALLBACK (cp_beacon_timer_expires));
/* Setup beacon indicator. */
GPIO_SETUP (LED_BEACON_TX_RX, GPIO_DIRECTION_OUT);
GPIO_SET (LED_BEACON_TX_RX, 0);
- bsu_init_beacon_cb (cp_beacon_receive, ctx);
+ bsu_init_beacon_cb (CALLBACK (cp_beacon_receive), ctx);
/* Store the current date for SPOC update coefficients. */
ctx->beacon.spoc_update_date = phy_date ();
/* Initialise tunable parameters. */
diff --git a/cesar/cp/cco/bw/src/bw.c b/cesar/cp/cco/bw/src/bw.c
index 939c798a1e..6c83a2c512 100644
--- a/cesar/cp/cco/bw/src/bw.c
+++ b/cesar/cp/cco/bw/src/bw.c
@@ -86,7 +86,7 @@ cp_cco_bw_init (cp_t *ctx)
sizeof (cp_cco_bw_alloc_t), NULL);
/* Initialise the list. */
- set_init (&ctx->bw.alloc_list, cp_cco_bw_alloc_less);
+ set_init (&ctx->bw.alloc_list, CALLBACK (cp_cco_bw_alloc_less));
}
void
diff --git a/cesar/cp/cco/region/src/region.c b/cesar/cp/cco/region/src/region.c
index 09c2162a00..ee5f2663f2 100644
--- a/cesar/cp/cco/region/src/region.c
+++ b/cesar/cp/cco/region/src/region.c
@@ -42,7 +42,7 @@ cp_cco_region_init (cp_t *ctx)
memset (&ctx->region, 0, sizeof (cp_cco_region_t));
/* Initialise the set. */
- set_init (&ctx->region.region_list, cp_cco_region_alloc_less);
+ set_init (&ctx->region.region_list, CALLBACK (cp_cco_region_alloc_less));
/* Initialise the slab. */
slab_cache_init (&ctx->region.slab, "Region manager Slab cache",
sizeof (cp_cco_region_alloc_t), NULL);
diff --git a/cesar/cp/cl_interf/src/cl_interf.c b/cesar/cp/cl_interf/src/cl_interf.c
index 810466e4cd..78e1a53028 100644
--- a/cesar/cp/cl_interf/src/cl_interf.c
+++ b/cesar/cp/cl_interf/src/cl_interf.c
@@ -50,7 +50,7 @@ cp_cl_interf_init (cp_t *ctx)
// Initialise the call backs.
interface_callback_init (ctx->interface,
- cp_cl_interf_rx_mme,
+ CALLBACK (cp_cl_interf_rx_mme),
ctx);
// Initialise the cache.
diff --git a/cesar/cp/fsm/src/events.c b/cesar/cp/fsm/src/events.c
index f074e9f90a..820f341adc 100644
--- a/cesar/cp/fsm/src/events.c
+++ b/cesar/cp/fsm/src/events.c
@@ -223,12 +223,12 @@ cp_fsm_event_init (cp_t *ctx)
NULL);
slab_cache_init (&ctx->fsm.event_mme_cache, "event_mme",
sizeof (cp_fsm_event_mme_t),
- cp_fsm_event_mme_destructor);
+ CALLBACK (cp_fsm_event_mme_destructor));
slab_cache_init (&ctx->fsm.event_sta_cache, "event_sta",
sizeof (cp_fsm_event_sta_t),
- cp_fsm_event_sta_destructor);
+ CALLBACK (cp_fsm_event_sta_destructor));
slab_cache_init (&ctx->fsm.event_beacon_cache, "event_beacon",
sizeof (cp_fsm_event_beacon_t),
- cp_fsm_event_beacon_destructor);
+ CALLBACK (cp_fsm_event_beacon_destructor));
}
diff --git a/cesar/cp/msg/src/msg.c b/cesar/cp/msg/src/msg.c
index 051cfb3164..b8038181ec 100644
--- a/cesar/cp/msg/src/msg.c
+++ b/cesar/cp/msg/src/msg.c
@@ -394,13 +394,15 @@ cp_msg_init (cp_t *ctx)
{
dbg_assert (ctx);
- slab_cache_init (&ctx->msg.mme_tx_slab_cache, "MME TX",
- sizeof (cp_mme_tx_t),
- (slab_object_destructor_t) cp_msg_mme_tx_destructor);
-
- slab_cache_init (&ctx->msg.mme_rx_slab_cache, "MME RX",
- sizeof (cp_mme_rx_t),
- (slab_object_destructor_t) cp_msg_mme_rx_destructor);
+ slab_cache_init (
+ &ctx->msg.mme_tx_slab_cache, "MME TX",
+ sizeof (cp_mme_tx_t),
+ (slab_object_destructor_t) CALLBACK (cp_msg_mme_tx_destructor));
+
+ slab_cache_init (
+ &ctx->msg.mme_rx_slab_cache, "MME RX",
+ sizeof (cp_mme_rx_t),
+ (slab_object_destructor_t) CALLBACK (cp_msg_mme_rx_destructor));
ctx->msg.fmsn = 1;
}
@@ -621,7 +623,8 @@ cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
dbg_assert (mme);
bitstream_init_buffer_cb (
&mme->bitstream,
- (bitstream_buffer_cb_t) cp_msg_mme_tx_change_buffer, mme);
+ (bitstream_buffer_cb_t) CALLBACK (cp_msg_mme_tx_change_buffer),
+ mme);
}
return mme;
diff --git a/cesar/cp/sta/mgr/src/net.c b/cesar/cp/sta/mgr/src/net.c
index ffc9d18337..84eb0a21e0 100644
--- a/cesar/cp/sta/mgr/src/net.c
+++ b/cesar/cp/sta/mgr/src/net.c
@@ -124,8 +124,9 @@ cp_net_init (cp_t *ctx, cp_net_t *net)
net->num_associated_stas = 0;
net->hm = MAC_COEXISTENCE_FULL_HYBRID_MODE;
net->beacon_recv_date = 0;
- set_init (&net->associated_stas, cp_net_station_assoc_less);
- set_init (&net->unassociated_stas, cp_net_station_unassoc_less);
+ set_init (&net->associated_stas, CALLBACK (cp_net_station_assoc_less));
+ set_init (&net->unassociated_stas,
+ CALLBACK (cp_net_station_unassoc_less));
}
void
diff --git a/cesar/hal/phy/test/phy/src/basic.c b/cesar/hal/phy/test/phy/src/basic.c
index 8f35daa7e4..74f59a5321 100644
--- a/cesar/hal/phy/test/phy/src/basic.c
+++ b/cesar/hal/phy/test/phy/src/basic.c
@@ -34,12 +34,17 @@ test_phy_basic (test_t t, test_phy_t *ctx, test_phy_msg_basic_t *msg)
test_begin (t, "init")
{
phy_uninit (ctx->phy);
- ctx->phy = phy_init (ctx, test_phy_rx_fc_cb, test_phy_access_cb,
- test_phy_access_conf_cb, test_phy_pbdma_cb,
- test_phy_tx_false_alarm_cb, test_phy_deferred_cb);
+ ctx->phy = phy_init (ctx,
+ CALLBACK (test_phy_rx_fc_cb),
+ CALLBACK (test_phy_access_cb),
+ CALLBACK (test_phy_access_conf_cb),
+ CALLBACK (test_phy_pbdma_cb),
+ CALLBACK (test_phy_tx_false_alarm_cb),
+ CALLBACK (test_phy_deferred_cb));
phy_set_tonemask (ctx->phy, ctx->tonemask,
ctx->tonemask_carrier_nb);
- phy_extra_timer_init (ctx->phy, ctx, test_phy_extra_timer_cb);
+ phy_extra_timer_init (ctx->phy, ctx,
+ CALLBACK (test_phy_extra_timer_cb));
test_phy_check_error (t, ctx);
} test_end;
}
diff --git a/cesar/hal/phy/test/phy/src/test_phy.c b/cesar/hal/phy/test/phy/src/test_phy.c
index edf884434d..8e9012b454 100644
--- a/cesar/hal/phy/test/phy/src/test_phy.c
+++ b/cesar/hal/phy/test/phy/src/test_phy.c
@@ -530,11 +530,15 @@ test_phy_thread (cyg_addrword_t data)
test_phy_t *ctx = (void *) data;
dbg_assert (ctx);
/* Initialise Phy. */
- ctx->phy = phy_init (ctx, test_phy_rx_fc_cb, test_phy_access_cb,
- test_phy_access_conf_cb, test_phy_pbdma_cb,
- test_phy_tx_false_alarm_cb, test_phy_deferred_cb);
+ ctx->phy = phy_init (ctx,
+ CALLBACK (test_phy_rx_fc_cb),
+ CALLBACK (test_phy_access_cb),
+ CALLBACK (test_phy_access_conf_cb),
+ CALLBACK (test_phy_pbdma_cb),
+ CALLBACK (test_phy_tx_false_alarm_cb),
+ CALLBACK (test_phy_deferred_cb));
phy_set_tonemask (ctx->phy, ctx->tonemask, ctx->tonemask_carrier_nb);
- phy_extra_timer_init (ctx->phy, ctx, test_phy_extra_timer_cb);
+ phy_extra_timer_init (ctx->phy, ctx, CALLBACK (test_phy_extra_timer_cb));
/* Handle messages. */
test_phy_msg_t *msg;
while ((msg = cyg_mbox_get (ctx->mbox)))
@@ -659,8 +663,9 @@ cyg_user_start (void)
interface_t *interface =
interface_init (cl, cl_mbx_get (cl), INVALID_PTR,
&mac_config, bufmgr);
- interface_callback_init (interface, cp_mme_recv, interface);
- ipmbox_register_rx_data_cb (ipmbox, INVALID_PTR, cl_ipmbox_data_recv);
+ interface_callback_init (interface, CALLBACK (cp_mme_recv), interface);
+ ipmbox_register_rx_data_cb (ipmbox, INVALID_PTR,
+ CALLBACK (cl_ipmbox_data_recv));
ipmbox_activate (ipmbox, true);
fcall = interface->fcall->fcall_ctx;
#else /* !CONFIG_FCALL_MME */
diff --git a/cesar/hal/timer/src/timer.c b/cesar/hal/timer/src/timer.c
index e97f9eb88f..c8c0444b9a 100644
--- a/cesar/hal/timer/src/timer.c
+++ b/cesar/hal/timer/src/timer.c
@@ -28,7 +28,7 @@ hal_timer_init (void)
(leon_timer_cb_t) hal_timer_instance_process);
// initialise the heap.
- heap_init (&hal_timer_global.heap, hal_timer_instance_lesser);
+ heap_init (&hal_timer_global.heap, CALLBACK (hal_timer_instance_lesser));
hal_timer_global.current_instance = NULL;
diff --git a/cesar/lib/src/restrack.c b/cesar/lib/src/restrack.c
index 2c85e66172..8112c63fbf 100644
--- a/cesar/lib/src/restrack.c
+++ b/cesar/lib/src/restrack.c
@@ -105,7 +105,7 @@ restrack_get_instance (void)
restrack_t *ctx = &restrack_global;
if (!ctx->inited)
{
- set_init (&ctx->resources_set, restrack_resource_less);
+ set_init (&ctx->resources_set, CALLBACK (restrack_resource_less));
ctx->inited = true;
}
if (!ctx->atexit_done)
@@ -130,7 +130,7 @@ restrack_resource_new (void *resource, const char *function, int line)
r->references = 0;
r->creator_function = function;
r->creator_line = line;
- set_init (&r->changes_set, restrack_resource_change_less);
+ set_init (&r->changes_set, CALLBACK (restrack_resource_change_less));
return r;
}
diff --git a/cesar/mac/pbproc/src/fsm.c b/cesar/mac/pbproc/src/fsm.c
index d3a8942310..2270690f91 100644
--- a/cesar/mac/pbproc/src/fsm.c
+++ b/cesar/mac/pbproc/src/fsm.c
@@ -84,10 +84,12 @@ pbproc_fsm_init (pbproc_t *ctx, pbproc_fsm_deferred_cb_t deferred_cb)
ctx->fsm.current_state = PBPROC_FSM_STATE_IDLE;
for (i = 0; i < PBPROC_FSM_STATE_NB; i++)
{
- ctx->fsm.states[i].rx_fc_cb = pbproc_fsm_unexpected_rx_fc;
- ctx->fsm.states[i].access_cb = pbproc_fsm_unexpected_access;
- ctx->fsm.states[i].access_conf_cb = pbproc_fsm_unexpected_access_conf;
- ctx->fsm.states[i].pbdma_cb = pbproc_fsm_unexpected_pbdma;
+ ctx->fsm.states[i].rx_fc_cb = CALLBACK (pbproc_fsm_unexpected_rx_fc);
+ ctx->fsm.states[i].access_cb =
+ CALLBACK (pbproc_fsm_unexpected_access);
+ ctx->fsm.states[i].access_conf_cb =
+ CALLBACK (pbproc_fsm_unexpected_access_conf);
+ ctx->fsm.states[i].pbdma_cb = CALLBACK (pbproc_fsm_unexpected_pbdma);
}
ctx->fsm.deferred_cb = deferred_cb;
ctx->fsm.schedule_deferred = false;
diff --git a/cesar/mac/pbproc/src/fsm_rx_beacon.c b/cesar/mac/pbproc/src/fsm_rx_beacon.c
index a79256a2e7..89dd666bed 100644
--- a/cesar/mac/pbproc/src/fsm_rx_beacon.c
+++ b/cesar/mac/pbproc/src/fsm_rx_beacon.c
@@ -23,7 +23,7 @@ pbproc_frbe_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_RX_BEACON].pbdma_cb =
- pbproc_frbe__rx_beacon__pbdma;
+ CALLBACK (pbproc_frbe__rx_beacon__pbdma);
}
void ARCH_ILRAM
diff --git a/cesar/mac/pbproc/src/fsm_rx_data.c b/cesar/mac/pbproc/src/fsm_rx_data.c
index 138a8e2414..35e0953f50 100644
--- a/cesar/mac/pbproc/src/fsm_rx_data.c
+++ b/cesar/mac/pbproc/src/fsm_rx_data.c
@@ -74,15 +74,15 @@ pbproc_frda_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_RX_DATA_WACK].pbdma_cb =
- pbproc_frda__rx_data_wack__pbdma;
+ CALLBACK (pbproc_frda__rx_data_wack__pbdma);
ctx->fsm.states[PBPROC_FSM_STATE_RX_DATA_WACK_LAST_PB].pbdma_cb =
- pbproc_frda__rx_data_wack_last_pb__pbdma;
+ CALLBACK (pbproc_frda__rx_data_wack_last_pb__pbdma);
ctx->fsm.states[PBPROC_FSM_STATE_RX_DATA_WOACK].pbdma_cb =
- pbproc_frda__rx_data_woack__pbdma;
+ CALLBACK (pbproc_frda__rx_data_woack__pbdma);
ctx->fsm.states[PBPROC_FSM_STATE_RX_BURST].rx_fc_cb =
- pbproc_frda__rx_burst__rx_fc;
+ CALLBACK (pbproc_frda__rx_burst__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_RX_BURST].access_cb =
- pbproc_frda__rx_burst__access;
+ CALLBACK (pbproc_frda__rx_burst__access);
}
void ARCH_ILRAM
diff --git a/cesar/mac/pbproc/src/fsm_rx_sound.c b/cesar/mac/pbproc/src/fsm_rx_sound.c
index ff12e93441..da8aa753c7 100644
--- a/cesar/mac/pbproc/src/fsm_rx_sound.c
+++ b/cesar/mac/pbproc/src/fsm_rx_sound.c
@@ -30,7 +30,7 @@ pbproc_frso_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_RX_SOUND].pbdma_cb =
- pbproc_frso__rx_sound__pbdma;
+ CALLBACK (pbproc_frso__rx_sound__pbdma);
}
void ARCH_ILRAM_PRIO (2)
diff --git a/cesar/mac/pbproc/src/fsm_top.c b/cesar/mac/pbproc/src/fsm_top.c
index 582d630528..55ed6e6f43 100644
--- a/cesar/mac/pbproc/src/fsm_top.c
+++ b/cesar/mac/pbproc/src/fsm_top.c
@@ -31,9 +31,9 @@ pbproc_ftop_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_IDLE].rx_fc_cb =
- pbproc_ftop__idle__rx_fc;
+ CALLBACK (pbproc_ftop__idle__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_IDLE].access_cb =
- pbproc_ftop__idle__access;
+ CALLBACK (pbproc_ftop__idle__access);
}
/**
diff --git a/cesar/mac/pbproc/src/fsm_tx_data.c b/cesar/mac/pbproc/src/fsm_tx_data.c
index 52bcc7a4d0..a7312dd3ab 100644
--- a/cesar/mac/pbproc/src/fsm_tx_data.c
+++ b/cesar/mac/pbproc/src/fsm_tx_data.c
@@ -27,19 +27,19 @@ pbproc_ftda_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_ACCESS_CONF].rx_fc_cb =
- pbproc_ftda__tx_wait_access_conf__rx_fc;
+ CALLBACK (pbproc_ftda__tx_wait_access_conf__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_ACCESS_CONF].access_cb =
- pbproc_ftda__tx_wait_access_conf__access;
+ CALLBACK (pbproc_ftda__tx_wait_access_conf__access);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_ACCESS_CONF].access_conf_cb =
- pbproc_ftda__tx_wait_access_conf__access_conf;
+ CALLBACK (pbproc_ftda__tx_wait_access_conf__access_conf);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_SACKD].rx_fc_cb =
- pbproc_ftda__tx_wait_sackd__rx_fc;
+ CALLBACK (pbproc_ftda__tx_wait_sackd__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_SACKD].access_cb =
- pbproc_ftda__tx_wait_sackd__access;
+ CALLBACK (pbproc_ftda__tx_wait_sackd__access);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_TX_END].pbdma_cb =
- pbproc_ftda__tx_wait_tx_end__pbdma;
+ CALLBACK (pbproc_ftda__tx_wait_tx_end__pbdma);
ctx->fsm.states[PBPROC_FSM_STATE_TX_BURST].access_conf_cb =
- pbproc_ftda__tx_burst__access_conf;
+ CALLBACK (pbproc_ftda__tx_burst__access_conf);
}
void ARCH_ILRAM
diff --git a/cesar/mac/pbproc/src/fsm_tx_rts_cts.c b/cesar/mac/pbproc/src/fsm_tx_rts_cts.c
index bcfdded11d..792ca3add5 100644
--- a/cesar/mac/pbproc/src/fsm_tx_rts_cts.c
+++ b/cesar/mac/pbproc/src/fsm_tx_rts_cts.c
@@ -27,9 +27,9 @@ pbproc_ftrc_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_CTS].rx_fc_cb =
- pbproc_ftrc__tx_wait_cts__rx_fc;
+ CALLBACK (pbproc_ftrc__tx_wait_cts__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_TX_WAIT_CTS].access_cb =
- pbproc_ftrc__tx_wait_cts__access;
+ CALLBACK (pbproc_ftrc__tx_wait_cts__access);
}
void ARCH_ILRAM
diff --git a/cesar/mac/pbproc/src/fsm_tx_sound.c b/cesar/mac/pbproc/src/fsm_tx_sound.c
index fbcd7cb759..b43fed10ca 100644
--- a/cesar/mac/pbproc/src/fsm_tx_sound.c
+++ b/cesar/mac/pbproc/src/fsm_tx_sound.c
@@ -27,9 +27,9 @@ pbproc_ftso_init (pbproc_t *ctx)
{
dbg_assert (ctx);
ctx->fsm.states[PBPROC_FSM_STATE_TX_SOUND_WAIT_ACK].rx_fc_cb =
- pbproc_ftso__tx_sound_wait_ack__rx_fc;
+ CALLBACK (pbproc_ftso__tx_sound_wait_ack__rx_fc);
ctx->fsm.states[PBPROC_FSM_STATE_TX_SOUND_WAIT_ACK].access_cb =
- pbproc_ftso__tx_sound_wait_ack__access;
+ CALLBACK (pbproc_ftso__tx_sound_wait_ack__access);
}
void ARCH_ILRAM_PRIO (2)
diff --git a/cesar/mac/pbproc/src/pbproc.c b/cesar/mac/pbproc/src/pbproc.c
index ec0266f9c1..83e4af3fd3 100644
--- a/cesar/mac/pbproc/src/pbproc.c
+++ b/cesar/mac/pbproc/src/pbproc.c
@@ -202,13 +202,17 @@ pbproc_init (mac_config_t *config, mac_store_t *store)
ctx->config = config;
ctx->store = store;
ctx->phy =
- phy_init (ctx, (phy_rx_fc_cb_t) pbproc_fsm_handle_rx_fc_event,
- (phy_access_cb_t) pbproc_fsm_handle_access_event,
- (phy_access_conf_cb_t) pbproc_fsm_handle_access_conf_event,
- (phy_pbdma_cb_t) pbproc_fsm_handle_pbdma_event,
- (phy_tx_false_alarm_cb_t) pbproc_fsm_handle_tx_false_alarm_event,
- (phy_deferred_cb_t) pbproc_fsm_handle_deferred);
- phy_extra_timer_init (ctx->phy, ctx, pbproc_spoc_update_cb);
+ phy_init (
+ ctx,
+ (phy_rx_fc_cb_t) CALLBACK (pbproc_fsm_handle_rx_fc_event),
+ (phy_access_cb_t) CALLBACK (pbproc_fsm_handle_access_event),
+ (phy_access_conf_cb_t) CALLBACK (
+ pbproc_fsm_handle_access_conf_event),
+ (phy_pbdma_cb_t) CALLBACK (pbproc_fsm_handle_pbdma_event),
+ (phy_tx_false_alarm_cb_t) CALLBACK (
+ pbproc_fsm_handle_tx_false_alarm_event),
+ (phy_deferred_cb_t) CALLBACK (pbproc_fsm_handle_deferred));
+ phy_extra_timer_init (ctx->phy, ctx, CALLBACK (pbproc_spoc_update_cb));
ctx->ca = ca_init (ctx->phy, config, store, PBPROC_ANTICIP_TCK);
pbproc_trace_init (ctx);
ctx->user_data = NULL;
@@ -240,7 +244,7 @@ pbproc_init (mac_config_t *config, mac_store_t *store)
ctx->chandata_nb = 0;
ctx->chandata_data = false;
/* Initialise FSM. */
- pbproc_fsm_init (ctx, pbproc_deferred);
+ pbproc_fsm_init (ctx, CALLBACK (pbproc_deferred));
pbproc_ftop_init (ctx);
pbproc_fhfc_init (ctx);
pbproc_frda_init (ctx);
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);
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);