mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-17 03:07:24 -05:00
Fix M17 Enc Type Values;
This commit is contained in:
@@ -2566,12 +2566,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
|
|
||||||
//fill in any extra info, like Meta (IV, etc)
|
//fill in any extra info, like Meta (IV, etc)
|
||||||
if (state->m17_enc == 2)
|
if (state->m17_enc == 1)
|
||||||
{
|
{
|
||||||
printw (" Scrambler - Type: %d", state->m17_enc_st);
|
printw (" Scrambler - Type: %d", state->m17_enc_st);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->m17_enc == 1)
|
if (state->m17_enc == 2)
|
||||||
{
|
{
|
||||||
printw (" AES-CTR - IV: ");
|
printw (" AES-CTR - IV: ");
|
||||||
//display packed meta as IV
|
//display packed meta as IV
|
||||||
|
|||||||
@@ -158,8 +158,6 @@ void M17decodeLSF(dsd_state * state)
|
|||||||
fprintf (stderr, " CAN: %d", lsf_cn);
|
fprintf (stderr, " CAN: %d", lsf_cn);
|
||||||
M17decodeCSD(state, lsf_dst, lsf_src);
|
M17decodeCSD(state, lsf_dst, lsf_src);
|
||||||
|
|
||||||
if (lsf_et != 0) fprintf (stderr, " ENC");
|
|
||||||
|
|
||||||
if (lsf_dt == 0) fprintf (stderr, " Reserved");
|
if (lsf_dt == 0) fprintf (stderr, " Reserved");
|
||||||
if (lsf_dt == 1) fprintf (stderr, " Data");
|
if (lsf_dt == 1) fprintf (stderr, " Data");
|
||||||
if (lsf_dt == 2) fprintf (stderr, " Voice (3200bps)");
|
if (lsf_dt == 2) fprintf (stderr, " Voice (3200bps)");
|
||||||
@@ -167,8 +165,9 @@ void M17decodeLSF(dsd_state * state)
|
|||||||
|
|
||||||
if (lsf_rs != 0) fprintf (stderr, " RS: %02X", lsf_rs);
|
if (lsf_rs != 0) fprintf (stderr, " RS: %02X", lsf_rs);
|
||||||
|
|
||||||
if (lsf_et == 1) fprintf (stderr, " AES-CTR");
|
if (lsf_et != 0) fprintf (stderr, " ENC:");
|
||||||
if (lsf_et == 2) fprintf (stderr, " Scrambler - %d", lsf_es);
|
if (lsf_et == 2) fprintf (stderr, " AES-CTR");
|
||||||
|
if (lsf_et == 1) fprintf (stderr, " Scrambler - %d", lsf_es);
|
||||||
|
|
||||||
state->m17_enc = lsf_et;
|
state->m17_enc = lsf_et;
|
||||||
state->m17_enc_st = lsf_es;
|
state->m17_enc_st = lsf_es;
|
||||||
|
|||||||
Reference in New Issue
Block a user