Skip to content

Commit

Permalink
Merge #19395
Browse files Browse the repository at this point in the history
19395: ztimer/ztimer64: uncrustify code r=miri64 a=miri64



Co-authored-by: Martine Lenders <m.lenders@fu-berlin.de>
  • Loading branch information
bors[bot] and miri64 authored Mar 15, 2023
2 parents 6894ee4 + dd96974 commit 97e8127
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions sys/include/ztimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ bool ztimer_acquire(ztimer_clock_t *clock);
#else
static inline bool ztimer_acquire(ztimer_clock_t *clock)
{
(void) clock;
(void)clock;
return false;
}
#endif
Expand All @@ -450,7 +450,7 @@ bool ztimer_release(ztimer_clock_t *clock);
#else
static inline bool ztimer_release(ztimer_clock_t *clock)
{
(void) clock;
(void)clock;
return false;
}
#endif
Expand Down
12 changes: 6 additions & 6 deletions sys/include/ztimer/periodic.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ typedef bool (*ztimer_periodic_callback_t)(void *);
* @brief ztimer periodic structure
*/
typedef struct {
ztimer_t timer; /**< timer object used for this timer */
ztimer_clock_t *clock; /**< clock for this timer */
uint32_t interval; /**< interval of this timer */
ztimer_now_t last; /**< last trigger time */
ztimer_periodic_callback_t callback; /**< called on each trigger */
void *arg; /**< argument for callback */
ztimer_t timer; /**< timer object used for this timer */
ztimer_clock_t *clock; /**< clock for this timer */
uint32_t interval; /**< interval of this timer */
ztimer_now_t last; /**< last trigger time */
ztimer_periodic_callback_t callback; /**< called on each trigger */
void *arg; /**< argument for callback */
} ztimer_periodic_t;

/**
Expand Down
2 changes: 1 addition & 1 deletion sys/ztimer/convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void ztimer_convert_init(ztimer_convert_t *ztimer_convert,
ztimer_convert_t tmp = {
.lower = lower,
.lower_entry = {
.callback = (void (*)(void *))ztimer_handler,
.callback = (void (*)(void *)) ztimer_handler,
.arg = ztimer_convert,
},
.super.max_value = max_value,
Expand Down
2 changes: 1 addition & 1 deletion sys/ztimer/convert_frac.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void ztimer_convert_frac_init(ztimer_convert_frac_t *self,
.super.super = { .ops = &ztimer_convert_frac_ops, },
.super.lower = lower,
.super.lower_entry =
{ .callback = (void (*)(void *))ztimer_handler, .arg = &self->super, },
{ .callback = (void (*)(void *)) ztimer_handler, .arg = &self->super, },
};

ztimer_convert_frac_compute_scale(self, freq_self, freq_lower);
Expand Down

0 comments on commit 97e8127

Please sign in to comment.