Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libplatsupport: use ltimer prefix for functions #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libplatsupport: use ltimer prefix for functions #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libplatsupport/src/arch/arm/generic_ltimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t
return error;
}
generic_ltimer->timer_irq_id = ps_irq_register(&ops.irq_ops, *generic_ltimer->callback_data.irq,
handle_irq_wrapper, &generic_ltimer->callback_data);
ltimer_handle_irq_wrapper, &generic_ltimer->callback_data);
if (generic_ltimer->timer_irq_id < 0) {
destroy(ltimer->data);
return EIO;
Expand Down
6 changes: 3 additions & 3 deletions libplatsupport/src/ltimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ typedef struct {
*
* Note that this wrapper assumes that the interrupts are level triggered.
*/
static inline void handle_irq_wrapper(void *data, ps_irq_acknowledge_fn_t acknowledge_fn, void *ack_data)
static inline void ltimer_handle_irq_wrapper(void *data, ps_irq_acknowledge_fn_t acknowledge_fn, void *ack_data)
{
assert(data);

Expand Down Expand Up @@ -92,7 +92,7 @@ static int helper_fdt_alloc_simple(
return 0;
}

static int get_resolution_dummy(void *data, uint64_t *resolution)
static int ltimer_get_resolution_dummy(void *data, uint64_t *resolution)
{
return ENOSYS;
}
Expand All @@ -108,7 +108,7 @@ static int create_ltimer_simple(
assert(ltimer != NULL);

ltimer->get_time = get_time;
ltimer->get_resolution = get_resolution_dummy;
ltimer->get_resolution = ltimer_get_resolution_dummy;
ltimer->set_timeout = set_timeout;
ltimer->reset = reset;
ltimer->destroy = destroy;
Expand Down
2 changes: 1 addition & 1 deletion libplatsupport/src/plat/ariane/ltimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t
destroy(ltimer->data);
return error;
}
timer->irq_id = ps_irq_register(&ops.irq_ops, *timer->callback_data.irq, handle_irq_wrapper,
timer->irq_id = ps_irq_register(&ops.irq_ops, *timer->callback_data.irq, ltimer_handle_irq_wrapper,
&timer->callback_data);
if (timer->irq_id < 0) {
destroy(ltimer->data);
Expand Down
2 changes: 1 addition & 1 deletion libplatsupport/src/plat/hifive/ltimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t
timers->callback_datas[i].ltimer = ltimer;
timers->callback_datas[i].irq = &irqs[i];
timers->callback_datas[i].irq_handler = ltimer_handle_irq;
timers->timer_irq_ids[i] = ps_irq_register(&ops.irq_ops, irqs[i], handle_irq_wrapper,
timers->timer_irq_ids[i] = ps_irq_register(&ops.irq_ops, irqs[i], ltimer_handle_irq_wrapper,
&timers->callback_datas[i]);
if (timers->timer_irq_ids[i] < 0) {
destroy(ltimer->data);
Expand Down
2 changes: 1 addition & 1 deletion libplatsupport/src/plat/odroidc2/ltimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t
odroidc2_timer->callback_data.irq_handler = handle_irq;
odroidc2_timer->callback_data.irq = &irqs[0];

odroidc2_timer->timer_irq_id = ps_irq_register(&ops.irq_ops, irqs[0], handle_irq_wrapper,
odroidc2_timer->timer_irq_id = ps_irq_register(&ops.irq_ops, irqs[0], ltimer_handle_irq_wrapper,
&odroidc2_timer->callback_data);
if (odroidc2_timer->timer_irq_id < 0) {
destroy(ltimer->data);
Expand Down
4 changes: 2 additions & 2 deletions libplatsupport/src/plat/polarfire/ltimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t

irq_id = ps_irq_register(&ops.irq_ops,
irqs[TIMEOUT_TIMER],
handle_irq_wrapper,
ltimer_handle_irq_wrapper,
&timers->callback_data[TIMEOUT_TIMER]);
if (irq_id < 0) {
ZF_LOGE("Failed to register irq %i for MSTimer", irqs[TIMEOUT_TIMER].irq.number);
Expand All @@ -279,7 +279,7 @@ int ltimer_default_init(ltimer_t *ltimer, ps_io_ops_t ops, ltimer_callback_fn_t

irq_id = ps_irq_register(&ops.irq_ops,
irqs[TIMESTAMP_TIMER],
handle_irq_wrapper,
ltimer_handle_irq_wrapper,
&timers->callback_data[TIMESTAMP_TIMER]);
if (irq_id < 0) {
ZF_LOGE("Failed to register irq %i for MSTimer", irqs[TIMESTAMP_TIMER].irq.number);
Expand Down
Loading