From 0a5323674acc522b35b10af3e350d334e4c94a65 Mon Sep 17 00:00:00 2001
From: H1ghBre4k3r <h1ghbre4k3r@dev.bre4k3r.de>
Date: Thu, 11 Mar 2021 00:32:36 +0100
Subject: [PATCH] Add storage changes

---
 src/storage.c | 35 ++++++++++++++++++-----------------
 src/storage.h | 11 ++---------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/storage.c b/src/storage.c
index fedb7ee..0715004 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -9,11 +9,12 @@
 #include "storage.h"
 
 // Maybe use this as param for init function
-#define SEC_COUNT 10U
+#define SEC_COUNT 8U
 
 #define STORED_CONTACTS_INFO_ID 0
 #define CONTACTS_OFFSET 1
 #define MAX_CONTACTS 65535
+#define ADDRESS_ID 1
 
 static struct nvs_fs fs;
 
@@ -25,8 +26,7 @@ inline storage_id_t convert_sn_to_storage_id(record_sequence_number_t sn) {
 }
 
 void increase_sn_counter() {
-    contact_information.latest_contact++;
-    if (contact_information.latest_contact - contact_information.oldest_contact >= MAX_CONTACTS ) {
+    if (contact_information.count >= MAX_CONTACTS ) {
         contact_information.oldest_contact++;
     }
 }
@@ -41,21 +41,23 @@ int init_contact_storage(void) {
     if (rc) {
         return rc;
     }
-    fs.sector_size = info.size * 4;
+    fs.sector_size = info.size;
     fs.sector_count = SEC_COUNT;
 
     rc = nvs_init(&fs, DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
+
+    // char buf[16];
+    // rc = nvs_read(&fs, ADDRESS_ID, &buf, sizeof(buf));
+    // if (rc > 0) { /* item was found, show it */
+    //     printk("Id: %d, Address: %s\n", ADDRESS_ID, buf);
+    // } else { /* item was not found, add it */
+    //     strcpy(buf, "192.168.1.1");
+    //     printk("No address found, adding %s at id %d\n", buf, ADDRESS_ID);
+    //     (void)nvs_write(&fs, ADDRESS_ID, &buf, strlen(buf) + 1);
+    // }
     return rc;
 }
 
-int has_contact(record_sequence_number_t sn) {
-    // Treat case of wrap-around and non-wrap-around different
-    if (contact_information.oldest_contact <= contact_information.latest_contact) {
-        return sn >= contact_information.oldest_contact && sn <= contact_information.latest_contact;
-    } else {
-        return sn <= contact_information.oldest_contact || sn >= contact_information.latest_contact;
-    }
-}
 
 int load_contact(contact_t* dest, record_sequence_number_t sn) {
     storage_id_t id = convert_sn_to_storage_id(sn);
@@ -70,8 +72,6 @@ int add_contact(contact_t* src) {
     record_sequence_number_t curr_sn = get_latest_sequence_number() + 1;
     storage_id_t id = convert_sn_to_storage_id(curr_sn);
 
-    contact_t test;
-    nvs_read(&fs, id, &test, sizeof(test));
     int rc = nvs_write(&fs, id, src, sizeof(*src));
     if (rc > 0) {
         increase_sn_counter();
@@ -80,13 +80,14 @@ int add_contact(contact_t* src) {
     return rc;
 }
 
+// TODO handle start and end
 int delete_contact(record_sequence_number_t sn) {
     storage_id_t id = convert_sn_to_storage_id(sn);
     return nvs_delete(&fs, id);
 }
 
 record_sequence_number_t get_latest_sequence_number() {
-    return contact_information.latest_contact;
+    return contact_information.oldest_contact + contact_information.count;
 }
 
 record_sequence_number_t get_oldest_sequence_number() {
@@ -94,5 +95,5 @@ record_sequence_number_t get_oldest_sequence_number() {
 }
 
 uint32_t get_num_contacts() {
-    return get_latest_sequence_number() - get_oldest_sequence_number();
-}
\ No newline at end of file
+    return contact_information.count;
+}
diff --git a/src/storage.h b/src/storage.h
index 2d66f60..46c8f9e 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -10,7 +10,7 @@ typedef uint16_t storage_id_t;
 
 typedef struct stored_contacts_information {
     record_sequence_number_t oldest_contact;
-    record_sequence_number_t latest_contact;
+    record_sequence_number_t count;
 } stored_contacts_information_t;
 
 /**
@@ -19,13 +19,6 @@ typedef struct stored_contacts_information {
  */
 int init_contact_storage();
 
-/**
- * Checks if a contact is available with number sn
- * @param sn
- * @return 1 if available, 0 otherwise or in case of an error
- */
-int has_contact(record_sequence_number_t sn);
-
 /**
  * Loads the contact with number sn into the destination struct
  * @param dest
@@ -68,4 +61,4 @@ record_sequence_number_t get_oldest_sequence_number();
  */
 uint32_t get_num_contacts();
 
-#endif
\ No newline at end of file
+#endif