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

8
src/nmt/nmt.c
View File

@@ -259,7 +259,7 @@ static inline int is_chan_class_tc(enum nmt_chan_type chan_type)
return 0;
}
static void nmt_timeout(struct timer *timer);
static void nmt_timeout(void *data);
/* Create transceiver instance and link to a list. */
int nmt_create(int nmt_system, const char *country, const char *kanal, enum nmt_chan_type chan_type, const char *device, int use_sdr, int samplerate, double rx_gain, double tx_gain, int pre_emphasis, int de_emphasis, const char *write_rx_wave, const char *write_tx_wave, const char *read_rx_wave, const char *read_tx_wave, uint8_t ms_power, uint8_t traffic_area, uint8_t area_no, int compandor, int supervisory, const char *smsc_number, int send_callerid, int send_clock, int loopback)
@@ -1677,9 +1677,9 @@ void nmt_receive_frame(nmt_t *nmt, const char *bits, double quality, double leve
}
/* Timeout handling */
static void nmt_timeout(struct timer *timer)
static void nmt_timeout(void *data)
{
nmt_t *nmt = (nmt_t *)timer->priv;
nmt_t *nmt = data;
switch (nmt->state) {
case STATE_MO_DIALING:
@@ -1692,7 +1692,7 @@ static void nmt_timeout(struct timer *timer)
timeout_mt_release(nmt);
break;
case STATE_ACTIVE:
timeout_active(nmt, timer->duration);
timeout_active(nmt, nmt->timer.duration);
break;
default:
break;

6
src/nmt/sms.c
View File

@@ -94,7 +94,7 @@ static const char sms_header[] = {
* init and exit
*/
static void sms_timeout(struct timer *timer);
static void sms_timeout(void *data);
/* init instance */
int sms_init_sender(nmt_t *nmt)
@@ -675,9 +675,9 @@ release:
return;
}
static void sms_timeout(struct timer *timer)
static void sms_timeout(void *data)
{
nmt_t *nmt = (nmt_t *)timer->priv;
nmt_t *nmt = data;
sms_release(nmt);
}

6
src/nmt/transaction.c
View File

@@ -27,7 +27,7 @@
#include "transaction.h"
static transaction_t *trans_list = NULL;
static void transaction_timeout(struct timer *timer);
static void transaction_timeout(void *data);
/* link transaction to list */
static void link_transaction(transaction_t *trans)
@@ -106,9 +106,9 @@ void destroy_transaction(transaction_t *trans)
}
/* Timeout handling */
static void transaction_timeout(struct timer *timer)
static void transaction_timeout(void *data)
{
transaction_t *trans = (transaction_t *)timer->priv;
transaction_t *trans = data;
timeout_mt_paging(trans);
}