From 2ce4fe015d927e278aad0a135e35d82e18a235be Mon Sep 17 00:00:00 2001 From: Paul Reckamp <paulrr2@illinois.edu> Date: Fri, 18 Dec 2020 10:51:06 -0600 Subject: [PATCH] Updated IPs for s_axilite --- hls/arp_server_subnet/arp_server_subnet.cpp | 4 ++-- hls/ip_handler/ip_handler.cpp | 2 +- hls/ipv4/ipv4.cpp | 4 ++-- hls/mac_ip_encode/mac_ip_encode.cpp | 6 +++--- hls/udp/udp.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hls/arp_server_subnet/arp_server_subnet.cpp b/hls/arp_server_subnet/arp_server_subnet.cpp index 422876a..026f12f 100644 --- a/hls/arp_server_subnet/arp_server_subnet.cpp +++ b/hls/arp_server_subnet/arp_server_subnet.cpp @@ -280,8 +280,8 @@ void arp_server_subnet_top( hls::stream<net_axis<DATA_WIDTH> >& arpData #pragma HLS INTERFACE axis register port=hostIpEncode_rsp name=m_axis_host_arp_lookup_reply #pragma HLS DATA_PACK variable=macIpEncode_rsp #pragma HLS DATA_PACK variable=hostIpEncode_rsp - #pragma HLS INTERFACE ap_stable register port=myMacAddress - #pragma HLS INTERFACE ap_stable register port=myIpAddress + #pragma HLS INTERFACE s_axilite register port=myMacAddress + #pragma HLS INTERFACE s_axilite register port=myIpAddress arp_server_subnet<DATA_WIDTH>(arpDataIn, macIpEncode_req, diff --git a/hls/ip_handler/ip_handler.cpp b/hls/ip_handler/ip_handler.cpp index abddda8..65ecb2a 100755 --- a/hls/ip_handler/ip_handler.cpp +++ b/hls/ip_handler/ip_handler.cpp @@ -569,7 +569,7 @@ void ip_handler_top(hls::stream<net_axis<DATA_WIDTH> >& s_axis_raw, #pragma HLS INTERFACE axis register port=m_axis_tcp // leads to Combinatorial Loops #pragma HLS INTERFACE axis register port=m_axis_roce - #pragma HLS INTERFACE ap_stable register port=myIpAddress + #pragma HLS INTERFACE s_axilite register port=myIpAddress ip_handler<DATA_WIDTH>(s_axis_raw, m_axis_arp, diff --git a/hls/ipv4/ipv4.cpp b/hls/ipv4/ipv4.cpp index b9f51c3..e35c30a 100644 --- a/hls/ipv4/ipv4.cpp +++ b/hls/ipv4/ipv4.cpp @@ -212,8 +212,8 @@ void ipv4_top( hls::stream<net_axis<DATA_WIDTH> >& s_axis_rx_data, #pragma HLS INTERFACE axis register port=m_axis_tx_data #pragma HLS DATA_PACK variable=m_axis_rx_meta #pragma HLS DATA_PACK variable=s_axis_tx_meta -#pragma HLS INTERFACE ap_stable register port=local_ipv4_address -#pragma HLS INTERFACE ap_stable register port=protocol +#pragma HLS INTERFACE s_axilite register port=local_ipv4_address +#pragma HLS INTERFACE s_axilite register port=protocol ipv4<DATA_WIDTH>(s_axis_rx_data, m_axis_rx_meta, diff --git a/hls/mac_ip_encode/mac_ip_encode.cpp b/hls/mac_ip_encode/mac_ip_encode.cpp index 9bfaa71..dc34237 100755 --- a/hls/mac_ip_encode/mac_ip_encode.cpp +++ b/hls/mac_ip_encode/mac_ip_encode.cpp @@ -434,9 +434,9 @@ void mac_ip_encode_top( hls::stream<net_axis<DATA_WIDTH> >& dataIn, #pragma HLS DATA_PACK variable=arpTableIn - #pragma HLS INTERFACE ap_stable register port=myMacAddress - #pragma HLS INTERFACE ap_stable register port=regSubNetMask - #pragma HLS INTERFACE ap_stable register port=regDefaultGateway + #pragma HLS INTERFACE s_axilite register port=myMacAddress + #pragma HLS INTERFACE s_axilite register port=regSubNetMask + #pragma HLS INTERFACE s_axilite register port=regDefaultGateway mac_ip_encode<DATA_WIDTH>( dataIn, arpTableIn, diff --git a/hls/udp/udp.cpp b/hls/udp/udp.cpp index 94131f2..46d4efe 100644 --- a/hls/udp/udp.cpp +++ b/hls/udp/udp.cpp @@ -270,8 +270,8 @@ void udp_top( hls::stream<ipMeta>& s_axis_rx_meta, #pragma HLS DATA_PACK variable=m_axis_rx_meta #pragma HLS DATA_PACK variable=s_axis_tx_meta #pragma HLS DATA_PACK variable=m_axis_tx_meta -#pragma HLS INTERFACE ap_stable register port=reg_ip_address -#pragma HLS INTERFACE ap_stable register port=reg_listen_port +#pragma HLS INTERFACE s_axilite register port=reg_ip_address +#pragma HLS INTERFACE s_axilite register port=reg_listen_port udp<DATA_WIDTH>(s_axis_rx_meta, -- GitLab