tried reducing dma reconfiguration over head

CMakeLists.txt

@@ -70,4 +70,4 @@ add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/main.c ${CMAKE_CU
 
 target_link_libraries(${PROJECT_NAME} PRIVATE pico_stdlib hardware_resets hardware_irq pico_lwip pico_multicore pico_cyw43_arch_none hardware_flash hardware_sync hardware_dma)
 pico_add_extra_outputs(${PROJECT_NAME})
-target_compile_definitions(${PROJECT_NAME} PRIVATE CYW43_SLEEP_CHECK_MS=1)
+target_compile_definitions(${PROJECT_NAME} PRIVATE CYW43_SLEEP_CHECK_MS=3)

build/CMakeCache.txt

@@ -502,7 +502,7 @@ PICO_BOOT_STAGE2_DIR:INTERNAL=/mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src
 PICO_CMAKE_PRELOAD_PLATFORM_DIR:INTERNAL=/mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/cmake/preload/platforms
 PICO_CMAKE_PRELOAD_PLATFORM_FILE:INTERNAL=/mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/cmake/preload/platforms/rp2040.cmake
 PICO_COMPILER_ASM:INTERNAL=/usr/bin/arm-none-eabi-gcc
-PICO_DOXYGEN_EXCLUDE_PATHS:INTERNAL= /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs
+PICO_DOXYGEN_EXCLUDE_PATHS:INTERNAL= /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common/cmsis /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040/hardware_regs
 PICO_DOXYGEN_PATHS:INTERNAL= /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/common /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/lib/cyw43-driver/src /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2_common /mnt/c/Users/siddk/Downloads/PicoPiFi/pico-sdk/src/rp2040
 PICO_NO_HARDWARE:INTERNAL=0
 PICO_ON_DEVICE:INTERNAL=1

build/CMakeFiles/PicoPiFi.dir/DependInfo.cmake

@@ -25,7 +25,7 @@ set(CMAKE_ASM_COMPILER_ID "GNU")
 # Preprocessor definitions for this target.
 set(CMAKE_TARGET_DEFINITIONS_ASM
   "CYW43_LWIP=0"
-  "CYW43_SLEEP_CHECK_MS=1"
+  "CYW43_SLEEP_CHECK_MS=3"
   "LIB_PICO_ASYNC_CONTEXT_THREADSAFE_BACKGROUND=1"
   "LIB_PICO_BIT_OPS=1"
   "LIB_PICO_BIT_OPS_PICO=1"

src/lwip.h

@@ -39,6 +39,7 @@ extern dma_channel_config align_cpy;
 extern dma_channel_config align_cpy_tail;
 extern dma_channel_config usb_cpy;
 
+extern int dma_memset_0_flag, chan_flag, chan_2_flag, dma_usb_cpy_flag, dma_align_cpy_head_flag, dma_align_cpy_flag, dma_align_cpy_tail_flag;
 
 extern char connect_ssid[190], connect_ssid_decode[95], connect_password[190], connect_password_decode[95], retry_ms[6], enc_type[1], wifi_configuration[450], 	wifi_configuration_last[450];
 extern int wifi_congfig_len;

src/main.c

@@ -21,18 +21,25 @@ int eth_frame_send_success;
 
 int chan = 0;
 dma_channel_config c;
+int chan_flag = 0;
 int chan_2 = 0;
 dma_channel_config c_2;
+int chan_2_flag = 0;
 int dma_memset_0 = 0;
 dma_channel_config memset_0;
+int dma_memset_0_flag = 0;
 int dma_align_cpy_head = 0;
 dma_channel_config align_cpy_head;
+int dma_align_cpy_head_flag = 0;
 int dma_align_cpy = 0;
 dma_channel_config align_cpy;
+int dma_align_cpy_flag = 0;
 int dma_align_cpy_tail = 0;
 dma_channel_config align_cpy_tail;
+int dma_align_cpy_tail_flag = 0;
 int dma_usb_cpy = 0;
 dma_channel_config usb_cpy;
+int dma_usb_cpy_flag = 0;
 
 void printline(int cdc,char string[],int len){
 	char buf[2048];
@@ -145,7 +152,7 @@ void core1(){
 
 int main(void)
 {
-    set_sys_clock_khz(200000, true);
+    //set_sys_clock_khz(200000, true);
 	memset(wifi_configuration_last,0,450);
 	memset(wifi_configuration,0,450);
 	memcpy(wifi_configuration, flash_target_contents, sizeof(wifi_configuration));
@@ -176,7 +183,7 @@ int main(void)
 	channel_config_set_write_increment(&c, true);
 
 	chan_2 = dma_claim_unused_channel(true);
-	dma_channel_set_irq0_enabled(chan_2, true);
+	//dma_channel_set_irq0_enabled(chan_2, true);
 
 	c_2 = dma_channel_get_default_config(chan_2);
 	channel_config_set_transfer_data_size(&c_2, DMA_SIZE_16);

src/usbd_rndis.c

@@ -506,14 +506,24 @@ int usbd_rndis_eth_tx(struct pbuf *p)
     rndis_data_packet_t *hdr;
 	hdr = (rndis_data_packet_t *)g_rndis_tx_buffer;
 	uint16_t zerobuf[] = {0};
-	dma_channel_configure(
-					dma_memset_0,            // Channel to be configured
-					&memset_0,              // The configuration we just created
-					hdr,// The initial write address
-					zerobuf,             // The initial read address
-					(sizeof(rndis_data_packet_t)/2)+1,             // Number of transfers; in this case each is 1 byte.
-					true             // Start immediately.
-				);
+	if(!dma_memset_0_flag){
+		dma_channel_configure(
+						dma_memset_0,            // Channel to be configured
+						&memset_0,              // The configuration we just created
+						hdr,// The initial write address
+						zerobuf,             // The initial read address
+						(sizeof(rndis_data_packet_t)/2)+1,             // Number of transfers; in this case each is 1 byte.
+						true             // Start immediately.
+					);
+		dma_memset_0_flag = 1;
+	} else {
+		//dma_channel_start(dma_memset_0);
+		//dma_channel_transfer_from_buffer_now( dma_memset_0, zerobuf, (sizeof(rndis_data_packet_t)/2)+1);
+
+		dma_channel_set_read_addr(dma_memset_0, zerobuf, false);
+        dma_channel_set_write_addr(dma_memset_0, hdr, false);
+        dma_channel_set_trans_count(dma_memset_0, (sizeof(rndis_data_packet_t)%2==1)?((sizeof(rndis_data_packet_t)+1)/2):(sizeof(rndis_data_packet_t)/2), true);
+	}
     if (g_usbd_rndis.link_status == NDIS_MEDIA_STATE_DISCONNECTED) {
         return -USB_ERR_NOTCONN;
     }

src/wifi_tx.c

@@ -102,6 +102,11 @@ void cyw43_cb_process_ethernet(void *cb_data, int itf, size_t len, const uint8_t
 					transfer_2,             // Number of transfers; in this case each is 1 byte.
 					true             // Start immediately.
 				);
+				int ret = usbd_rndis_eth_tx(out_pkt_dma_2);
+				if (0 != ret) {
+					ret = ERR_BUF;
+				}
+				pbuf_free(out_pkt_dma_2);
 			} else {
 				out_pkt = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
 				out_pkt->payload = buf;
@@ -119,5 +124,5 @@ void dma_handler() {
 		ret = ERR_BUF;
 	}
 	pbuf_free(out_pkt_dma);
-    dma_hw->ints0 = 1u << chan;
+	dma_hw->ints0 = 1u << chan;
 }

usb_config.h

@@ -197,6 +197,7 @@ static inline void *usb_memcpy(void *dest, const void *src, size_t n)
             leading_bytes = n;
         }
         //memcpy(d, s, leading_bytes);
+		if(!dma_align_cpy_head_flag){
 		dma_channel_configure(
 					dma_align_cpy_head,            // Channel to be configured
 					&align_cpy_head,              // The configuration we just created
@@ -205,6 +206,12 @@ static inline void *usb_memcpy(void *dest, const void *src, size_t n)
 					leading_bytes,             // Number of transfers; in this case each is 1 byte.
 					true             // Start immediately.
 				);
+		dma_align_cpy_head_flag = 1;
+		} else {
+			dma_channel_set_read_addr(dma_align_cpy_head, s, false);
+			dma_channel_set_write_addr(dma_align_cpy_head, d, false);
+			dma_channel_set_trans_count(dma_align_cpy_head,leading_bytes, true);
+		}
         d += leading_bytes;
         s += leading_bytes;
         n -= leading_bytes;
@@ -218,15 +225,21 @@ static inline void *usb_memcpy(void *dest, const void *src, size_t n)
 	for (size_t i = 0; i < word_count; ++i) {
         dw[i] = sw[i];
     }*/
-	dma_channel_configure(
-					dma_align_cpy,            // Channel to be configured
-					&align_cpy,              // The configuration we just created
-					dw,// The initial write address
-					sw,             // The initial read address
-					word_count,             // Number of transfers; in this case each is 1 byte.
-					true             // Start immediately.
-				);
-
+	if(!dma_align_cpy_flag){
+		dma_channel_configure(
+						dma_align_cpy,            // Channel to be configured
+						&align_cpy,              // The configuration we just created
+						dw,// The initial write address
+						sw,             // The initial read address
+						word_count,             // Number of transfers; in this case each is 1 byte.
+						true             // Start immediately.
+					);
+		dma_align_cpy_flag = 1;
+	} else {
+		dma_channel_set_read_addr(dma_align_cpy, sw, false);
+		dma_channel_set_write_addr(dma_align_cpy, dw, false);
+		dma_channel_set_trans_count(dma_align_cpy,word_count, true);
+	}
 
     // Update pointers and remaining byte count
     d = (char *)(dw + word_count);
@@ -236,6 +249,7 @@ static inline void *usb_memcpy(void *dest, const void *src, size_t n)
     // Copy remaining bytes
     if (n > 0) {
         //memcpy(d, s, n);
+		if(!dma_align_cpy_tail_flag){
 		dma_channel_configure(
 					dma_align_cpy_tail,            // Channel to be configured
 					&align_cpy_tail,              // The configuration we just created
@@ -244,6 +258,12 @@ static inline void *usb_memcpy(void *dest, const void *src, size_t n)
 					n,             // Number of transfers; in this case each is 1 byte.
 					true             // Start immediately.
 				);
+			dma_align_cpy_tail_flag = 1;
+		} else {
+			dma_channel_set_read_addr(dma_align_cpy_tail, s, false);
+			dma_channel_set_write_addr(dma_align_cpy_tail, d, false);
+			dma_channel_set_trans_count(dma_align_cpy_tail,n, true);
+		}
     }
 	//dma_channel_wait_for_finish_blocking(dma_align_cpy);