From 9c42a72275993aa8f921c6ee0ea8e79882711def Mon Sep 17 00:00:00 2001
From: Nick Moore <nick@zoic.org>
Date: Tue, 16 Apr 2019 14:32:27 +1000
Subject: [PATCH] Fix up single-byte access to nvm.ByteArray

---
 ports/nrf/common-hal/nvm/ByteArray.h | 2 --
 shared-bindings/nvm/ByteArray.c      | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/common-hal/nvm/ByteArray.h b/ports/nrf/common-hal/nvm/ByteArray.h
index e47a87b9ee..a8d09dd43a 100644
--- a/ports/nrf/common-hal/nvm/ByteArray.h
+++ b/ports/nrf/common-hal/nvm/ByteArray.h
@@ -31,8 +31,6 @@
 
 typedef struct {
     mp_obj_base_t base;
-    uint32_t start_address;
-    uint32_t len;
 } nvm_bytearray_obj_t;
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_NVM_BYTEARRAY_H
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
index 22cd838b1e..31bedeacc0 100644
--- a/shared-bindings/nvm/ByteArray.c
+++ b/shared-bindings/nvm/ByteArray.c
@@ -124,7 +124,8 @@ STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
 #endif
         } else {
             // Single index rather than slice.
-            size_t index = mp_get_index(self->base.type, self->len, index_in, false);
+            size_t index = mp_get_index(self->base.type, common_hal_nvm_bytearray_get_length(self),
+                    index_in, false);
             if (value == MP_OBJ_SENTINEL) {
                 // load
                 uint8_t value_out;