FreeCalypso > hg > freecalypso-sw

changeset 892:eed6dc6aca3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gsm-fw/comlib/cl_imei.c: hell with TI's different return code types
author Space Falcon <falcon@ivan.Harhan.ORG>
date Mon, 29 Jun 2015 22:57:27 +0000
parents f3fba126778a
children fa119e49673b
files gsm-fw/comlib/cl_imei.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/comlib/cl_imei.c	Mon Jun 29 21:58:15 2015 +0000
+++ b/gsm-fw/comlib/cl_imei.c	Mon Jun 29 22:57:27 2015 +0000
@@ -193,10 +193,12 @@
 */
 extern BYTE cl_get_imeisv(USHORT imeiBufSize, UBYTE *imeiBufPtr, UBYTE imeiType)
 {
+#if CONFIG_MOKOFFS
   USHORT ret;
-#if CONFIG_MOKOFFS
   UBYTE version;
   UBYTE buf[SIZE_EF_IMEI];
+#else
+  BYTE ret;
 #endif
 
   TRACE_FUNCTION("cl_get_imeisv()");
@@ -258,8 +260,7 @@
    * hard-coded fallback and error indication
    */
 
-  ret = ffs_file_read(CL_IMEI_FFS_PATH, imeiBufPtr, CL_IMEI_SIZE);
-  if (ret >= EFFS_OK) {
+  if (ffs_file_read(CL_IMEI_FFS_PATH, imeiBufPtr, CL_IMEI_SIZE) >= EFFS_OK) {
     memcpy(stored_imei, imeiBufPtr, CL_IMEI_SIZE);
     imei_flag = 1;
     return CL_IMEI_OK;