Diff: modem_callbacks.cpp

Revision:

8:afc331e53b7d

Parent:

5:8c7ce9a28169

--- a/modem_callbacks.cpp	Thu May 28 09:12:20 2020 +0000
+++ b/modem_callbacks.cpp	Fri Feb 19 14:25:06 2021 +0000
@@ -1,87 +1,37 @@
-#include "modem_ref_helper.h"
+#include "modem_d7a.h"
 
 // ============================================================}}}
 
 // Callbacks to MODEM's ALP requests
 // ============================================================{{{
-void my_read(u8 fid, u32 offset, u32 length, int id)
+void my_read(u8 action, u8 fid, u32 offset, u32 length, int id)
 {
-    modem_respond(ALP_ERR_FILE_NOT_FOUND, id);
-}
-
-void my_write(u8 fid, void *data, u32 offset, u32 length, int id)
-{
-    modem_respond(ALP_ERR_FILE_NOT_FOUND, id);
+    modem_ref_respond(action, ALP_ERR_FILE_NOT_FOUND, id);
 }
 
-void my_read_fprop(u8 fid, int id)
-{
-    modem_respond(ALP_ERR_FILE_NOT_FOUND, id);
-}
-
-void my_flush(u8 fid, int id)
+void my_write(u8 action, u8 fid, void *data, u32 offset, u32 length, int id)
 {
-    modem_respond(ALP_ERR_FILE_NOT_FOUND, id);
-}
-
-void my_delete(u8 fid, int id)
-{
-    modem_respond(ALP_ERR_FILE_NOT_FOUND, id);
+    modem_ref_respond(action, ALP_ERR_FILE_NOT_FOUND, id);
 }
 
-void my_udata(void *data, u32 length)
+void my_read_fprop(u8 action, u8 fid, int id)
+{
+    modem_ref_respond(action, ALP_ERR_FILE_NOT_FOUND, id);
+}
+
+void my_flush(u8 action, u8 fid, int id)
+{
+    modem_ref_respond(action, ALP_ERR_FILE_NOT_FOUND, id);
+}
+
+void my_delete(u8 action, u8 fid, int id)
+{
+    modem_ref_respond(action, ALP_ERR_FILE_NOT_FOUND, id);
+}
+
+void my_udata(alp_payload_t* alp)
 {    
-    uint8_t* p = (uint8_t*)data;
-    int32_t rem = length;
-    alp_parsed_chunk_t r;
-    d7a_sp_res_t* istat;
-    
-    do {
-        uint32_t parsed = alp_parse_chunk(&p, &r);
-        if (!parsed)
-        {
-            // Discard the payload in case of parsing error.
-            PRINT("Parsing error!\r\n");
-            break;
-        }
-        rem -= parsed;
-        
-        switch (r.type)
-        {
-            // Interface status
-            case ALP_OPCODE_RSP_ISTATUS:
-                // D7A Interface
-                if (ALP_ITF_TYPE_D7A == r.meta.itf.type)
-                {
-                    union {
-                        u8      b[8];
-                        u32     w[2];
-                    } uid;
-                    
-                    // ISTATUS can come either alone or together with ALP_OPCODE_RSP_F_DATA
-                    // but there should be only one per payload, moreover it will come first
-                    istat = (d7a_sp_res_t*)r.data;
-                    memcpy(uid.b,istat->addressee.id,8);
-                        
-                    PRINT("Got accessed by UID:%08X%08X SNR: %3ddB RXLEV: -%-3ddBm LB: %3ddB\n",
-                    HAL_U32_BYTE_SWAP(uid.w[0]), HAL_U32_BYTE_SWAP(uid.w[1]),
-                    istat->snr, istat->rxlev, istat->lb);
-                }
-                else
-                {
-                    PRINT("Got accessed by unknown Interface 0x%02X\n", r.meta.itf.type);
-                }
-                break;
-            // Data return
-            case ALP_OPCODE_RSP_F_DATA:
-                // RSP_F_DATA can come either alone or together with ISTATUS
-                PRINT("Got UNS File[%3d]@%d %d Bytes\n", r.meta.f_data.fid, r.meta.f_data.offset, r.meta.f_data.length);
-                break;
-            default:
-                PRINT("Untreated OPCODE %d\n", r.type);
-                break;
-        }
-    } while (rem > 0);
+    alp_payload_print(alp);
 }
 
 void my_lqual(u8 ifid, int per)
@@ -107,4 +57,21 @@
     
     // Modem re-booted, restart APP
     my_reset();
+}
+
+void my_busy(u8 busy)
+{
+    if (busy)
+    {
+        PRINT("Modem Busy\r\n");
+        
+        /* Stop report, do not use modem */
+        /* Wait for modem reboot or modem not busy */
+    }
+    else
+    {
+        PRINT("Modem not Busy\r\n");
+        
+        /* Resume reports */
+    }
 }
\ No newline at end of file