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

Fixed typos in cli output and source code comments

Browse Source
This commit is contained in:
Martin Hauke
2021-01-01 22:11:48 +01:00
committed by Andreas Eversberg
parent 97636aac1e
commit a07764f0d9
79 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/amps/amps.h
View File

@@ -89,12 +89,12 @@ struct amps {
int fsk_rx_sync_tolerant; /* be more tolerant to sync */
/* the dotting buffer stores the elapsed samples, so we can calculate
* an average time of zero-crossings during dotting sequence.
* this buffer wrapps every 256 values */
* this buffer wrpps every 256 values */
double fsk_rx_dotting_elapsed[256]; /* dotting buffer with elapsed samples since last zero-crossing */
uint8_t fsk_rx_dotting_pos; /* position of next value in dotting buffer */
int fsk_rx_dotting_life; /* counter to expire when no sync was found after dotting */
double fsk_rx_dotting_average; /* last average slope position of dotting sequnece. */
/* the ex buffer holds the duration of one bit, and wrapps every
/* the ex buffer holds the duration of one bit, and wraps every
* bit. */
double fsk_rx_bitcount; /* counts the bit. if it reaches or exceeds 1, the bit is complete and the next bit starts */
sample_t *fsk_rx_window; /* rx buffer for one bit */
@@ -103,7 +103,7 @@ struct amps {
int fsk_rx_window_begin; /* where to begin detecting level */
int fsk_rx_window_end; /* where to end detecting level */
int fsk_rx_window_pos; /* current position in buffer */
/* the rx bufffer received one frame until rx length */
/* the rx buffer received one frame until rx length */
char fsk_rx_frame[FSK_MAX_BITS + 1]; /* +1 because 0-termination */
int fsk_rx_frame_length; /* length of expected frame */
int fsk_rx_frame_count; /* count number of received bit */
@@ -123,7 +123,7 @@ struct amps {
char rx_recc_dialing[33]; /* received dial string */
/* FOCC frame states */
int rx_focc_word_count; /* counts received words */
int tx_focc_frame_count; /* used to schedule system informations */
int tx_focc_frame_count; /* used to schedule system information */
int tx_focc_send; /* if set, send message words */
uint32_t tx_focc_min1; /* mobile id */
uint16_t tx_focc_min2;
@@ -131,8 +131,8 @@ struct amps {
uint8_t tx_focc_msg_type; /* message (3 values) */
uint8_t tx_focc_ordq;
uint8_t tx_focc_order;
int tx_focc_word_count; /* counts transmitted words in a muli word message */
int tx_focc_word_repeat; /* countrs repeats of mulit word message */
int tx_focc_word_count; /* counts transmitted words in a multi word message */
int tx_focc_word_repeat; /* counts repeats of multi word message */
/* FVC frame states */
int tx_fvc_send; /* if set, send message words */
int tx_fvc_chan; /* channel to assign for voice call */

6
src/amps/dsp.c
View File

@@ -22,7 +22,7 @@
*
* AMPS modulates the carrier frequency. If it is 8 kHz above, it is high level,
* if it is 8 kHz below, it is low level. The bits are coded using Manchester
* code. A 1 is coded by low level, followed by a hight level. A 0 is coded by
* code. A 1 is coded by low level, followed by a high level. A 0 is coded by
* a high level, followed by a low level. This will cause at least one level
* change within each bit. Also the level changes between equal bits, see
* Manchester coding. The bit rate is 10 KHz.
@@ -239,7 +239,7 @@ int dsp_init_sender(amps_t *amps, int tolerant)
}
amps->fsk_rx_window = spl;
/* create devation and ramp */
/* create deviation and ramp */
amps->fsk_deviation = (!tacs) ? AMPS_FSK_DEVIATION : TACS_FSK_DEVIATION;
dsp_init_ramp(amps);
@@ -508,7 +508,7 @@ static void fsk_rx_bit(amps_t *amps, sample_t *spl, int len, int pos, int begin,
int bit;
double max = 0, min = 0;
/* decode one bit. substact the first half from the second half.
/* decode one bit. subtract the first half from the second half.
* the result shows the direction of the bit change: 1 == positive.
*/
pos -= begin; /* possible wrap is handled below */

8
src/amps/frame.c
View File

@@ -2136,7 +2136,7 @@ struct amps_ie_desc amps_ie_desc[] = {
{ AMPS_IE_AUTH, "AUTH", "Support of authentication procedures described in TIA/EIA-136-510", ie_yes },
{ AMPS_IE_AUTHBS, "AUTHBS", "Output response of the authentication algorithm initiated by the Base Station Challenge Order", ie_hex },
{ AMPS_IE_AUTHR, "AUTHR", "Output response of the authentication algorithm", ie_hex },
{ AMPS_IE_AUTHU, "AUTHU", "Output of the authentication algorithm when responsing to a Unique Challenge Order", ie_hex },
{ AMPS_IE_AUTHU, "AUTHU", "Output of the authentication algorithm when responding to a Unique Challenge Order", ie_hex },
{ AMPS_IE_Acked_Data, "Acked Data", "Used to identidy the selected privacy mode for a data/fax call", ie_acked_data },
{ AMPS_IE_Async_Data, "Async Data", "Async Data is supported on the current Analog Control Channel", ie_yes },
{ AMPS_IE_BIS, "BIS", "Busy-Idle status field", ie_bis },
@@ -2149,7 +2149,7 @@ struct amps_ie_desc amps_ie_desc[] = {
{ AMPS_IE_CHARACTER_3, "CHARACTER 3", "ASCII Character", ie_ascii },
{ AMPS_IE_CMAC, "CMAC", "Control mobile attenuation field", ie_cmac },
{ AMPS_IE_CMAX_1, "CMAX-1", "CMAX is the number of access channels in the system", ie_cmax },
{ AMPS_IE_COUNT, "COUNT", "A modulo-64 count for authenticaiton", NULL },
{ AMPS_IE_COUNT, "COUNT", "A modulo-64 count for authentication", NULL },
{ AMPS_IE_CPA, "CPA", "Combined paging/access field", ie_yes },
{ AMPS_IE_CPN_RL, "CPN_RL", "Number of Characters in Calling Party Number", NULL },
{ AMPS_IE_CRC, "CRC", "Identifies used CRC", ie_crc },
@@ -3192,7 +3192,7 @@ static int amps_decode_word_recc(amps_t *amps, uint64_t word, int first)
}
amps->rx_recc_nawc--;
if (amps->rx_recc_nawc != nawc) {
PDEBUG_CHAN(DFRAME, DEBUG_NOTICE, "Received additional word with NAWC missmatch!\n");
PDEBUG_CHAN(DFRAME, DEBUG_NOTICE, "Received additional word with NAWC mismatch!\n");
}
}
@@ -3661,7 +3661,7 @@ static int amps_decode_bits_recc(amps_t *amps, const char *bits, int first)
if (debuglevel == DEBUG_DEBUG || crc_ok_count > 0) {
PDEBUG_CHAN(DFRAME, DEBUG_INFO, "RX RECC: DCC=%d (%d of 5 CRCs are ok)\n", dcc, crc_ok_count);
if (dcc != amps->si.dcc) {
PDEBUG(DFRAME, DEBUG_INFO, "received DCC=%d missmatches the base station's DCC=%d\n", dcc, amps->si.dcc);
PDEBUG(DFRAME, DEBUG_INFO, "received DCC=%d mismatches the base station's DCC=%d\n", dcc, amps->si.dcc);
return 0;
}
}

10
src/amps/sysinfo.c
View File

@@ -56,7 +56,7 @@ void init_sysinfo(amps_si *si, int cmac, int vmac, int dtx, int dcc, int sid1, i
/* all words */
si->dcc = dcc;
/* VC assginment */
/* VC assignment */
si->vmac = vmac;
/* filler */
@@ -100,15 +100,15 @@ void init_sysinfo(amps_si *si, int cmac, int vmac, int dtx, int dcc, int sid1, i
for (i = 0; i < 16; i++)
si->overload.olc[i] = 1;
/* Acces Tyoe */
/* Access Tyoe */
/* 'bis' must be 0, so the phone does not wait for busy bit.
* We cannot respond with B/I fast enough due to processing delay.
* So we don't set the B/I bit to busy on reception of message.
* The access type message (including this 'bis') must also be included.
*/
si->acc_type.bis = bis; /* must be clear to ignore B/I bit */
si->acc_type.pci_home = 0; /* if set, bscap must allso be set */
si->acc_type.pci_roam = 0; /* if set, bscap must allso be set */
si->acc_type.pci_home = 0; /* if set, bscap must also be set */
si->acc_type.pci_roam = 0; /* if set, bscap must also be set */
si->acc_type.bspc = 0;
si->acc_type.bscap = 0;
@@ -145,7 +145,7 @@ void prepare_sysinfo(amps_si *si)
si->num = i; /* train is running */
si->count = 0; /* first message in train */
if (i > (int)(sizeof(si->type) / sizeof(si->type[0]))) {
fprintf(stderr, "si type array overflow, pleas fix!\n");
fprintf(stderr, "si type array overflow, please fix!\n");
abort();
}
}

4
src/amps/sysinfo.h
View File

@@ -63,7 +63,7 @@ struct sysinfo_overload {
uint8_t olc[16];
};
/* Acces Tyoe */
/* Access Tyoe */
struct sysinfo_acc_type {
uint8_t bis;
uint8_t pci_home;
@@ -90,7 +90,7 @@ typedef struct system_information {
int overhead_repeat;
/* all words */
uint8_t dcc;
/* VC assginment */
/* VC assignment */
uint8_t vmac;
/* broadcast */
struct sysinfo_filler filler;

8
src/amps/transaction.c
View File

@@ -65,7 +65,7 @@ static const char *trans_state_name(int state)
case TRANS_PAGE_REPLY:
return "PAGE REPLY";
default:
return "<invald transaction state>";
return "<invalid transaction state>";
}
}
@@ -98,7 +98,7 @@ const char *trans_short_state_name(int state)
case TRANS_PAGE_REPLY:
return "PAGE";
default:
return "<invald transaction state>";
return "<invalid transaction state>";
}
}
@@ -109,7 +109,7 @@ transaction_t *create_transaction(amps_t *amps, enum amps_trans_state state, uin
transaction_t *trans = NULL;
amps_t *search_amps;
/* search transaction for this subsriber */
/* search transaction for this subscriber */
for (sender = sender_head; sender; sender = sender->next) {
search_amps = (amps_t *) sender;
/* search transaction for this callref */
@@ -121,7 +121,7 @@ transaction_t *create_transaction(amps_t *amps, enum amps_trans_state state, uin
const char *number = amps_min2number(trans->min1, trans->min2);
int old_callref = trans->callref;
amps_t *old_amps = trans->amps;
PDEBUG(DTRANS, DEBUG_NOTICE, "Found alredy pending transaction for subscriber '%s', deleting!\n", number);
PDEBUG(DTRANS, DEBUG_NOTICE, "Found already pending transaction for subscriber '%s', deleting!\n", number);
destroy_transaction(trans);
if (old_amps) /* should be... */
amps_go_idle(old_amps);