diff --git a/IEC60870-Slave/test/iec104_idle_transport_test.c b/IEC60870-Slave/test/iec104_idle_transport_test.c index f1454aa3..e57f5c34 100644 --- a/IEC60870-Slave/test/iec104_idle_transport_test.c +++ b/IEC60870-Slave/test/iec104_idle_transport_test.c @@ -138,10 +138,10 @@ static void test_capacity_and_admission(void) CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, 0U) == IEC104_TCP_SUBMIT_WAIT); flush(); push_ack(2U); flush(); CHECK(IEC104_Connection_Begin_Receive_Batch(&sut->connection, sut->generation) == IEC104_CONNECTION_OK); - CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, fake.now, 0U) == IEC104_CONNECTION_ERROR); + CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, (uint32_t)fake.now, 0U) == IEC104_CONNECTION_ERROR); CHECK(IEC104_Connection_Submit_Idle(&sut->connection, sut->generation, asdu, sizeof(asdu), - 0U, fake.now, &head) == IEC104_CONNECTION_ERROR); - CHECK(IEC104_Connection_Tick(&sut->connection, sut->generation, fake.now) == IEC104_CONNECTION_OK); + 0U, (uint32_t)fake.now, &head) == IEC104_CONNECTION_ERROR); + CHECK(IEC104_Connection_Tick(&sut->connection, sut->generation, (uint32_t)fake.now) == IEC104_CONNECTION_OK); fake.now += sut->config.protocol.link.t3_ms; CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, 0U) == IEC104_TCP_SUBMIT_WAIT); CHECK(IEC104_TcpServer_Send_Idle(sut, sut->generation, asdu, sizeof(asdu), 0U) == IEC104_TCP_SUBMIT_WAIT); @@ -253,7 +253,7 @@ static void test_record_reserve_and_tail_notification(void) CHECK(IEC104_TcpServer_Send_Idle(sut, sut->generation, asdu, sizeof(asdu), IEC104_TCP_RECORD_CAPACITY - 1U) == IEC104_TCP_SUBMIT_OK); memset(&ack, 0, sizeof(ack)); ack.frame_type = IEC104_FRAME_TYPE_S; ack.receive_number = 1U; - CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, fake.now) == + CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); CHECK(sut->connection.send_manager.idle_unacked_count == 0U && sut->connection.send_manager.record_count == 1U); CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, IEC104_TCP_RECORD_CAPACITY - 1U) == @@ -267,7 +267,7 @@ static void test_record_reserve_and_tail_notification(void) CHECK(IEC60870_Asdu_Create_From_Buffer(&object, IEC104_Slave_Get_Application_Layer_Parameters(slave), bytes, sizeof(bytes)) == IEC60870_ASDU_OK); CHECK(IEC104_Slave_Send_Idle(slave, &identity, &object, 1U) == IEC104_TCP_SUBMIT_OK); - CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, fake.now) == + CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); CHECK(IEC104_Slave_Query_Idle_Send(slave, &identity, 1U) == IEC104_TCP_SUBMIT_OK); CHECK(IEC104_Slave_Send_Idle(slave, &identity, &object, 1U) == IEC104_TCP_SUBMIT_OK); @@ -343,7 +343,7 @@ static void test_retained_request_resume(void) gi[2] = (uint8_t)(count << 1); gi[3] = (uint8_t)(count >> 7); push(gi, sizeof(gi)); for (i = 0U; i < count + 16U && !sut->rx_event_pending; ++i) { poll_once(); } CHECK(sut->rx_event_pending != 0U && sut->connection.rx_link_applied != 0U); - CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, fake.now, 1U) == + CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, (uint32_t)fake.now, 1U) == IEC104_CONNECTION_WAIT); while (IEC104_Slave_NextEvent(slave, &event) == IEC104_TCP_EVENT_READY) {} CHECK(IEC104_Slave_Check_Request(slave, &identity) == IEC104_SLAVE_REQUEST_READY); diff --git a/IEC60870-Slave/test/iec104_response_transport_test.c b/IEC60870-Slave/test/iec104_response_transport_test.c index e1a22085..9d1477db 100644 --- a/IEC60870-Slave/test/iec104_response_transport_test.c +++ b/IEC60870-Slave/test/iec104_response_transport_test.c @@ -348,7 +348,7 @@ static void test_response_sustained_bidirectional_fairness(void) frame[4] = (uint8_t)(nr << 1); frame[5] = (uint8_t)(nr >> 7); CHECK(IEC104_Parse_APCI(frame, sizeof(frame), &ack) == 1); CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, - sut->generation, &ack, fake.now) == IEC104_SEND_MANAGER_OK); + sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); /* Model a fresh receive/record batch without flushing extra I frames. */ sut->event_budget = TCP_EVENT_BUDGET; sut->event_yield = 0U; diff --git a/IEC60870-Slave/test/iec104_tcp_scheduler_test.c b/IEC60870-Slave/test/iec104_tcp_scheduler_test.c index af020fd0..db91e500 100644 --- a/IEC60870-Slave/test/iec104_tcp_scheduler_test.c +++ b/IEC60870-Slave/test/iec104_tcp_scheduler_test.c @@ -533,7 +533,7 @@ static void check_testfr_wait_without_probe(void) { uint32_t wait_ms = 0; CHECK(IEC104_Connection_Get_Wait_Time(&sut->connection, sut->generation, - fake.now, 60000, &wait_ms) == IEC104_CONNECTION_OK); + (uint32_t)fake.now, 60000, &wait_ms) == IEC104_CONNECTION_OK); CHECK(wait_ms == 60000); CHECK(sut->connection.link_state.testfr_state == IEC104_TESTFR_IDLE); CHECK(!sut->connection.testfr_timer_active); @@ -746,23 +746,23 @@ static void test_peer_testfr_manager_contract(void) apci.u_function = IEC104_U_TESTFR_ACT; saved = sut->connection.link_state; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation + 1U, &apci, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation + 1U, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(memcmp(&sut->connection.link_state, &saved, sizeof(saved)) == 0); apci.u_function = IEC104_U_TESTFR_CON; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(memcmp(&sut->connection.link_state, &saved, sizeof(saved)) == 0); CHECK(sut->connection.send_buffer.control_count == 0); apci.u_function = IEC104_U_TESTFR_ACT; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_QUEUED); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_QUEUED); CHECK(sut->connection.link_state.peer_testfr_seen == 1); CHECK(IEC104_SendManager_Queue_Testfr_Act(&sut->connection.send_manager, - sut->generation, fake.now) == IEC104_SEND_MANAGER_WAIT); + sut->generation, (uint32_t)fake.now) == IEC104_SEND_MANAGER_WAIT); CHECK(IEC104_SendManager_Queue_T3_Testfr(&sut->connection.send_manager, - sut->generation, 40000, 20000, fake.now) == IEC104_SEND_MANAGER_WAIT); + sut->generation, 40000, 20000, (uint32_t)fake.now) == IEC104_SEND_MANAGER_WAIT); CHECK(IEC104_SendManager_Queue_T3_Testfr(&sut->connection.send_manager, - sut->generation, 40000, 0, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation, 40000, 0, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(sut->connection.send_buffer.control_count == 1); poll_once(); CHECK(fake.sent_bytes == sizeof(start_act) + sizeof(scheduler_test_con)); @@ -781,7 +781,7 @@ static void test_peer_testfr_reservation_failure(void) apci.u_function = IEC104_U_TESTFR_ACT; sut->connection.send_buffer.next_frame_serial = UINT64_MAX; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_FATAL); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_FATAL); CHECK(sut->connection.link_state.peer_testfr_seen == 1); CHECK(sut->connection.send_buffer.control_count == 0 && !sut->connection.send_buffer.has_reservation); end();