diff options
Diffstat (limited to 'src/mpt1327')
| -rw-r--r-- | src/mpt1327/main.c | 16 | ||||
| -rwxr-xr-x | src/mpt1327/mpt1327.c | 4 | ||||
| -rwxr-xr-x | src/mpt1327/mpt1327.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mpt1327/main.c b/src/mpt1327/main.c index bd90f4d..fd0d1ea 100644 --- a/src/mpt1327/main.c +++ b/src/mpt1327/main.c @@ -289,10 +289,10 @@ int main(int argc, char *argv[]) mandatory = 1; } if (use_sdr) { - /* set audiodev */ + /* set device */ for (i = 0; i < num_kanal; i++) - audiodev[i] = "sdr"; - num_audiodev = num_kanal; + dsp_device[i] = "sdr"; + num_device = num_kanal; /* set channel types for more than 1 channel */ if (num_kanal > 1 && num_chan_type == 0) { chan_type[0] = CHAN_TYPE_CC; @@ -302,9 +302,9 @@ int main(int argc, char *argv[]) } } - if (num_kanal == 1 && num_audiodev == 0) - num_audiodev = 1; /* use default */ - if (num_kanal != num_audiodev) { + if (num_kanal == 1 && num_device == 0) + num_device = 1; /* use default */ + if (num_kanal != num_device) { fprintf(stderr, "You need to specify as many sound devices as you have channels.\n"); exit(0); } @@ -370,7 +370,7 @@ int main(int argc, char *argv[]) /* create transceiver instance */ for (i = 0; i < num_kanal; i++) { - rc = mpt1327_create(band, kanal[i], chan_type[i], audiodev[i], use_sdr, samplerate, rx_gain, tx_gain, write_rx_wave, write_tx_wave, read_rx_wave, read_tx_wave, loopback, squelch_db); + rc = mpt1327_create(band, kanal[i], chan_type[i], dsp_device[i], use_sdr, dsp_samplerate, rx_gain, tx_gain, write_rx_wave, write_tx_wave, read_rx_wave, read_tx_wave, loopback, squelch_db); if (rc < 0) { fprintf(stderr, "Failed to create transceiver instance. Quitting!\n"); goto fail; @@ -380,7 +380,7 @@ int main(int argc, char *argv[]) mpt1327_check_channels(); - main_mobile("mpt1327", &quit, latency, interval, NULL, station_id, 7); + main_mobile("mpt1327", &quit, NULL, station_id, 7); fail: /* destroy transceiver instance */ diff --git a/src/mpt1327/mpt1327.c b/src/mpt1327/mpt1327.c index cb11139..24c9103 100755 --- a/src/mpt1327/mpt1327.c +++ b/src/mpt1327/mpt1327.c @@ -580,7 +580,7 @@ static void mpt1327_new_state(mpt1327_t *mpt1327, enum mpt1327_state new_state, static void mpt1327_timeout(struct timer *timer); /* Create transceiver instance and link to a list. */ -int mpt1327_create(enum mpt1327_band band, const char *kanal, enum mpt1327_chan_type chan_type, const char *audiodev, int use_sdr, int samplerate, double rx_gain, double tx_gain, const char *write_rx_wave, const char *write_tx_wave, const char *read_rx_wave, const char *read_tx_wave, int loopback, double squelch_db) +int mpt1327_create(enum mpt1327_band band, const char *kanal, enum mpt1327_chan_type chan_type, const char *device, int use_sdr, int samplerate, double rx_gain, double tx_gain, const char *write_rx_wave, const char *write_tx_wave, const char *read_rx_wave, const char *read_tx_wave, int loopback, double squelch_db) { sender_t *sender; mpt1327_t *mpt1327; @@ -607,7 +607,7 @@ int mpt1327_create(enum mpt1327_band band, const char *kanal, enum mpt1327_chan_ PDEBUG(DMPT1327, DEBUG_DEBUG, "Creating 'MPT1327' instance for Channel %s on Band %s (sample rate %d).\n", kanal, mpt1327_band_def[band].name, samplerate); /* init general part of transceiver */ - rc = sender_create(&mpt1327->sender, kanal, mpt1327_channel2freq(band, atoi(kanal), 0), mpt1327_channel2freq(band, atoi(kanal), 1), audiodev, use_sdr, samplerate, rx_gain, tx_gain, 0, 0, write_rx_wave, write_tx_wave, read_rx_wave, read_tx_wave, loopback, PAGING_SIGNAL_NONE); + rc = sender_create(&mpt1327->sender, kanal, mpt1327_channel2freq(band, atoi(kanal), 0), mpt1327_channel2freq(band, atoi(kanal), 1), device, use_sdr, samplerate, rx_gain, tx_gain, 0, 0, write_rx_wave, write_tx_wave, read_rx_wave, read_tx_wave, loopback, PAGING_SIGNAL_NONE); if (rc < 0) { PDEBUG(DMPT1327, DEBUG_ERROR, "Failed to init 'Sender' processing!\n"); goto error; diff --git a/src/mpt1327/mpt1327.h b/src/mpt1327/mpt1327.h index 7878727..ab71970 100755 --- a/src/mpt1327/mpt1327.h +++ b/src/mpt1327/mpt1327.h @@ -146,7 +146,7 @@ void mpt1327_channel_list(void); int mpt1327_channel_by_short_name(const char *short_name); const char *chan_type_short_name(enum mpt1327_chan_type chan_type); const char *chan_type_long_name(enum mpt1327_chan_type chan_type); -int mpt1327_create(enum mpt1327_band band, const char *kanal, enum mpt1327_chan_type chan_type, const char *audiodev, int use_sdr, int samplerate, double rx_gain, double tx_gain, const char *write_rx_wave, const char *write_tx_wave, const char *read_rx_wave, const char *read_tx_wave, int loopback, double squelch_db); +int mpt1327_create(enum mpt1327_band band, const char *kanal, enum mpt1327_chan_type chan_type, const char *device, int use_sdr, int samplerate, double rx_gain, double tx_gain, const char *write_rx_wave, const char *write_tx_wave, const char *read_rx_wave, const char *read_tx_wave, int loopback, double squelch_db); void mpt1327_check_channels(void); void mpt1327_destroy(sender_t *sender); void mpt1327_receive_codeword(mpt1327_t *mpt1327, uint64_t bits, double quality, double level); |