summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorsave2010-05-06 15:31:35 +0000
committersave2010-05-06 15:31:35 +0000
commit71c02063509b3028f934d442d521db481925c3d8 (patch)
tree24556af0934f48de6a5015ead5fccb4c9453b41e /cleopatre
parentee7e3dcca196e9bc8e7fa578b98347117f620a47 (diff)
cleo/spidupd: change MS_UPDATE (0x8000) into VS_UPDATE (0xA064)
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6993 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/tools/spidupd/spidupd_host.h6
-rw-r--r--cleopatre/u-boot-1.1.6/net/spidupd.c96
-rw-r--r--cleopatre/u-boot-1.1.6/net/spidupd.h36
3 files changed, 69 insertions, 69 deletions
diff --git a/cleopatre/tools/spidupd/spidupd_host.h b/cleopatre/tools/spidupd/spidupd_host.h
index 87c11d109d..a4fdbc3daf 100644
--- a/cleopatre/tools/spidupd/spidupd_host.h
+++ b/cleopatre/tools/spidupd/spidupd_host.h
@@ -90,9 +90,9 @@ while (0);
#endif
/** SPIDUPD Messages. */
-#define VS_UPDATE_START 0x8000
-#define VS_UPDATE_TRANSFER 0x8004
-#define VS_UPDATE_END 0x8008
+#define VS_UPDATE_START 0xA064
+#define VS_UPDATE_TRANSFER 0xA068
+#define VS_UPDATE_END 0xA06C
/** Informations about REQ, CNF IND or RSP is held in two LSBs. */
#define VS_UPDATE_START_REQ (VS_UPDATE_START | 0x0)
diff --git a/cleopatre/u-boot-1.1.6/net/spidupd.c b/cleopatre/u-boot-1.1.6/net/spidupd.c
index 823e3a67dc..0b3fc0a4a6 100644
--- a/cleopatre/u-boot-1.1.6/net/spidupd.c
+++ b/cleopatre/u-boot-1.1.6/net/spidupd.c
@@ -98,9 +98,9 @@ struct update_process {
int timeout;
struct update_place *place;
struct update_image *image;
- MsUpdStartCnf_t start_cnf;
- MsUpdTransfCnf_t transfer_cnf;
- MsUpdEndCnf_t end_cnf;
+ VsUpdStartCnf_t start_cnf;
+ VsUpdTransfCnf_t transfer_cnf;
+ VsUpdEndCnf_t end_cnf;
};
/** Global processus structure */
@@ -538,16 +538,16 @@ static void SpidupdSend(void)
int transfer_end = 0;
volatile uchar *pkt;
VSMS_MME_t *mme;
- MsUpdStartCnf_t *ms_update_start_cnf;
- MsUpdTransfCnf_t *ms_update_transfer_cnf;
- MsUpdEndCnf_t *ms_update_end_cnf;
+ VsUpdStartCnf_t *vs_update_start_cnf;
+ VsUpdTransfCnf_t *vs_update_transfer_cnf;
+ VsUpdEndCnf_t *vs_update_end_cnf;
/* Set structures pointers */
pkt = NetTxPacket;
mme = (VSMS_MME_t *)pkt;
- ms_update_start_cnf = (MsUpdStartCnf_t *)(mme+1);
- ms_update_transfer_cnf = (MsUpdTransfCnf_t *)(mme+1);
- ms_update_end_cnf = (MsUpdEndCnf_t *)(mme+1);
+ vs_update_start_cnf = (VsUpdStartCnf_t *)(mme+1);
+ vs_update_transfer_cnf = (VsUpdTransfCnf_t *)(mme+1);
+ vs_update_end_cnf = (VsUpdEndCnf_t *)(mme+1);
/* Set the MME version, FMI and OUI */
mme->mmv = MME_MMV;
@@ -563,39 +563,39 @@ static void SpidupdSend(void)
switch (ctx.state)
{
case STATE_WAIT_UPD_START:
- /* Set mmtype to MS_UPDATE_START_CNF */
- mme->mmtype = htommes(MS_UPDATE_START_CNF);
+ /* Set mmtype to VS_UPDATE_START_CNF */
+ mme->mmtype = htommes(VS_UPDATE_START_CNF);
/* Append the message */
- ms_update_start_cnf->start_update = ctx.start_cnf.start_update;
+ vs_update_start_cnf->start_update = ctx.start_cnf.start_update;
/* This is the end of packet, determine length */
- len = ((ulong)ms_update_start_cnf - (ulong)pkt) + sizeof(MsUpdStartCnf_t);
+ len = ((ulong)vs_update_start_cnf - (ulong)pkt) + sizeof(VsUpdStartCnf_t);
break;
case STATE_WAIT_UPD_TRANSFER:
if(ctx.next_state == STATE_WAIT_UPD_TRANSFER)
{
- /* Set mmtype to MS_UPDATE_START_CNF */
- mme->mmtype = htommes(MS_UPDATE_TRANSFER_CNF);
+ /* Set mmtype to VS_UPDATE_START_CNF */
+ mme->mmtype = htommes(VS_UPDATE_TRANSFER_CNF);
/* Append the message */
- ms_update_transfer_cnf->ack = ctx.transfer_cnf.ack;
- ms_update_transfer_cnf->next_block = htommel(ctx.transfer_cnf.next_block);
+ vs_update_transfer_cnf->ack = ctx.transfer_cnf.ack;
+ vs_update_transfer_cnf->next_block = htommel(ctx.transfer_cnf.next_block);
/* This is the end of packet, determine length */
- len = ((ulong)ms_update_transfer_cnf - (ulong)pkt) + sizeof(MsUpdTransfCnf_t);
+ len = ((ulong)vs_update_transfer_cnf - (ulong)pkt) + sizeof(VsUpdTransfCnf_t);
}
else if(ctx.next_state == STATE_UPD_END)
{
- /* Set mmtype to MS_UPDATE_START_CNF */
- mme->mmtype = htommes(MS_UPDATE_END_CNF);
+ /* Set mmtype to VS_UPDATE_START_CNF */
+ mme->mmtype = htommes(VS_UPDATE_END_CNF);
/* Append the message */
- ms_update_end_cnf->result = ctx.end_cnf.result;
+ vs_update_end_cnf->result = ctx.end_cnf.result;
/* This is the end of packet, determine length */
- len = ((ulong)ms_update_end_cnf - (ulong)pkt) + sizeof(MsUpdEndCnf_t);
+ len = ((ulong)vs_update_end_cnf - (ulong)pkt) + sizeof(VsUpdEndCnf_t);
transfer_end = 1;
}
@@ -633,9 +633,9 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
{
int i;
VSMS_MME_t *mme;
- MsUpdStartReq_t *ms_update_start_req;
- MsUpdTransfReq_t *ms_update_transfer_req;
- MsUpdEndReq_t *ms_update_end_req;
+ VsUpdStartReq_t *vs_update_start_req;
+ VsUpdTransfReq_t *vs_update_transfer_req;
+ VsUpdEndReq_t *vs_update_end_req;
uchar md5_server[16];
uchar md5_client[16];
struct update_image *image = ctx.image;
@@ -644,12 +644,12 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
/* Set structures pointers */
mme = (VSMS_MME_t *)pkt;
- ms_update_start_req = (MsUpdStartReq_t *)(mme+1);
- ms_update_transfer_req = (MsUpdTransfReq_t *)(mme+1);
- ms_update_end_req = (MsUpdEndReq_t *)(mme+1);
+ vs_update_start_req = (VsUpdStartReq_t *)(mme+1);
+ vs_update_transfer_req = (VsUpdTransfReq_t *)(mme+1);
+ vs_update_end_req = (VsUpdEndReq_t *)(mme+1);
mmtype = (ushort)(mmetohs(mme->mmtype));
- if(!MS_UPDATE_RANGE(mmtype) ||
+ if(!VS_UPDATE_RANGE(mmtype) ||
!VSMS_MME_IS_CORRECT_OUI(mme, OUI_SPIDCOM))
return;
@@ -666,8 +666,8 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
switch(mmtype)
{
- case MS_UPDATE_START_REQ:
- TRACE("Got MS_UPDATE_START_REQ\n");
+ case VS_UPDATE_START_REQ:
+ TRACE("Got VS_UPDATE_START_REQ\n");
#ifdef ET_DEBUG
{
@@ -676,12 +676,12 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
puts("version = ");
for (i=0; i<16; i++)
{
- printf("%c", (ms_update_start_req->version)[i]);
+ printf("%c", (vs_update_start_req->version)[i]);
}
printf("\n");
}
- printf("arch = %#x\n", ms_update_start_req->arch);
- printf("upd_type = %#x\n", ms_update_start_req->upd_type);
+ printf("arch = %#x\n", vs_update_start_req->arch);
+ printf("upd_type = %#x\n", vs_update_start_req->upd_type);
#endif
/* Check that no previous update is running */
@@ -695,7 +695,7 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
/* shape the response to client */
if(place->correct_img_exist)
{
- if(place->correct_archi != ms_update_start_req->arch)
+ if(place->correct_archi != vs_update_start_req->arch)
{
/* Request bad architecture */
printf("Error (New image bad Architecture).\n");
@@ -704,7 +704,7 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
ctx.next_state = STATE_WAIT_UPD_START;
break;
}
- if(place->correct_type != ms_update_start_req->upd_type)
+ if(place->correct_type != vs_update_start_req->upd_type)
{
/* Request doesn't concern a sImage */
printf("Error (New image bad type).\n" );
@@ -717,7 +717,7 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
/* if we already have valid image with the same version, don't update it */
for(i=0 ; i<place->nb_img ; i++)
{
- if(strcmp(place->versions[i], (char*)ms_update_start_req->version) == 0)
+ if(strcmp(place->versions[i], (char*)vs_update_start_req->version) == 0)
{
printf("Error (Same Version).\n" );
ctx.modem_busy = 0;
@@ -735,12 +735,12 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
}
break;
- case MS_UPDATE_TRANSFER_REQ:
- TRACE("Got MS_UPDATE_TRANSFER_REQ\n");
+ case VS_UPDATE_TRANSFER_REQ:
+ TRACE("Got VS_UPDATE_TRANSFER_REQ\n");
TRACE("received_block = %#x\n", image->num_rx_blk);
- TRACE("block_id = %#x\n", mmetohl(ms_update_transfer_req->block_id) );
- TRACE("length = %d\n", mmetohl(ms_update_transfer_req->length) );
+ TRACE("block_id = %#x\n", mmetohl(vs_update_transfer_req->block_id) );
+ TRACE("length = %d\n", mmetohl(vs_update_transfer_req->length) );
if(ctx.state == STATE_WAIT_UPD_TRANSFER)
@@ -749,7 +749,7 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
* We are expecting to receive next block
* of the one that we received last time
*/
- if( mmetohl(ms_update_transfer_req->block_id) != image->num_rx_blk )
+ if( mmetohl(vs_update_transfer_req->block_id) != image->num_rx_blk )
{
TRACE("FAILURE : Received block ID does not match expected.\n" );
@@ -765,12 +765,12 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
/* Put block in RAM */
memcpy((void*)(place->ram_addr + image->len),
- ms_update_transfer_req->data,
- ms_update_transfer_req->length);
+ vs_update_transfer_req->data,
+ vs_update_transfer_req->length);
/* Increase transfered length */
- image->len += mmetohl(ms_update_transfer_req->length);
+ image->len += mmetohl(vs_update_transfer_req->length);
/* we successfully received block, increment received counter */
image->num_rx_blk++;
@@ -789,14 +789,14 @@ static void SpidupdHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len
ctx.next_state = STATE_WAIT_UPD_TRANSFER;
break;
- case MS_UPDATE_END_REQ:
- TRACE("Got MS_UPDATE_END_REQ\n");
+ case VS_UPDATE_END_REQ:
+ TRACE("Got VS_UPDATE_END_REQ\n");
TRACE("|\n");
if (ctx.state == STATE_WAIT_UPD_TRANSFER)
{
/* Transfer is finished so calculate MD5 */
- memcpy(md5_client, ms_update_end_req->md5_sum, 16);
+ memcpy(md5_client, vs_update_end_req->md5_sum, 16);
md5_image((md5_byte_t *)md5_server);
if( memcmp(md5_server, md5_client, 16) != 0 )
diff --git a/cleopatre/u-boot-1.1.6/net/spidupd.h b/cleopatre/u-boot-1.1.6/net/spidupd.h
index dcf39dd298..433ce94f98 100644
--- a/cleopatre/u-boot-1.1.6/net/spidupd.h
+++ b/cleopatre/u-boot-1.1.6/net/spidupd.h
@@ -40,20 +40,20 @@
*/
/* SPIDUPD Messages */
-#define MS_UPDATE_START 0x8000
-#define MS_UPDATE_TRANSFER 0x8004
-#define MS_UPDATE_END 0x8008
+#define VS_UPDATE_START 0xA064
+#define VS_UPDATE_TRANSFER 0xA068
+#define VS_UPDATE_END 0xA06C
/* information about REQ, CNF IND or RSP is held in two LSBs */
-#define MS_UPDATE_START_REQ (MS_UPDATE_START | 0x0)
-#define MS_UPDATE_START_CNF (MS_UPDATE_START | 0x1)
-#define MS_UPDATE_TRANSFER_REQ (MS_UPDATE_TRANSFER | 0x0)
-#define MS_UPDATE_TRANSFER_CNF (MS_UPDATE_TRANSFER | 0x1)
-#define MS_UPDATE_END_REQ (MS_UPDATE_END | 0x0)
-#define MS_UPDATE_END_CNF (MS_UPDATE_END | 0x1)
-#define MS_UPDATE_END_IND (MS_UPDATE_END | 0x2)
+#define VS_UPDATE_START_REQ (VS_UPDATE_START | 0x0)
+#define VS_UPDATE_START_CNF (VS_UPDATE_START | 0x1)
+#define VS_UPDATE_TRANSFER_REQ (VS_UPDATE_TRANSFER | 0x0)
+#define VS_UPDATE_TRANSFER_CNF (VS_UPDATE_TRANSFER | 0x1)
+#define VS_UPDATE_END_REQ (VS_UPDATE_END | 0x0)
+#define VS_UPDATE_END_CNF (VS_UPDATE_END | 0x1)
+#define VS_UPDATE_END_IND (VS_UPDATE_END | 0x2)
-#define MS_UPDATE_RANGE(type) ((type >= MS_UPDATE_START) && (type <= MS_UPDATE_END))
+#define VS_UPDATE_RANGE(type) ((type >= VS_UPDATE_START) && (type <= VS_UPDATE_END))
/*
* SPIDUPD Primitive types
@@ -63,40 +63,40 @@ typedef struct
unsigned char version[16]; /* version string of the fw to send */
unsigned long arch; /* modem arch type; default: 0 (spc300) */
unsigned long upd_type; /* update type; default: 0 for normal image */
-} __attribute__ ((__packed__)) MsUpdStartReq_t;
+} __attribute__ ((__packed__)) VsUpdStartReq_t;
typedef struct
{
unsigned char start_update; /* 0 - success, 0x1..0x5 - error messages */
-} __attribute__ ((__packed__)) MsUpdStartCnf_t;
+} __attribute__ ((__packed__)) VsUpdStartCnf_t;
typedef struct
{
unsigned int block_id; /* block ID of data to be sent */
unsigned int length; /* length of data to be sent */
unsigned char data[MAX_MME_SIZE - 8]; /* padded data (for min size of eth packet) */
-} __attribute__ ((__packed__)) MsUpdTransfReq_t;
+} __attribute__ ((__packed__)) VsUpdTransfReq_t;
typedef struct
{
unsigned char ack; /* 0 - success, 0x1 - failure */
unsigned int next_block; /* next block ID that server expects */
-} __attribute__ ((__packed__)) MsUpdTransfCnf_t;
+} __attribute__ ((__packed__)) VsUpdTransfCnf_t;
typedef struct
{
unsigned char md5_sum[16]; /* 0 - success, 0x1 - failure */
-} __attribute__ ((__packed__)) MsUpdEndReq_t;
+} __attribute__ ((__packed__)) VsUpdEndReq_t;
typedef struct
{
unsigned char result; /* 0 - success, 0x1 - failure */
-} __attribute__ ((__packed__)) MsUpdEndCnf_t;
+} __attribute__ ((__packed__)) VsUpdEndCnf_t;
typedef struct
{
unsigned char result; /* 0 - success, 0x1..0x2 - error messages */
-} __attribute__ ((__packed__)) MsUpdEndInd_t;
+} __attribute__ ((__packed__)) VsUpdEndInd_t;
/* Failure codes in server response */