From 0fad89044924616682759b244c763e50080a7be1 Mon Sep 17 00:00:00 2001 From: Attila BODY Date: Thu, 13 Feb 2020 12:55:52 +0100 Subject: [PATCH] Eliminating crcstatus* parameter wherever it is not used --- application/application.c | 2 +- components/f4ll_c/inc/f4ll_c/packetusart.h | 2 +- components/f4ll_c/src/packetusart.c | 2 +- components/f4ll_c/test/packetusart_unittest.cpp | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/application.c b/application/application.c index 9d944b3..ac36a58 100644 --- a/application/application.c +++ b/application/application.c @@ -81,7 +81,7 @@ void MainLoop() uint16_t len = sizeof(text2Send) - 1 - (rand() & randmask); DIAG_ENTER_BUSY(); Mcd_Copy(Pu_GetTxBuffer(&g_uartStatuses[idx]), text2Send, len); - Pu_Post(&g_uartStatuses[idx], NULL, len, &g_crcStatus, 1); + Pu_Post(&g_uartStatuses[idx], NULL, len, 1); DIAG_EXIT_BUSY(); } for(uint16_t rIdx = 0; rIdx < 2; ++rIdx) diff --git a/components/f4ll_c/inc/f4ll_c/packetusart.h b/components/f4ll_c/inc/f4ll_c/packetusart.h index b6a4038..02bf11f 100644 --- a/components/f4ll_c/inc/f4ll_c/packetusart.h +++ b/components/f4ll_c/inc/f4ll_c/packetusart.h @@ -30,7 +30,7 @@ void Pu_Init( uint8_t* Pu_GetTxBuffer(struct usartstatus_t *status); -uint8_t Pu_Post(struct usartstatus_t *status, uint8_t const *payload, uint8_t length, struct crcstatus_t *crcStatus, uint8_t waitForCrcQueue); +uint8_t Pu_Post(struct usartstatus_t *status, uint8_t const *payload, uint8_t length, uint8_t waitForCrcQueue); void Pu_SetupReceive(struct usartstatus_t *status); void Pu_SetupTransmit(USART_TypeDef *usart, DMA_TypeDef* dma, uint32_t stream, void *buffer, uint32_t length); void Pu_ConsumePacket(struct usartstatus_t *status, uint8_t packetIndex); diff --git a/components/f4ll_c/src/packetusart.c b/components/f4ll_c/src/packetusart.c index 764b670..1f316af 100644 --- a/components/f4ll_c/src/packetusart.c +++ b/components/f4ll_c/src/packetusart.c @@ -142,7 +142,7 @@ uint8_t MOCKABLE(Pu_CheckHeader)(struct usartpacket_t *packet) } -uint8_t MOCKABLE(Pu_Post)(struct usartstatus_t *status, uint8_t const *payload, uint8_t length, struct crcstatus_t *crcStatus, uint8_t waitForCrcQueue) +uint8_t MOCKABLE(Pu_Post)(struct usartstatus_t *status, uint8_t const *payload, uint8_t length, uint8_t waitForCrcQueue) { struct usart_buffer_t *buffer = &status->txBuffer; uint8_t hash = STARTMARKER; diff --git a/components/f4ll_c/test/packetusart_unittest.cpp b/components/f4ll_c/test/packetusart_unittest.cpp index 0a13bc9..225f4ee 100644 --- a/components/f4ll_c/test/packetusart_unittest.cpp +++ b/components/f4ll_c/test/packetusart_unittest.cpp @@ -345,7 +345,7 @@ TEST_F(PacketUsart, Post_copy_nowait) ACTIVATE_MOCK(Pu_SetupTransmit, mock); ACTIVATE_MOCK_RV(Crc_IsTaskQueued, mock, 1); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, false); + Pu_Post(&usartStatus, testData, sizeof(testData), false); EXPECT_EQ(usartStatus.txBuffer.busy, 1); EXPECT_EQ(usartStatus.txBuffer.requestedLength, expectedLength); @@ -369,7 +369,7 @@ TEST_F(PacketUsart, Post_copy_wait_nodelay) ACTIVATE_MOCK(Pu_SetupTransmit, mock); ACTIVATE_MOCK_RV(Crc_IsTaskQueued, mock, 0); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, true); + Pu_Post(&usartStatus, testData, sizeof(testData), true); EXPECT_EQ(MOCK_CALLCOUNT(Crc_IsTaskQueued, mock), 1); } @@ -394,7 +394,7 @@ TEST_F(PacketUsart, Post_copy_wait_delay) pthread_t th; std::thread t([](std::promise& finished) { pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, true);; + Pu_Post(&usartStatus, testData, sizeof(testData), true);; finished.set_value(true); }, std::ref(promiseFinished)); th = t.native_handle(); @@ -411,7 +411,7 @@ TEST_F(PacketUsart, Post_copy_wait_delay) TEST_F(PacketUsart, HandleTxDmaIrq_tc) { Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, true); + Pu_Post(&usartStatus, testData, sizeof(testData), true); memset(&fakeDma1, 0, sizeof(fakeDma1)); fakeDma1.HISR = DMA_HISR_TCIF7; @@ -431,7 +431,7 @@ TEST_F(PacketUsart, HandleTxDmaIrq_tc) TEST_F(PacketUsart, HandleTxDmaIrq_te) { Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, true); + Pu_Post(&usartStatus, testData, sizeof(testData), true); memset(&fakeDma1, 0, sizeof(fakeDma1)); fakeDma1.HISR = DMA_HISR_TEIF7; @@ -450,7 +450,7 @@ TEST_F(PacketUsart, HandleTxDmaIrq_te) TEST_F(PacketUsart, HandleUsartIrq_tc) { Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); - Pu_Post(&usartStatus, testData, sizeof(testData), &crcStatus, true); + Pu_Post(&usartStatus, testData, sizeof(testData), true); ACTIVATE_MOCK_RV(LL_USART_IsActiveFlag_IDLE, mock, 0); ACTIVATE_MOCK_RV(LL_USART_IsActiveFlag_TC, mock, 1);