zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

altera: jesd204_phy: Fix indention issues 

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
main
Lars-Peter Clausen 2017-08-21 13:57:25 +02:00
parent d5eedf8356
commit 4de0a94e37
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
library/altera/jesd204_phy/jesd204_phy_glue_hw.tcl
View File

@ -80,7 +80,7 @@ proc glue_add_if {num name type dir {bcast false}} {
} else { } else {
for {set i 0} {$i < $num} {incr i} { for {set i 0} {$i < $num} {incr i} {
add_interface ${name}_${i} $type $dir add_interface ${name}_${i} $type $dir
} }
} }
add_interface phy_${name} conduit end add_interface phy_${name} conduit end
} }
@ -90,13 +90,13 @@ proc glue_add_if_port {num ifname port role dir width {bcast false}} {
set phy_width [expr $num * $width] set phy_width [expr $num * $width]
if {$dir == "Input"} { if {$dir == "Input"} {
set sig "in" set sig "in"
set phy_dir "Output" set phy_dir "Output"
set phy_sig "out" set phy_sig "out"
} else { } else {
set sig "out" set sig "out"
set phy_dir "Input" set phy_dir "Input"
set phy_sig "in" set phy_sig "in"
} }
if {$bcast} { if {$bcast} {
@ -110,7 +110,7 @@ proc glue_add_if_port {num ifname port role dir width {bcast false}} {
add_interface_port ${ifname}_${i} ${port}_${i} $role $dir $width add_interface_port ${ifname}_${i} ${port}_${i} $role $dir $width
set_port_property ${port}_${i} fragment_list \ set_port_property ${port}_${i} fragment_list \
[format "%s(%d:%d)" $sig [expr $base + $width - 1] $base] [format "%s(%d:%d)" $sig [expr $base + $width - 1] $base]
} }
} }
add_interface_port phy_${ifname} phy_${port} $role $phy_dir $phy_width add_interface_port phy_${ifname} phy_${port} $role $phy_dir $phy_width
@ -118,10 +118,10 @@ proc glue_add_if_port {num ifname port role dir width {bcast false}} {
if {$bcast} { if {$bcast} {
set _frag [format "%s(%d:%d)" $phy_sig [expr $sig_offset + $width - 1] $sig_offset] set _frag [format "%s(%d:%d)" $phy_sig [expr $sig_offset + $width - 1] $sig_offset]
set sig_offset [expr $sig_offset + $width] set sig_offset [expr $sig_offset + $width]
set frag "${_frag}" set frag "${_frag}"
for {set i 1} {$i < $num} {incr i} { for {set i 1} {$i < $num} {incr i} {
set frag [concat ${frag} ${_frag}] set frag [concat ${frag} ${_frag}]
} }
} else { } else {
set frag [format "%s(%d:%d)" $phy_sig [expr $sig_offset + $phy_width - 1] $sig_offset] set frag [format "%s(%d:%d)" $phy_sig [expr $sig_offset + $phy_width - 1] $sig_offset]
set sig_offset [expr $sig_offset + $phy_width] set sig_offset [expr $sig_offset + $phy_width]
@ -135,13 +135,13 @@ proc glue_add_if_port_conduit {num ifname port phy_port dir width} {
set phy_width [expr $num * $width] set phy_width [expr $num * $width]
if {$dir == "Input"} { if {$dir == "Input"} {
set sig "in" set sig "in"
set phy_dir "Output" set phy_dir "Output"
set phy_sig "out" set phy_sig "out"
} else { } else {
set sig "out" set sig "out"
set phy_dir "Input" set phy_dir "Input"
set phy_sig "in" set phy_sig "in"
} }
for {set i 0} {$i < $num} {incr i} { for {set i 0} {$i < $num} {incr i} {
@ -168,7 +168,7 @@ proc glue_add_const_conduit {port width} {
add_interface $ifname conduit end add_interface $ifname conduit end
add_interface_port $ifname $ifname $port Output $width add_interface_port $ifname $ifname $port Output $width
set_port_property $ifname fragment_list [format "const_out(%d:%d)" \ set_port_property $ifname fragment_list [format "const_out(%d:%d)" \
[expr $const_offset + $width - 1] $const_offset] [expr $const_offset + $width - 1] $const_offset]
set const_offset [expr $const_offset + $width] set const_offset [expr $const_offset + $width]
} }
@ -212,20 +212,20 @@ proc jesd204_phy_glue_elab {} {
glue_add_if_port $num_of_lanes tx_serial_clk0 tx_serial_clk0 clk Input 1 true glue_add_if_port $num_of_lanes tx_serial_clk0 tx_serial_clk0 clk Input 1 true
if {$soft_pcs} { if {$soft_pcs} {
set unused_width [expr $num_of_lanes * 88] set unused_width [expr $num_of_lanes * 88]
glue_add_const_conduit tx_enh_data_valid $num_of_lanes glue_add_const_conduit tx_enh_data_valid $num_of_lanes
for {set i 0} {$i < $num_of_lanes} {incr i} { for {set i 0} {$i < $num_of_lanes} {incr i} {
add_interface tx_raw_data_${i} conduit start add_interface tx_raw_data_${i} conduit start
} }
glue_add_if_port_conduit $num_of_lanes tx_raw_data raw_data tx_parallel_data Input 40 glue_add_if_port_conduit $num_of_lanes tx_raw_data raw_data tx_parallel_data Input 40
} else { } else {
set unused_width [expr $num_of_lanes * 92] set unused_width [expr $num_of_lanes * 92]
for {set i 0} {$i < $num_of_lanes} {incr i} { for {set i 0} {$i < $num_of_lanes} {incr i} {
add_interface tx_phy_${i} conduit start add_interface tx_phy_${i} conduit start
} }
glue_add_if_port_conduit $num_of_lanes tx_phy char tx_parallel_data Input 32 glue_add_if_port_conduit $num_of_lanes tx_phy char tx_parallel_data Input 32
glue_add_if_port_conduit $num_of_lanes tx_phy charisk tx_datak Input 4 glue_add_if_port_conduit $num_of_lanes tx_phy charisk tx_datak Input 4
} }
@ -244,12 +244,12 @@ proc jesd204_phy_glue_elab {} {
if {$soft_pcs} { if {$soft_pcs} {
for {set i 0} {$i < $num_of_lanes} {incr i} { for {set i 0} {$i < $num_of_lanes} {incr i} {
add_interface rx_raw_data_${i} conduit start add_interface rx_raw_data_${i} conduit start
} }
glue_add_if_port_conduit $num_of_lanes rx_raw_data raw_data rx_parallel_data Output 40 glue_add_if_port_conduit $num_of_lanes rx_raw_data raw_data rx_parallel_data Output 40
} else { } else {
for {set i 0} {$i < $num_of_lanes} {incr i} { for {set i 0} {$i < $num_of_lanes} {incr i} {
add_interface rx_phy_${i} conduit start add_interface rx_phy_${i} conduit start
} }
glue_add_if_port_conduit $num_of_lanes rx_phy char rx_parallel_data Output 32 glue_add_if_port_conduit $num_of_lanes rx_phy char rx_parallel_data Output 32
glue_add_if_port_conduit $num_of_lanes rx_phy charisk rx_datak Output 4 glue_add_if_port_conduit $num_of_lanes rx_phy charisk rx_datak Output 4
glue_add_if_port_conduit $num_of_lanes rx_phy disperr rx_disperr Output 4 glue_add_if_port_conduit $num_of_lanes rx_phy disperr rx_disperr Output 4
@ -260,7 +260,7 @@ proc jesd204_phy_glue_elab {} {
add_interface const_out conduit end add_interface const_out conduit end
add_interface_port const_out const_out const_out Output 1 add_interface_port const_out const_out const_out Output 1
set_port_property const_out TERMINATION true set_port_property const_out TERMINATION true
set const_offset 1 set const_offset 1
} }
set_interface_property reconfig_reset associatedClock reconfig_clk set_interface_property reconfig_reset associatedClock reconfig_clk

13
library/altera/jesd204_phy/jesd204_phy_hw.tcl
View File

@ -156,7 +156,7 @@ proc jesd204_phy_composition_callback {} {
if {$soft_pcs} { if {$soft_pcs} {
add_connection phy_glue.phy_tx_enh_data_valid native_phy.tx_enh_data_valid add_connection phy_glue.phy_tx_enh_data_valid native_phy.tx_enh_data_valid
} }
foreach x {reconfig_clk reconfig_reset reconfig_avmm tx_coreclkin \ foreach x {reconfig_clk reconfig_reset reconfig_avmm tx_coreclkin \
tx_clkout tx_serial_clk0 tx_parallel_data unused_tx_parallel_data} { tx_clkout tx_serial_clk0 tx_parallel_data unused_tx_parallel_data} {
@ -168,9 +168,9 @@ proc jesd204_phy_composition_callback {} {
set_interface_property ${x} EXPORT_OF native_phy.tx_${x} set_interface_property ${x} EXPORT_OF native_phy.tx_${x}
} }
if {$soft_pcs == false} { if {$soft_pcs == false} {
add_connection phy_glue.phy_tx_datak native_phy.tx_datak add_connection phy_glue.phy_tx_datak native_phy.tx_datak
} }
} else { } else {
add_interface ref_clk clock sink add_interface ref_clk clock sink
set_interface_property ref_clk EXPORT_OF phy_glue.rx_cdr_refclk0 set_interface_property ref_clk EXPORT_OF phy_glue.rx_cdr_refclk0
@ -187,11 +187,11 @@ proc jesd204_phy_composition_callback {} {
add_connection phy_glue.phy_${x} native_phy.${x} add_connection phy_glue.phy_${x} native_phy.${x}
} }
if {$soft_pcs == false} { if {$soft_pcs == false} {
foreach x {rx_datak rx_disperr rx_errdetect rx_std_wa_patternalign} { foreach x {rx_datak rx_disperr rx_errdetect rx_std_wa_patternalign} {
add_connection phy_glue.phy_${x} native_phy.${x} add_connection phy_glue.phy_${x} native_phy.${x}
} }
} }
} }
for {set i 0} {$i < $num_of_lanes} {incr i} { for {set i 0} {$i < $num_of_lanes} {incr i} {
@ -212,7 +212,6 @@ proc jesd204_phy_composition_callback {} {
set_interface_property phy_${i} EXPORT_OF phy_glue.tx_phy_${i} set_interface_property phy_${i} EXPORT_OF phy_glue.tx_phy_${i}
} }
} else { } else {
if {$soft_pcs} { if {$soft_pcs} {
add_instance soft_pcs_${i} jesd204_soft_pcs_rx add_instance soft_pcs_${i} jesd204_soft_pcs_rx
add_connection link_clock.clk soft_pcs_${i}.clock add_connection link_clock.clk soft_pcs_${i}.clock
@ -223,6 +222,6 @@ proc jesd204_phy_composition_callback {} {
} else { } else {
set_interface_property phy_${i} EXPORT_OF phy_glue.rx_phy_${i} set_interface_property phy_${i} EXPORT_OF phy_glue.rx_phy_${i}
} }
} }
} }
} }