diff --git a/XilinxProcessorIPLib/drivers/spi/data/spi.tcl b/XilinxProcessorIPLib/drivers/spi/data/spi.tcl index 02842431..e493caf3 100755 --- a/XilinxProcessorIPLib/drivers/spi/data/spi.tcl +++ b/XilinxProcessorIPLib/drivers/spi/data/spi.tcl @@ -72,10 +72,10 @@ proc xdefine_axispi_include_file {drv_handle file_name drv_string} { global periph_ninstances # Open include file - set file_handle [::hsm::utils::open_include_file $file_name] + set file_handle [::hsi::utils::open_include_file $file_name] # Get all peripherals connected to this driver - set periphs [::hsm::utils::get_common_driver_ips $drv_handle] + set periphs [::hsi::utils::get_common_driver_ips $drv_handle] # Handle NUM_INSTANCES set periph_ninstances 0 @@ -84,7 +84,7 @@ proc xdefine_axispi_include_file {drv_handle file_name drv_string} { init_periph_config_struct_spi $periph_ninstances incr periph_ninstances 1 } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $drv_string NUM_INSTANCES] $periph_ninstances" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $drv_string NUM_INSTANCES] $periph_ninstances" # Now print all useful parameters for all peripherals @@ -122,18 +122,18 @@ proc xdefine_axispi_params_instance {file_handle periph device_id} { } puts $file_handle "/* Definitions for peripheral [string toupper [get_property NAME $periph]] */" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "DEVICE_ID"] $device_id" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "DEVICE_ID"] $device_id" if {$xip_mode_value == 0} { if {$axi_type_value == 0} { - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "BASEADDR"] [get_property CONFIG.C_BASEADDR $periph]" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph HIGHADDR] [get_property CONFIG.C_HIGHADDR $periph]" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "BASEADDR"] [get_property CONFIG.C_BASEADDR $periph]" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph HIGHADDR] [get_property CONFIG.C_HIGHADDR $periph]" } else { - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "BASEADDR"] $axi4_baseaddr_value" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph HIGHADDR] $axi4_highaddr_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "BASEADDR"] $axi4_baseaddr_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph HIGHADDR] $axi4_highaddr_value" } } else { - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "BASEADDR"] [get_property CONFIG.C_BASEADDR $periph]" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph HIGHADDR] [get_property CONFIG.C_HIGHADDR $periph]" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "BASEADDR"] [get_property CONFIG.C_BASEADDR $periph]" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph HIGHADDR] [get_property CONFIG.C_HIGHADDR $periph]" } set value [get_property CONFIG.C_FIFO_EXIST $periph] @@ -143,7 +143,7 @@ proc xdefine_axispi_params_instance {file_handle periph device_id} { set value1 0 } else { set value1 [get_property CONFIG.C_FIFO_DEPTH $periph] - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "FIFO_DEPTH"] $value1" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "FIFO_DEPTH"] $value1" if {$value1 == 0} { set value1 0 } else { @@ -153,32 +153,32 @@ proc xdefine_axispi_params_instance {file_handle periph device_id} { } else { set value1 $value } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "FIFO_EXIST"] $value1" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "FIFO_EXIST"] $value1" set value [get_property CONFIG.C_SPI_SLAVE_ONLY $periph] if {[llength $value] == 0} { set value 0 } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "SPI_SLAVE_ONLY"] $value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "SPI_SLAVE_ONLY"] $value" set value [get_property CONFIG.C_NUM_SS_BITS $periph] if {[llength $value] == 0} { set value 0 } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "NUM_SS_BITS"] $value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "NUM_SS_BITS"] $value" set value [get_property CONFIG.C_NUM_TRANSFER_BITS $periph] if {[llength $value] == 0} { set value 0 } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "NUM_TRANSFER_BITS"] $value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "NUM_TRANSFER_BITS"] $value" set value [get_property CONFIG.C_SPI_MODE $periph] if {[llength $value] == 0} { set value 0 } - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "SPI_MODE"] $value" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "TYPE_OF_AXI4_INTERFACE"] $axi_type_value" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "AXI4_BASEADDR"] $axi4_baseaddr_value" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "AXI4_HIGHADDR"] $axi4_highaddr_value" - puts $file_handle "\#define [::hsm::utils::get_driver_param_name $periph "XIP_MODE"] $xip_mode_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "SPI_MODE"] $value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "TYPE_OF_AXI4_INTERFACE"] $axi_type_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "AXI4_BASEADDR"] $axi4_baseaddr_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "AXI4_HIGHADDR"] $axi4_highaddr_value" + puts $file_handle "\#define [::hsi::utils::get_driver_param_name $periph "XIP_MODE"] $xip_mode_value" } proc xdefine_axispi_params_canonical {file_handle periph device_id} { @@ -315,7 +315,7 @@ proc xdefine_axispi_config_file {file_name drv_string} { set filename [file join "src" $file_name] file delete $filename set config_file [open $filename w] - ::hsm::utils::write_c_header $config_file "Driver configuration" + ::hsi::utils::write_c_header $config_file "Driver configuration" puts $config_file "\#include \"xparameters.h\"" puts $config_file "\#include \"[string tolower $drv_string].h\"" puts $config_file "\n/*" diff --git a/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl b/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl index 00135615..0e270887 100755 --- a/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl +++ b/XilinxProcessorIPLib/drivers/spi/data/spi_tapp.tcl @@ -81,7 +81,7 @@ proc gen_include_files {swproj mhsinst} { return "" } if {$swproj == 1} { - set spi_intr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] + set spi_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst] if { ${spi_intr} == 1} { set inc_file_lines {xspi.h spi_header.h spi_intr_header.h} } else { @@ -97,7 +97,7 @@ proc gen_src_files {swproj mhsinst} { return "" } if {$swproj == 1} { - set spi_intr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] + set spi_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst] if { ${spi_intr} == 1} { set inc_file_lines {examples/xspi_selftest_example.c examples/xspi_intr_example.c data/spi_header.h data/spi_intr_header.h} } else { @@ -117,7 +117,7 @@ proc gen_init_code {swproj mhsinst} { return "" } if {$swproj == 1} { - set spi_intr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] + set spi_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst] set ipname [get_property NAME $mhsinst] if { ${spi_intr} == 1} { @@ -137,18 +137,18 @@ proc gen_testfunc_call {swproj mhsinst} { } set ipname [get_property NAME $mhsinst] - set deviceid [::hsm::utils::get_ip_param_name $mhsinst "DEVICE_ID"] + set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"] set stdout [get_property CONFIG.STDOUT [get_os]] if { $stdout == "" || $stdout == "none" } { set hasStdout 0 } else { set hasStdout 1 } - set spi_intr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] + set spi_intr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst] if { ${spi_intr} == 1} { set intr_pin_name [get_pins -of_objects [get_cells $ipname] -filter "TYPE==INTERRUPT"] - set intcname [::hsm::utils::get_connected_intr_cntrl $ipname $intr_pin_name] + set intcname [::hsi::utils::get_connected_intr_cntrl $ipname $intr_pin_name] set intcvar intc set proc [get_property IP_NAME [get_cells [get_sw_processor]]] }