From 3764154c3e1f58ee22230a9da9c499ca9d1b0d9c Mon Sep 17 00:00:00 2001 From: NonPIayerCharacter <18557343+NonPIayerCharacter@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:20:55 +0300 Subject: [PATCH] sram + cam adjust --- project/utilities/gcc_csky.ld | 34 ++++++-------------------- sdk/app/prc_stream/prc_stream.c | 2 +- sdk/app/spook/frame.c | 8 +++--- sdk/app/spook/rtp-jpeg.c | 2 +- sdk/app/ui/player2_ui.c | 2 +- sdk/app/ui/player_ui.c | 2 +- sdk/app/video_app/new_video_app.c | 2 +- sdk/app/video_app/video_app.c | 2 +- sdk/lib/net/lwip/src/core/tcp.c | 2 -- sdk/lib/video/dvp/cmos_sensor/csi_v2.c | 12 ++++----- 10 files changed, 24 insertions(+), 44 deletions(-) diff --git a/project/utilities/gcc_csky.ld b/project/utilities/gcc_csky.ld index 5493214..8d3cd75 100644 --- a/project/utilities/gcc_csky.ld +++ b/project/utilities/gcc_csky.ld @@ -22,8 +22,8 @@ ******************************************************************************/ MEMORY { - SRAM0 : ORIGIN = 0x20041000 , LENGTH = 0x2c00 /*SRAM0 16 - 4KB - 1k*/ - SRAM : ORIGIN = 0x20000004 , LENGTH = 0x3fffc /* on-chip SRAM 288KB */ +/* SRAM0 : ORIGIN = 0x20041000 , LENGTH = 0x2c00 */ /*SRAM0 16 - 4KB - 1k*/ + SRAM : ORIGIN = 0x20000004 , LENGTH = 0x431fc /* on-chip SRAM 288KB */ /* SRAM : ORIGIN = 0x38000000 , LENGTH = 0x400000 */ FLASH : ORIGIN = 0x18000000 , LENGTH = 0x200000 PSRAM : ORIGIN = 0x38000000 , LENGTH = 0x400000 @@ -31,10 +31,10 @@ MEMORY __heap_size = 0x11000; -PROVIDE (__ram_end = 0x20040000); -PROVIDE (__heap_end = 0x20040000); -PROVIDE (__sleep_data_start = 0x20040004); -PROVIDE (__sleep_data_stop = 0x20040a00); +PROVIDE (__ram_end = 0x20043200); +PROVIDE (__heap_end = 0x20043200); +PROVIDE (__sleep_data_start = 0x20043200); +PROVIDE (__sleep_data_stop = 0x20043bfc); PROVIDE (__psram_heap_end = 0x38400000); REGION_ALIAS("REGION_TEXT", FLASH); @@ -47,7 +47,7 @@ REGION_ALIAS("REGION_NOLOAD_PSRAM", PSRAM); REGION_ALIAS("REGION_DATA2", SRAM); REGION_ALIAS("REGION_OTA_VMA", SRAM); REGION_ALIAS("REGION_TEXT2", SRAM); -REGION_ALIAS("REGION_DSLEEP", SRAM0); +REGION_ALIAS("REGION_DSLEEP", SRAM); ENTRY(Reset_Handler) SECTIONS @@ -293,22 +293,4 @@ SECTIONS /* ASSERT(DEFINED(ROM_FUNC_ENABLE), "please disable ROM Functions in ld file") */ /* ASSERT(ADDR(.text) < 0x20000068, "ROM Functions data area conflict!!!")*/ - memset = 0X00000584; - memcpy = 0X00000624; - memcmp = 0X000006A4; - strcasecmp = 0X0000232C; - strncasecmp = 0X00002370; - ll_qspi_xip_erase = 0X0000680C; - ll_qspi_xip_read = 0X00006854; - ll_qspi_xip_write = 0X00006898; - ll_qspi_xip_opt_enter = 0X00006728; - ll_qspi_xip_opt_exit = 0X0000679C; - ll_qspi_enter_xip_mode = 0X00006180; - ll_qspi_exit_xip_mode = 0X00006204; - ll_qspi_stig = 0X000060D8; - ll_ospi_psram_mrr = 0X00003798; - ll_ospi_psram_mrw = 0X0000380C; - ll_ospi_stig = 0X00003680; - qspi_flash_erase_handle = 0x00002d5c; - ll_qspi_cmd_busy_wait = 0x00006120; - +INPUT(utilities/romcode.ld) \ No newline at end of file diff --git a/sdk/app/prc_stream/prc_stream.c b/sdk/app/prc_stream/prc_stream.c index fe07d76..ec76783 100644 --- a/sdk/app/prc_stream/prc_stream.c +++ b/sdk/app/prc_stream/prc_stream.c @@ -85,7 +85,7 @@ void prc_finish(void *d) { struct prc_pixel *pixel_prc = (struct prc_pixel*)d; pixel_prc->hardward_ready = 1; - _os_printf("$"); + //_os_printf("$"); } diff --git a/sdk/app/spook/frame.c b/sdk/app/spook/frame.c index e60b8cc..58bac54 100644 --- a/sdk/app/spook/frame.c +++ b/sdk/app/spook/frame.c @@ -263,7 +263,7 @@ void spook_send_thread_stream(struct rtsp_priv *r) audio_f = GET_FRAME(audio_s); if(audio_f) { - _os_printf("A"); + //_os_printf("A"); audio = audio_ex->jf;//ex->slave_cur->f; audio->get_f = audio_f; audio->length = GET_DATA_LEN(audio_f); @@ -299,7 +299,7 @@ void spook_send_thread_stream(struct rtsp_priv *r) if((os_jiffies() - time_for_count) > 1000){ time_for_count = os_jiffies(); - _os_printf("cnt_num:%d\r\n",cnt_num); + //_os_printf("cnt_num:%d\r\n",cnt_num); cnt_num = 0; } jpeg->length = GET_DATA_LEN(get_f);; @@ -314,7 +314,7 @@ void spook_send_thread_stream(struct rtsp_priv *r) * callback: get_back_frame( struct frame *f, void *d ) * d: (jpeg_encoder *)en */ - _os_printf("#"); + //_os_printf("#"); //_os_printf("ex:%X\tf:%X\n",ex,ex->f); ex->f( jpeg, ex->d ); } @@ -325,7 +325,7 @@ void spook_send_thread_stream(struct rtsp_priv *r) count_times++; if(count_times>25) { - _os_printf("time:%lld\n",csi_kernel_get_ticks()-time); + //_os_printf("time:%lld\n",csi_kernel_get_ticks()-time); count_times = 0; time = csi_kernel_get_ticks(); } diff --git a/sdk/app/spook/rtp-jpeg.c b/sdk/app/spook/rtp-jpeg.c index b654fa2..f6544da 100644 --- a/sdk/app/spook/rtp-jpeg.c +++ b/sdk/app/spook/rtp-jpeg.c @@ -857,7 +857,7 @@ int fd_send_data(int fd,unsigned char *sendbuf,int sendLen,int times) } if(size<0) { - _os_printf("%s err size:%d\n",__FUNCTION__,size); + //_os_printf("%s err size:%d\n",__FUNCTION__,size); return -1; } diff --git a/sdk/app/ui/player2_ui.c b/sdk/app/ui/player2_ui.c index c4f07a2..ca77179 100644 --- a/sdk/app/ui/player2_ui.c +++ b/sdk/app/ui/player2_ui.c @@ -522,7 +522,7 @@ static int opcode_func(stream *s,void *priv,int opcode) if(data->data) { //因为是转发,所以这里移除的话是交给原来的方法移除 - _os_printf("$"); + //_os_printf("$"); free_data(data->data); data->data = NULL; } diff --git a/sdk/app/ui/player_ui.c b/sdk/app/ui/player_ui.c index b3dd0dd..e6f0a52 100644 --- a/sdk/app/ui/player_ui.c +++ b/sdk/app/ui/player_ui.c @@ -499,7 +499,7 @@ static int opcode_func(stream *s,void *priv,int opcode) if(data->data) { //因为是转发,所以这里移除的话是交给原来的方法移除 - _os_printf("$"); + //_os_printf("$"); free_data(data->data); data->data = NULL; } diff --git a/sdk/app/video_app/new_video_app.c b/sdk/app/video_app/new_video_app.c index 5b300c1..c51967d 100644 --- a/sdk/app/video_app/new_video_app.c +++ b/sdk/app/video_app/new_video_app.c @@ -655,7 +655,7 @@ static void jpeg_in_sram(struct os_work *work,struct list_head *get_f) j->malloc_mem = dest_list; del_jpeg_frame(get_f); //统一发送数据,这个时候,其他流才有可能获取到数据 - _os_printf("$"); + //_os_printf("$"); send_data_to_stream(data_s); } } diff --git a/sdk/app/video_app/video_app.c b/sdk/app/video_app/video_app.c index 31291c0..6990a23 100644 --- a/sdk/app/video_app/video_app.c +++ b/sdk/app/video_app/video_app.c @@ -675,7 +675,7 @@ void jpeg_in_sram(struct list_head *get_f) j->malloc_mem = dest_list; del_jpeg_frame(get_f); //统一发送数据,这个时候,其他流才有可能获取到数据 - _os_printf("$"); + //_os_printf("$"); send_data_to_stream(data_s); } } diff --git a/sdk/lib/net/lwip/src/core/tcp.c b/sdk/lib/net/lwip/src/core/tcp.c index ad29577..57614b2 100644 --- a/sdk/lib/net/lwip/src/core/tcp.c +++ b/sdk/lib/net/lwip/src/core/tcp.c @@ -1889,8 +1889,6 @@ tcp_alloc(u8_t prio) /* adjust err stats: memp_malloc failed above */ MEMP_STATS_DEC(err, MEMP_TCP_PCB); } - }else{ - printf("NO FREE TCP_PCB! total:%d\r\n", MEMP_NUM_TCP_PCB); } if (pcb != NULL) { diff --git a/sdk/lib/video/dvp/cmos_sensor/csi_v2.c b/sdk/lib/video/dvp/cmos_sensor/csi_v2.c index 9fe4c7d..7cfb7e8 100644 --- a/sdk/lib/video/dvp/cmos_sensor/csi_v2.c +++ b/sdk/lib/video/dvp/cmos_sensor/csi_v2.c @@ -1,7 +1,7 @@ #include "sys_config.h" #include "typesdef.h" #include "lib/video/dvp/cmos_sensor/csi.h" -#include "lib/video/dvp/cmos_sensor/csi_V2.h" +#include "lib/video/dvp/cmos_sensor/csi_v2.h" #include "devid.h" #include "hal/gpio.h" #include "osal/irq.h" @@ -1118,7 +1118,7 @@ void vpp_hsie_isr(uint32 irq,uint32 image_h,uint32 param){ void vpp_vsie_isr(uint32 irq,uint32 dev,uint32 param){ vs_isr++; - set_time_watermark(2022,9,1,20,1,(os_jiffies()/1000)%60); + //set_time_watermark(2022,9,1,20,1,(os_jiffies()/1000)%60); } void vpp_data_done(uint32 irq,uint32 dev,uint32 param){ @@ -1817,11 +1817,11 @@ bool csi_yuv_mode(){ vpp_set_water0_color(vpp_test,0xff,0x80,0x80); vpp_set_water0_bitmap(vpp_test,(uint32)ele_lib); - vpp_set_water0_locate(vpp_test,50,36); + vpp_set_water0_locate(vpp_test,0,0); vpp_set_water0_contrast(vpp_test,0); vpp_set_watermark0_charsize_and_num(vpp_test,12,32,19); vpp_set_watermark0_mode(vpp_test,1); - set_time_watermark(2222,22,22,22,22,22); + set_time_watermark(0000,00,00,00,00,00); vpp_set_water0_rc(vpp_test,0); @@ -1861,8 +1861,8 @@ bool csi_yuv_mode(){ #endif vpp_set_mode(vpp_test,IMAGE_FORMAT); - vpp_set_watermark0_enable(vpp_test,1); - vpp_set_watermark1_enable(vpp_test,1); + vpp_set_watermark0_enable(vpp_test,0); + vpp_set_watermark1_enable(vpp_test,0); #if IPF_EN // vpp_set_ifp_en(vpp_test,1);