Diff: src/d7a.cpp

Revision:

63:afd046faedb0

Parent:

60:8d4133fbc060

Child:

66:492b1d7ba370

--- a/src/d7a.cpp	Tue Oct 04 08:55:52 2016 +0000
+++ b/src/d7a.cpp	Mon Oct 10 13:31:44 2016 +0000
@@ -54,7 +54,7 @@
         
     } while (0);
     
-    WARNING(err >= D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
+    WARNING(err == D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
     
     return err;
 }
@@ -80,7 +80,7 @@
         err = d7a_sys_close();
     } while (0);
     
-    WARNING(err >= D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
+    WARNING(err == D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
     
     return err;
 }
@@ -94,7 +94,7 @@
     
     err = d7a_modem_start();
     
-    WARNING(err >= D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
+    WARNING(err == D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
     
     return err;
 }
@@ -108,7 +108,7 @@
     
     err = d7a_modem_stop();
     
-    WARNING(err >= D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
+    WARNING(err == D7A_ERR_NONE, "%s err %d\r\n", __FUNCTION__, err);
     
     return err;
 }
@@ -137,7 +137,7 @@
     
     DPRINT("Create %d Done. err %d\r\n", file_id, err);
     
-    WARNING(err >= D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, err);
+    WARNING(err == D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, err);
     
     return err;
 }
@@ -168,7 +168,7 @@
     
     DPRINT("Declare %d Done\r\n", file_id);
     
-    WARNING(err >= D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, err);
+    WARNING(err == D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, err);
     
     return err;
 }
@@ -180,13 +180,13 @@
     
     d7a_msg_t** ret;
     
-    DPRINT("Read %d.\r\n", file_id);
+    DPRINT("Read %d @%d %d bytes.\r\n", file_id, offset, size);
     
     ret = d7a_alp_read_file(file_id, offset, size, addressee, retry);
     
     DPRINT("Read %d Done.\r\n", file_id);
     
-    //WARNING(ret[0]->err >= D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, ret[0]->err);
+    WARNING(ret[0]->err == D7A_ERR_NONE, "%s FID: %d OFF: %d LEN: %d err %d\r\n", __FUNCTION__, file_id, offset, size, ret[0]->err);
     
     return ret;
 }
@@ -198,13 +198,13 @@
     
     d7a_msg_t** ret;
     
-    DPRINT("Write %d.\r\n", file_id);
+    DPRINT("Write %d @%d %d bytes.\r\n", file_id, offset, size);
     
     ret = d7a_alp_write_file(file_id, offset, size, buf, addressee, retry, resp);
     
     DPRINT("Write %d Done.\r\n", file_id);
     
-    //WARNING(ret[0]->err >= D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, ret[0]->err);
+    WARNING(ret[0]->err == D7A_ERR_NONE, "%s FID: %d OFF: %d LEN: %d err %d\r\n", __FUNCTION__, file_id, offset, size, ret[0]->err);
     
     return ret;
 }
@@ -216,7 +216,7 @@
     
     d7a_errors_t err;
     
-    DPRINT("Notify %d.\r\n", file_id);
+    DPRINT("Notify %d @%d %d bytes.\r\n", file_id, offset, size);
     
     notify_file_param_t notif = {
         .bf.fid = file_id,
@@ -228,7 +228,7 @@
     
     DPRINT("Notify %d Done. err %d\r\n", file_id, err);
     
-    WARNING(err >= D7A_ERR_NONE, "%s FID %d err %d\r\n", __FUNCTION__, file_id, err);
+    WARNING(err == D7A_ERR_NONE, "%s FID: %d OFF: %d LEN: %d err %d\r\n", __FUNCTION__, file_id, offset, size, err);
     
     return err;
 }
@@ -281,7 +281,7 @@
     d7a_free_msg(msg);
     
     msg = d7a_read(2, 0, sizeof(d7a_revision_t));
-    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read UID file. err %d\r\n", msg[0]->err);
+    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read Revision file. err %d\r\n", msg[0]->err);
     ASSERT(msg[0]->data, "No data in response\r\n");
     memcpy(&rev, msg[0]->data->buf, sizeof(d7a_revision_t));
     d7a_free_msg(msg);