xiretza/splink
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vhdl: reorganize receive FSM to avoid ghdl issues

Browse source 
https://github.com/ghdl/ghdl/issues/2077
https://github.com/ghdl/ghdl/issues/2078
This commit is contained in:
Xiretza 2022-06-06 15:24:49 +02:00
parent 40caa85d92
commit 4d07ec3fa1
1 changed files with 57 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
vhdl/splink.vhdl
View file

@ -34,6 +34,14 @@ architecture a of splink is
type led_data_arr_t is array(0 to NUM_STRANDS-1) of led_data_t; type led_data_arr_t is array(0 to NUM_STRANDS-1) of led_data_t;
signal led_data_arr : led_data_arr_t; signal led_data_arr : led_data_arr_t;
signal active_strand: natural range 0 to NUM_STRANDS-1;
signal num_pixels: natural range 1 to MAX_STRAND_LEN;
signal frame_number: unsigned(31 downto 0);
signal pixels_received: natural range 0 to MAX_STRAND_LEN-1;
type receive_state_t is (FRAME_NUM, STRAND_NUM, DATA, DROP);
signal receive_state : receive_state_t;
begin begin
driver_gen: for i in 0 to NUM_STRANDS-1 generate driver_gen: for i in 0 to NUM_STRANDS-1 generate
ws2812_inst: entity work.ws2812 ws2812_inst: entity work.ws2812
@ -61,66 +69,78 @@ begin
dout => drivers(i) dout => drivers(i)
); );
writer: process(clk)
type strand_store_t is array(0 to MAX_STRAND_LEN-1) of color_t;
variable strand_store: strand_store_t;
begin
if rising_edge(clk) then
led_data_arr(i).current_color <= strand_store(to_integer(unsigned(led_data_arr(i).addr)));
if udp_valid = '1' and receive_state = DATA and active_strand = i then
strand_store(pixels_received) := udp_data(23 downto 0);
if pixels_received = num_pixels - 1 and udp_last = '1' then
led_data_arr(i).was_written <= '1';
end if;
end if;
if frame_done then
led_data_arr(i).was_written <= '0';
end if;
end if;
end process;
end generate; end generate;
writer: process(clk) process(led_data_arr)
type strand_store_t is array(0 to MAX_STRAND_LEN-1) of color_t; begin
type strand_stores_t is array(0 to NUM_STRANDS-1) of strand_store_t; frame_done <= '1';
variable strand_stores: strand_stores_t;
variable active_strand: natural range 0 to NUM_STRANDS-1; for i in 0 to NUM_STRANDS-1 loop
variable packet_len: natural range 1 to MAX_STRAND_LEN; if not led_data_arr(i).was_written then
variable frame_number: unsigned(31 downto 0); frame_done <= '0';
variable store_counter: natural range 0 to MAX_STRAND_LEN-1; end if;
end loop;
end process;
type receive_state_t is (FRAME_NUM, STRAND_NUM, DATA, DROP); fsm: process(clk)
variable receive_state : receive_state_t;
begin begin
if rising_edge(clk) then if rising_edge(clk) then
frame_done <= '0'; if reset then
receive_state <= STRAND_NUM;
elsif udp_valid then
if udp_last then
-- always resynchronize to start of packet
receive_state <= STRAND_NUM;
end if;
for i in 0 to NUM_STRANDS-1 loop
led_data_arr(i).current_color <= strand_stores(i)(to_integer(unsigned(led_data_arr(i).addr)));
end loop;
if udp_valid then
case receive_state is case receive_state is
when STRAND_NUM => when STRAND_NUM =>
-- TODO udp_length, range check with MAX_STRAND_LEN -- TODO udp_length, range check with MAX_STRAND_LEN
packet_len := MAX_STRAND_LEN; num_pixels <= MAX_STRAND_LEN;
-- FIXME bounds check -- FIXME bounds check
active_strand := to_integer(unsigned(udp_data)); active_strand <= to_integer(unsigned(udp_data));
receive_state := FRAME_NUM; receive_state <= FRAME_NUM;
when FRAME_NUM => when FRAME_NUM =>
frame_number := unsigned(udp_data); frame_number <= unsigned(udp_data);
store_counter := 0; pixels_received <= 0;
receive_state := DATA; receive_state <= DATA;
when DATA => when DATA =>
strand_stores(active_strand)(store_counter) := udp_data(23 downto 0); if pixels_received /= num_pixels - 1 then
pixels_received <= pixels_received + 1;
if store_counter = packet_len then elsif not udp_last then
if udp_last then -- packet too long
--led_data_arr(active_strand).was_written <= '1'; receive_state <= DROP;
else
-- packet too long
receive_state := DROP;
end if;
else
store_counter := store_counter + 1;
end if; end if;
when DROP => when DROP =>
-- wait until udp_last -- wait until udp_last
end case; end case;
if udp_last then
receive_state := STRAND_NUM;
end if;
end if; end if;
end if; end if;
end process; end process;