RFS NV item handling methods are now sending the io confirmation message directly

3 files changed, 12 insertions, 23 deletions

diff --git a/include/rfs.h b/include/rfs.h
index 6fbc0f0..cebe5c4 100644
--- a/include/rfs.h
+++ b/include/rfs.h
@@ -54,8 +54,8 @@ void nv_data_md5_check(struct ipc_client *client);
 int nv_data_read(struct ipc_client *client, int offset, int length, char *buf);
 int nv_data_write(struct ipc_client *client, int offset, int length, char *buf);
 
-struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_write_item(struct ipc_client *client, struct ipc_message_info *info);
-struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_read_item(struct ipc_client *client, struct ipc_message_info *info);
+void ipc_rfs_send_io_confirm_for_nv_write_item(struct ipc_client *client, struct ipc_message_info *info);
+void ipc_rfs_send_io_confirm_for_nv_read_item(struct ipc_client *client, struct ipc_message_info *info);
 
 #endif
 
diff --git a/samsung-ipc/rfs.c b/samsung-ipc/rfs.c
index 5484c98..4d24e48 100644
--- a/samsung-ipc/rfs.c
+++ b/samsung-ipc/rfs.c
@@ -618,7 +618,7 @@ int nv_data_write(struct ipc_client *client, int offset, int length, char *buf)
     return 0;
 }
 
-struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_read_item(struct ipc_client *client, struct ipc_message_info *info)
+void ipc_rfs_send_io_confirm_for_nv_read_item(struct ipc_client *client, struct ipc_message_info *info)
 {
     struct ipc_rfs_io *rfs_io = (struct ipc_rfs_io *) info->data;
     struct ipc_rfs_io_confirm *rfs_io_conf;
@@ -646,13 +646,11 @@ struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_read_item(struct ipc
     rfs_io_conf->offset = rfs_io->offset;
     rfs_io_conf->length = rfs_io->length;
 
-    // ipc_rfs_send(IPC_RFS_NV_READ_ITEM, rfs_io_conf, rfs_io->length + sizeof(struct ipc_rfs_io_confirm), info->aseq);
-    // free(rfs_io_conf);
-
-    return rfs_io_conf;
+    ipc_client_send(client, IPC_RFS_NV_READ_ITEM, 0, rfs_io_conf, rfs_io->length + sizeof(struct ipc_rfs_io_confirm), info->aseq);
+    free(rfs_io_conf);
 }
 
-struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_write_item(struct ipc_client *client, struct ipc_message_info *info)
+void ipc_rfs_send_io_confirm_for_nv_write_item(struct ipc_client *client, struct ipc_message_info *info)
 {
     struct ipc_rfs_io *rfs_io = (struct ipc_rfs_io *) info->data;
     struct ipc_rfs_io_confirm *rfs_io_conf;
@@ -679,9 +677,8 @@ struct ipc_rfs_io_confirm* ipc_rfs_create_io_confirm_for_nv_write_item(struct ip
     rfs_io_conf->offset = rfs_io->offset;
     rfs_io_conf->length = rfs_io->length;
 
-    // ipc_rfs_send(IPC_RFS_NV_WRITE_ITEM, &rfs_io_conf, sizeof(struct ipc_rfs_io_confirm), info->aseq);
-
-    return rfs_io_conf;
+    ipc_client_send(client, IPC_RFS_NV_WRITE_ITEM, 0, rfs_io_conf, sizeof(struct ipc_rfs_io_confirm), info->aseq);
+    free(rfs_io_conf);
 }
 
 // vim:ts=4:sw=4:expandtab
diff --git a/vapi/samsung-ipc-1.0.vapi b/vapi/samsung-ipc-1.0.vapi
index 5dcd5df..8d042ee 100644
--- a/vapi/samsung-ipc-1.0.vapi
+++ b/vapi/samsung-ipc-1.0.vapi
@@ -1182,18 +1182,10 @@ namespace SamsungIpc
 
     namespace Rfs
     {
-        [CCode (cname = "struct ipc_rfs_io_confirm", destroy_function = "", free_function = "")]
-        public struct IoConfirm
-        {
-            public uint8 confirm;
-            public uint offset;
-            public uint length;
-        }
-
-        [CCode (cname = "ipc_rfs_create_io_confirm_for_nv_read_item")]
-        public IoConfirm create_io_confirm_for_nv_read_item(Client client, Request req);
-        [CCode (cname = "ipc_rfs_create_io_confirm_for_nv_write_item")]
-        public IoConfirm create_io_confirm_for_nv_write_item(Client client, Request req);
+        [CCode (cname = "ipc_rfs_send_io_confirm_for_nv_read_item")]
+        public void send_io_confirm_for_nv_read_item(Client client, Response req);
+        [CCode (cname = "ipc_rfs_send_io_confirm_for_nv_write_item")]
+        public void send_io_confirm_for_nv_write_item(Client client, Response req);
     }
 
     /* ******************************************************************************** */