playground-stm32/f407ve_packetusart_c
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminating crcstatus* parameter wherever it is not used

Browse source
This commit is contained in:
Attila Body 2020-02-13 12:55:52 +01:00
parent 5e7279edc6
commit 0fad890449
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/application.c
View file

@ -81,7 +81,7 @@ void MainLoop()
uint16_t len = sizeof(text2Send) - 1 - (rand() & randmask); uint16_t len = sizeof(text2Send) - 1 - (rand() & randmask);
DIAG_ENTER_BUSY(); DIAG_ENTER_BUSY();
Mcd_Copy(Pu_GetTxBuffer(&g_uartStatuses[idx]), text2Send, len); 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(); DIAG_EXIT_BUSY();
} }
for(uint16_t rIdx = 0; rIdx < 2; ++rIdx) for(uint16_t rIdx = 0; rIdx < 2; ++rIdx)

2
components/f4ll_c/inc/f4ll_c/packetusart.h
View file

@ -30,7 +30,7 @@ void Pu_Init(
uint8_t* Pu_GetTxBuffer(struct usartstatus_t *status); 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_SetupReceive(struct usartstatus_t *status);
void Pu_SetupTransmit(USART_TypeDef *usart, DMA_TypeDef* dma, uint32_t stream, void *buffer, uint32_t length); 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); void Pu_ConsumePacket(struct usartstatus_t *status, uint8_t packetIndex);

2
components/f4ll_c/src/packetusart.c
View file

@ -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; struct usart_buffer_t *buffer = &status->txBuffer;
uint8_t hash = STARTMARKER; uint8_t hash = STARTMARKER;

12
components/f4ll_c/test/packetusart_unittest.cpp
View file

@ -345,7 +345,7 @@ TEST_F(PacketUsart, Post_copy_nowait)
ACTIVATE_MOCK(Pu_SetupTransmit, mock); ACTIVATE_MOCK(Pu_SetupTransmit, mock);
ACTIVATE_MOCK_RV(Crc_IsTaskQueued, mock, 1); 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.busy, 1);
EXPECT_EQ(usartStatus.txBuffer.requestedLength, expectedLength); EXPECT_EQ(usartStatus.txBuffer.requestedLength, expectedLength);
@ -369,7 +369,7 @@ TEST_F(PacketUsart, Post_copy_wait_nodelay)
ACTIVATE_MOCK(Pu_SetupTransmit, mock); ACTIVATE_MOCK(Pu_SetupTransmit, mock);
ACTIVATE_MOCK_RV(Crc_IsTaskQueued, mock, 0); 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); EXPECT_EQ(MOCK_CALLCOUNT(Crc_IsTaskQueued, mock), 1);
} }
@ -394,7 +394,7 @@ TEST_F(PacketUsart, Post_copy_wait_delay)
pthread_t th; pthread_t th;
std::thread t([](std::promise<bool>& finished) { std::thread t([](std::promise<bool>& finished) {
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL); 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); finished.set_value(true);
}, std::ref(promiseFinished)); }, std::ref(promiseFinished));
th = t.native_handle(); th = t.native_handle();
@ -411,7 +411,7 @@ TEST_F(PacketUsart, Post_copy_wait_delay)
TEST_F(PacketUsart, HandleTxDmaIrq_tc) TEST_F(PacketUsart, HandleTxDmaIrq_tc)
{ {
Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); 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)); memset(&fakeDma1, 0, sizeof(fakeDma1));
fakeDma1.HISR = DMA_HISR_TCIF7; fakeDma1.HISR = DMA_HISR_TCIF7;
@ -431,7 +431,7 @@ TEST_F(PacketUsart, HandleTxDmaIrq_tc)
TEST_F(PacketUsart, HandleTxDmaIrq_te) TEST_F(PacketUsart, HandleTxDmaIrq_te)
{ {
Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); 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)); memset(&fakeDma1, 0, sizeof(fakeDma1));
fakeDma1.HISR = DMA_HISR_TEIF7; fakeDma1.HISR = DMA_HISR_TEIF7;
@ -450,7 +450,7 @@ TEST_F(PacketUsart, HandleTxDmaIrq_te)
TEST_F(PacketUsart, HandleUsartIrq_tc) TEST_F(PacketUsart, HandleUsartIrq_tc)
{ {
Pu_Init(&usartStatus, &fakeUsart, DMA1, 0, 7, &crcStatus, FakePacketReceivedCallback_mock, &fakePacketReceivedCallbackParam); 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_IDLE, mock, 0);
ACTIVATE_MOCK_RV(LL_USART_IsActiveFlag_TC, mock, 1); ACTIVATE_MOCK_RV(LL_USART_IsActiveFlag_TC, mock, 1);