Fixed compiler error for old GCC

pull/1/head
Andreas Eversberg 3 years ago
parent f132059edf
commit ddce867821
  1. 5
      src/amps/amps.h
  2. 2
      src/amps/transaction.h
  3. 7
      src/cnetz/cnetz.h
  4. 2
      src/cnetz/fsk_demod.h
  5. 1
      src/nmt/dms.h
  6. 5
      src/nmt/nmt.h

@ -2,6 +2,7 @@
#include "../libmobile/sender.h"
#include "../libtimer/timer.h"
#include "../libcompandor/compandor.h"
typedef struct amps amps_t;
#include "sysinfo.h"
#include "transaction.h"
@ -35,7 +36,7 @@ enum fsk_rx_sync {
#define FSK_MAX_BITS 1032 /* maximum number of bits to process (FVC with dotting+sync) */
typedef struct amps {
struct amps {
sender_t sender;
compandor_t cstate;
int pre_emphasis; /* use pre_emphasis by this instance */
@ -159,7 +160,7 @@ typedef struct amps {
double when_received; /* time stamp of received frame start (start of dotting) */
double when_transmitted[16]; /* time stamps of filler frames with different count */
int when_count; /* counter of the filler frame */
} amps_t;
};
void amps_channel_list(void);
int amps_channel_by_short_name(const char *short_name);

@ -1,6 +1,4 @@
typedef struct amps amps_t;
enum amps_trans_state {
TRANS_NULL = 0,
TRANS_REGISTER_ACK, /* attach request received, waiting to ack */

@ -1,8 +1,9 @@
#include "../libcompandor/compandor.h"
#include "../libtimer/timer.h"
#include "../libmobile/sender.h"
#include "fsk_demod.h"
#include "../libscrambler/scrambler.h"
typedef struct cnetz cnetz_t;
#include "fsk_demod.h"
#include "transaction.h"
#define CNETZ_OGK_KANAL 131
@ -63,7 +64,7 @@ struct clock_speed {
};
/* instance of cnetz sender */
typedef struct cnetz {
struct cnetz {
sender_t sender;
enum cnetz_chan_type chan_type; /* channel type */
scrambler_t scrambler_tx; /* mirror what we transmit to MS */
@ -130,7 +131,7 @@ typedef struct cnetz {
struct clock_speed clock_speed;
transaction_t *trans_list; /* list of transactions */
} cnetz_t;
};
double cnetz_kanal2freq(int kanal, int unterband);
void cnetz_channel_list(void);

@ -16,8 +16,6 @@ enum demod_type {
FSK_DEMOD_LEVEL, /* check for zero crossing (good for SDR) */
};
typedef struct cnetz cnetz_t;
typedef struct fsk_fm_demod {
cnetz_t *cnetz; /* pointer back to cnetz instance */

@ -1,4 +1,3 @@
typedef struct nmt nmt_t;
struct dms_frame {
struct dms_frame *next;

@ -5,6 +5,7 @@
#include "../libmobile/call.h"
#include "../libfsk/fsk.h"
#include "../libgoertzel/goertzel.h"
typedef struct nmt nmt_t;
#include "dms.h"
#include "sms.h"
@ -73,7 +74,7 @@ typedef struct nmt_sysinfo {
const char *nmt_dir_name(enum nmt_direction dir);
typedef struct nmt {
struct nmt {
sender_t sender;
nmt_sysinfo_t sysinfo;
compandor_t cstate;
@ -136,7 +137,7 @@ typedef struct nmt {
sms_t sms; /* SMS states */
char smsc_number[33]; /* digits to match SMSC */
struct timer sms_timer;
} nmt_t;
};
void nmt_channel_list(int nmt_system);
int nmt_channel_by_short_name(int nmt_system, const char *short_name);

Loading…
Cancel
Save