cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

Indexing tables by casting index to unsigned integer only

This commit is contained in:
Andreas Eversberg 2017-01-24 07:59:09 +01:00
parent 23a42aeb2c
commit 538a959128
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/amps/dsp.c
View File

@ -316,7 +316,7 @@ static int fsk_encode(amps_t *amps, char bit)
if ((last & 1)) { if ((last & 1)) {
/* last bit was 1, this bit is 1, so we ramp down first */ /* last bit was 1, this bit is 1, so we ramp down first */
do { do {
*spl++ = ramp_down[(int)phase]; *spl++ = ramp_down[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -330,7 +330,7 @@ static int fsk_encode(amps_t *amps, char bit)
} }
/* ramp up */ /* ramp up */
do { do {
*spl++ = ramp_up[(int)phase]; *spl++ = ramp_up[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -345,14 +345,14 @@ static int fsk_encode(amps_t *amps, char bit)
} else { } else {
/* last bit was 0, this bit is 0, so we ramp up first */ /* last bit was 0, this bit is 0, so we ramp up first */
do { do {
*spl++ = ramp_up[(int)phase]; *spl++ = ramp_up[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
} }
/* ramp down */ /* ramp down */
do { do {
*spl++ = ramp_down[(int)phase]; *spl++ = ramp_down[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -441,7 +441,7 @@ static void sat_encode(amps_t *amps, int16_t *samples, int length)
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
sample = *samples; sample = *samples;
sample += dsp_sine_sat[((uint8_t)phase) & 0xff]; sample += dsp_sine_sat[(uint8_t)phase];
if (sample > 32767) if (sample > 32767)
sample = 32767; sample = 32767;
else if (sample < -32767) else if (sample < -32767)
@ -464,7 +464,7 @@ static void test_tone_encode(amps_t *amps, int16_t *samples, int length)
phase = amps->test_phase256; phase = amps->test_phase256;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
*samples++ = dsp_sine_test[((uint8_t)phase) & 0xff]; *samples++ = dsp_sine_test[(uint8_t)phase];
phase += phaseshift; phase += phaseshift;
if (phase >= 256) if (phase >= 256)
phase -= 256; phase -= 256;

16
src/anetz/dsp.c
View File

@ -254,10 +254,10 @@ static void fsk_paging_tone(anetz_t *anetz, int16_t *samples, int length)
} }
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
sample = (int32_t)dsp_sine_tone[((uint8_t)phase[0]) & 0xff] sample = (int32_t)dsp_sine_tone[(uint8_t)phase[0]]
+ (int32_t)dsp_sine_tone[((uint8_t)phase[1]) & 0xff] + (int32_t)dsp_sine_tone[(uint8_t)phase[1]]
+ (int32_t)dsp_sine_tone[((uint8_t)phase[2]) & 0xff] + (int32_t)dsp_sine_tone[(uint8_t)phase[2]]
+ (int32_t)dsp_sine_tone[((uint8_t)phase[3]) & 0xff]; + (int32_t)dsp_sine_tone[(uint8_t)phase[3]];
*samples++ = sample / 4.0 * anetz->page_gain; *samples++ = sample / 4.0 * anetz->page_gain;
phase[0] += phaseshift[0]; phase[0] += phaseshift[0];
phase[1] += phaseshift[1]; phase[1] += phaseshift[1];
@ -300,12 +300,12 @@ static void fsk_paging_tone_sequence(anetz_t *anetz, int16_t *samples, int lengt
while (length) { while (length) {
/* use tone, but during transition of tones, keep phase 0 degrees (high level) until next tone reaches 0 degrees (high level) */ /* use tone, but during transition of tones, keep phase 0 degrees (high level) until next tone reaches 0 degrees (high level) */
if (!transition) if (!transition)
*samples++ = dsp_sine_tone[((uint8_t)phase[tone]) & 0xff] * anetz->page_gain; *samples++ = dsp_sine_tone[(uint8_t)phase[tone]] * anetz->page_gain;
else { else {
/* fade between old an new tone */ /* fade between old an new tone */
*samples++ *samples++
= (double)dsp_sine_tone[((uint8_t)phase[(tone - 1) & 3]) & 0xff] * (double)(transition - count) / (double)transition / 2.0 * anetz->page_gain = (double)dsp_sine_tone[(uint8_t)phase[(tone - 1) & 3]] * (double)(transition - count) / (double)transition / 2.0 * anetz->page_gain
+ (double)dsp_sine_tone[((uint8_t)phase[tone]) & 0xff] * (double)count / (double)transition / 2.0 * anetz->page_gain; + (double)dsp_sine_tone[(uint8_t)phase[tone]] * (double)count / (double)transition / 2.0 * anetz->page_gain;
} }
phase[0] += phaseshift[0]; phase[0] += phaseshift[0];
phase[1] += phaseshift[1]; phase[1] += phaseshift[1];
@ -350,7 +350,7 @@ static void fsk_tone(anetz_t *anetz, int16_t *samples, int length)
phase = anetz->tone_phase256; phase = anetz->tone_phase256;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
*samples++ = dsp_sine_tone[((uint8_t)phase) & 0xff]; *samples++ = dsp_sine_tone[(uint8_t)phase];
phase += phaseshift; phase += phaseshift;
if (phase >= 256) if (phase >= 256)
phase -= 256; phase -= 256;

4
src/bnetz/dsp.c
View File

@ -317,7 +317,7 @@ static void fsk_tone(bnetz_t *bnetz, int16_t *samples, int length, int tone)
phaseshift = bnetz->phaseshift256[tone]; phaseshift = bnetz->phaseshift256[tone];
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
*samples++ = dsp_sine[((uint8_t)phase) & 0xff]; *samples++ = dsp_sine[(uint8_t)phase];
phase += phaseshift; phase += phaseshift;
if (phase >= 256) if (phase >= 256)
phase -= 256; phase -= 256;
@ -351,7 +351,7 @@ next_telegramm:
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
phaseshift = bnetz->phaseshift256[telegramm[i] == '1']; phaseshift = bnetz->phaseshift256[telegramm[i] == '1'];
for (j = 0; j < bnetz->samples_per_bit; j++) { for (j = 0; j < bnetz->samples_per_bit; j++) {
*spl++ = dsp_sine[((uint8_t)phase) & 0xff]; *spl++ = dsp_sine[(uint8_t)phase];
phase += phaseshift; phase += phaseshift;
if (phase >= 256) if (phase >= 256)
phase -= 256; phase -= 256;

28
src/cnetz/dsp.c
View File

@ -253,12 +253,12 @@ static int fsk_testtone_encode(cnetz_t *cnetz)
/* add 198 bits of test tone */ /* add 198 bits of test tone */
for (i = 0; i < 99; i++) { for (i = 0; i < 99; i++) {
do { do {
*spl++ = ramp_up[(int)phase]; *spl++ = ramp_up[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
do { do {
*spl++ = ramp_down[(int)phase]; *spl++ = ramp_down[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -346,14 +346,14 @@ static int fsk_block_encode(cnetz_t *cnetz, const char *bits)
if (bits[i] == '1') { if (bits[i] == '1') {
/* ramp up from 0 */ /* ramp up from 0 */
do { do {
*spl++ = ramp_up[(int)phase] / 2 + deviation / 2; *spl++ = ramp_up[(uint8_t)phase] / 2 + deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
} else { } else {
/* ramp down from 0 */ /* ramp down from 0 */
do { do {
*spl++ = ramp_down[(int)phase] / 2 - deviation / 2; *spl++ = ramp_down[(uint8_t)phase] / 2 - deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -370,7 +370,7 @@ static int fsk_block_encode(cnetz_t *cnetz, const char *bits)
} else { } else {
/* ramp down */ /* ramp down */
do { do {
*spl++ = ramp_down[(int)phase]; *spl++ = ramp_down[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -380,7 +380,7 @@ static int fsk_block_encode(cnetz_t *cnetz, const char *bits)
if (bits[i] == '1') { if (bits[i] == '1') {
/* ramp up */ /* ramp up */
do { do {
*spl++ = ramp_up[(int)phase]; *spl++ = ramp_up[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -400,14 +400,14 @@ static int fsk_block_encode(cnetz_t *cnetz, const char *bits)
if (last == '0') { if (last == '0') {
/* ramp up to 0 */ /* ramp up to 0 */
do { do {
*spl++ = ramp_up[(int)phase] / 2 - deviation / 2; *spl++ = ramp_up[(uint8_t)phase] / 2 - deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
} else { } else {
/* ramp down to 0 */ /* ramp down to 0 */
do { do {
*spl++ = ramp_down[(int)phase] / 2 + deviation / 2; *spl++ = ramp_down[(uint8_t)phase] / 2 + deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -481,14 +481,14 @@ static int fsk_distributed_encode(cnetz_t *cnetz, const char *bits)
if (bits[i * 4 + j] == '1') { if (bits[i * 4 + j] == '1') {
/* ramp up from 0 */ /* ramp up from 0 */
do { do {
*spl++ = ramp_up[(int)phase] / 2 + deviation / 2; *spl++ = ramp_up[(uint8_t)phase] / 2 + deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
} else { } else {
/* ramp down from 0 */ /* ramp down from 0 */
do { do {
*spl++ = ramp_down[(int)phase] / 2 - deviation / 2; *spl++ = ramp_down[(uint8_t)phase] / 2 - deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -505,7 +505,7 @@ static int fsk_distributed_encode(cnetz_t *cnetz, const char *bits)
} else { } else {
/* ramp down */ /* ramp down */
do { do {
*spl++ = ramp_down[(int)phase]; *spl++ = ramp_down[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -515,7 +515,7 @@ static int fsk_distributed_encode(cnetz_t *cnetz, const char *bits)
if (bits[i * 4 + j] == '1') { if (bits[i * 4 + j] == '1') {
/* ramp up */ /* ramp up */
do { do {
*spl++ = ramp_up[(int)phase]; *spl++ = ramp_up[(uint8_t)phase];
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
@ -535,14 +535,14 @@ static int fsk_distributed_encode(cnetz_t *cnetz, const char *bits)
if (last == '0') { if (last == '0') {
/* ramp up to 0 */ /* ramp up to 0 */
do { do {
*spl++ = ramp_up[(int)phase] / 2 - deviation / 2; *spl++ = ramp_up[(uint8_t)phase] / 2 - deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;
} else { } else {
/* ramp down to 0 */ /* ramp down to 0 */
do { do {
*spl++ = ramp_down[(int)phase] / 2 + deviation / 2; *spl++ = ramp_down[(uint8_t)phase] / 2 + deviation / 2;
phase += bitstep; phase += bitstep;
} while (phase < 256.0); } while (phase < 256.0);
phase -= 256.0; phase -= 256.0;

6
src/nmt/dsp.c
View File

@ -512,7 +512,7 @@ int fsk_render_frame(nmt_t *nmt, const char *frame, int length, int16_t *sample)
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
bit = (frame[i] == '1'); bit = (frame[i] == '1');
do { do {
*sample++ = dsp_tone_bit[polarity][bit][((uint8_t)phase) & 0xff]; *sample++ = dsp_tone_bit[polarity][bit][(uint8_t)phase];
count++; count++;
phase += phaseshift; phase += phaseshift;
} while (phase < 256.0); } while (phase < 256.0);
@ -586,7 +586,7 @@ static void super_encode(nmt_t *nmt, int16_t *samples, int length)
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
sample = *samples; sample = *samples;
sample += dsp_sine_super[((uint8_t)phase) & 0xff]; sample += dsp_sine_super[(uint8_t)phase];
if (sample > 32767) if (sample > 32767)
sample = 32767; sample = 32767;
else if (sample < -32767) else if (sample < -32767)
@ -610,7 +610,7 @@ static void dial_tone(nmt_t *nmt, int16_t *samples, int length)
phase = nmt->dial_phase256; phase = nmt->dial_phase256;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
*samples++ = dsp_sine_dialtone[((uint8_t)phase) & 0xff]; *samples++ = dsp_sine_dialtone[(uint8_t)phase];
phase += phaseshift; phase += phaseshift;
if (phase >= 256) if (phase >= 256)
phase -= 256; phase -= 256;