Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed modcods not in Table 5 and 12 #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
removed modcods not in Table 5 and 12
Modcods not in Table 5 and Table 12 have been removed from the cfg creation case statements. Here are the specifics.
1) Short frames do not use the 9/10 rate, so that rate was removed for all short frame entries.
2) 8PSK uses 6 of the 11 rates. Unused rates were removed from both short and normal frame entries.
3) 16APSK uses 6 of the 11 rates. Unused rates were removed from both short and normal frame entries.
4) 32APSK uses 5 of the 11 rates. Unused rates were removed from both short and normal frame entries.
  • Loading branch information
Abraxas3d authored Oct 21, 2022
commit f11bfec055e79feeba326b3000b74e195c4203fb
120 changes: 42 additions & 78 deletions rtl/inline_config_adapter.vhd
Original file line number Diff line number Diff line change
@@ -77,84 +77,48 @@ architecture inline_config_adapter of inline_config_adapter is
when 16#07# => cfg := (frame_type => fecframe_short, constellation => mod_qpsk, code_rate => C4_5);
when 16#08# => cfg := (frame_type => fecframe_short, constellation => mod_qpsk, code_rate => C5_6);
when 16#09# => cfg := (frame_type => fecframe_short, constellation => mod_qpsk, code_rate => C8_9);
when 16#0a# => cfg := (frame_type => fecframe_short, constellation => mod_qpsk, code_rate => C9_10);
when 16#0b# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C1_4);
when 16#0c# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C1_3);
when 16#0d# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C2_5);
when 16#0e# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C1_2);
when 16#0f# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C3_5);
when 16#10# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C2_3);
when 16#11# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C3_4);
when 16#12# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C4_5);
when 16#13# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C5_6);
when 16#14# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C8_9);
when 16#15# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C9_10);
when 16#16# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C1_4);
when 16#17# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C1_3);
when 16#18# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C2_5);
when 16#19# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C1_2);
when 16#1a# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C3_5);
when 16#1b# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C2_3);
when 16#1c# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C3_4);
when 16#1d# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C4_5);
when 16#1e# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C5_6);
when 16#1f# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C8_9);
when 16#20# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C9_10);
when 16#21# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C1_4);
when 16#22# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C1_3);
when 16#23# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C2_5);
when 16#24# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C1_2);
when 16#25# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C3_5);
when 16#26# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C2_3);
when 16#27# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C3_4);
when 16#28# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C4_5);
when 16#29# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C5_6);
when 16#2a# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C8_9);
when 16#2b# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C9_10);
when 16#2c# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_4);
when 16#2d# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_3);
when 16#2e# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C2_5);
when 16#2f# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_2);
when 16#30# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C3_5);
when 16#31# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C2_3);
when 16#32# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C3_4);
when 16#33# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C4_5);
when 16#34# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C5_6);
when 16#35# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C8_9);
when 16#36# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C9_10);
when 16#37# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C1_4);
when 16#38# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C1_3);
when 16#39# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C2_5);
when 16#3a# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C1_2);
when 16#3b# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C3_5);
when 16#3c# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C2_3);
when 16#3d# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C3_4);
when 16#3e# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C4_5);
when 16#3f# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C5_6);
when 16#40# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C8_9);
when 16#41# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C9_10);
when 16#42# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C1_4);
when 16#43# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C1_3);
when 16#44# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C2_5);
when 16#45# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C1_2);
when 16#46# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C3_5);
when 16#47# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C2_3);
when 16#48# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C3_4);
when 16#49# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C4_5);
when 16#4a# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C5_6);
when 16#4b# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C8_9);
when 16#4c# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C9_10);
when 16#4d# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C1_4);
when 16#4e# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C1_3);
when 16#4f# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C2_5);
when 16#50# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C1_2);
when 16#51# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C3_5);
when 16#52# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C2_3);
when 16#53# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C3_4);
when 16#54# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C4_5);
when 16#55# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C5_6);
when 16#56# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C8_9);
when 16#57# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C9_10);
when 16#0a# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C3_5);
when 16#0b# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C2_3);
when 16#0c# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C3_4);
when 16#0d# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C5_6);
when 16#0e# => cfg := (frame_type => fecframe_short, constellation => mod_8psk, code_rate => C8_9);
when 16#0f# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C2_3);
when 16#10# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C3_4);
when 16#11# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C4_5);
when 16#12# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C5_6);
when 16#13# => cfg := (frame_type => fecframe_short, constellation => mod_16apsk, code_rate => C8_9);
when 16#14# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C3_4);
when 16#15# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C4_5);
when 16#16# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C5_6);
when 16#17# => cfg := (frame_type => fecframe_short, constellation => mod_32apsk, code_rate => C8_9);
when 16#18# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_4);
when 16#19# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_3);
when 16#1a# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C2_5);
when 16#1b# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C1_2);
when 16#1c# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C3_5);
when 16#1d# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C2_3);
when 16#1e# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C3_4);
when 16#1f# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C4_5);
when 16#20# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C5_6);
when 16#21# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C8_9);
when 16#22# => cfg := (frame_type => fecframe_normal, constellation => mod_qpsk, code_rate => C9_10);
when 16#23# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C3_5);
when 16#24# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C2_3);
when 16#25# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C3_4);
when 16#26# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C5_6);
when 16#27# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C8_9);
when 16#28# => cfg := (frame_type => fecframe_normal, constellation => mod_8psk, code_rate => C9_10);
when 16#29# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C2_3);
when 16#2a# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C3_4);
when 16#2b# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C4_5);
when 16#2c# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C5_6);
when 16#2d# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C8_9);
when 16#2e# => cfg := (frame_type => fecframe_normal, constellation => mod_16apsk, code_rate => C9_10);
when 16#2f# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C3_4);
when 16#30# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C4_5);
when 16#31# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C5_6);
when 16#32# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C8_9);
when 16#33# => cfg := (frame_type => fecframe_normal, constellation => mod_32apsk, code_rate => C9_10);
when others =>
cfg := (unknown, unknown, unknown);
report "Unable to decode TID: " & integer'image(to_integer(unsigned(v)))