Diff: modem_d7a.cpp

Revision:

76:cbe558f136a4

Parent:

75:dad2f09cb870

Child:

77:5146f44cde83

--- a/modem_d7a.cpp	Tue Sep 07 15:59:23 2021 +0000
+++ b/modem_d7a.cpp	Tue Sep 21 08:48:40 2021 +0000
@@ -216,7 +216,7 @@
     PRINT("-----------------------------------------\r\n");
     FLUSH();
 
-    modem_cup_update(&rev);
+    //modem_cup_update(&rev);
 
     return 0;
 }
@@ -274,17 +274,17 @@
     return ALP_ERR_UNKNOWN;
 }
 
-int modem_raw_alp(alp_payload_t* alp, alp_payload_t** alp_rsp, uint32_t timeout)
+int modem_raw_alp(alp_payload_t* alp, alp_payload_t** alp_rsp)
 {
-    return _modem_d7a_send(NULL, alp, alp_rsp, timeout);
+    return _modem_d7a_send(NULL, alp, alp_rsp, MODEM_TIMEOUT_LOCAL);
 }
 
-int modem_remote_raw_alp(void* itf, alp_payload_t* alp, alp_payload_t** alp_rsp, uint32_t timeout)
+int modem_remote_raw_alp(void* itf, alp_payload_t* alp, alp_payload_t** alp_rsp)
 {
-    return _modem_d7a_send(itf, alp, alp_rsp, timeout);
+    return _modem_d7a_send(itf, alp, alp_rsp, MODEM_TIMEOUT_DISTANT);
 }
 
-int modem_send_alp(void* itf, void *istatus, alp_payload_t* alp, uint32_t timeout)
+static int _modem_send_alp(void* itf, void *istatus, alp_payload_t* alp, uint32_t timeout)
 {
     int err = ALP_ERR_UNKNOWN;
     alp_payload_t* alp_rsp = NULL;
@@ -368,37 +368,37 @@
 int modem_write_file(uint8_t fid, void *data, uint32_t offset, uint32_t length)
 {
     alp_payload_t* alp = alp_payload_f_wr_data(NULL, fid, data, offset, length, false);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 int modem_remote_write_file(uint8_t* itf, void *istatus , uint8_t fid, void *data, uint32_t offset, uint32_t length)
 {
     alp_payload_t* alp = alp_payload_f_wr_data(NULL, fid, data, offset, length, false);
-    return modem_send_alp(itf, istatus, alp, MODEM_TIMEOUT_DISTANT);
+    return _modem_send_alp(itf, istatus, alp, MODEM_TIMEOUT_DISTANT);
 }
 
 int modem_flush_file(uint8_t fid)
 {
     alp_payload_t* alp = alp_payload_f_flush(NULL, fid, false);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 int modem_declare_file(uint8_t fid, alp_file_header_t* header)
 {
     alp_payload_t* alp = alp_payload_f_declare(NULL, fid, header);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 int modem_notify_file(uint8_t fid, uint32_t offset, uint32_t length)
 {
     alp_payload_t* alp = alp_payload_f_touch(NULL, fid, offset, length, false);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 static int _modem_d7a_itf_enable(u8 enable)
 {
     alp_payload_t* alp = alp_payload_activate_itf(NULL, ALP_ITF_TYPE_D7A, 24, 0, ALP_D7A_ISTAT_RESP | ALP_D7A_ISTAT_UNS | ALP_D7A_ISTAT_EOP, enable);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 int modem_d7a_enable_itf(void)
@@ -414,13 +414,13 @@
 static int modem_lwan_set_urc(void)
 {
     alp_payload_t* alp = alp_payload_urcc_en(NULL, ALP_URC_TYPE_ITF_BUSY, FID_LWAN_ITF, 1);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 static int modem_lwan_enable_itf(void)
 {
     alp_payload_t* alp = alp_payload_activate_itf(NULL, ALP_ITF_TYPE_LWAN, 1, FID_LWAN_ITF, 0, true);
-    return modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
+    return _modem_send_alp(NULL, NULL, alp, MODEM_TIMEOUT_LOCAL);
 }
 
 int modem_lwan_open(modem_lwan_callbacks_t* callbacks)
@@ -450,8 +450,7 @@
 int modem_lwan_send(alp_payload_t* alp)
 {
     alp_itf_lwan_cfg_t itf = { .type = ALP_ITF_TYPE_LWAN };
-    
-    return modem_remote_raw_alp((void*)&itf, alp, NULL, MODEM_TIMEOUT_DISTANT);
+    return _modem_d7a_send((void*)&itf, alp, NULL, MODEM_TIMEOUT_DISTANT);
 }
 
 int modem_lwan_get_status(lwan_status_t* status)