Fixed typos in cli output and source code comments

This commit is contained in:
Martin Hauke 2021-01-01 22:11:48 +01:00 committed by Andreas Eversberg
parent 0a27198540
commit b38841d46e
22 changed files with 46 additions and 46 deletions

View File

@ -332,7 +332,7 @@ void display_measurements_update(dispmeasparam_t *param, double value, double va
param->value_count++;
break;
default:
fprintf(stderr, "Paramer '%s' has unknown type %d, please fix!\n", param->name, param->type);
fprintf(stderr, "Parameter '%s' has unknown type %d, please fix!\n", param->name, param->type);
abort();
}
}

View File

@ -74,7 +74,7 @@ int init_emphasis(emphasis_t *state, int samplerate, double cut_off, double cut_
/* do not pre-emphasis above CUT_OFF_L
* Mobile network specifications want -18 dB per octave.
* With two interations we have 24 dB, - 6 dB (from emphasis). */
* With two iterations we have 24 dB, - 6 dB (from emphasis). */
iir_lowpass_init(&state->p.lp, cut_off_l, samplerate, 2);
/* calibrate amplification to be neutral at 1000 Hz */

View File

@ -181,7 +181,7 @@ void fir_process(fir_filter_t *fir, sample_t *samples, int num)
/* convolve samples */
y = 0;
for (j = 0; j < fir->ntaps; j++) {
/* convolve sample from ring buffer, starting with oldes */
/* convolve sample from ring buffer, starting with oldest */
y += fir->buffer[fir->buffer_pos] * fir->taps[j];
if (++fir->buffer_pos == fir->ntaps)
fir->buffer_pos = 0;

View File

@ -72,7 +72,7 @@ int fm_mod_init(fm_mod_t *mod, double samplerate, double offset, double amplitud
int i;
if (!has_init) {
fprintf(stderr, "libfm was not initialized, plese fix!\n");
fprintf(stderr, "libfm was not initialized, please fix!\n");
abort();
}
@ -264,7 +264,7 @@ again:
int fm_demod_init(fm_demod_t *demod, double samplerate, double offset, double bandwidth)
{
if (!has_init) {
fprintf(stderr, "libfm was not initialized, plese fix!\n");
fprintf(stderr, "libfm was not initialized, please fix!\n");
abort();
}

View File

@ -102,7 +102,7 @@ int fsk_mod_init(fsk_mod_t *fsk, void *inst, int (*send_bit)(void *inst), int sa
fsk->cycles_per_bit65536[1] = waves * 65536.0;
}
/* if filter is enabled, add a band pass filter to smoot the spectrum of the tones
/* if filter is enabled, add a band pass filter to smooth the spectrum of the tones
* the bandwidth is twice the difference between f0 and f1
*/
if (filter) {

View File

@ -16,7 +16,7 @@ typedef struct fsk_mod {
int tx_bit; /* current transmitting bit (-1 if not set) */
double tx_bitpos; /* current transmit position in bit */
int filter; /* set, if filters are used */
iir_filter_t lp[2]; /* filter to smoot transmission spectrum */
iir_filter_t lp[2]; /* filter to smooth transmission spectrum */
} fsk_mod_t;
typedef struct fsk_demod {

View File

@ -532,7 +532,7 @@ dial_after_hangup:
fflush(stdout);
}
/* get keys from keyboad to control call via console
/* get keys from keyboard to control call via console
* returns 1 on exit (ctrl+c) */
void process_console(int c)
{
@ -588,7 +588,7 @@ void process_console(int c)
/* put samples into ring buffer */
for (i = 0; i < count; i++) {
console.tx_buffer[console.tx_buffer_pos] = samples[i];
/* if ring buffer wrapps, deliver data down to call process */
/* if ring buffer wraps, deliver data down to call process */
if (++console.tx_buffer_pos == 160) {
console.tx_buffer_pos = 0;
/* only if we have a call */

View File

@ -143,7 +143,7 @@ void main_mobile_print_help(const char *arg0, const char *ext_usage)
printf(" at least one control channel and two voice channels. Alternatively\n");
printf(" use one combined control+voice channel and one voice channels.\n");
printf(" -o --osmocc-sock\n");
printf(" Disable built-in call contol and offer socket\n");
printf(" Disable built-in call control and offer socket\n");
printf(" --cc \"<osmo-cc arg>\" [--cc ...]\n");
printf(" Pass arguments to Osmo-CC endpoint. Use '-cc help' for description.\n");
printf(" -t --tones 0 | 1\n");
@ -152,7 +152,7 @@ void main_mobile_print_help(const char *arg0, const char *ext_usage)
printf(" -l --loopback <type>\n");
printf(" Loopback test: 1 = internal | 2 = external | 3 = echo\n");
printf(" -r --realtime <prio>\n");
printf(" Set prio: 0 to diable, 99 for maximum (default = %d)\n", rt_prio);
printf(" Set prio: 0 to disable, 99 for maximum (default = %d)\n", rt_prio);
printf(" --fast-math\n");
printf(" Use fast math approximation for slow CPU / ARM based systems.\n");
printf(" --write-rx-wave <file>\n");

View File

@ -295,7 +295,7 @@ void sender_set_fm(sender_t *sender, double max_deviation, double max_modulation
sender->speech_deviation = speech_deviation;
sender->max_display = max_display;
PDEBUG_CHAN(DSENDER, DEBUG_DEBUG, "Maxium deviation: %.1f kHz, Maximum modulation: %.1f kHz\n", max_deviation / 1000.0, max_modulation / 1000.0);
PDEBUG_CHAN(DSENDER, DEBUG_DEBUG, "Maximum deviation: %.1f kHz, Maximum modulation: %.1f kHz\n", max_deviation / 1000.0, max_modulation / 1000.0);
PDEBUG_CHAN(DSENDER, DEBUG_DEBUG, "Deviation at speech level: %.1f kHz\n", speech_deviation / 1000.0);
}

View File

@ -846,7 +846,7 @@ static int ack_msg(mtp_t *mtp, uint8_t bsn)
{
struct mtp_msg *msg = mtp->tx_queue, *temp;
/* search for frame that has been tranmitted and acked */
/* search for frame that has been transmitted and acked */
while (msg) {
/* is not transmitted, we are done */
if (!msg->transmitted) {
@ -916,13 +916,13 @@ static void mtp_receive_lssu(mtp_t *mtp, uint8_t fsn, uint8_t bib, uint8_t statu
handle_event(mtp, MTP_PRIM_SIO, NULL, 0);
break;
case STATUS_N:
/* Adopt intial sequence numbers: SAE does, so do we */
/* Adopt initial sequence numbers: SAE does, so do we */
mtp->rx_seq = fsn;
mtp->fib = bib;
handle_event(mtp, MTP_PRIM_SIN, NULL, 0);
break;
case STATUS_E:
/* Adopt intial sequence numbers: SAE does, so do we */
/* Adopt initial sequence numbers: SAE does, so do we */
mtp->rx_seq = fsn;
mtp->fib = bib;
handle_event(mtp, MTP_PRIM_SIE, NULL, 0);
@ -964,7 +964,7 @@ static void mtp_receive_fisu(mtp_t *mtp, uint8_t bsn, uint8_t bib, uint8_t fsn,
/* if the FSN is different and received FIB equals last BIB sent */
if (fsn != mtp->rx_seq && fib == mtp->bib) {
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, " -> Send nack, because we missed a frame and FIB equals last transmitted BIB.\n");
/* shedule NACK */
/* schedule NACK */
mtp->tx_nack = 1;
}
}
@ -1017,7 +1017,7 @@ static void mtp_receive_msu(mtp_t *mtp, uint8_t bsn, uint8_t bib, uint8_t fsn, u
/* iii) if sequence number is not equal and not one more than the last received,
* a NACK is sent, if FIB equals last BIB */
if (fib == mtp->bib) {
/* shedule NACK */
/* schedule NACK */
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, " -> Send nack, because we missed a frame and FIB equals last transmitted BIB.\n");
mtp->tx_nack = 1;
} else
@ -1101,9 +1101,9 @@ static int mtp_receive_frame(mtp_t *mtp, uint8_t *data, int len)
}
if (len == 1)
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, "Receiving LSSU (lentgh = %d) with status flag 0x%02x (%s)\n", len, data[3], mtp_sf_names[data[3] & 0x7]);
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, "Receiving LSSU (length = %d) with status flag 0x%02x (%s)\n", len, data[3], mtp_sf_names[data[3] & 0x7]);
if (len == 2)
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, "Receiving LSSU (lentgh = %d) with status flag 0x%04x (%s)\n", len, data[3] | (data[4] << 8), mtp_sf_names[data[3] & 0x7]);
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, "Receiving LSSU (length = %d) with status flag 0x%04x (%s)\n", len, data[3] | (data[4] << 8), mtp_sf_names[data[3] & 0x7]);
if (len == 1 || len == 2) {
/* receive LSSU */
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, " -> FSN %d, FIB %d, BSN %d, BIB %d\n", fsn, fib, bsn, bib);
@ -1138,7 +1138,7 @@ uint8_t mtp_send_bit(mtp_t *mtp)
/* start frame after flag */
if (++mtp->tx_bit_count == 8) {
mtp->tx_bit_count = 0;
/* continously send flag when power off */
/* continuously send flag when power off */
if (mtp->l2_state == MTP_L2STATE_POWER_OFF)
return bit;
mtp->tx_byte_count = 0;
@ -1242,7 +1242,7 @@ void mtp_receive_bit(mtp_t *mtp, uint8_t bit)
{
int rc;
/* octect counting */
/* octet counting */
if (mtp->rx_octet_counting) {
if (++mtp->rx_octet_count == 8 * N) {
/* octet counter hits */
@ -1267,7 +1267,7 @@ void mtp_receive_bit(mtp_t *mtp, uint8_t bit)
mtp_monitor(mtp, MONITOR_GOOD);
}
if (rc == 0 && mtp->rx_octet_counting) {
/* stop octect counting */
/* stop octet counting */
PDEBUG_CHAN(DMTP2, DEBUG_DEBUG, "Stop Octet counting, due to correctly received frame\n");
mtp->rx_octet_counting = 0;
}

View File

@ -960,7 +960,7 @@ static int osmo_cc_handle_endpoint(osmo_cc_endpoint_t *ep)
}
/* main handler
* note that it must be called in a loop (with ohter handlers) until no work was done
* note that it must be called in a loop (with other handlers) until no work was done
*/
int osmo_cc_handle(void)
{
@ -1071,7 +1071,7 @@ static void osmo_cc_help_address(void)
printf("remote [<IPv6 address>]:<port>\n\n");
printf("These options can be used to define local and remote IP and port for the socket\n");
printf("interface. Note that IPv6 adresses must be enclosed by '[' and ']'.\n\n");
printf("interface. Note that IPv6 addresses must be enclosed by '[' and ']'.\n\n");
printf("If no local address was given, the IPv4 loopback IP and port %d is used. If\n", OSMO_CC_DEFAULT_PORT);
printf("this port is already in use, the first free higher port is used.\n\n");

View File

@ -109,7 +109,7 @@ osmo_cc_msg_t *osmo_cc_new_msg(uint8_t msg_type)
PDEBUG(DCC, DEBUG_ERROR, "No memory\n");
abort();
}
/* set message type and zero lentgh */
/* set message type and zero length */
msg->type = msg_type;
msg->length_networkorder = htons(0);
@ -831,7 +831,7 @@ int osmo_cc_get_ie_sdp(osmo_cc_msg_t *msg, int ie_repeat, char *sdp, size_t sdp_
return rc;
}
/* helper to encode socket addresss */
/* helper to encode socket address */
void osmo_cc_add_ie_socket_address(osmo_cc_msg_t *msg, const char *address)
{
struct osmo_cc_ie_socket_address *ie_socket_address;
@ -840,7 +840,7 @@ void osmo_cc_add_ie_socket_address(osmo_cc_msg_t *msg, const char *address)
memcpy(ie_socket_address->address, address, strlen(address));
}
/* helper to decode socket addresss */
/* helper to decode socket address */
int osmo_cc_get_ie_socket_address(osmo_cc_msg_t *msg, int ie_repeat, char *address, size_t address_size)
{
struct osmo_cc_ie_socket_address *ie_socket_address;

View File

@ -223,7 +223,7 @@ enum osmo_cc_ie_type {
#define OSMO_CC_DTMF_MODE_ON 1 /* start tone */
#define OSMO_CC_DTMF_MODE_DIGITS 2 /* play tone(s) with duration and pauses */
#define OSMO_CC_SOCKET_CAUSE_VERSION_MISMATCH 1 /* version missmatch */
#define OSMO_CC_SOCKET_CAUSE_VERSION_MISMATCH 1 /* version mismatch */
#define OSMO_CC_SOCKET_CAUSE_FAILED 2 /* connection failed */
#define OSMO_CC_SOCKET_CAUSE_BROKEN_PIPE 3 /* connected socket failed */
#define OSMO_CC_SOCKET_CAUSE_TIMEOUT 4 /* keepalive packets timeout */

View File

@ -141,7 +141,7 @@ char *osmo_cc_session_gensdp(osmo_cc_session_t *session)
return sdp;
}
/* seperate a word from string that is delimited with one or more space characters */
/* separate a word from string that is delimited with one or more space characters */
static char *wordsep(char **text_p)
{
char *text = *text_p;

View File

@ -470,7 +470,7 @@ static int osmo_cc_session_negotiate(osmo_cc_session_t *session_local, struct os
PDEBUG(DCC, DEBUG_DEBUG, "Negotiating session.\n");
/* copy remote session infromation */
/* copy remote session information */
session_local->origin_remote.username = strdup(session_remote->origin_remote.username);
session_local->origin_remote.sess_id = strdup(session_remote->origin_remote.sess_id);
session_local->origin_remote.sess_version = strdup(session_remote->origin_remote.sess_version);

View File

@ -442,7 +442,7 @@ static int transmit_conn(osmo_cc_conn_t *conn)
/* start TX keepalive timeer, if not already
* because we stop at every message above, we actually restart the timer here.
* only if there is no message for the amout of time, the timer fires.
* only if there is no message for the amount of time, the timer fires.
*/
if (!timer_running(&conn->tx_keepalive_timer))
timer_start(&conn->tx_keepalive_timer, OSMO_CC_SOCKET_TX_KEEPALIVE);

View File

@ -81,7 +81,7 @@ int samplerate_downsample(samplerate_t *state, sample_t *samples, int input_num)
/* remove number of input samples from index */
in_index -= (double)input_num;
/* in_index cannot be negative, excpet due to rounding error, so... */
/* in_index cannot be negative, except due to rounding error, so... */
if ((int)in_index < 0)
in_index = 0.0;
@ -137,7 +137,7 @@ int samplerate_upsample(samplerate_t *state, sample_t *input, int input_num, sam
/* remove number of input samples from index */
in_index -= (double)input_num;
/* in_index cannot be negative, excpet due to rounding error, so... */
/* in_index cannot be negative, except due to rounding error, so... */
if ((int)in_index < 0)
in_index = 0.0;

View File

@ -180,7 +180,7 @@ void *sdr_open(const char __attribute__((__unused__)) *audiodev, double *tx_freq
sdr->amplitude = 1.0 / (double)channels;
sdr->samplerate = samplerate;
sdr->latspl = latspl;
sdr->threads = threads; /* always requried, because write may block */
sdr->threads = threads; /* always required, because write may block */
sdr->oversample = oversample;
if (threads) {

View File

@ -80,7 +80,7 @@ int uhd_open(size_t channel, const char *_device_args, const char *_stream_args,
error = uhd_string_vector_make(&clocks);
if (error) {
clock_vector_error:
PDEBUG(DUHD, DEBUG_ERROR, "Failed to hande UHD vector, please fix!\n");
PDEBUG(DUHD, DEBUG_ERROR, "Failed to handle UHD vector, please fix!\n");
uhd_close();
return -EIO;
}
@ -139,7 +139,7 @@ int uhd_open(size_t channel, const char *_device_args, const char *_stream_args,
error = uhd_string_vector_make(&antennas);
if (error) {
tx_vector_error:
PDEBUG(DUHD, DEBUG_ERROR, "Failed to hande UHD vector, please fix!\n");
PDEBUG(DUHD, DEBUG_ERROR, "Failed to handle UHD vector, please fix!\n");
uhd_close();
return -EIO;
}
@ -249,7 +249,7 @@ int uhd_open(size_t channel, const char *_device_args, const char *_stream_args,
tune_request.args = strdup(_tune_args);
error = uhd_usrp_set_tx_freq(usrp, &tune_request, channel, &tune_result);
if (error) {
PDEBUG(DUHD, DEBUG_ERROR, "Failed to set TX frequeny to %.0f Hz\n", tx_frequency);
PDEBUG(DUHD, DEBUG_ERROR, "Failed to set TX frequency to %.0f Hz\n", tx_frequency);
uhd_close();
return -EIO;
}
@ -320,7 +320,7 @@ int uhd_open(size_t channel, const char *_device_args, const char *_stream_args,
error = uhd_string_vector_make(&antennas);
if (error) {
rx_vector_error:
PDEBUG(DUHD, DEBUG_ERROR, "Failed to hande UHD vector, please fix!\n");
PDEBUG(DUHD, DEBUG_ERROR, "Failed to handle UHD vector, please fix!\n");
uhd_close();
return -EIO;
}
@ -437,7 +437,7 @@ int uhd_open(size_t channel, const char *_device_args, const char *_stream_args,
tune_request.args = strdup(_tune_args);
error = uhd_usrp_set_rx_freq(usrp, &tune_request, channel, &tune_result);
if (error) {
PDEBUG(DUHD, DEBUG_ERROR, "Failed to set RX frequeny to %.0f Hz\n", rx_frequency);
PDEBUG(DUHD, DEBUG_ERROR, "Failed to set RX frequency to %.0f Hz\n", rx_frequency);
uhd_close();
return -EIO;
}

View File

@ -60,12 +60,12 @@ serial_t *serial_open(const char *serial_device, int serial_baud, int serial_dat
if (serial_databits < 5 || serial_databits > 8) {
serial_errno = -EINVAL;
serial_errnostr = "Only 5 trough 8 stopbits supported.";
serial_errnostr = "Only 5 through 8 stopbits supported.";
return NULL;
}
if (serial_stopbits < 1 || serial_stopbits > 2) {
serial_errno = -EINVAL;
serial_errnostr = "Only 1 trough 2 stopbits supported.";
serial_errnostr = "Only 1 through 2 stopbits supported.";
return NULL;
}
if (serial_xonxoff !='e' && serial_xonxoff != 'd') {
@ -201,7 +201,7 @@ serial_t *serial_open(const char *serial_device, int serial_baud, int serial_dat
free(serial);
} else {
serial_errno = -ENOMEM;
serial_errnostr = "not enougth memory for handle";
serial_errnostr = "not enough memory for handle";
}
return NULL;
@ -227,7 +227,7 @@ void serial_close(serial_t *serial)
/*
read = serial_read(serial, &buffer, size);
reads until buffer "size" has reached or until timeout has occured.
reads until buffer "size" has reached or until timeout has occurred.
"read" gives the number of bytes read.
*/
@ -251,7 +251,7 @@ int serial_read(serial_t *serial, uint8_t *buffer, int size)
/*
wrote = serial_write(serial, &buffer, size);
writes until buffer "size" has reached or until timeout has occured.
writes until buffer "size" has reached or until timeout has occurred.
"wrote" gives the number of bytes written.
*/

View File

@ -384,7 +384,7 @@ int sound_read(void *inst, sample_t **samples, int num, int channels, double *rf
int in, rc;
int i, ii;
/* make valgrind happy, because snd_pcm_readi() does not seem to initally fill buffer with values */
/* make valgrind happy, because snd_pcm_readi() does not seem to initially fill buffer with values */
memset(buff, 0, sizeof(buff));
/* get samples in rx buffer */

View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Based on orignal Scrambler code from SIT-Rom:
/* Based on original Scrambler code from SIT-Rom:
r6 already has input bit at position 0.
r6 (low) and r7 (high) are the shift register.