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

Transcode fourth digit of TACS phone number correctly, if it is 0.

Browse Source
This commit is contained in:
Andreas Eversberg
2018-04-19 21:08:45 +02:00
parent 49050eff90
commit 32cefbbffc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amps/amps.c
View File

@@ -209,7 +209,7 @@ void amps_number2min(const char *number, uint32_t *min1, uint16_t *min2)
*min1 |= digit2binary(number[4]) * 100 + digit2binary(number[5]) * 10 + digit2binary(number[6]) - 111; *min1 |= digit2binary(number[4]) * 100 + digit2binary(number[5]) * 10 + digit2binary(number[6]) - 111;
} else { } else {
/* MIN1 */ /* MIN1 */
*min1 = (number[0] - '0') << 20; *min1 = digit2binary(number[0]) << 20;
*min1 |= (digit2binary(number[1]) * 100 + digit2binary(number[2]) * 10 + digit2binary(number[3]) - 111) << 10; *min1 |= (digit2binary(number[1]) * 100 + digit2binary(number[2]) * 10 + digit2binary(number[3]) - 111) << 10;
*min1 |= digit2binary(number[4]) * 100 + digit2binary(number[5]) * 10 + digit2binary(number[6]) - 111; *min1 |= digit2binary(number[4]) * 100 + digit2binary(number[5]) * 10 + digit2binary(number[6]) - 111;
} }
@@ -262,10 +262,10 @@ const char *amps_min12number(uint32_t min1)
} }
} else { } else {
/* MIN1 */ /* MIN1 */
if ((min1 >> 20) > 9) if ((min1 >> 20) < 1 || (min1 >> 20) > 10)
number[0] = '?'; number[0] = '?';
else else
number[0] = '0' + (min1 >> 20); number[0] = binary2digit(min1 >> 20);
if (((min1 >> 10) & 0x3ff) > 999) if (((min1 >> 10) & 0x3ff) > 999)
strcpy(number + 1, "???"); strcpy(number + 1, "???");
else { else {