Trond Enger / d7a_1x

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of d7a_1x by WizziLab

Diff: src/d7a_fs.cpp

Revision:
33:f9a542d3efaa
Parent:
31:ab9bfdbc6b44
Child:
34:1311cc53201a
--- a/src/d7a_fs.cpp	Thu Jun 16 12:10:10 2016 +0000
+++ b/src/d7a_fs.cpp	Fri Jun 24 10:11:19 2016 +0000
@@ -86,18 +86,10 @@
 void* d7a_fs_wait_done( uint32_t millisec )
 {
     FPRINT("\r\n");
-    void* ret;
     osEvent evt = g_fs_ctx.fs_done.get(millisec);
-    if (evt.status == osEventMessage)
-    {
-        ret = (void*)evt.value.p;
-    }
-    else
-    {
-        ret = (void*)0xFFFFFFFF;
-        EPRINT("FS Wait Timeout!\r\n");
-    }
-    return ret;
+    ASSERT(evt.status == osEventMessage, "FS Wait Timeout!\r\n");
+
+    return (void*)evt.value.p;
 }
 
 void d7a_fs_new_pkt(d7a_com_rx_msg_t* pkt)
@@ -304,7 +296,7 @@
         {
             case KAL_COM_FLOW_FS_CMD:
                 d7a_fs_com_req_t* req = (d7a_fs_com_req_t*)pkt->buffer;
-                DPRINT("Rfs[%d] cmd:%d\n",req->fid,req->cmd);
+                DPRINT("Rfs(%d)[%d] cmd:%d\n", req->id, req->fid, req->cmd);
                 //dbg_print_data("%02X ", (uint8_t*)req, sizeof(d7a_fs_com_req_t));
                 //DPRINT("\r\n");
                 d7a_fs_com_resp_t buf = (d7a_fs_com_resp_t) {.id = req->id, .cmd = FS_OP_RETSTAT};