Diff: src/modem_ref.cpp

Revision:

51:92667569acc7

Parent:

50:9eb5eed8b014

Child:

56:67e3d9608403

--- a/src/modem_ref.cpp	Tue May 26 08:39:25 2020 +0000
+++ b/src/modem_ref.cpp	Tue May 26 08:48:06 2020 +0000
@@ -673,9 +673,6 @@
     DEALLOC_BUFFER(tmp);
 }
 
-<<<<<<< working copy
-public void modem_remote_write_file(u8* itf, u8 itf_length, void *istatus, u8 fid, void *data, u32 offset, u32 length, u8 id)
-=======
 public void modem_remote_read_file_root(u8* itf, u8 itf_length, void *istatus , u8 fid, void *data, u32 offset, u32 length, u8* root_key, u8 id)
 {
     ALLOC_BUFFER(u8, tmp, ALP_ACTION_TAG_SIZE + ALP_ACTION_FORWARD_SIZE(itf_length) + ALP_ACTION_PERM_REQ_SIZE(ALP_ACTION_F_RD_DATA_SIZE_MAX));
@@ -702,13 +699,11 @@
             &tmp[perm_offset + ALP_ACTION_PERM_REQ_OFFSET],
             ALP_ACTION_F_RD_DATA_SIZE(offset, length));
             
-    SERIAL_SEND(WC_FLOW_ALP_UNS, tmp, (u8)(p-tmp));
+    serial_send(WC_FLOW_ALP_UNS, tmp, (p-tmp));
     DEALLOC_BUFFER(tmp);
 }
 
-
 public void modem_remote_write_file(u8* itf, u8 itf_length, void *istatus , u8 fid, void *data, u32 offset, u32 length, u8 id)
->>>>>>> merge rev
 {
     ALLOC_BUFFER(u8, tmp,ALP_ACTION_TAG_SIZE + ALP_ACTION_FORWARD_SIZE(itf_length) + ALP_ACTION_F_WR_DATA_SIZE_MAX(length));
     u8* p = tmp;
@@ -763,35 +758,6 @@
     DEALLOC_BUFFER(tmp);
 }
 
-public void modem_remote_write_file_root(u8* itf, u8 itf_length, void *istatus , u8 fid, void *data, u32 offset, u32 length, u8* root_key, u8 id)
-{
-    ALLOC_BUFFER(u8, tmp, ALP_ACTION_TAG_SIZE + ALP_ACTION_FORWARD_SIZE(itf_length) + ALP_ACTION_PERM_REQ_SIZE(ALP_ACTION_F_WR_DATA_SIZE_MAX(length)));
-    u8* p = tmp;
-    u32 perm_offset;
-    
-    ASSERT(root_key != NULL, "Missing ROOT KEY\n");
-    
-    g_modem.user[id].istatus = (u8*)istatus;
-
-    REF_PRINT("RMT WR FILE (ROOT)[%d]@%d %d Bytes (itf %d Bytes)\n", fid, offset, length, itf_length);
-    ALP_ACTION_TAG(p, id, true);
-    ALP_ACTION_FORWARD(p, itf, itf_length);
-    
-    // Mark start of permission request
-    perm_offset = (u32)(p-tmp);
-    
-    // Actual Operation will take place after PERM_REQ
-    p = &tmp[perm_offset + ALP_ACTION_PERM_REQ_OFFSET];
-    ALP_ACTION_F_WR_DATA(p, true, fid, offset, length, data);
-    
-    modem_add_root_permission(&tmp[perm_offset], root_key,
-            &tmp[perm_offset + ALP_ACTION_PERM_REQ_OFFSET],
-            ALP_ACTION_F_WR_DATA_SIZE(offset, length));
-    
-    SERIAL_SEND(WC_FLOW_ALP_UNS,tmp, (u8)(p-tmp));
-    DEALLOC_BUFFER(tmp);
-}
-
 public void modem_enable_urc(u8 type, u8 ifid, u8 val, u8 enable, u8 id)
 {
     u8 tmp[ALP_ACTION_TAG_SIZE + ALP_ACTION_URCC_SIZE(ALP_URC_TYPE_LQUAL)];