URL
https://opencores.org/ocsvn/sata_controller_core/sata_controller_core/trunk
Subversion Repositories sata_controller_core
Compare Revisions
- This comparison shows the changes necessary to convert path
/sata_controller_core/trunk/sata2_fifo_v1_00_a
- from Rev 10 to Rev 7
- ↔ Reverse comparison
Rev 10 → Rev 7
/hdl/vhdl/sata_link_layer.vhd
927,7 → 927,6
prim_type_tx_next <= prim_type_tx; |
FIS_word_count_next <= FIS_word_count; |
tx_sector_count_next <= tx_sector_count; |
tx_charisk_TX_FRAME <= '1'; |
--------------------------------------------------------------------------- |
-- Finite State Machine |
--------------------------------------------------------------------------- |
964,7 → 963,6
|
-- x3 |
when send_FIS => |
tx_charisk_TX_FRAME <= '0'; |
--Send FIS data |
prim_type_tx_next <= FIS; |
-- ALIGN primitives after 256 DWORDS |
982,7 → 980,6
-- Transmit buffer empty condition |
if (tx_fifo_almost_empty = '1') then |
if (align_en_out = '0') then |
tx_charisk_TX_FRAME <= '1'; |
prim_type_tx_next <= HOLD; |
tx_frame_next <= send_HOLD; |
end if; |
995,7 → 992,6
end if; |
if ((tx_sector_count >= conv_std_logic_vector(sector_count, 16)) or (FIS_word_count >= FIS_count_value)) then |
if (align_en_out = '0') then |
tx_charisk_TX_FRAME <= '0'; |
FIS_word_count_next <= (others => '0'); |
tx_fifo_re_next <= '1'; |
prim_type_tx_next <= FIS; |
1082,8 → 1078,9
|
-- ASYNCHRONOUS MUXES |
tx_charisk_RX_FRAME <= '1'; |
--tx_charisk_TX_FRAME <= '0' when (((tx_frame_curr = send_FIS) and (tx_fifo_almost_empty = '0')) or ((tx_frame_curr=send_FIS) and |
-- (tx_fifo_almost_empty = '1') and (master_fsm_curr = H2D_REG_FIS))) else '1'; |
tx_charisk_TX_FRAME <= '0' when (((tx_frame_curr = send_FIS) and (tx_fifo_almost_empty = '0')) or ((tx_frame_curr=send_FIS) and |
(tx_fifo_almost_empty = '1') and (master_fsm_curr = H2D_REG_FIS))) else '1'; |
--tx_charisk_TX_FRAME <= '0' when ((tx_frame_curr = send_FIS) and (tx_fifo_almost_empty = '0')) else '1'; |
--tx_charisk_out <= '0' when ((tx_frame_curr = send_FIS) or (prim_type_tx = PRIM_SCRM)) else tx_charisk_RX_FRAME when (rx_tx_state_sel = '0') else tx_charisk_TX_FRAME; |
tx_charisk_out <= tx_charisk_RX_FRAME when (rx_tx_state_sel = '0') else tx_charisk_TX_FRAME; |
prim_type <= prim_type_rx when (rx_tx_state_sel = '0') else prim_type_tx; |