williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make libtimer to be osmo_* compatible in some places

Browse Source
This commit is contained in:
Andreas Eversberg
2023-01-20 18:03:44 +01:00
parent 3bc3e67abb
commit f4abbaf027
25 changed files with 141 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/jolly/jolly.c
+6 -6
View File
@@ -204,8 +204,8 @@ static void jolly_new_state(jolly_t *jolly, enum jolly_state new_state)
jolly_display_status();
}
static void jolly_timeout(struct timer *timer);
static void jolly_speech_timeout(struct timer *timer);
static void jolly_timeout(void *data);
static void jolly_speech_timeout(void *data);
static void jolly_go_idle(jolly_t *jolly);
/* Create transceiver instance and link to a list. */
@@ -425,9 +425,9 @@ void jolly_receive_dtmf(void *priv, char digit, dtmf_meas_t *meas)
}
/* Timeout handling */
static void jolly_timeout(struct timer *timer)
static void jolly_timeout(void *data)
{
jolly_t *jolly = (jolly_t *)timer->priv;
jolly_t *jolly = data;
switch (jolly->state) {
case STATE_OUT_DIALING:
@@ -453,9 +453,9 @@ static void jolly_timeout(struct timer *timer)
}
}
static void jolly_speech_timeout(struct timer *timer)
static void jolly_speech_timeout(void *data)
{
jolly_t *jolly = (jolly_t *)timer->priv;
jolly_t *jolly = data;
switch (jolly->state) {
case STATE_OUT_VERIFY: