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

Typos: acknowledgement -> acknowledgment signalling -> signaling

Browse Source
This commit is contained in:
Andreas Eversberg
2016-07-24 10:26:01 +02:00
parent c273bbc5ff
commit 6a5af9aeac
18 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cnetz/cnetz.c
View File

@@ -757,12 +757,12 @@ const telegramm_t *cnetz_transmit_telegramm_rufblock(cnetz_t *cnetz)
telegramm.futln_rest_nr = trans->futln_rest;
switch (trans->state) {
case TRANS_EM:
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgement 'Einbuchquittung' to Attachment request.\n");
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgment 'Einbuchquittung' to Attachment request.\n");
telegramm.opcode = OPCODE_EBQ_R;
destroy_transaction(trans);
break;
case TRANS_UM:
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgement 'Umbuchquittung' to Roaming requuest.\n");
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgment 'Umbuchquittung' to Roaming requuest.\n");
telegramm.opcode = OPCODE_UBQ_R;
destroy_transaction(trans);
break;
@@ -851,7 +851,7 @@ const telegramm_t *cnetz_transmit_telegramm_meldeblock(cnetz_t *cnetz)
if (trans) {
switch (trans->state) {
case TRANS_VWG:
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgement 'Wahlaufforderung' to outging call\n");
PDEBUG(DCNETZ, DEBUG_INFO, "Sending acknowledgment 'Wahlaufforderung' to outging call\n");
telegramm.opcode = OPCODE_WAF_M;
telegramm.futln_nationalitaet = trans->futln_nat;
telegramm.futln_heimat_fuvst_nr = trans->futln_fuvst;

8
src/cnetz/cnetz.h
View File

@@ -30,12 +30,12 @@ enum cnetz_state {
/* timers */
#define F_BQ 8 /* number of not received frames at BQ state */
#define F_VHQK 16 /* number of not received frames at VHQ state during concentrated signalling */
#define F_VHQ 16 /* number of not received frames at VHQ state during distributed signalling */
#define F_VHQK 16 /* number of not received frames at VHQ state during concentrated signaling */
#define F_VHQ 16 /* number of not received frames at VHQ state during distributed signaling */
#define F_DS 16 /* number of not received frames at DS state */
#define F_RTA 16 /* number of not received frames at RTA state */
#define N_AFKT 6 /* number of release frames to send during concentrated signalling */
#define N_AFV 4 /* number of release frames to send during distributed signalling */
#define N_AFKT 6 /* number of release frames to send during concentrated signaling */
#define N_AFV 4 /* number of release frames to send during distributed signaling */
/* clear causes */
#define CNETZ_CAUSE_TEILNEHMERBESETZT 0 /* subscriber busy */

6
src/cnetz/fsk_fm_demod.c
View File

@@ -38,7 +38,7 @@
*
* To determine a change from noise, we use a theshold. This is set to half of
* the level of last received change. This means that the next change may be
* down to a half lower. There is a special case during distributed signalling.
* down to a half lower. There is a special case during distributed signaling.
* The first level change of each data chunk raises or falls from 0-level
* (unmodulated carrier), so the threshold for this bit is only a quarter of the
* last received change.
@@ -418,7 +418,7 @@ void fsk_fm_demod(fsk_fm_demod_t *fsk, int16_t *samples, int length)
bit_time_uncorrected = fsk->bit_time_uncorrected;
bit_count = fsk->bit_count;
/* process signalling block, sample by sample */
/* process signaling block, sample by sample */
for (i = 0; i < length; i++) {
spl[pos++] = samples[i];
if (pos == len)
@@ -431,7 +431,7 @@ void fsk_fm_demod(fsk_fm_demod_t *fsk, int16_t *samples, int length)
#endif
find_change(fsk);
} else {
/* in distributed signalling, measure over 5 bits, but ignore 5th bit.
/* in distributed signaling, measure over 5 bits, but ignore 5th bit.
* also reset next_bit, as soon as we reach the window */
/* note that we start from 0.5, because we detect change 0.5 bits later,

2
src/cnetz/fsk_fm_demod.h
View File

@@ -27,7 +27,7 @@ typedef struct fsk_fm_demod {
int level_threshold; /* threshold for detection of next level change */
double bits_per_sample; /* duration of one sample in bits */
double next_bit; /* count time to detect bits */
int bit_count; /* counts bits, to match 4 bits at distributed signalling */
int bit_count; /* counts bits, to match 4 bits at distributed signaling */
int last_change_positive; /* flags last level change direction */
enum fsk_sync sync; /* set, if we are in sync and what polarity we receive */
double sync_level; /* what was the level, when we received the sync */

2
src/cnetz/main.c
View File

@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "*******************************************************************************\n");
fprintf(stderr, "I strongly suggest to let me do pre- and de-emphasis (options -E -e)!\n");
fprintf(stderr, "Use a transmitter/receiver without emphasis and let me do that!\n");
fprintf(stderr, "Because carrier FSK signalling and scrambled voice (default) does not use\n");
fprintf(stderr, "Because carrier FSK signaling and scrambled voice (default) does not use\n");
fprintf(stderr, "emphasis, I like to control emphasis by myself for best results.\n");
fprintf(stderr, "*******************************************************************************\n");
}

6
src/cnetz/telegramm.c
View File

@@ -1522,7 +1522,7 @@ selected:
switch (cnetz->dsp_mode) {
case DSP_MODE_OGK:
if (definition_opcode[opcode].block != BLOCK_R && definition_opcode[opcode].block != BLOCK_M) {
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used OgK channel signalling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used OgK channel signaling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
return;
}
/* determine block by last timeslot sent and by message type */
@@ -1533,14 +1533,14 @@ selected:
break;
case DSP_MODE_SPK_K:
if (definition_opcode[opcode].block != BLOCK_K) {
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used for concentrated signalling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used for concentrated signaling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
return;
}
cnetz_receive_telegramm_spk_k(cnetz, &telegramm);
break;
case DSP_MODE_SPK_V:
if (definition_opcode[opcode].block != BLOCK_V) {
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used for distributed signalling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm that is not used for distributed signaling, ignoring! (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
return;
}
cnetz_receive_telegramm_spk_v(cnetz, &telegramm);