michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys/mgmt/hawkbit: Check if the download completed

Browse source 
Remove the unused semaphore and use a boolean variable to check if the
download is complete.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2021-07-31 13:14:49 +08:00 • committed by Christopher Friedt
commit 17dd9f4928
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/mgmt/hawkbit/hawkbit.c
View file

@ -74,7 +74,6 @@ static struct hawkbit_context {
int32_t action_id; int32_t action_id;
uint8_t *response_data; uint8_t *response_data;
int32_t json_action_id; int32_t json_action_id;
struct k_sem semaphore;
size_t url_buffer_size; size_t url_buffer_size;
size_t status_buffer_size; size_t status_buffer_size;
struct hawkbit_download dl; struct hawkbit_download dl;
@ -84,6 +83,7 @@ static struct hawkbit_context {
uint8_t status_buffer[STATUS_BUFFER_SIZE]; uint8_t status_buffer[STATUS_BUFFER_SIZE];
uint8_t recv_buf_tcp[RECV_BUFFER_SIZE]; uint8_t recv_buf_tcp[RECV_BUFFER_SIZE];
enum hawkbit_response code_status; enum hawkbit_response code_status;
bool final_data_received;
} hb_context; } hb_context;
static union { static union {
@ -829,7 +829,7 @@ static void response_cb(struct http_response *rsp,
} }
if (final_data == HTTP_DATA_FINAL) { if (final_data == HTTP_DATA_FINAL) {
k_sem_give(&hb_context.semaphore); hb_context.final_data_received = true;
} }
break; break;
@ -865,6 +865,7 @@ static bool send_request(enum http_method method,
hb_context.http_req.response = response_cb; hb_context.http_req.response = response_cb;
hb_context.http_req.recv_buf = hb_context.recv_buf_tcp; hb_context.http_req.recv_buf = hb_context.recv_buf_tcp;
hb_context.http_req.recv_buf_len = sizeof(hb_context.recv_buf_tcp); hb_context.http_req.recv_buf_len = sizeof(hb_context.recv_buf_tcp);
hb_context.final_data_received = false;
switch (type) { switch (type) {
case HAWKBIT_PROBE: case HAWKBIT_PROBE:
@ -1023,7 +1024,6 @@ enum hawkbit_response hawkbit_probe(void)
memset(&hb_context, 0, sizeof(hb_context)); memset(&hb_context, 0, sizeof(hb_context));
hb_context.response_data = malloc(RESPONSE_BUFFER_SIZE); hb_context.response_data = malloc(RESPONSE_BUFFER_SIZE);
k_sem_init(&hb_context.semaphore, 0, 1);
if (!boot_is_img_confirmed()) { if (!boot_is_img_confirmed()) {
LOG_ERR("The current image is not confirmed"); LOG_ERR("The current image is not confirmed");
@ -1210,8 +1210,11 @@ enum hawkbit_response hawkbit_probe(void)
goto cleanup; goto cleanup;
} }
if (boot_request_upgrade(BOOT_UPGRADE_TEST)) { if (!hb_context.final_data_received) {
LOG_ERR("Download failed"); LOG_ERR("Download is not complete");
hb_context.code_status = HAWKBIT_DOWNLOAD_ERROR;
} else if (boot_request_upgrade(BOOT_UPGRADE_TEST)) {
LOG_ERR("Failed to mark the image in slot 1 as pending");
hb_context.code_status = HAWKBIT_DOWNLOAD_ERROR; hb_context.code_status = HAWKBIT_DOWNLOAD_ERROR;
} else { } else {
hb_context.code_status = HAWKBIT_UPDATE_INSTALLED; hb_context.code_status = HAWKBIT_UPDATE_INSTALLED;