From d744efedf08124cc38967989b560be5612a08e61 Mon Sep 17 00:00:00 2001 From: yuysh Date: Wed, 27 May 2026 18:21:20 +0800 Subject: [PATCH] Remove network related code as they are not needed for this debug project --- Vitis_Classic/NewInstrCalBoard/src/main.c | 182 +--------------------- 1 file changed, 1 insertion(+), 181 deletions(-) diff --git a/Vitis_Classic/NewInstrCalBoard/src/main.c b/Vitis_Classic/NewInstrCalBoard/src/main.c index 5a396d6..f56e16c 100644 --- a/Vitis_Classic/NewInstrCalBoard/src/main.c +++ b/Vitis_Classic/NewInstrCalBoard/src/main.c @@ -35,193 +35,17 @@ #include "xil_printf.h" #endif -#include "lwip/tcp.h" -extern void tcp_tmr(void); /* declared in tcp_priv.h, not in public tcp.h */ #include "xil_cache.h" #include "GPIO_Driv.h" #include "SPI_Driv.h" #include "cal_meas.h" -#if LWIP_IPV6==1 -#include "lwip/ip.h" -#else -#if LWIP_DHCP==1 -#include "lwip/dhcp.h" -#endif -#endif - -/* defined by each RAW mode application */ -void print_app_header(); -int start_application(); -int transfer_data(); - -/* missing declaration in lwIP */ -void lwip_init(); - -#if LWIP_IPV6==0 -#if LWIP_DHCP==1 -extern volatile int dhcp_timoutcntr; -err_t dhcp_start(struct netif *netif); -#endif -#endif - -static struct netif server_netif; -struct netif *echo_netif; - -#if LWIP_IPV6==1 -void print_ip6(char *msg, ip_addr_t *ip) -{ - print(msg); - xil_printf(" %x:%x:%x:%x:%x:%x:%x:%x\n\r", - IP6_ADDR_BLOCK1(&ip->u_addr.ip6), - IP6_ADDR_BLOCK2(&ip->u_addr.ip6), - IP6_ADDR_BLOCK3(&ip->u_addr.ip6), - IP6_ADDR_BLOCK4(&ip->u_addr.ip6), - IP6_ADDR_BLOCK5(&ip->u_addr.ip6), - IP6_ADDR_BLOCK6(&ip->u_addr.ip6), - IP6_ADDR_BLOCK7(&ip->u_addr.ip6), - IP6_ADDR_BLOCK8(&ip->u_addr.ip6)); - -} -#else -void -print_ip(char *msg, ip_addr_t *ip) -{ - print(msg); - xil_printf("%d.%d.%d.%d\n\r", ip4_addr1(ip), ip4_addr2(ip), - ip4_addr3(ip), ip4_addr4(ip)); -} - -void -print_ip_settings(ip_addr_t *ip, ip_addr_t *mask, ip_addr_t *gw) -{ - - print_ip("Board IP: ", ip); - print_ip("Netmask : ", mask); - print_ip("Gateway : ", gw); -} -#endif - -#if defined (__arm__) && !defined (ARMR5) -#if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1 -int ProgramSi5324(void); -int ProgramSfpPhy(void); -#endif -#endif - -#ifdef XPS_BOARD_ZCU102 -#ifdef XPAR_XIICPS_0_DEVICE_ID -int IicPhyReset(void); -#endif -#endif - int main() { -#if LWIP_IPV6==0 - ip_addr_t ipaddr, netmask, gw; - -#endif - /* the mac address of the board. this should be unique per board */ - unsigned char mac_ethernet_address[] = - { 0x00, 0x0a, 0x35, 0x00, 0x01, 0x01 }; - - echo_netif = &server_netif; -#if defined (__arm__) && !defined (ARMR5) -#if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1 - ProgramSi5324(); - ProgramSfpPhy(); -#endif -#endif - -/* Define this board specific macro in order perform PHY reset on ZCU102 */ -#ifdef XPS_BOARD_ZCU102 - if(IicPhyReset()) { - xil_printf("Error performing PHY reset \n\r"); - return -1; - } -#endif init_platform(); -#if LWIP_IPV6==0 -#if LWIP_DHCP==1 - ipaddr.addr = 0; - gw.addr = 0; - netmask.addr = 0; -#else - /* initialize IP addresses to be used */ - IP4_ADDR(&ipaddr, 192, 168, 100, 110); - IP4_ADDR(&netmask, 255, 255, 255, 0); - IP4_ADDR(&gw, 192, 168, 100, 1); -#endif -#endif - print_app_header(); - - lwip_init(); - -#if (LWIP_IPV6 == 0) - /* Add network interface to the netif_list, and set it as default */ - if (!xemac_add(echo_netif, &ipaddr, &netmask, - &gw, mac_ethernet_address, - PLATFORM_EMAC_BASEADDR)) { - xil_printf("Error adding N/W interface\n\r"); - return -1; - } -#else - /* Add network interface to the netif_list, and set it as default */ - if (!xemac_add(echo_netif, NULL, NULL, NULL, mac_ethernet_address, - PLATFORM_EMAC_BASEADDR)) { - xil_printf("Error adding N/W interface\n\r"); - return -1; - } - echo_netif->ip6_autoconfig_enabled = 1; - - netif_create_ip6_linklocal_address(echo_netif, 1); - netif_ip6_addr_set_state(echo_netif, 0, IP6_ADDR_VALID); - - print_ip6("\n\rBoard IPv6 address ", &echo_netif->ip6_addr[0].u_addr.ip6); - -#endif - netif_set_default(echo_netif); - - /* now enable interrupts */ - //platform_enable_interrupts(); - - /* specify that the network if is up */ - netif_set_up(echo_netif); - -#if (LWIP_IPV6 == 0) -#if (LWIP_DHCP==1) - /* Create a new DHCP client for this interface. - * Note: you must call dhcp_fine_tmr() and dhcp_coarse_tmr() at - * the predefined regular intervals after starting the client. - */ - dhcp_start(echo_netif); - dhcp_timoutcntr = 24; - - while(((echo_netif->ip_addr.addr) == 0) && (dhcp_timoutcntr > 0)) - xemacif_input(echo_netif); - - if (dhcp_timoutcntr <= 0) { - if ((echo_netif->ip_addr.addr) == 0) { - xil_printf("DHCP Timeout\r\n"); - xil_printf("Configuring default IP of 192.168.100.110\r\n"); - IP4_ADDR(&(echo_netif->ip_addr), 192, 168, 100, 110); - IP4_ADDR(&(echo_netif->netmask), 255, 255, 255, 0); - IP4_ADDR(&(echo_netif->gw), 192, 168, 100, 1); - } - } - - ipaddr.addr = echo_netif->ip_addr.addr; - gw.addr = echo_netif->gw.addr; - netmask.addr = echo_netif->netmask.addr; -#endif - - print_ip_settings(&ipaddr, &netmask, &gw); - -#endif - EMIO_config(); interface_initial(CPLD_U1); @@ -231,15 +55,11 @@ int main() rst_CPLD(CPLD_U2,4); rst_CPLD(CPLD_U3,4); - /* start the application (web server, rxtest, txtest, etc..) */ - start_application(); /* receive and process packets */ while (1) { - tcp_tmr(); - xemacif_input(echo_netif); - transfer_data(); + } /* never reached */