From e3e44d23fce3df5b6ada29e16c7c0604eb7d77c2 Mon Sep 17 00:00:00 2001 From: Reuben Cartwright Date: Tue, 27 Aug 2024 11:10:09 +0100 Subject: [PATCH] fix-protypes: Fix `mqtt_agent_task.h` prototypes The only public function declared in `mqtt_agent_task.c` is `vStartMqttAgentTask` as other functions were extracted to separate files in previous work. The prototypes for these other functions were left behind in `mqtt_agent_task.h`. This commit removes them. Also change `ota_agent_task.c` to include `events.h`, which is where these function prototypes were placed in previous work. Signed-off-by: Reuben Cartwright --- .../aws_iot/coremqtt_agent/integration/inc/mqtt_agent_task.h | 5 +---- .../ota_for_aws_iot_embedded_sdk/integration/CMakeLists.txt | 1 + .../integration/src/ota_agent_task.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/aws_iot/coremqtt_agent/integration/inc/mqtt_agent_task.h b/components/aws_iot/coremqtt_agent/integration/inc/mqtt_agent_task.h index 5826e914..0cb71855 100644 --- a/components/aws_iot/coremqtt_agent/integration/inc/mqtt_agent_task.h +++ b/components/aws_iot/coremqtt_agent/integration/inc/mqtt_agent_task.h @@ -1,7 +1,7 @@ /* * FreeRTOS V202012.00 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * Copyright 2024 Arm Limited and/or its affiliates + * Copyright 2023-2024 Arm Limited and/or its affiliates * * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -56,9 +56,6 @@ struct MQTTAgentCommandContext void * pArgs; }; -void vWaitUntilMQTTAgentReady( void ); -void vWaitUntilMQTTAgentConnected( void ); -bool xIsMqttAgentConnected( void ); void vStartMqttAgentTask( void ); #endif /* MQTT_AGENT_H */ diff --git a/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/CMakeLists.txt b/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/CMakeLists.txt index 160bdd3b..96b70d2b 100644 --- a/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/CMakeLists.txt +++ b/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(ota-for-aws-iot-embedded-sdk coremqtt coremqtt-agent freertos-ota-pal-psa + helpers-events helpers-logging tinycbor ) diff --git a/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/src/ota_agent_task.c b/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/src/ota_agent_task.c index a38cf3f0..a9a845d4 100644 --- a/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/src/ota_agent_task.c +++ b/components/aws_iot/ota_for_aws_iot_embedded_sdk/integration/src/ota_agent_task.c @@ -35,6 +35,7 @@ #include "app_config.h" #include "mqtt_agent_task.h" +#include "events.h" /* includes for TFM */ #include "psa/update.h"