use pointer to get nvs handle

Author: microdev1

ports/esp32s2/common-hal/nvm/ByteArray.c

@@ -27,14 +27,13 @@
 #include "common-hal/nvm/ByteArray.h"
 
 #include "py/runtime.h"
-
 #include "nvs_flash.h"
 
 uint32_t common_hal_nvm_bytearray_get_length(nvm_bytearray_obj_t *self) {
     return self->len;
 }
 
-static nvs_handle get_nvs_handle(void) {
+static void get_nvs_handle(nvs_handle_t * nvs_handle) {
     // Initialize NVS
     esp_err_t err = nvs_flash_init();
     if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
@@ -46,32 +45,31 @@ static nvs_handle get_nvs_handle(void) {
     ESP_ERROR_CHECK(err);
 
     // Open NVS handle
-    nvs_handle nvs_handle;
-    if (nvs_open("CPY", NVS_READWRITE, &nvs_handle) != ESP_OK) {
+    if (nvs_open("CPY", NVS_READWRITE, nvs_handle) != ESP_OK) {
         mp_raise_RuntimeError(translate("NVS Error"));
     }
-    return nvs_handle;
 }
 
 bool common_hal_nvm_bytearray_set_bytes(nvm_bytearray_obj_t *self,
         uint32_t start_index, uint8_t* values, uint32_t len) {
     char index[9];
-    sprintf(index, "%i", start_index - CIRCUITPY_INTERNAL_NVM_START_ADDR);
+    sprintf(index, "%i", start_index);
     // start nvs
-    nvs_handle handle = get_nvs_handle();
+    nvs_handle_t handle;
+    get_nvs_handle(&handle);
     bool status = ((nvs_set_u8(handle, (const char *)index, *values) == ESP_OK) && (nvs_commit(handle) == ESP_OK));
     // close nvs
     nvs_close(handle);
     return status;
 }
 
-// NVM memory is memory mapped so reading it is easy.
 void common_hal_nvm_bytearray_get_bytes(nvm_bytearray_obj_t *self,
         uint32_t start_index, uint32_t len, uint8_t* values) {
     char index[9];
-    sprintf(index, "%i", start_index - CIRCUITPY_INTERNAL_NVM_START_ADDR);
+    sprintf(index, "%i", start_index);
     // start nvs
-    nvs_handle handle = get_nvs_handle();
+    nvs_handle_t handle;
+    get_nvs_handle(&handle);
     if (nvs_get_u8(handle, (const char *)index, values) != ESP_OK) {
         mp_raise_RuntimeError(translate("NVS Error"));
     }