Преглед на файлове

平峰测试,将malloc改为数组

LAPTOP-KB7QFH2U\ChenJie-PC преди 2 години
родител
ревизия
dd3c7380be
променени са 2 файла, в които са добавени 2 реда и са изтрити 28 реда
  1. 2 9
      src/AppTaskUart1.c
  2. 0 19
      src/hal_adapter.c

+ 2 - 9
src/AppTaskUart1.c

@@ -1536,8 +1536,8 @@ void Fota_Ftp(uint8 *dataPtrIn)
 	        uint32 FlashAddStart = 0;
 	        uint32 appReceviedCRC;
 	        uint16 getDataLenErrCount = 0;
-	        uint8 *UartData = NULL;
-	        uint8 *FlashData = NULL;
+	        uint8 UartData[512] = {0};
+	        uint8 FlashData[512] = {0};
 	        uint8 *fileDataPtr = NULL;
 	        memset(ATSendDataBuffer,0x00,sizeof(ATSendDataBuffer));
 			sprintf(ATSendDataBuffer, "AT+CFTRANTX=\"c:/%s\"\r\n",keyFilename);
@@ -1555,15 +1555,10 @@ void Fota_Ftp(uint8 *dataPtrIn)
 	                Hal_SetAppInfo(fileLen, appReceviedCRC, CONTROLLER_SELF);
 					while(readLenAsk!=0)
 					{
-					    UartData = pvPortMalloc(512);
-					    FlashData = pvPortMalloc(512);
 						memset(UartData,0x00,512);
 						memset(FlashData,0x00,512);
 						memset(ATSendDataBuffer,0x00,sizeof(ATSendDataBuffer));
 						sprintf(ATSendDataBuffer, "AT+CFTRANTX=\"c:/%s\",%d,%d\r\n", filenamePtr,currentAddr, readLenAsk);
-#if SEGGER_PRINTF==1
-	SEGGER_RTT_printf("[%d]UartData=%X,FlashData=%X,UartData-1=%X-%X,UartData=%X-%X,UartData+1=%X-%X\r\n",__LINE__,UartData,FlashData,(&UartData)-1,*((&UartData)-1),(&UartData),*((&UartData)),(&UartData)+1,*((&UartData)+1));
-#endif
 						UART_Query_Data(UART_LPUART1, UART_LPUART1, ATSendDataBuffer, mstrlen(ATSendDataBuffer), UartData, &ReadLen, pdMS_TO_TICKS(5000));
 						sprintf(findDataBuffer, "+CFTRANTX: DATA,%d", readLenAsk);
 						if (ReadLen == (readLenAsk+strlen(findDataBuffer)+26))
@@ -1609,8 +1604,6 @@ void Fota_Ftp(uint8 *dataPtrIn)
 						{
 							getDataLenErrCount++;
 						}
-						vPortFree(UartData);
-						vPortFree(FlashData);
 						if(getDataLenErrCount>=100)
 						{
 							break;

+ 0 - 19
src/hal_adapter.c

@@ -173,26 +173,7 @@ Std_ReturnType UART_Query_Data(uint8 transChannel, uint8 recvChannel, uint8 *txB
 		{
 			*rxlen = UartRecvMsg.DataLen;
 	//		read_ringBuffer(rxBuffer, queueRecvSize, &uartRingBuffer[recvChannel]);
-#if SEGGER_PRINTF==1
-	SEGGER_RTT_printf("[%d]rxBuffer=%X,dataAddr=%X,Len=%d,addr=%X,\r\n",__LINE__,rxBuffer,(uint8 *)(UartRecvMsg.dataAddr),UartRecvMsg.DataLen,uartRingBuffer[2]);
-#endif
-#if SEGGER_PRINTF==1
-	SEGGER_RTT_printf("dataAddr= ");
-	for(uint16 i=0;i<UartRecvMsg.DataLen;i++)
-	{
-		SEGGER_RTT_printf("%02X ",*((uint8 *)(UartRecvMsg.dataAddr)+i));
-	}
-	SEGGER_RTT_printf("\r\n");
-#endif
 			memcpy(rxBuffer,(uint8 *)(UartRecvMsg.dataAddr),UartRecvMsg.DataLen);
-#if SEGGER_PRINTF==1
-	SEGGER_RTT_printf("rxBuffer= ");
-	for(uint16 i=0;i<UartRecvMsg.DataLen;i++)
-	{
-		SEGGER_RTT_printf("%02X ",*((uint8 *)(UartRecvMsg.dataAddr)+i));
-	}
-	SEGGER_RTT_printf("\r\n");
-#endif
 			retVal = E_OK;
 		}
 		else