rfs: Proper IPC functions for nv_data specs, without generic fallback values

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

2 files changed, 8 insertions, 24 deletions

diff --git a/include/rfs.h b/include/rfs.h
index 3b8971b..d56f05a 100644
--- a/include/rfs.h
+++ b/include/rfs.h
@@ -30,22 +30,6 @@
 #define IPC_RFS_NV_WRITE_ITEM                                   0x4202
 
 /*
- * Values
- */
-
-#define NV_DATA_SIZE_DEFAULT                                    0x200000
-#define NV_DATA_CHUNK_SIZE_DEFAULT                              0x1000
-
-#define NV_DATA_PATH_DEFAULT                    "/efs/nv_data.bin"
-#define NV_DATA_MD5_PATH_DEFAULT                "/efs/nv_data.bin.md5"
-#define NV_DATA_BAK_PATH_DEFAULT                "/efs/.nv_data.bak"
-#define NV_DATA_MD5_BAK_PATH_DEFAULT            "/efs/.nv_data.bak.md5"
-#define NV_STATE_PATH_DEFAULT                   "/efs/.nv_state"
-#define NV_DATA_SECRET_DEFAULT                  "Samsung_Android_RIL"
-
-#define MD5_STRING_SIZE                         MD5_DIGEST_LENGTH * 2 + 1
-
-/*
  * Structures
  */
 
@@ -76,14 +60,6 @@ struct ipc_rfs_nv_write_item_confirm_data {
  */
 
 void md5hash2string(char *out, unsigned char *in);
-char *nv_data_path(struct ipc_client *client);
-char *nv_data_md5_path(struct ipc_client *client);
-char *nv_data_bak_path(struct ipc_client *client);
-char *nv_data_md5_bak_path(struct ipc_client *client);
-char *nv_state_path(struct ipc_client *client);
-char *nv_data_secret(struct ipc_client *client);
-int nv_data_size(struct ipc_client *client);
-int nv_data_chunk_size(struct ipc_client *client);
 void nv_data_generate(struct ipc_client *client);
 void nv_data_md5_compute(void *data_p, int size, char *secret, void *hash);
 void nv_data_md5_generate(struct ipc_client *client);
diff --git a/include/samsung-ipc.h b/include/samsung-ipc.h
index 2cdc509..f0d7eba 100644
--- a/include/samsung-ipc.h
+++ b/include/samsung-ipc.h
@@ -108,6 +108,14 @@ char *ipc_client_gprs_get_iface(struct ipc_client *client, int cid);
 int ipc_client_gprs_get_capabilities(struct ipc_client *client,
     struct ipc_client_gprs_capabilities *capabilities);
 
+char *ipc_client_nv_data_path(struct ipc_client *client);
+char *ipc_client_nv_data_md5_path(struct ipc_client *client);
+char *ipc_client_nv_data_backup_path(struct ipc_client *client);
+char *ipc_client_nv_data_backup_md5_path(struct ipc_client *client);
+char *ipc_client_nv_data_secret(struct ipc_client *client);
+int ipc_client_nv_data_size(struct ipc_client *client);
+int ipc_client_nv_data_chunk_size(struct ipc_client *client);
+
 const char *ipc_response_type_to_str(int type);
 const char *ipc_request_type_to_str(int type);
 const char *ipc_command_to_str(int command);