Remove TS specific prefixes and paths from FWU code
The PSA FWU definitions are not Trusted Services specific, remove
prefixes and directories which indicate otherwise.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I91e3b72fe34070983244f2a926a8e9f4e2617eb7
diff --git a/components/app/fwu-tool/app/metadata_v1_reader.cpp b/components/app/fwu-tool/app/metadata_v1_reader.cpp
index 195fa6e..4394050 100644
--- a/components/app/fwu-tool/app/metadata_v1_reader.cpp
+++ b/components/app/fwu-tool/app/metadata_v1_reader.cpp
@@ -7,7 +7,7 @@
#include <assert.h>
#include "metadata_reader.h"
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
+#include "protocols/service/fwu/metadata_v1.h"
class metadata_v1_reader : public metadata_version_specific_reader {
public:
diff --git a/components/app/fwu-tool/app/metadata_v2_reader.cpp b/components/app/fwu-tool/app/metadata_v2_reader.cpp
index 61faa61..9ce3393 100644
--- a/components/app/fwu-tool/app/metadata_v2_reader.cpp
+++ b/components/app/fwu-tool/app/metadata_v2_reader.cpp
@@ -7,7 +7,7 @@
#include <assert.h>
#include "metadata_reader.h"
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/metadata_v2.h"
class metadata_v2_reader : public metadata_version_specific_reader {
public:
diff --git a/components/app/fwu-tool/cmd_print_image_dir.cpp b/components/app/fwu-tool/cmd_print_image_dir.cpp
index 1e07027..a50af82 100644
--- a/components/app/fwu-tool/cmd_print_image_dir.cpp
+++ b/components/app/fwu-tool/cmd_print_image_dir.cpp
@@ -13,7 +13,7 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
void cmd_print_image_dir(fwu_app &app)
{
@@ -29,13 +29,13 @@
return;
}
- if (fetched_object.size() < offsetof(ts_fwu_image_directory, img_info_entry)) {
+ if (fetched_object.size() < offsetof(fwu_image_directory, img_info_entry)) {
printf("Error: invalid image directory size\n");
return;
}
- const struct ts_fwu_image_directory *img_dir =
- (const struct ts_fwu_image_directory *)fetched_object.data();
+ const struct fwu_image_directory *img_dir =
+ (const struct fwu_image_directory *)fetched_object.data();
printf("\nimage_directory (size %zu bytes) :\n", fetched_object.size());
printf("\tdirectory_version : %d\n", img_dir->directory_version);
diff --git a/components/app/fwu-tool/cmd_print_metadata_v1.cpp b/components/app/fwu-tool/cmd_print_metadata_v1.cpp
index 6539e57..0fcfe45 100644
--- a/components/app/fwu-tool/cmd_print_metadata_v1.cpp
+++ b/components/app/fwu-tool/cmd_print_metadata_v1.cpp
@@ -13,8 +13,8 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/metadata_v1.h"
void cmd_print_metadata_v1(fwu_app &app)
{
diff --git a/components/app/fwu-tool/cmd_print_metadata_v2.cpp b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
index 666dcb2..7367438 100644
--- a/components/app/fwu-tool/cmd_print_metadata_v2.cpp
+++ b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
@@ -13,8 +13,8 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/metadata_v2.h"
void cmd_print_metadata_v2(fwu_app &app)
{
diff --git a/components/service/fwu/agent/fw_directory.c b/components/service/fwu/agent/fw_directory.c
index ec7486b..3e95cc0 100644
--- a/components/service/fwu/agent/fw_directory.c
+++ b/components/service/fwu/agent/fw_directory.c
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <string.h>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
void fw_directory_init(struct fw_directory *fw_directory)
{
diff --git a/components/service/fwu/agent/img_dir_serializer.c b/components/service/fwu/agent/img_dir_serializer.c
index d1f44af..e8dafea 100644
--- a/components/service/fwu/agent/img_dir_serializer.c
+++ b/components/service/fwu/agent/img_dir_serializer.c
@@ -11,7 +11,7 @@
#include <string.h>
#include "fw_directory.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
#include "service/fwu/fw_store/fw_store.h"
int img_dir_serializer_serialize(const struct fw_directory *fw_dir, const struct fw_store *fw_store,
@@ -24,7 +24,7 @@
if (buf_size < serialized_len)
return FWU_STATUS_OUT_OF_BOUNDS;
- struct ts_fwu_image_directory *output = (struct ts_fwu_image_directory *)buf;
+ struct fwu_image_directory *output = (struct fwu_image_directory *)buf;
/* Clear the output buffer */
memset(buf, 0, serialized_len);
@@ -35,10 +35,10 @@
assert(boot_info);
output->directory_version = 2;
- output->img_info_offset = offsetof(struct ts_fwu_image_directory, img_info_entry);
+ output->img_info_offset = offsetof(struct fwu_image_directory, img_info_entry);
output->num_images = fw_directory_num_images(fw_dir);
output->correct_boot = (boot_info->active_index == boot_info->boot_index);
- output->img_info_size = sizeof(struct ts_fwu_image_info_entry);
+ output->img_info_size = sizeof(struct fwu_image_info_entry);
output->reserved = 0;
/* Serialize image info for each image */
@@ -67,6 +67,6 @@
size_t img_dir_serializer_get_len(const struct fw_directory *fw_dir)
{
- return offsetof(struct ts_fwu_image_directory, img_info_entry) +
- sizeof(struct ts_fwu_image_info_entry) * fw_directory_num_images(fw_dir);
+ return offsetof(struct fwu_image_directory, img_info_entry) +
+ sizeof(struct fwu_image_info_entry) * fw_directory_num_images(fw_dir);
}
diff --git a/components/service/fwu/agent/stream_manager.c b/components/service/fwu/agent/stream_manager.c
index c93bdf1..bd7365f 100644
--- a/components/service/fwu/agent/stream_manager.c
+++ b/components/service/fwu/agent/stream_manager.c
@@ -9,7 +9,7 @@
#include <stddef.h>
#include <string.h>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/fw_store/fw_store.h"
static uint32_t generate_handle(struct stream_manager *subject,
diff --git a/components/service/fwu/agent/update_agent.c b/components/service/fwu/agent/update_agent.c
index 733a012..938361a 100644
--- a/components/service/fwu/agent/update_agent.c
+++ b/components/service/fwu/agent/update_agent.c
@@ -13,8 +13,8 @@
#include "common/uuid/uuid.h"
#include "img_dir_serializer.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/fw_store/fw_store.h"
#include "service/fwu/inspector/fw_inspector.h"
#include "trace.h"
diff --git a/components/service/fwu/common/update_agent_interface.c b/components/service/fwu/common/update_agent_interface.c
index 4a2078f..0582036 100644
--- a/components/service/fwu/common/update_agent_interface.c
+++ b/components/service/fwu/common/update_agent_interface.c
@@ -5,7 +5,7 @@
*/
#include "update_agent_interface.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
int update_agent_discover(struct update_agent *update_agent, struct fwu_discovery_result *result)
{
diff --git a/components/service/fwu/common/update_agent_interface.h b/components/service/fwu/common/update_agent_interface.h
index 0068908..8681672 100644
--- a/components/service/fwu/common/update_agent_interface.h
+++ b/components/service/fwu/common/update_agent_interface.h
@@ -12,7 +12,7 @@
#include <stdint.h>
#include "common/uuid/uuid.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#ifdef __cplusplus
extern "C" {
diff --git a/components/service/fwu/fw_store/banked/banked_fw_store.c b/components/service/fwu/fw_store/banked/banked_fw_store.c
index b987b48..e88095f 100644
--- a/components/service/fwu/fw_store/banked/banked_fw_store.c
+++ b/components/service/fwu/fw_store/banked/banked_fw_store.c
@@ -13,8 +13,8 @@
#include "bank_scheme.h"
#include "common/uuid/uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/installer/installer.h"
#include "service/fwu/installer/installer_index.h"
#include "volume_id.h"
diff --git a/components/service/fwu/fw_store/banked/metadata_manager.c b/components/service/fwu/fw_store/banked/metadata_manager.c
index 954dcc9..fe6eb66 100644
--- a/components/service/fwu/fw_store/banked/metadata_manager.c
+++ b/components/service/fwu/fw_store/banked/metadata_manager.c
@@ -15,7 +15,7 @@
#include "common/crc32/crc32.h"
#include "media/volume/index/volume_index.h"
#include "media/volume/volume.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/fw_store/banked/metadata_serializer/metadata_serializer.h"
#include "trace.h"
#include "volume_id.h"
diff --git a/components/service/fwu/fw_store/banked/metadata_serializer/v1/metadata_serializer_v1.c b/components/service/fwu/fw_store/banked/metadata_serializer/v1/metadata_serializer_v1.c
index 5458b4c..4e2a3dd 100644
--- a/components/service/fwu/fw_store/banked/metadata_serializer/v1/metadata_serializer_v1.c
+++ b/components/service/fwu/fw_store/banked/metadata_serializer/v1/metadata_serializer_v1.c
@@ -14,8 +14,8 @@
#include "common/uuid/uuid.h"
#include "media/volume/index/volume_index.h"
#include "media/volume/volume.h"
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/metadata_v1.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/agent/fw_directory.h"
#include "service/fwu/fw_store/banked/bank_tracker.h"
#include "service/fwu/fw_store/banked/metadata_serializer/metadata_serializer.h"
diff --git a/components/service/fwu/fw_store/banked/metadata_serializer/v2/metadata_serializer_v2.c b/components/service/fwu/fw_store/banked/metadata_serializer/v2/metadata_serializer_v2.c
index 65fd411..b8a4012 100644
--- a/components/service/fwu/fw_store/banked/metadata_serializer/v2/metadata_serializer_v2.c
+++ b/components/service/fwu/fw_store/banked/metadata_serializer/v2/metadata_serializer_v2.c
@@ -14,8 +14,8 @@
#include "common/uuid/uuid.h"
#include "media/volume/index/volume_index.h"
#include "media/volume/volume.h"
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/metadata_v2.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/agent/fw_directory.h"
#include "service/fwu/fw_store/banked/bank_tracker.h"
#include "service/fwu/fw_store/banked/metadata_serializer/metadata_serializer.h"
diff --git a/components/service/fwu/fw_store/banked/test/metadata_v2_tests.cpp b/components/service/fwu/fw_store/banked/test/metadata_v2_tests.cpp
index ecc83b4..d40e637 100644
--- a/components/service/fwu/fw_store/banked/test/metadata_v2_tests.cpp
+++ b/components/service/fwu/fw_store/banked/test/metadata_v2_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <cstddef>
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/metadata_v2.h"
/* Tests check FWU metadata protocol definitions are aligned to the FWU-A
* specification.
diff --git a/components/service/fwu/inspector/direct/direct_fw_inspector.c b/components/service/fwu/inspector/direct/direct_fw_inspector.c
index 503cf45..63d64fc 100644
--- a/components/service/fwu/inspector/direct/direct_fw_inspector.c
+++ b/components/service/fwu/inspector/direct/direct_fw_inspector.c
@@ -8,7 +8,7 @@
#include "direct_fw_inspector.h"
#include "media/volume/index/volume_index.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/agent/fw_directory.h"
#include "service/fwu/fw_store/banked/volume_id.h"
#include "service/fwu/installer/installer.h"
diff --git a/components/service/fwu/installer/copy/copy_installer.c b/components/service/fwu/installer/copy/copy_installer.c
index 84543a3..21fd790 100644
--- a/components/service/fwu/installer/copy/copy_installer.c
+++ b/components/service/fwu/installer/copy/copy_installer.c
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include "media/volume/index/volume_index.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "util.h"
#define COPY_CHUNK_SIZE (4096)
diff --git a/components/service/fwu/installer/installer.c b/components/service/fwu/installer/installer.c
index b69a71c..433ea5a 100644
--- a/components/service/fwu/installer/installer.c
+++ b/components/service/fwu/installer/installer.c
@@ -11,7 +11,7 @@
#include <stdbool.h>
#include <stddef.h>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
void installer_init(struct installer *installer, enum install_type install_type,
uint32_t location_id, const struct uuid_octets *location_uuid, void *context,
diff --git a/components/service/fwu/installer/raw/raw_installer.c b/components/service/fwu/installer/raw/raw_installer.c
index 0002779..227183e 100644
--- a/components/service/fwu/installer/raw/raw_installer.c
+++ b/components/service/fwu/installer/raw/raw_installer.c
@@ -12,7 +12,7 @@
#include <string.h>
#include "media/volume/index/volume_index.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/agent/fw_directory.h"
static int raw_installer_begin(void *context, unsigned int current_volume_id,
diff --git a/components/service/fwu/provider/fwu_provider.c b/components/service/fwu/provider/fwu_provider.c
index 9085a98..d1d8df7 100644
--- a/components/service/fwu/provider/fwu_provider.c
+++ b/components/service/fwu/provider/fwu_provider.c
@@ -10,7 +10,7 @@
#include "common/uuid/uuid.h"
#include "protocols/rpc/common/packed-c/status.h"
-#include "protocols/service/fwu/packed-c/opcodes.h"
+#include "protocols/service/fwu/opcodes.h"
#include "service/fwu/common/update_agent_interface.h"
#include "service/fwu/provider/serializer/fwu_provider_serializer.h"
#include "fwu_uuid.h"
diff --git a/components/service/fwu/provider/fwu_provider_shim.c b/components/service/fwu/provider/fwu_provider_shim.c
index 0f1e471..6d67870 100644
--- a/components/service/fwu/provider/fwu_provider_shim.c
+++ b/components/service/fwu/provider/fwu_provider_shim.c
@@ -5,15 +5,14 @@
*/
#include "fwu_provider_shim.h"
-
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
#include "util.h"
static rpc_status_t receive(void *context, struct rpc_request *req)
{
struct rpc_service_interface *fwu_rpc_interface = (struct rpc_service_interface *)context;
- struct ts_fwu_request_header *req_header = NULL;
- struct ts_fwu_response_header *resp_header = NULL;
+ struct fwu_request_header *req_header = NULL;
+ struct fwu_response_header *resp_header = NULL;
rpc_status_t rpc_status = RPC_ERROR_INTERNAL;
struct rpc_request fwu_req = { 0 };
@@ -23,8 +22,8 @@
if (req->response.size < sizeof(*resp_header))
return RPC_ERROR_INVALID_RESPONSE_BODY;
- req_header = (struct ts_fwu_request_header *)req->request.data;
- resp_header = (struct ts_fwu_response_header *)req->response.data;
+ req_header = (struct fwu_request_header *)req->request.data;
+ resp_header = (struct fwu_response_header *)req->response.data;
/* Build new RPC request without the request headers */
fwu_req = *req;
diff --git a/components/service/fwu/provider/serializer/packed-c/packedc_fwu_provider_serializer.c b/components/service/fwu/provider/serializer/packed-c/packedc_fwu_provider_serializer.c
index e45160f..888affb 100644
--- a/components/service/fwu/provider/serializer/packed-c/packedc_fwu_provider_serializer.c
+++ b/components/service/fwu/provider/serializer/packed-c/packedc_fwu_provider_serializer.c
@@ -8,7 +8,7 @@
#include <string.h>
#include "protocols/rpc/common/packed-c/status.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
#include "util.h"
rpc_status_t serialize_discover_resp(const struct rpc_buffer *resp_buf, int16_t service_status,
@@ -17,20 +17,20 @@
uint32_t vendor_specific_flags, uint8_t *function_presence)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_RESPONSE_BODY;
- struct ts_fwu_discover_out *resp_msg = NULL;
+ struct fwu_discover_out *resp_msg = NULL;
size_t len = 0;
if (ADD_OVERFLOW(sizeof(*resp_msg), num_func, &len))
return RPC_ERROR_INVALID_RESPONSE_BODY;
if (len <= resp_buf->size) {
- resp_msg = (struct ts_fwu_discover_out *)resp_buf->data;
+ resp_msg = (struct fwu_discover_out *)resp_buf->data;
resp_msg->service_status = service_status;
resp_msg->version_major = version_major;
resp_msg->version_minor = version_minor;
resp_msg->off_function_presence =
- offsetof(struct ts_fwu_discover_out, function_presence);
+ offsetof(struct fwu_discover_out, function_presence);
resp_msg->num_func = num_func;
resp_msg->max_payload_size = max_payload_size;
resp_msg->flags = flags;
@@ -49,11 +49,11 @@
struct uuid_octets *update_guid)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_begin_staging_in);
+ size_t expected_fixed_len = sizeof(struct fwu_begin_staging_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_begin_staging_in *recv_msg =
- (const struct ts_fwu_begin_staging_in *)req_buf->data;
+ const struct fwu_begin_staging_in *recv_msg =
+ (const struct fwu_begin_staging_in *)req_buf->data;
size_t full_len = 0;
if (ADD_OVERFLOW(expected_fixed_len, recv_msg->partial_update_count, &full_len))
@@ -78,11 +78,11 @@
struct uuid_octets *image_type_uuid, uint8_t *op_type)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_open_in);
+ size_t expected_fixed_len = sizeof(struct fwu_open_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_open_in *recv_msg =
- (const struct ts_fwu_open_in *)req_buf->data;
+ const struct fwu_open_in *recv_msg =
+ (const struct fwu_open_in *)req_buf->data;
if (recv_msg->op_type == FWU_OPEN_OP_TYPE_READ ||
recv_msg->op_type == FWU_OPEN_OP_TYPE_WRITE) {
@@ -100,10 +100,10 @@
static rpc_status_t serialize_open_resp(struct rpc_buffer *resp_buf, uint32_t handle)
{
rpc_status_t rpc_status = RPC_ERROR_INTERNAL;
- size_t fixed_len = sizeof(struct ts_fwu_open_out);
+ size_t fixed_len = sizeof(struct fwu_open_out);
if (fixed_len <= resp_buf->size) {
- struct ts_fwu_open_out *resp_msg = (struct ts_fwu_open_out *)resp_buf->data;
+ struct fwu_open_out *resp_msg = (struct fwu_open_out *)resp_buf->data;
resp_msg->handle = handle;
@@ -120,11 +120,11 @@
const uint8_t **data)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_write_stream_in);
+ size_t expected_fixed_len = sizeof(struct fwu_write_stream_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_write_stream_in *recv_msg =
- (const struct ts_fwu_write_stream_in *)req_buf->data;
+ const struct fwu_write_stream_in *recv_msg =
+ (const struct fwu_write_stream_in *)req_buf->data;
*handle = recv_msg->handle;
*data_length = recv_msg->data_len;
@@ -140,11 +140,11 @@
uint32_t *handle)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_read_stream_in);
+ size_t expected_fixed_len = sizeof(struct fwu_read_stream_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_read_stream_in *recv_msg =
- (const struct ts_fwu_read_stream_in *)req_buf->data;
+ const struct fwu_read_stream_in *recv_msg =
+ (const struct fwu_read_stream_in *)req_buf->data;
*handle = recv_msg->handle;
rpc_status = RPC_SUCCESS;
@@ -156,8 +156,8 @@
static void read_stream_resp_payload(const struct rpc_buffer *resp_buf, uint8_t **payload_buf,
size_t *max_payload)
{
- struct ts_fwu_read_stream_out *resp_msg = (struct ts_fwu_read_stream_out *)resp_buf->data;
- size_t fixed_len = offsetof(struct ts_fwu_read_stream_out, payload);
+ struct fwu_read_stream_out *resp_msg = (struct fwu_read_stream_out *)resp_buf->data;
+ size_t fixed_len = offsetof(struct fwu_read_stream_out, payload);
*max_payload = 0;
*payload_buf = resp_msg->payload;
@@ -170,8 +170,8 @@
size_t total_bytes)
{
rpc_status_t rpc_status = RPC_ERROR_INTERNAL;
- struct ts_fwu_read_stream_out *resp_msg = (struct ts_fwu_read_stream_out *)resp_buf->data;
- size_t proto_overhead = offsetof(struct ts_fwu_read_stream_out, payload);
+ struct fwu_read_stream_out *resp_msg = (struct fwu_read_stream_out *)resp_buf->data;
+ size_t proto_overhead = offsetof(struct fwu_read_stream_out, payload);
if (read_bytes > (SIZE_MAX - proto_overhead))
return RPC_ERROR_INVALID_VALUE;
@@ -194,11 +194,11 @@
bool *accepted, size_t *max_atomic_len)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_commit_in);
+ size_t expected_fixed_len = sizeof(struct fwu_commit_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_commit_in *recv_msg =
- (const struct ts_fwu_commit_in *)req_buf->data;
+ const struct fwu_commit_in *recv_msg =
+ (const struct fwu_commit_in *)req_buf->data;
*handle = recv_msg->handle;
*accepted = (recv_msg->acceptance_req == 0);
@@ -213,9 +213,9 @@
size_t total_work)
{
rpc_status_t rpc_status = RPC_ERROR_INTERNAL;
- struct ts_fwu_commit_out *resp_msg = (struct ts_fwu_commit_out *)resp_buf->data;
+ struct fwu_commit_out *resp_msg = (struct fwu_commit_out *)resp_buf->data;
- size_t required_len = sizeof(struct ts_fwu_commit_out);
+ size_t required_len = sizeof(struct fwu_commit_out);
if (required_len <= resp_buf->size) {
resp_msg->progress = progress;
@@ -233,11 +233,11 @@
struct uuid_octets *image_type_uuid)
{
rpc_status_t rpc_status = RPC_ERROR_INVALID_REQUEST_BODY;
- size_t expected_fixed_len = sizeof(struct ts_fwu_accept_image_in);
+ size_t expected_fixed_len = sizeof(struct fwu_accept_image_in);
if (expected_fixed_len <= req_buf->data_length) {
- const struct ts_fwu_accept_image_in *recv_msg =
- (const struct ts_fwu_accept_image_in *)req_buf->data;
+ const struct fwu_accept_image_in *recv_msg =
+ (const struct fwu_accept_image_in *)req_buf->data;
memcpy(image_type_uuid->octets, recv_msg->image_type_uuid, UUID_OCTETS_LEN);
rpc_status = RPC_SUCCESS;
diff --git a/components/service/fwu/test/fwu_client/direct/direct_fwu_client.cpp b/components/service/fwu/test/fwu_client/direct/direct_fwu_client.cpp
index 89f870c..aa4cd3e 100644
--- a/components/service/fwu/test/fwu_client/direct/direct_fwu_client.cpp
+++ b/components/service/fwu/test/fwu_client/direct/direct_fwu_client.cpp
@@ -9,7 +9,7 @@
#include <cstring>
#include "service/fwu/common/update_agent_interface.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
direct_fwu_client::direct_fwu_client(struct update_agent **update_agent)
: fwu_client()
diff --git a/components/service/fwu/test/fwu_client/remote/remote_fwu_client.cpp b/components/service/fwu/test/fwu_client/remote/remote_fwu_client.cpp
index f28d86d..16dffc4 100644
--- a/components/service/fwu/test/fwu_client/remote/remote_fwu_client.cpp
+++ b/components/service/fwu/test/fwu_client/remote/remote_fwu_client.cpp
@@ -12,9 +12,9 @@
#include "protocols/rpc/common/packed-c/encoding.h"
#include "protocols/rpc/common/packed-c/status.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/opcodes.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/opcodes.h"
+#include "protocols/service/fwu/status.h"
#include "util.h"
remote_fwu_client::remote_fwu_client()
@@ -73,11 +73,11 @@
uint8_t **request_buffer, size_t request_length,
size_t response_max_length)
{
- struct ts_fwu_request_header *req_header = NULL;
+ struct fwu_request_header *req_header = NULL;
rpc_call_handle handle = NULL;
request_length += sizeof(*req_header);
- response_max_length += sizeof(struct ts_fwu_response_header);
+ response_max_length += sizeof(struct fwu_response_header);
handle = rpc_caller_session_begin(session, (uint8_t **)&req_header, request_length,
response_max_length);
@@ -93,7 +93,7 @@
uint8_t **response_buffer, size_t *response_length,
service_status_t *service_status)
{
- struct ts_fwu_response_header *resp_header = NULL;
+ struct fwu_response_header *resp_header = NULL;
fwu_call_handle *fwu_handle = (fwu_call_handle *)handle;
rpc_status_t status = RPC_ERROR_INTERNAL;
@@ -156,7 +156,7 @@
uint32_t *vendor_specific_flags, uint8_t *function_presence)
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_discover_out *resp_msg = NULL;
+ struct fwu_discover_out *resp_msg = NULL;
size_t max_resp_len = 0;
if (!m_service_context)
@@ -184,7 +184,7 @@
if (fwu_status == FWU_STATUS_SUCCESS) {
if (resp_len <= max_resp_len) {
- resp_msg = (struct ts_fwu_discover_out *)resp_buf;
+ resp_msg = (struct fwu_discover_out *)resp_buf;
*service_status = resp_msg->service_status;
*version_major = resp_msg->version_major;
@@ -210,7 +210,7 @@
struct uuid_octets update_guid[])
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_begin_staging_in *req_msg = NULL;
+ struct fwu_begin_staging_in *req_msg = NULL;
size_t req_len = 0;
size_t uuids_size = 0;
@@ -231,7 +231,7 @@
size_t resp_len = 0;
service_status_t service_status = 0;
- req_msg = (struct ts_fwu_begin_staging_in *)req_buf;
+ req_msg = (struct fwu_begin_staging_in *)req_buf;
req_msg->reserved = 0;
req_msg->vendor_flags = vendor_flags;
req_msg->partial_update_count = partial_update_count;
@@ -263,8 +263,8 @@
int remote_fwu_client::accept(const struct uuid_octets *image_type_uuid)
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_accept_image_in req_msg = { 0 };
- size_t req_len = sizeof(struct ts_fwu_accept_image_in);
+ struct fwu_accept_image_in req_msg = { 0 };
+ size_t req_len = sizeof(struct fwu_accept_image_in);
if (!m_service_context)
return fwu_status;
@@ -304,8 +304,8 @@
int remote_fwu_client::open(const struct uuid_octets *uuid, op_type op_type, uint32_t *handle)
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_open_in req_msg = { 0 };
- size_t req_len = sizeof(struct ts_fwu_open_in);
+ struct fwu_open_in req_msg = { 0 };
+ size_t req_len = sizeof(struct fwu_open_in);
if (!m_service_context)
return fwu_status;
@@ -317,7 +317,7 @@
uint8_t *req_buf;
call_handle = fwu_caller_session_begin(m_rpc_session, &req_buf, req_len,
- sizeof(struct ts_fwu_open_out));
+ sizeof(struct fwu_open_out));
if (call_handle) {
uint8_t *resp_buf;
@@ -334,10 +334,10 @@
fwu_status = service_status;
if ((fwu_status == FWU_STATUS_SUCCESS) &&
- (resp_len >= sizeof(struct ts_fwu_open_out))) {
- struct ts_fwu_open_out resp_msg;
+ (resp_len >= sizeof(struct fwu_open_out))) {
+ struct fwu_open_out resp_msg;
- memcpy(&resp_msg, resp_buf, sizeof(struct ts_fwu_open_out));
+ memcpy(&resp_msg, resp_buf, sizeof(struct fwu_open_out));
*handle = resp_msg.handle;
}
}
@@ -351,8 +351,8 @@
int remote_fwu_client::commit(uint32_t handle, bool accepted)
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_commit_in req_msg = { 0 };
- size_t req_len = sizeof(struct ts_fwu_commit_in);
+ struct fwu_commit_in req_msg = { 0 };
+ size_t req_len = sizeof(struct fwu_commit_in);
if (!m_service_context)
return fwu_status;
@@ -387,7 +387,7 @@
int remote_fwu_client::write_stream(uint32_t handle, const uint8_t *data, size_t data_len)
{
- size_t proto_overhead = offsetof(ts_fwu_write_stream_in, payload);
+ size_t proto_overhead = offsetof(fwu_write_stream_in, payload);
size_t max_payload = (m_client.service_info.max_payload > proto_overhead) ?
m_client.service_info.max_payload - proto_overhead :
0;
@@ -402,7 +402,7 @@
return FWU_STATUS_NOT_AVAILABLE;
size_t total_written = 0;
- struct ts_fwu_write_stream_in req_msg;
+ struct fwu_write_stream_in req_msg;
req_msg.handle = handle;
@@ -451,8 +451,8 @@
size_t *total_len)
{
int fwu_status = FWU_STATUS_NOT_AVAILABLE;
- struct ts_fwu_read_stream_in req_msg;
- size_t req_len = sizeof(struct ts_fwu_read_stream_in);
+ struct fwu_read_stream_in req_msg;
+ size_t req_len = sizeof(struct fwu_read_stream_in);
if (!m_service_context)
return fwu_status;
@@ -466,7 +466,7 @@
uint8_t *req_buf;
call_handle = fwu_caller_session_begin(m_rpc_session, &req_buf, req_len,
- sizeof(struct ts_fwu_read_stream_out) + buf_size);
+ sizeof(struct fwu_read_stream_out) + buf_size);
if (call_handle) {
uint8_t *resp_buf;
@@ -479,14 +479,14 @@
FWU_FUNC_ID_READ_STREAM,
&resp_buf, &resp_len, &service_status);
- size_t proto_overhead = offsetof(ts_fwu_read_stream_out, payload);
+ size_t proto_overhead = offsetof(fwu_read_stream_out, payload);
if (m_client.rpc_status == TS_RPC_CALL_ACCEPTED) {
fwu_status = service_status;
if ((fwu_status == FWU_STATUS_SUCCESS) && (resp_len >= proto_overhead)) {
- const struct ts_fwu_read_stream_out *resp_msg =
- (const struct ts_fwu_read_stream_out *)resp_buf;
+ const struct fwu_read_stream_out *resp_msg =
+ (const struct fwu_read_stream_out *)resp_buf;
*read_len = resp_msg->read_bytes;
*total_len = resp_msg->total_bytes;
diff --git a/components/service/fwu/test/fwu_client/remote/remote_fwu_client.h b/components/service/fwu/test/fwu_client/remote/remote_fwu_client.h
index f473ee7..c5a1167 100644
--- a/components/service/fwu/test/fwu_client/remote/remote_fwu_client.h
+++ b/components/service/fwu/test/fwu_client/remote/remote_fwu_client.h
@@ -51,7 +51,7 @@
void close_session(void);
struct fwu_call_handle {
- struct ts_fwu_request_header *req_header;
+ struct fwu_request_header *req_header;
rpc_call_handle handle;
};
diff --git a/components/service/fwu/test/image_directory_checker/image_directory_checker.cpp b/components/service/fwu/test/image_directory_checker/image_directory_checker.cpp
index 8aaa321..85eee97 100644
--- a/components/service/fwu/test/image_directory_checker/image_directory_checker.cpp
+++ b/components/service/fwu/test/image_directory_checker/image_directory_checker.cpp
@@ -69,9 +69,9 @@
{
size_t num_images = 0;
- if (m_total_read_len >= offsetof(struct ts_fwu_image_directory, img_info_entry)) {
- const struct ts_fwu_image_directory *header =
- (const struct ts_fwu_image_directory *)m_buf;
+ if (m_total_read_len >= offsetof(struct fwu_image_directory, img_info_entry)) {
+ const struct fwu_image_directory *header =
+ (const struct fwu_image_directory *)m_buf;
num_images = header->num_images;
}
@@ -86,22 +86,22 @@
(memcmp(this->m_buf, rhs.m_buf, this->m_total_read_len) == 0);
}
-const struct ts_fwu_image_directory *image_directory_checker::get_header(void) const
+const struct fwu_image_directory *image_directory_checker::get_header(void) const
{
- const struct ts_fwu_image_directory *header = NULL;
+ const struct fwu_image_directory *header = NULL;
- if (m_total_read_len >= offsetof(struct ts_fwu_image_directory, img_info_entry))
- header = (const struct ts_fwu_image_directory *)m_buf;
+ if (m_total_read_len >= offsetof(struct fwu_image_directory, img_info_entry))
+ header = (const struct fwu_image_directory *)m_buf;
return header;
}
-const struct ts_fwu_image_info_entry *
+const struct fwu_image_info_entry *
image_directory_checker::find_entry(const struct uuid_octets *img_type_uuid) const
{
- const struct ts_fwu_image_info_entry *found_entry = NULL;
+ const struct fwu_image_info_entry *found_entry = NULL;
- const struct ts_fwu_image_directory *header = get_header();
+ const struct fwu_image_directory *header = get_header();
if (header) {
unsigned int index = 0;
@@ -123,8 +123,8 @@
void image_directory_checker::alloc_buffer(void)
{
- m_buf_size = offsetof(struct ts_fwu_image_directory, img_info_entry) +
- MAX_IMAGES * sizeof(ts_fwu_image_info_entry);
+ m_buf_size = offsetof(struct fwu_image_directory, img_info_entry) +
+ MAX_IMAGES * sizeof(fwu_image_info_entry);
m_buf = new uint8_t[m_buf_size];
assert(m_buf);
diff --git a/components/service/fwu/test/image_directory_checker/image_directory_checker.h b/components/service/fwu/test/image_directory_checker/image_directory_checker.h
index a8594a3..1e0bbe2 100644
--- a/components/service/fwu/test/image_directory_checker/image_directory_checker.h
+++ b/components/service/fwu/test/image_directory_checker/image_directory_checker.h
@@ -11,7 +11,7 @@
#include <cstdint>
#include "common/uuid/uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
#include "service/fwu/test/fwu_client/fwu_client.h"
/*
@@ -29,8 +29,8 @@
bool is_contents_equal(const image_directory_checker &rhs) const;
- const struct ts_fwu_image_directory *get_header(void) const;
- const struct ts_fwu_image_info_entry *
+ const struct fwu_image_directory *get_header(void) const;
+ const struct fwu_image_info_entry *
find_entry(const struct uuid_octets *img_type_uuid) const;
private:
diff --git a/components/service/fwu/test/metadata_checker/metadata_checker_v1.cpp b/components/service/fwu/test/metadata_checker/metadata_checker_v1.cpp
index f64037c..733c756 100644
--- a/components/service/fwu/test/metadata_checker/metadata_checker_v1.cpp
+++ b/components/service/fwu/test/metadata_checker/metadata_checker_v1.cpp
@@ -8,7 +8,7 @@
#include <CppUTest/TestHarness.h>
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
+#include "protocols/service/fwu/metadata_v1.h"
#include "service/fwu/agent/fw_directory.h"
const size_t metadata_checker_v1::MAX_FWU_METADATA_SIZE =
diff --git a/components/service/fwu/test/metadata_checker/metadata_checker_v2.cpp b/components/service/fwu/test/metadata_checker/metadata_checker_v2.cpp
index e51ed32..e4a853c 100644
--- a/components/service/fwu/test/metadata_checker/metadata_checker_v2.cpp
+++ b/components/service/fwu/test/metadata_checker/metadata_checker_v2.cpp
@@ -8,7 +8,7 @@
#include <CppUTest/TestHarness.h>
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/metadata_v2.h"
#include "service/fwu/agent/fw_directory.h"
const size_t metadata_checker_v2::MAX_FWU_METADATA_SIZE =
diff --git a/components/service/fwu/test/metadata_fetcher/client/client_metadata_fetcher.cpp b/components/service/fwu/test/metadata_fetcher/client/client_metadata_fetcher.cpp
index 8a64637..49e1455 100644
--- a/components/service/fwu/test/metadata_fetcher/client/client_metadata_fetcher.cpp
+++ b/components/service/fwu/test/metadata_fetcher/client/client_metadata_fetcher.cpp
@@ -10,7 +10,7 @@
#include <cstring>
#include "common/uuid/uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
client_metadata_fetcher::client_metadata_fetcher(fwu_client *fwu_client)
: metadata_fetcher()
diff --git a/components/service/fwu/test/ref_scenarios/image_directory_tests.cpp b/components/service/fwu/test/ref_scenarios/image_directory_tests.cpp
index 126f3fa..2332522 100644
--- a/components/service/fwu/test/ref_scenarios/image_directory_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/image_directory_tests.cpp
@@ -146,13 +146,13 @@
status = checker.fetch_image_directory(m_fwu_client);
LONGS_EQUAL(0, status);
- const struct ts_fwu_image_directory *dir_header = checker.get_header();
+ const struct fwu_image_directory *dir_header = checker.get_header();
/* Expect directory header to reflect correct values */
CHECK_TRUE(dir_header);
- UNSIGNED_LONGS_EQUAL(offsetof(struct ts_fwu_image_directory, img_info_entry),
+ UNSIGNED_LONGS_EQUAL(offsetof(struct fwu_image_directory, img_info_entry),
dir_header->img_info_offset);
- UNSIGNED_LONGS_EQUAL(sizeof(struct ts_fwu_image_info_entry), dir_header->img_info_size);
+ UNSIGNED_LONGS_EQUAL(sizeof(struct fwu_image_info_entry), dir_header->img_info_size);
UNSIGNED_LONGS_EQUAL(2, dir_header->directory_version);
UNSIGNED_LONGS_EQUAL(1, dir_header->correct_boot);
UNSIGNED_LONGS_EQUAL(0, dir_header->reserved);
@@ -163,7 +163,7 @@
m_dut->whole_volume_image_type_uuid(0, &expected_img_type_uuid);
- const struct ts_fwu_image_info_entry *image_entry =
+ const struct fwu_image_info_entry *image_entry =
checker.find_entry(&expected_img_type_uuid);
CHECK_TRUE(image_entry);
@@ -187,7 +187,7 @@
status = checker.fetch_image_directory(m_fwu_client);
LONGS_EQUAL(0, status);
- const struct ts_fwu_image_directory *dir_header = checker.get_header();
+ const struct fwu_image_directory *dir_header = checker.get_header();
/* Expect directory header to reflect correct values */
CHECK_TRUE(dir_header);
@@ -201,7 +201,7 @@
m_dut->whole_volume_image_type_uuid(0, &expected_img_type_uuid);
- const struct ts_fwu_image_info_entry *image_entry =
+ const struct fwu_image_info_entry *image_entry =
checker.find_entry(&expected_img_type_uuid);
CHECK_TRUE(image_entry);
@@ -226,7 +226,7 @@
status = checker.fetch_image_directory(m_fwu_client);
LONGS_EQUAL(0, status);
- const struct ts_fwu_image_directory *dir_header = checker.get_header();
+ const struct fwu_image_directory *dir_header = checker.get_header();
/* Expect directory header to reflect correct values */
CHECK_TRUE(dir_header);
diff --git a/components/service/fwu/test/ref_scenarios/invalid_behaviour_tests.cpp b/components/service/fwu/test/ref_scenarios/invalid_behaviour_tests.cpp
index ec77406..3a67dbc 100644
--- a/components/service/fwu/test/ref_scenarios/invalid_behaviour_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/invalid_behaviour_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
#include "service/fwu/test/image_directory_checker/image_directory_checker.h"
diff --git a/components/service/fwu/test/ref_scenarios/oversize_image_tests.cpp b/components/service/fwu/test/ref_scenarios/oversize_image_tests.cpp
index 65b7ebb..2dba6e4 100644
--- a/components/service/fwu/test/ref_scenarios/oversize_image_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/oversize_image_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
#include "service/fwu/test/image_directory_checker/image_directory_checker.h"
@@ -39,7 +39,7 @@
int status = dir_checker.fetch_image_directory(m_fwu_client);
LONGS_EQUAL(0, status);
- const struct ts_fwu_image_info_entry *img_entry = dir_checker.find_entry(uuid);
+ const struct fwu_image_info_entry *img_entry = dir_checker.find_entry(uuid);
CHECK_TRUE(img_entry);
return static_cast<size_t>(img_entry->img_max_size);
diff --git a/components/service/fwu/test/ref_scenarios/power_failure_tests.cpp b/components/service/fwu/test/ref_scenarios/power_failure_tests.cpp
index 47fb812..3ee2015 100644
--- a/components/service/fwu/test/ref_scenarios/power_failure_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/power_failure_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
/*
diff --git a/components/service/fwu/test/ref_scenarios/rollback_tests.cpp b/components/service/fwu/test/ref_scenarios/rollback_tests.cpp
index 50005b4..1222068 100644
--- a/components/service/fwu/test/ref_scenarios/rollback_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/rollback_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
diff --git a/components/service/fwu/test/ref_scenarios/update_fmp_tests.cpp b/components/service/fwu/test/ref_scenarios/update_fmp_tests.cpp
index 0a37363..53a96a9 100644
--- a/components/service/fwu/test/ref_scenarios/update_fmp_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/update_fmp_tests.cpp
@@ -10,8 +10,8 @@
#include <vector>
#include "common/uuid/uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
@@ -118,7 +118,7 @@
size_t reported_total_len = 0;
struct uuid_octets uuid;
- struct ts_fwu_image_directory *img_dir = NULL;
+ struct fwu_image_directory *img_dir = NULL;
size_t data_len_read = 0;
int num_img = 0;
@@ -142,7 +142,7 @@
status = client->open(&uuid, fwu_client::op_type::READ, &stream_handle);
LONGS_EQUAL(FWU_STATUS_SUCCESS, status);
- img_dir = (ts_fwu_image_directory *)new uint8_t[reported_total_len];
+ img_dir = (fwu_image_directory *)new uint8_t[reported_total_len];
// Read the firmware directory info into img_dir.
status = client->read_stream(stream_handle, reinterpret_cast<uint8_t *>(img_dir),
diff --git a/components/service/fwu/test/ref_scenarios/update_scenario_tests.cpp b/components/service/fwu/test/ref_scenarios/update_scenario_tests.cpp
index 57bc900..c48eb68 100644
--- a/components/service/fwu/test/ref_scenarios/update_scenario_tests.cpp
+++ b/components/service/fwu/test/ref_scenarios/update_scenario_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
diff --git a/components/service/fwu/test/service/fwu_service_tests.cpp b/components/service/fwu/test/service/fwu_service_tests.cpp
index 0476d92..1624609 100644
--- a/components/service/fwu/test/service/fwu_service_tests.cpp
+++ b/components/service/fwu/test/service/fwu_service_tests.cpp
@@ -7,7 +7,7 @@
#include <CppUTest/TestHarness.h>
#include <vector>
-#include "protocols/service/fwu/packed-c/status.h"
+#include "protocols/service/fwu/status.h"
#include "service/fwu/test/fwu_dut/fwu_dut.h"
#include "service/fwu/test/fwu_dut_factory/fwu_dut_factory.h"
#include "service/fwu/test/image_directory_checker/image_directory_checker.h"
diff --git a/protocols/service/fwu/packed-c/fwu_proto.h b/protocols/service/fwu/fwu_proto.h
similarity index 72%
rename from protocols/service/fwu/packed-c/fwu_proto.h
rename to protocols/service/fwu/fwu_proto.h
index 8bf4314..4bcacb1 100644
--- a/protocols/service/fwu/packed-c/fwu_proto.h
+++ b/protocols/service/fwu/fwu_proto.h
@@ -40,7 +40,7 @@
*/
#define FWU_IMAGE_DIRECTORY_VERSION (2)
-struct __attribute__((__packed__)) ts_fwu_image_info_entry {
+struct __attribute__((__packed__)) fwu_image_info_entry {
uint8_t img_type_uuid[OSF_UUID_OCTET_LEN];
uint32_t client_permissions;
uint32_t img_max_size;
@@ -50,31 +50,31 @@
uint32_t reserved;
};
-struct __attribute__((__packed__)) ts_fwu_image_directory {
+struct __attribute__((__packed__)) fwu_image_directory {
uint32_t directory_version;
uint32_t img_info_offset;
uint32_t num_images;
uint32_t correct_boot;
uint32_t img_info_size;
uint32_t reserved;
- struct ts_fwu_image_info_entry img_info_entry[];
+ struct fwu_image_info_entry img_info_entry[];
};
/**
* Message parameters
*/
-struct __attribute__((__packed__)) ts_fwu_request_header {
+struct __attribute__((__packed__)) fwu_request_header {
uint32_t func_id;
uint8_t payload[];
};
-struct __attribute__((__packed__)) ts_fwu_response_header {
+struct __attribute__((__packed__)) fwu_response_header {
uint32_t status;
uint8_t payload[];
};
-struct __attribute__((__packed__)) ts_fwu_discover_out {
+struct __attribute__((__packed__)) fwu_discover_out {
int16_t service_status;
uint8_t version_major;
uint8_t version_minor;
@@ -86,50 +86,50 @@
uint8_t function_presence[];
};
-struct __attribute__((__packed__)) ts_fwu_begin_staging_in {
+struct __attribute__((__packed__)) fwu_begin_staging_in {
uint32_t reserved;
uint32_t vendor_flags;
uint32_t partial_update_count;
uint8_t update_guid[];
};
-struct __attribute__((__packed__)) ts_fwu_open_in {
+struct __attribute__((__packed__)) fwu_open_in {
uint8_t image_type_uuid[OSF_UUID_OCTET_LEN];
uint8_t op_type;
};
-struct __attribute__((__packed__)) ts_fwu_open_out {
+struct __attribute__((__packed__)) fwu_open_out {
uint32_t handle;
};
-struct __attribute__((__packed__)) ts_fwu_write_stream_in {
+struct __attribute__((__packed__)) fwu_write_stream_in {
uint32_t handle;
uint32_t data_len;
uint8_t payload[];
};
-struct __attribute__((__packed__)) ts_fwu_read_stream_in {
+struct __attribute__((__packed__)) fwu_read_stream_in {
uint32_t handle;
};
-struct __attribute__((__packed__)) ts_fwu_read_stream_out {
+struct __attribute__((__packed__)) fwu_read_stream_out {
uint32_t read_bytes;
uint32_t total_bytes;
uint8_t payload[];
};
-struct __attribute__((__packed__)) ts_fwu_commit_in {
+struct __attribute__((__packed__)) fwu_commit_in {
uint32_t handle;
uint32_t acceptance_req;
uint32_t max_atomic_len;
};
-struct __attribute__((__packed__)) ts_fwu_commit_out {
+struct __attribute__((__packed__)) fwu_commit_out {
uint32_t progress;
uint32_t total_work;
};
-struct __attribute__((__packed__)) ts_fwu_accept_image_in {
+struct __attribute__((__packed__)) fwu_accept_image_in {
uint32_t reserved;
uint8_t image_type_uuid[OSF_UUID_OCTET_LEN];
};
diff --git a/protocols/service/fwu/packed-c/metadata.h b/protocols/service/fwu/metadata.h
similarity index 100%
rename from protocols/service/fwu/packed-c/metadata.h
rename to protocols/service/fwu/metadata.h
diff --git a/protocols/service/fwu/packed-c/metadata_v1.h b/protocols/service/fwu/metadata_v1.h
similarity index 100%
rename from protocols/service/fwu/packed-c/metadata_v1.h
rename to protocols/service/fwu/metadata_v1.h
diff --git a/protocols/service/fwu/packed-c/metadata_v2.h b/protocols/service/fwu/metadata_v2.h
similarity index 100%
rename from protocols/service/fwu/packed-c/metadata_v2.h
rename to protocols/service/fwu/metadata_v2.h
diff --git a/protocols/service/fwu/packed-c/opcodes.h b/protocols/service/fwu/opcodes.h
similarity index 100%
rename from protocols/service/fwu/packed-c/opcodes.h
rename to protocols/service/fwu/opcodes.h
diff --git a/protocols/service/fwu/packed-c/status.h b/protocols/service/fwu/status.h
similarity index 100%
rename from protocols/service/fwu/packed-c/status.h
rename to protocols/service/fwu/status.h