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

Minor debug message corrections

Browse Source
This commit is contained in:
Andreas Eversberg
2018-02-15 07:22:24 +01:00
parent 3ab5a3f6a9
commit 6277753574
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amps/dsp.c
View File

@@ -217,7 +217,7 @@ int dsp_init_sender(amps_t *amps, int tolerant)
amps->fsk_tx_buffer_size = amps->fsk_bitduration + 10; /* 10 extra to avoid overflow due to rounding */ amps->fsk_tx_buffer_size = amps->fsk_bitduration + 10; /* 10 extra to avoid overflow due to rounding */
spl = calloc(sizeof(*spl), amps->fsk_tx_buffer_size); spl = calloc(sizeof(*spl), amps->fsk_tx_buffer_size);
if (!spl) { if (!spl) {
PDEBUG(DDSP, DEBUG_DEBUG, "No memory!\n"); PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
rc = -ENOMEM; rc = -ENOMEM;
goto error; goto error;
} }
@@ -233,7 +233,7 @@ int dsp_init_sender(amps_t *amps, int tolerant)
PDEBUG(DDSP, DEBUG_DEBUG, " -> Samples in window to analyse level right of edge: %d..%d\n", amps->fsk_rx_window_half, amps->fsk_rx_window_end - 1); PDEBUG(DDSP, DEBUG_DEBUG, " -> Samples in window to analyse level right of edge: %d..%d\n", amps->fsk_rx_window_half, amps->fsk_rx_window_end - 1);
spl = calloc(sizeof(*amps->fsk_rx_window), amps->fsk_rx_window_length); spl = calloc(sizeof(*amps->fsk_rx_window), amps->fsk_rx_window_length);
if (!spl) { if (!spl) {
PDEBUG(DDSP, DEBUG_DEBUG, "No memory!\n"); PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
rc = -ENOMEM; rc = -ENOMEM;
goto error; goto error;
} }

2
src/bnetz/dsp.c
View File

@@ -90,7 +90,7 @@ int dsp_init_sender(bnetz_t *bnetz, double squelch_db)
/* init fsk */ /* init fsk */
if (fsk_init(&bnetz->fsk, bnetz, fsk_send_bit, fsk_receive_bit, bnetz->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 0, BIT_ADJUST) < 0) { if (fsk_init(&bnetz->fsk, bnetz, fsk_send_bit, fsk_receive_bit, bnetz->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 0, BIT_ADJUST) < 0) {
PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "FSK init failed!\n"); PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n");
return -EINVAL; return -EINVAL;
} }

4
src/cnetz/dsp.c
View File

@@ -112,7 +112,7 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], en
cnetz->fsk_tx_buffer_size = size * 1.1; /* more to compensate clock speed */ cnetz->fsk_tx_buffer_size = size * 1.1; /* more to compensate clock speed */
cnetz->fsk_tx_buffer = calloc(sizeof(sample_t), cnetz->fsk_tx_buffer_size); cnetz->fsk_tx_buffer = calloc(sizeof(sample_t), cnetz->fsk_tx_buffer_size);
if (!cnetz->fsk_tx_buffer) { if (!cnetz->fsk_tx_buffer) {
PDEBUG(DDSP, DEBUG_DEBUG, "No memory!\n"); PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
rc = -ENOMEM; rc = -ENOMEM;
goto error; goto error;
} }
@@ -127,7 +127,7 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], en
/* create speech buffer */ /* create speech buffer */
cnetz->dsp_speech_buffer = calloc(sizeof(sample_t), (int)(cnetz->fsk_bitduration * 70.0)); /* more to compensate clock speed. we just need it to fill 62 bits (60 bits, including pause bits). */ cnetz->dsp_speech_buffer = calloc(sizeof(sample_t), (int)(cnetz->fsk_bitduration * 70.0)); /* more to compensate clock speed. we just need it to fill 62 bits (60 bits, including pause bits). */
if (!cnetz->dsp_speech_buffer) { if (!cnetz->dsp_speech_buffer) {
PDEBUG(DDSP, DEBUG_DEBUG, "No memory!\n"); PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
rc = -ENOMEM; rc = -ENOMEM;
goto error; goto error;
} }

2
src/libmobile/sender.c
View File

@@ -321,7 +321,7 @@ void process_sender_audio(sender_t *sender, int *quit, int latspl)
#endif #endif
count = sender->audio_get_tosend(sender->audio, latspl); count = sender->audio_get_tosend(sender->audio, latspl);
if (count < 0) { if (count < 0) {
PDEBUG(DSENDER, DEBUG_ERROR, "Failed to get samples in buffer (rc = %d)!\n", count); PDEBUG(DSENDER, DEBUG_ERROR, "Failed to get number of samples in buffer (rc = %d)!\n", count);
if (count == -EPIPE) { if (count == -EPIPE) {
if (cant_recover) { if (cant_recover) {
cant_recover: cant_recover:

2
src/nmt/dsp.c
View File

@@ -121,7 +121,7 @@ int dsp_init_sender(nmt_t *nmt, double deviation_factor)
/* init fsk */ /* init fsk */
if (fsk_init(&nmt->fsk, nmt, fsk_send_bit, fsk_receive_bit, nmt->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 1, BIT_ADJUST) < 0) { if (fsk_init(&nmt->fsk, nmt, fsk_send_bit, fsk_receive_bit, nmt->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 1, BIT_ADJUST) < 0) {
PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "FSK init failed!\n"); PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n");
return -EINVAL; return -EINVAL;
} }

4
src/r2000/dsp.c
View File

@@ -87,7 +87,7 @@ int dsp_init_sender(r2000_t *r2000)
/* init fsk */ /* init fsk */
if (fsk_init(&r2000->fsk, r2000, fsk_send_bit, fsk_receive_bit, r2000->sender.samplerate, FSK_BIT_RATE, FSK_F0, FSK_F1, TX_PEAK_FSK, 1, FSK_BIT_ADJUST) < 0) { if (fsk_init(&r2000->fsk, r2000, fsk_send_bit, fsk_receive_bit, r2000->sender.samplerate, FSK_BIT_RATE, FSK_F0, FSK_F1, TX_PEAK_FSK, 1, FSK_BIT_ADJUST) < 0) {
PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "FSK init failed!\n"); PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n");
return -EINVAL; return -EINVAL;
} }
if (r2000->sender.loopback) if (r2000->sender.loopback)
@@ -97,7 +97,7 @@ int dsp_init_sender(r2000_t *r2000)
/* init supervisorty fsk */ /* init supervisorty fsk */
if (fsk_init(&r2000->super_fsk, r2000, super_send_bit, super_receive_bit, r2000->sender.samplerate, SUPER_BIT_RATE, SUPER_F0, SUPER_F1, TX_PEAK_SUPER, 0, SUPER_BIT_ADJUST) < 0) { if (fsk_init(&r2000->super_fsk, r2000, super_send_bit, super_receive_bit, r2000->sender.samplerate, SUPER_BIT_RATE, SUPER_F0, SUPER_F1, TX_PEAK_SUPER, 0, SUPER_BIT_ADJUST) < 0) {
PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "FSK init failed!\n"); PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n");
return -EINVAL; return -EINVAL;
} }