From 47b782e976a97ad3d14cf1f3a265a63cdc1bd1e9 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 28 Aug 2026 13:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=90=8E=E4=BF=9D=E7=95=99=20TSOIP=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/atsc_app/bsp/eeprom.c | 4 +++- src/atsc_app/bsp/fpga.c | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/atsc_app/bsp/eeprom.c b/src/atsc_app/bsp/eeprom.c index 2ac4ee1..44a4634 100755 --- a/src/atsc_app/bsp/eeprom.c +++ b/src/atsc_app/bsp/eeprom.c @@ -2401,11 +2401,13 @@ void e2rom_read_tsoip(int tsoip_index, S_TSOIP_CONFIG_PARA *ppara) log_printf(LOG_DEBUG,I_NOUSED,"TSOIP_%d ppara->receive_type=%s\n", tsoip_index+1, ppara->receive_type==0?"multi":"singl" ); ppara->fec = (c256_byteread(EEPROM_FEC_ADDR)<<8)|c256_byteread(EEPROM_FEC_ADDR+1); - if(ppara->fec >= 1) { + if(ppara->fec > 1) { ppara->fec = 0; } ppara->delay = (c256_byteread(EEPROM_FEC_DLY_ADDR)<<8)|c256_byteread(EEPROM_FEC_DLY_ADDR+1); + ppara->row = (c256_byteread(EEPROM_ROW_ADDR)<<8)|c256_byteread(EEPROM_ROW_ADDR+1); + ppara->col = (c256_byteread(EEPROM_COL_ADDR)<<8)|c256_byteread(EEPROM_COL_ADDR+1); ppara->sfn_mfn_sel = c256_byteread(EEPROM_SFN_MFN_SEL); if(ppara->sfn_mfn_sel != NET_SFN && ppara->sfn_mfn_sel != NET_MFN) { ppara->sfn_mfn_sel = NET_SFN; diff --git a/src/atsc_app/bsp/fpga.c b/src/atsc_app/bsp/fpga.c index 82d7099..d29273d 100755 --- a/src/atsc_app/bsp/fpga.c +++ b/src/atsc_app/bsp/fpga.c @@ -1717,11 +1717,9 @@ void config_fpga_para(void) fpga_save_all_para(TRUE); - /* TSOIP ---20220214 s ---*/ - // PR03: force TSoIP unicast defaults (192.168.2.200/single) onto BOTH cores every boot - extern void e2rom_load_default_param_t_tsoip(int tsoip_index, uint32 type); - e2rom_load_default_param_t_tsoip(TSOIP_1, 0); - e2rom_load_default_param_t_tsoip(TSOIP_2, 0); + /* TSOIP settings have already been restored by e2rom_read_all_para(). + * Do not load defaults here: that routine also writes the defaults back to + * EEPROM and would erase the values set from the web page on every reboot. */ tsoip_byte_write(TSOIP_1, I2C_REG_ADDRES, 0x11); delay_ms(200);//delay_ms(6000);