altos/telefireone-v1.0: Track ao_led_init API change

[fw/altos] / src / drivers / ao_log_fat.c

diff --git a/src/drivers/ao_log_fat.c b/src/drivers/ao_log_fat.c
index 6b433b991c03e2f0081f344efc51c6e50dbf4089..62e97868e1f7e445cd4b63262ec9306343041a53 100644 (file)
--- a/src/drivers/ao_log_fat.c
+++ b/src/drivers/ao_log_fat.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,34 +22,38 @@
 
 static uint8_t log_year, log_month, log_day;
 static uint8_t log_open;
+static int8_t  log_fd;
 static uint8_t log_mutex;
 
 static void
 ao_log_open(void)
 {
-       char    name[12];
+       static char     name[12];
        int8_t  status;
 
        sprintf(name,"%04d%02d%02dLOG", 2000 + log_year, log_month, log_day);
        status = ao_fat_open(name, AO_FAT_OPEN_WRITE);
-       switch (status) {
-       case AO_FAT_SUCCESS:
-               ao_fat_seek(0, AO_FAT_SEEK_END);
+       if (status >= 0) {
+               log_fd = status;
+               ao_fat_seek(log_fd, 0, AO_FAT_SEEK_END);
                log_open = 1;
-               break;
-       case -AO_FAT_ENOENT:
+       } else if (status == -AO_FAT_ENOENT) {
                status = ao_fat_creat(name);
-               if (status == AO_FAT_SUCCESS)
+               if (status >= 0) {
+                       log_fd = status;
                        log_open = 1;
-               break;
+               }
        } 
 }
 
 static void
 ao_log_close(void)
 {
-       log_open = 0;
-       ao_fat_close();
+       if (log_open) {
+               log_open = 0;
+               ao_fat_close(log_fd);
+               log_fd = -1;
+       }
 }
 
 uint8_t
@@ -77,7 +82,7 @@ ao_log_mega(struct ao_log_mega *log)
                }
        }
        if (log_open) {
-               wrote = ao_fat_write(log, sizeof (*log)) == AO_FAT_SUCCESS;
+               wrote = ao_fat_write(log_fd, log, sizeof (*log)) == AO_FAT_SUCCESS;
                ao_fat_sync();
        }
        ao_mutex_put(&log_mutex);