Changeset 604:b81293d144f0

Timestamp:

06/11/08 11:29:46 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Add nx_fs_write() return value check in USB command recording.

Location:

nxos/systems/tag-route

Files:

• main.h (modified) (1 diff)
• record.c (modified) (1 diff)
• usb.c (modified) (2 diffs)

nxos/systems/tag-route/main.h

@@ -18 +18 @@
 void replay(char *filename);
 void usb_recv(void);
-void usb_recv_to(fs_fd_t fd);
+fs_err_t usb_recv_to(fs_fd_t fd);
 
 #endif /* __NXOS_TAG_ROUTE_MAIN_H__ */

nxos/systems/tag-route/record.c

@@ -45 +45 @@
   nx_display_string("File opened.\n");
   nx_display_string("Waiting...\n");
-  usb_recv_to(fd);
+
+  if (usb_recv_to(fd) != FS_ERR_NO_ERROR) {
+    nx_display_string("Error!\n");
+    nx_fs_close(fd);
+    return;
+  }
 
   nx_display_uint(nx_fs_get_filesize(fd));

nxos/systems/tag-route/usb.c

@@ -61 +61 @@
 }
 
-void usb_recv_to(fs_fd_t fd) {
+fs_err_t usb_recv_to(fs_fd_t fd) {
   U8 buf[RCMD_BUF_LEN];
+  fs_err_t err;
   size_t i;
 
@@ -74 +75 @@
 
     for (i=0; i<strlen((char *)buf); i++) {
-      nx_fs_write(fd, buf[i]);
+      err = nx_fs_write(fd, buf[i]);
+      if (err != FS_ERR_NO_ERROR) {
+        return err;
+      }
     }
-    nx_fs_write(fd, (U8)'\n');
+
+    err = nx_fs_write(fd, (U8)'\n');
+    if (err != FS_ERR_NO_ERROR) {
+      return err;
+    }
 
     nx_rcmd_do((char *)buf);
     nx_systick_wait_ms(50);
   } while (!streq((char *)buf, "end"));
+
+  return FS_ERR_NO_ERROR;
 }