summaryrefslogtreecommitdiff
path: root/cleopatre/application/managerd/src
diff options
context:
space:
mode:
authorlefranc2010-02-01 13:10:22 +0000
committerlefranc2010-02-01 13:10:22 +0000
commit4f401c4dffa12d517cdd8e9d1e4e60dc09a87954 (patch)
tree73f4a1cf0ddfc0fee2d0bf252977aca97dd03448 /cleopatre/application/managerd/src
parenta81364e9fe7915be89f76cf34c98b529c3d9c05c (diff)
cleo/appli/managerd: add cnf inside get_version structure name
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6681 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/application/managerd/src')
-rw-r--r--cleopatre/application/managerd/src/vs_mme.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/cleopatre/application/managerd/src/vs_mme.c b/cleopatre/application/managerd/src/vs_mme.c
index 248c9002ea..b9afe32948 100644
--- a/cleopatre/application/managerd/src/vs_mme.c
+++ b/cleopatre/application/managerd/src/vs_mme.c
@@ -38,7 +38,7 @@
*/
enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request, MME_t *confirm, int len)
{
- vs_get_version_t *get_version;
+ vs_get_version_cnf_t *get_version_cnf;
spidcom_image_desc_t desc;
char mtd_name[32];
FILE *fp;
@@ -48,7 +48,7 @@ enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request,
assert (NULL != ctx);
assert (NULL != request);
assert (NULL != confirm);
- assert (len >= sizeof(vs_get_version_t) + sizeof(MME_t));
+ assert (len >= sizeof(vs_get_version_cnf_t) + sizeof(MME_t));
/* check for request content */
if(memcmp ((char *)request + sizeof(MME_t), OUI_SPIDCOM, 3))
@@ -64,19 +64,19 @@ enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request,
confirm->fmi = 0;
/* set get_version inside confirm buffer */
- get_version = (vs_get_version_t *)((unsigned char*)confirm + sizeof(MME_t));
+ get_version_cnf = (vs_get_version_cnf_t *)((unsigned char*)confirm + sizeof(MME_t));
/* fill get_version */
- memcpy (get_version->oui, OUI_SPIDCOM, 3);
- get_version->result = 0;
- get_version->device_id = SPC300_ID;
+ memcpy (get_version_cnf->oui, OUI_SPIDCOM, 3);
+ get_version_cnf->result = 0;
+ get_version_cnf->device_id = SPC300_ID;
// TODO: find the right index value
- get_version->current_image_index = 0;
+ get_version_cnf->current_image_index = 0;
/* get image description */
memset (&desc, '\0', sizeof(desc));
if(LIBSPID_SUCCESS == libspid_image_get_desc (LIBSPID_IMAGE_DESC_TYPE_CURRENT, &desc, mtd_name))
{
- memcpy (get_version->applicative_version, desc.version, sizeof(desc.version));
+ memcpy (get_version_cnf->applicative_version, desc.version, sizeof(desc.version));
}
if((fp = fopen (PLC_VERSION_PATH, "r")) != NULL)
@@ -88,7 +88,7 @@ enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request,
{
if(strstr (label, FIRMWARE_LABEL))
{
- strncpy ((char *)get_version->av_stack_version, version, sizeof(get_version->av_stack_version));
+ strncpy ((char *)get_version_cnf->av_stack_version, version, sizeof(get_version_cnf->av_stack_version));
break;
}
}
@@ -99,6 +99,6 @@ enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request,
// TODO: fill alternate image info with firmware !!!
/* send confirm MME */
- bridge_send_to_br (ctx, (uint8_t *)confirm, sizeof(MME_t) + sizeof(vs_get_version_t));
+ bridge_send_to_br (ctx, (uint8_t *)confirm, sizeof(MME_t) + sizeof(vs_get_version_cnf_t));
return TO_DROP;
}