Diff: src/d7a_fs.cpp

Revision:

83:f4054d0b29ba

Parent:

79:82b01c1a62f6

Child:

84:e5388f1b8ed9

diff -r 5d1b101b6d11 -r f4054d0b29ba src/d7a_fs.cpp
--- a/src/d7a_fs.cpp	Thu Jan 05 12:37:44 2017 +0000
+++ b/src/d7a_fs.cpp	Thu Jan 05 12:59:13 2017 +0000
@@ -9,9 +9,11 @@
 #if 0
     #define FS_DPRINT(...)          DPRINT(__VA_ARGS__)
     #define FS_DPRINT_DATA(...)     DPRINT_DATA(__VA_ARGS__)
+    #define FS_FPRINT(...)          FPRINT(__VA_ARGS__)
 #else
     #define FS_DPRINT(...);
     #define FS_DPRINT_DATA(...);
+    #define FS_FPRINT(...);
 #endif
 
 #define FS_MAX_FILE_QTY     256
@@ -51,7 +53,7 @@
 
 d7a_errors_t d7a_fs_open(WriteFileFunction wf, ReadFileFunction rf)
 {
-    FPRINT("\r\n");
+    FS_FPRINT("\r\n");
     
     g_fs_write_file = wf;
     g_fs_read_file = rf;
@@ -64,7 +66,7 @@
 
 d7a_errors_t d7a_fs_close(void)
 {
-    FPRINT("\r\n");
+    FS_FPRINT("\r\n");
 
     g_fs_thread.terminate();
     
@@ -73,7 +75,7 @@
 
 static void d7a_fs_msg(uint8_t* buf, uint8_t len, uint8_t id)
 {
-    FPRINT("\r\n");
+    FS_FPRINT("\r\n");
     d7a_com_tx_msg_t msg;
     msg.id = id;
     msg.pbuf = buf;
@@ -84,13 +86,13 @@
 
 void d7a_fs_new_pkt(d7a_com_rx_msg_t* pkt)
 {
-    FPRINT("\r\n");
+    FS_FPRINT("\r\n");
     ASSERT(g_fs_pkt_queue.put(pkt) == osOK, "FS queue full!\r\n");
 }
 
 d7a_com_rx_msg_t* d7a_fs_wait_pkt( uint32_t millisec )
 {
-    FPRINT("(millisec:%d)\r\n", millisec);
+    FS_FPRINT("(millisec:%d)\r\n", millisec);
     osEvent evt = g_fs_pkt_queue.get(millisec);
     return (evt.status == osEventMessage)? (d7a_com_rx_msg_t*)evt.value.p : NULL;
 }
@@ -124,7 +126,7 @@
 //  |     | retdat |status| length | datas...                    |
 void d7a_fs_thread()
 {
-    FPRINT("(id:0x%08x)\r\n", osThreadGetId());
+    FS_FPRINT("(id:0x%08x)\r\n", osThreadGetId());
     d7a_com_rx_msg_t* pkt;
     int8_t status = FS_STAT_OK;