[tuxdroid-svn] r1239 - firmware/tuxup/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2008-06-20 14:44:27 +0200 (Fri, 20 Jun 2008)
New Revision: 1239

Modified:
   firmware/tuxup/trunk/error.h
   firmware/tuxup/trunk/main.c
Log:
* Merged two error codes
* Added the default error code in the function "program"

Modified: firmware/tuxup/trunk/error.h
===================================================================
--- firmware/tuxup/trunk/error.h	2008-06-20 12:42:12 UTC (rev 1238)
+++ firmware/tuxup/trunk/error.h	2008-06-20 12:44:27 UTC (rev 1239)
@@ -27,12 +27,11 @@
     E_TUXUP_BADPARAMETER            = 2,
     E_TUXUP_DONGLENOTFOUND          = 3,
     E_TUXUP_DONGLEMANUALBOOTLOAD    = 4,
-    E_TUXUP_BADHEXFILE              = 5,
-    E_TUXUP_BADEEPFILE              = 6,
-    E_TUXUP_BOOTLOADINGFAILED       = 7,
-    E_TUXUP_USBERROR                = 8,
-    E_TUXUP_DFUPROGNOTFOUND         = 9,
-    E_TUXUP_PROGRAMMINGFAILED       = 10
+    E_TUXUP_BADPROGFILE             = 5,
+    E_TUXUP_BOOTLOADINGFAILED       = 6,
+    E_TUXUP_USBERROR                = 7,
+    E_TUXUP_DFUPROGNOTFOUND         = 8,
+    E_TUXUP_PROGRAMMINGFAILED       = 9
 } tuxup_error_t;
 
 #endif /* _ERROR_ */

Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c	2008-06-20 12:42:12 UTC (rev 1238)
+++ firmware/tuxup/trunk/main.c	2008-06-20 12:44:27 UTC (rev 1239)
@@ -239,7 +239,7 @@
     if ((fs = fopen(filename, "r")) == NULL)
     {
         fprintf(stderr, "Unable to open file '%s' for reading\n", filename);
-        exit(E_TUXUP_BADHEXFILE);
+        exit(E_TUXUP_BADPROGFILE);
     }
 
     while (fscanf(fs, " %s", word) != EOF)
@@ -277,7 +277,7 @@
     {
         printf("[FAIL] Programming of '%s' failed, this file is not a correct"
                " hex file for that CPU\n\n", filename);
-        return E_TUXUP_BADHEXFILE;
+        return E_TUXUP_BADPROGFILE;
     }
     printf("Programming %s in the ", filename);
     if (version.cpu_nbr == TUXCORE_CPU_NUM)
@@ -304,7 +304,7 @@
     {
         printf("Unrecognized CPU number, %s doesn't appear to be compiled"
                " for a CPU of tuxdroid.\n", filename);
-        return E_TUXUP_BADHEXFILE;
+        return E_TUXUP_BADPROGFILE;
     }
     printf("Version %d.%d.%d\n", version.ver_major, version.ver_minor,
            version.ver_update);
@@ -357,7 +357,7 @@
     else
     {
         printf("Wrong CPU number specified for the eeprom.\n");
-        return E_TUXUP_BADEEPFILE;
+        return E_TUXUP_BADPROGFILE;
     }
 
     if (pretend)
@@ -401,14 +401,14 @@
     {
         printf("[FAIL] Programming of '%s' failed, this file is not a correct"
                " hex file for that CPU\n\n", filename);
-        return E_TUXUP_BADHEXFILE;
+        return E_TUXUP_BADPROGFILE;
     }
 
     if (version.cpu_nbr != FUXUSB_CPU_NUM)
     {
         printf("Unrecognized CPU number, %s doesn't appear to be compiled"
                " for a CPU of tuxdroid.\n", filename);
-        return E_TUXUP_BADHEXFILE;
+        return E_TUXUP_BADPROGFILE;
     }
     printf("Version %d.%d.%d\n", version.ver_major, version.ver_minor,
            version.ver_update);
@@ -510,7 +510,7 @@
  */
 static int program(char const *filename, char const *path)
 {
-    int ret = -1;
+    int ret = E_TUXUP_BADPROGFILE;
     size_t len;
     char *extension, filenamepath[PATH_MAX];
 
@@ -571,7 +571,7 @@
             }
         }
     }
-    if (ret == -1)
+    if (ret == E_TUXUP_BADPROGFILE)
         fprintf(stderr, "%s is not a valid programming file.\n", filename);
     fprintf(stdout, "\n");
     return ret;
@@ -585,7 +585,7 @@
     char path[PATH_MAX];
     enum program_modes_t program_mode = NONE;
     time_t start_time, end_time;
-    int ret = 0;
+    int ret = E_TUXUP_NOERROR;
 
     int next_option;