summaryrefslogtreecommitdiff
path: root/cesar/ce
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/ce
parentfb8255d2d814a1d9d7250c8af87e75f694733b53 (diff)
cesar: use CALLBACK macro to register callbacks, refs #3414
Diffstat (limited to 'cesar/ce')
-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
3 files changed, 13 insertions, 12 deletions
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);