From ea0e2f80b7612d7d3119355a455667b3c4beb6d7 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Mon, 4 Jan 2021 23:11:25 -0600
Subject: [PATCH 1/6] Changing to duck-typing

---
 .../adafruit_bus_device/I2CDevice.c           | 81 +++++++++----------
 .../adafruit_bus_device/I2CDevice.h           |  4 +-
 shared-module/adafruit_bus_device/I2CDevice.c | 67 ++++++++++-----
 shared-module/adafruit_bus_device/I2CDevice.h |  2 +-
 4 files changed, 89 insertions(+), 65 deletions(-)

diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/I2CDevice.c
index a4c04e198c805..d3b6fbec4442c 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/I2CDevice.c
@@ -31,6 +31,7 @@
 #include "shared-bindings/adafruit_bus_device/I2CDevice.h"
 #include "shared-bindings/util.h"
 #include "shared-module/adafruit_bus_device/I2CDevice.h"
+#include "shared-bindings/busio/I2C.h"
 
 #include "lib/utils/buffer_helper.h"
 #include "lib/utils/context_manager_helpers.h"
@@ -76,7 +77,7 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    busio_i2c_obj_t* i2c = args[ARG_i2c].u_obj;
+    mp_obj_t* i2c = args[ARG_i2c].u_obj;
 
     common_hal_adafruit_bus_device_i2cdevice_construct(MP_OBJ_TO_PTR(self), i2c, args[ARG_device_address].u_int);
     if (args[ARG_probe].u_bool == true) {
@@ -107,7 +108,7 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit___obj, 4, 4, adafruit_bus_device_i2cdevice_obj___exit__);
 
-//|     def readinto(self, buf: WriteableBuffer, *, start: int = 0, end: int = 0) -> None:
+//|     def readinto(self, buf: WriteableBuffer, *, start: int = 0, end: Optional[int] = None) -> None:
 //|         """Read into ``buf`` from the device. The number of bytes read will be the
 //|         length of ``buf``.
 //|         If ``start`` or ``end`` is provided, then the buffer will be sliced
@@ -118,22 +119,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit_
 //|         :param int end: Index to write up to but not include; if None, use ``len(buf)``"""
 //|         ...
 //|
-STATIC void readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE);
-
-    size_t length = bufinfo.len;
-    normalize_buffer_bounds(&start, end, &length);
-    if (length == 0) {
-        mp_raise_ValueError(translate("Buffer must be at least length 1"));
-    }
-
-    uint8_t status = common_hal_adafruit_bus_device_i2cdevice_readinto(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length);
-    if (status != 0) {
-        mp_raise_OSError(status);
-    }
-}
-
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -147,12 +132,21 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_o
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    readinto(self, args[ARG_buffer].u_obj, args[ARG_start].u_int, args[ARG_end].u_int);
+    mp_obj_t dest[8];
+    mp_load_method(self->i2c, MP_QSTR_readfrom_into, dest);
+    dest[2] = mp_obj_new_int_from_ull(self->device_address);
+    dest[3] = args[ARG_buffer].u_obj;
+    dest[4] = mp_obj_new_str("start", 5);
+    dest[5] = mp_obj_new_int(args[ARG_start].u_int);
+    dest[6] = mp_obj_new_str("end", 3);
+    dest[7] = mp_obj_new_int(args[ARG_end].u_int);
+    mp_call_method_n_kw(2, 2, dest);
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 2, adafruit_bus_device_i2cdevice_readinto);
 
-//|     def write(self, buf: ReadableBuffer, *, start: int = 0, end: int = 0) -> None:
+//|     def write(self, buf: ReadableBuffer, *, start: int = 0, end: Optional[int] = None) -> None:
 //|         """Write the bytes from ``buffer`` to the device, then transmit a stop bit.
 //|         If ``start`` or ``end`` is provided, then the buffer will be sliced
 //|         as if ``buffer[start:end]``. This will not cause an allocation like
@@ -163,22 +157,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 2,
 //|         """
 //|         ...
 //|
-STATIC void write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end, bool transmit_stop_bit) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_READ);
-
-    size_t length = bufinfo.len;
-    normalize_buffer_bounds(&start, end, &length);
-    if (length == 0) {
-        mp_raise_ValueError(translate("Buffer must be at least length 1"));
-    }
-
-    uint8_t status = common_hal_adafruit_bus_device_i2cdevice_write(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length, transmit_stop_bit);
-    if (status != 0) {
-        mp_raise_OSError(status);
-    }
-}
-
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -191,13 +169,22 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    write(self, args[ARG_buffer].u_obj, args[ARG_start].u_int, args[ARG_end].u_int, true);
+    mp_obj_t dest[8];
+    mp_load_method(self->i2c, MP_QSTR_writeto, dest);
+    dest[2] = mp_obj_new_int_from_ull(self->device_address);
+    dest[3] = args[ARG_buffer].u_obj;
+    dest[4] = mp_obj_new_str("start", 5);
+    dest[5] = mp_obj_new_int(args[ARG_start].u_int);
+    dest[6] = mp_obj_new_str("end", 3);
+    dest[7] = mp_obj_new_int(args[ARG_end].u_int);
+    mp_call_method_n_kw(2, 2, dest);
+
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 2, adafruit_bus_device_i2cdevice_write);
 
 
-//|     def write_then_readinto(self, out_buffer: WriteableBuffer, in_buffer: ReadableBuffer, *, out_start: int = 0, out_end: int = 0, in_start: int = 0, in_end: int = 0) -> None:
+//|     def write_then_readinto(self, out_buffer: WriteableBuffer, in_buffer: ReadableBuffer, *, out_start: int = 0, out_end: Optional[int] = None, in_start: int = 0, in_end: Optional[int] = None) -> None:
 //|         """Write the bytes from ``out_buffer`` to the device, then immediately
 //|         reads into ``in_buffer`` from the device. The number of bytes read
 //|         will be the length of ``in_buffer``.
@@ -233,9 +220,21 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    write(self, args[ARG_out_buffer].u_obj, args[ARG_out_start].u_int, args[ARG_out_end].u_int, false);
-
-    readinto(self, args[ARG_in_buffer].u_obj, args[ARG_in_start].u_int, args[ARG_in_end].u_int);
+    mp_obj_t dest[13];
+    mp_load_method(self->i2c, MP_QSTR_writeto_then_readfrom, dest);
+    dest[2] = mp_obj_new_int_from_ull(self->device_address);
+    dest[3] = args[ARG_out_buffer].u_obj;
+    dest[4] = args[ARG_in_buffer].u_obj;
+    dest[5] = mp_obj_new_str("out_start", 9);
+    dest[6] = mp_obj_new_int(args[ARG_out_start].u_int);
+    dest[7] = mp_obj_new_str("out_end", 7);
+    dest[8] = mp_obj_new_int(args[ARG_out_end].u_int);
+    dest[9] = mp_obj_new_str("in_start", 8);
+    dest[10] = mp_obj_new_int(args[ARG_in_start].u_int);
+    dest[11] = mp_obj_new_str("in_end", 6);
+    dest[12] = mp_obj_new_int(args[ARG_in_end].u_int);
+
+    mp_call_method_n_kw(3, 4, dest);
 
     return mp_const_none;
 }
diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.h b/shared-bindings/adafruit_bus_device/I2CDevice.h
index cf7b1321a080e..82ef1feb80f3c 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.h
+++ b/shared-bindings/adafruit_bus_device/I2CDevice.h
@@ -43,9 +43,7 @@
 extern const mp_obj_type_t adafruit_bus_device_i2cdevice_type;
 
 // Initializes the hardware peripheral.
-extern void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address);
-extern uint8_t common_hal_adafruit_bus_device_i2cdevice_readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length);
-extern uint8_t common_hal_adafruit_bus_device_i2cdevice_write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length, bool transmit_stop_bit);
+extern void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t *i2c, uint8_t device_address);
 extern void common_hal_adafruit_bus_device_i2cdevice_lock(adafruit_bus_device_i2cdevice_obj_t *self);
 extern void common_hal_adafruit_bus_device_i2cdevice_unlock(adafruit_bus_device_i2cdevice_obj_t *self);
 extern void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_device_i2cdevice_obj_t *self);
diff --git a/shared-module/adafruit_bus_device/I2CDevice.c b/shared-module/adafruit_bus_device/I2CDevice.c
index 83abe80d649c0..53811d4910c50 100644
--- a/shared-module/adafruit_bus_device/I2CDevice.c
+++ b/shared-module/adafruit_bus_device/I2CDevice.c
@@ -31,48 +31,75 @@
 #include "py/runtime.h"
 #include "lib/utils/interrupt_char.h"
 
-void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address) {
+void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t *i2c, uint8_t device_address) {
     self->i2c = i2c;
     self->device_address = device_address;
 }
 
 void common_hal_adafruit_bus_device_i2cdevice_lock(adafruit_bus_device_i2cdevice_obj_t *self) {
-    bool success = common_hal_busio_i2c_try_lock(self->i2c);
+    mp_obj_t dest[2];
+    mp_load_method(self->i2c, MP_QSTR_try_lock, dest);
 
-    while (!success) {
+    mp_obj_t success = mp_call_method_n_kw(0, 0, dest);
+
+    while (!mp_obj_is_true(success)) {
         RUN_BACKGROUND_TASKS;
         if (mp_hal_is_interrupted()) {
             break;
         }
 
-        success = common_hal_busio_i2c_try_lock(self->i2c);
+        success = mp_call_method_n_kw(0, 0, dest);
     }
 }
 
 void common_hal_adafruit_bus_device_i2cdevice_unlock(adafruit_bus_device_i2cdevice_obj_t *self) {
-    common_hal_busio_i2c_unlock(self->i2c);
-}
-
-uint8_t common_hal_adafruit_bus_device_i2cdevice_readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length) {
-    return common_hal_busio_i2c_read(self->i2c, self->device_address, buffer, length);
-}
-
-uint8_t common_hal_adafruit_bus_device_i2cdevice_write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length, bool transmit_stop_bit) {
-    return common_hal_busio_i2c_write(self->i2c, self->device_address, buffer, length, transmit_stop_bit);
+    mp_obj_t dest[2];
+    mp_load_method(self->i2c, MP_QSTR_unlock, dest);
+    mp_call_method_n_kw(0, 0, dest);
 }
 
 void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_device_i2cdevice_obj_t *self) {
     common_hal_adafruit_bus_device_i2cdevice_lock(self);
 
-    mp_buffer_info_t bufinfo;
-    mp_obj_t buffer = mp_obj_new_bytearray_of_zeros(1);
+    mp_buffer_info_t write_bufinfo;
+    mp_obj_t write_buffer = mp_obj_new_bytearray_of_zeros(0);
+    mp_get_buffer_raise(write_buffer, &write_bufinfo, MP_BUFFER_READ);
+
+    mp_obj_t dest[4];
 
-    mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE);
+    /* catch exceptions that may be thrown while probing for the device */
+    nlr_buf_t write_nlr;
+    if (nlr_push(&write_nlr) == 0) {
+        mp_load_method(self->i2c, MP_QSTR_writeto, dest);
+        dest[2] = mp_obj_new_int_from_ull(self->device_address);
+        dest[3] = write_buffer;
+        mp_call_method_n_kw(2, 0, dest);
+        nlr_pop();
+    } else {
+        /* some OS's don't like writing an empty bytestring... retry by reading a byte */
+        mp_buffer_info_t read_bufinfo;
+        mp_obj_t read_buffer = mp_obj_new_bytearray_of_zeros(1);
+        mp_get_buffer_raise(read_buffer, &read_bufinfo, MP_BUFFER_WRITE);
 
-    uint8_t status = common_hal_adafruit_bus_device_i2cdevice_readinto(self, (uint8_t*)bufinfo.buf, 1);
-    if (status != 0) {
-        common_hal_adafruit_bus_device_i2cdevice_unlock(self);
-        mp_raise_ValueError_varg(translate("No I2C device at address: %x"), self->device_address);
+        mp_load_method(self->i2c, MP_QSTR_readfrom_into, dest);
+        dest[2] = mp_obj_new_int_from_ull(self->device_address);
+        dest[3] = read_buffer;
+
+        nlr_buf_t read_nlr;
+        if (nlr_push(&read_nlr) == 0) {
+            mp_call_method_n_kw(2, 0, dest);
+            nlr_pop();
+        } else {
+            /* At this point we tried two methods and only got exceptions */
+            if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t*)read_nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
+                common_hal_adafruit_bus_device_i2cdevice_unlock(self);
+                mp_raise_ValueError_varg(translate("No I2C device at address: %x"), self->device_address);
+            }
+            else {
+                /* In case we receive an unrelated exception pass it up */
+                nlr_raise(MP_OBJ_FROM_PTR(read_nlr.ret_val));
+            }
+        }
     }
 
     common_hal_adafruit_bus_device_i2cdevice_unlock(self);
diff --git a/shared-module/adafruit_bus_device/I2CDevice.h b/shared-module/adafruit_bus_device/I2CDevice.h
index d06adb9f5067f..b76bafb2c11bb 100644
--- a/shared-module/adafruit_bus_device/I2CDevice.h
+++ b/shared-module/adafruit_bus_device/I2CDevice.h
@@ -32,7 +32,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    busio_i2c_obj_t *i2c;
+    mp_obj_t *i2c;
     uint8_t device_address;
 } adafruit_bus_device_i2cdevice_obj_t;
 

From b609bc012434e1a8753196b2d020a3d05faf7948 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Tue, 5 Jan 2021 16:29:37 -0600
Subject: [PATCH 2/6] Removed unused include

---
 shared-bindings/adafruit_bus_device/I2CDevice.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/I2CDevice.c
index d3b6fbec4442c..f76cfb0e11812 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/I2CDevice.c
@@ -31,7 +31,6 @@
 #include "shared-bindings/adafruit_bus_device/I2CDevice.h"
 #include "shared-bindings/util.h"
 #include "shared-module/adafruit_bus_device/I2CDevice.h"
-#include "shared-bindings/busio/I2C.h"
 
 #include "lib/utils/buffer_helper.h"
 #include "lib/utils/context_manager_helpers.h"

From d3995eaf9748f641355a92c2929f3330a027b586 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Sat, 9 Jan 2021 10:07:08 -0600
Subject: [PATCH 3/6] Fixes from draft PR

---
 .../adafruit_bus_device/I2CDevice.c           | 17 +++++-----
 shared-module/adafruit_bus_device/I2CDevice.c | 33 +++++--------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/I2CDevice.c
index f76cfb0e11812..15e8cc706390f 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/I2CDevice.c
@@ -135,9 +135,10 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_o
     mp_load_method(self->i2c, MP_QSTR_readfrom_into, dest);
     dest[2] = mp_obj_new_int_from_ull(self->device_address);
     dest[3] = args[ARG_buffer].u_obj;
-    dest[4] = mp_obj_new_str("start", 5);
+    //dest[4] = mp_obj_new_str("start", 5);
+    dest[4] = MP_OBJ_NEW_QSTR(MP_QSTR_start);
     dest[5] = mp_obj_new_int(args[ARG_start].u_int);
-    dest[6] = mp_obj_new_str("end", 3);
+    dest[6] = MP_OBJ_NEW_QSTR(MP_QSTR_end);
     dest[7] = mp_obj_new_int(args[ARG_end].u_int);
     mp_call_method_n_kw(2, 2, dest);
 
@@ -172,9 +173,9 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_
     mp_load_method(self->i2c, MP_QSTR_writeto, dest);
     dest[2] = mp_obj_new_int_from_ull(self->device_address);
     dest[3] = args[ARG_buffer].u_obj;
-    dest[4] = mp_obj_new_str("start", 5);
+    dest[4] = MP_OBJ_NEW_QSTR(MP_QSTR_start);
     dest[5] = mp_obj_new_int(args[ARG_start].u_int);
-    dest[6] = mp_obj_new_str("end", 3);
+    dest[6] = MP_OBJ_NEW_QSTR(MP_QSTR_end);
     dest[7] = mp_obj_new_int(args[ARG_end].u_int);
     mp_call_method_n_kw(2, 2, dest);
 
@@ -224,13 +225,13 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args,
     dest[2] = mp_obj_new_int_from_ull(self->device_address);
     dest[3] = args[ARG_out_buffer].u_obj;
     dest[4] = args[ARG_in_buffer].u_obj;
-    dest[5] = mp_obj_new_str("out_start", 9);
+    dest[5] = MP_OBJ_NEW_QSTR(MP_QSTR_out_start);
     dest[6] = mp_obj_new_int(args[ARG_out_start].u_int);
-    dest[7] = mp_obj_new_str("out_end", 7);
+    dest[7] = MP_OBJ_NEW_QSTR(MP_QSTR_out_end);
     dest[8] = mp_obj_new_int(args[ARG_out_end].u_int);
-    dest[9] = mp_obj_new_str("in_start", 8);
+    dest[9] = MP_OBJ_NEW_QSTR(MP_QSTR_in_start);
     dest[10] = mp_obj_new_int(args[ARG_in_start].u_int);
-    dest[11] = mp_obj_new_str("in_end", 6);
+    dest[11] = MP_OBJ_NEW_QSTR(MP_QSTR_in_end);
     dest[12] = mp_obj_new_int(args[ARG_in_end].u_int);
 
     mp_call_method_n_kw(3, 4, dest);
diff --git a/shared-module/adafruit_bus_device/I2CDevice.c b/shared-module/adafruit_bus_device/I2CDevice.c
index 53811d4910c50..792ab7183c831 100644
--- a/shared-module/adafruit_bus_device/I2CDevice.c
+++ b/shared-module/adafruit_bus_device/I2CDevice.c
@@ -68,37 +68,22 @@ void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_devi
     mp_obj_t dest[4];
 
     /* catch exceptions that may be thrown while probing for the device */
-    nlr_buf_t write_nlr;
-    if (nlr_push(&write_nlr) == 0) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
         mp_load_method(self->i2c, MP_QSTR_writeto, dest);
         dest[2] = mp_obj_new_int_from_ull(self->device_address);
         dest[3] = write_buffer;
         mp_call_method_n_kw(2, 0, dest);
         nlr_pop();
     } else {
-        /* some OS's don't like writing an empty bytestring... retry by reading a byte */
-        mp_buffer_info_t read_bufinfo;
-        mp_obj_t read_buffer = mp_obj_new_bytearray_of_zeros(1);
-        mp_get_buffer_raise(read_buffer, &read_bufinfo, MP_BUFFER_WRITE);
+        common_hal_adafruit_bus_device_i2cdevice_unlock(self);
 
-        mp_load_method(self->i2c, MP_QSTR_readfrom_into, dest);
-        dest[2] = mp_obj_new_int_from_ull(self->device_address);
-        dest[3] = read_buffer;
-
-        nlr_buf_t read_nlr;
-        if (nlr_push(&read_nlr) == 0) {
-            mp_call_method_n_kw(2, 0, dest);
-            nlr_pop();
-        } else {
-            /* At this point we tried two methods and only got exceptions */
-            if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t*)read_nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
-                common_hal_adafruit_bus_device_i2cdevice_unlock(self);
-                mp_raise_ValueError_varg(translate("No I2C device at address: %x"), self->device_address);
-            }
-            else {
-                /* In case we receive an unrelated exception pass it up */
-                nlr_raise(MP_OBJ_FROM_PTR(read_nlr.ret_val));
-            }
+        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t*)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
+            mp_raise_ValueError_varg(translate("No I2C device at address: %x"), self->device_address);
+        }
+        else {
+            /* In case we receive an unrelated exception pass it up */
+            nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 

From f50c9f4145bbf6409f909a7d0cb83786db905bf8 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Sat, 16 Jan 2021 14:18:46 -0600
Subject: [PATCH 4/6] Reenabling busdevice in core

---
 py/circuitpy_mpconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index d0145a90f33a5..5df48debeba6b 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -100,7 +100,7 @@ CFLAGS += -DCIRCUITPY_BLEIO=$(CIRCUITPY_BLEIO)
 CIRCUITPY_BOARD ?= 1
 CFLAGS += -DCIRCUITPY_BOARD=$(CIRCUITPY_BOARD)
 
-CIRCUITPY_BUSDEVICE = 0
+CIRCUITPY_BUSDEVICE ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_BUSDEVICE=$(CIRCUITPY_BUSDEVICE)
 
 CIRCUITPY_BUILTINS_POW3 ?= $(CIRCUITPY_FULL_BUILD)

From 49e059cdaf8cedccf175cf00d8286788c2077ac1 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Sat, 16 Jan 2021 16:37:42 -0600
Subject: [PATCH 5/6] Removing frozen libraries

---
 ports/atmel-samd/boards/8086_commander/mpconfigboard.mk          | 1 -
 .../atmel-samd/boards/circuitplayground_express/mpconfigboard.mk | 1 -
 .../boards/circuitplayground_express_crickit/mpconfigboard.mk    | 1 -
 .../boards/circuitplayground_express_displayio/mpconfigboard.mk  | 1 -
 .../boards/feather_m0_express_crickit/mpconfigboard.mk           | 1 -
 ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk        | 1 -
 ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk        | 1 -
 ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk    | 1 -
 ports/atmel-samd/boards/pycubed/mpconfigboard.mk                 | 1 -
 ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk            | 1 -
 ports/atmel-samd/boards/sam32/mpconfigboard.mk                   | 1 -
 ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk            | 1 -
 ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk            | 1 -
 13 files changed, 13 deletions(-)

diff --git a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
index b5a4bc735f958..f976dfe787cb8 100644
--- a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
@@ -22,7 +22,6 @@ CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_BUSDEVICE = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ADXL34x
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
index 505f5c145db1c..0b150a5fbea41 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@@ -22,7 +22,6 @@ SUPEROPT_GC = 0
 CFLAGS_INLINE_LIMIT = 55
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index c3be33134cd96..35b6f12293cf5 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -26,7 +26,6 @@ CFLAGS_INLINE_LIMIT = 50
 
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
index 51e9b05af207a..f754f3513ce3e 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@@ -27,7 +27,6 @@ SUPEROPT_GC = 0
 CFLAGS_INLINE_LIMIT = 55
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
index f06163b84af14..309563ff4998c 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
@@ -21,7 +21,6 @@ CFLAGS_INLINE_LIMIT = 50
 CIRCUITPY_MSGPACK = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 6e089bb90d636..6ea21ed82e824 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -28,5 +28,4 @@ CFLAGS_INLINE_LIMIT = 35
 SUPEROPT_GC = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM69
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index 383b6a6df448e..76a6be2e34e28 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -29,5 +29,4 @@ CFLAGS_INLINE_LIMIT = 35
 SUPEROPT_GC = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
index 1931ceb9a87a7..2b211abd4e06d 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
@@ -27,7 +27,6 @@ CFLAGS_INLINE_LIMIT = 55
 SUPEROPT_GC = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 
diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
index b7b8073ab9f42..a82362b8d2c3d 100644
--- a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
@@ -21,7 +21,6 @@ CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
index f49bb3fef039b..3bf42d70543b6 100644
--- a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
@@ -21,7 +21,6 @@ CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/atmel-samd/boards/sam32/mpconfigboard.mk b/ports/atmel-samd/boards/sam32/mpconfigboard.mk
index 1dc686ef8aa69..9ac24a014c60e 100644
--- a/ports/atmel-samd/boards/sam32/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sam32/mpconfigboard.mk
@@ -13,5 +13,4 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_USTACK = 1
 
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
index 3562228c71e6e..d6f333b5be6e7 100644
--- a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
@@ -24,4 +24,3 @@ CIRCUITPY_TOUCHIO=0
 CIRCUITPY_BUSDEVICE=1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
diff --git a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
index 53908293f5d1a..fd2fa044a8d1a 100644
--- a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
@@ -27,5 +27,4 @@ CIRCUITPY_COUNTIO=0
 CIRCUITPY_BUSDEVICE=1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD

From 41b9196167576c9a593d51e601edd51cba5b72c4 Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Sun, 17 Jan 2021 00:00:06 -0600
Subject: [PATCH 6/6] Disabling in more small boards

---
 ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk | 1 +
 ports/atmel-samd/boards/serpente/mpconfigboard.mk               | 1 +
 ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk     | 1 +
 ports/atmel-samd/boards/ugame10/mpconfigboard.mk                | 1 +
 ports/nrf/boards/pca10100/mpconfigboard.mk                      | 1 +
 ports/stm/boards/espruino_pico/mpconfigboard.mk                 | 1 +
 6 files changed, 6 insertions(+)

diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
index 178258b6cd534..2ace30fb53457 100755
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@@ -16,6 +16,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
+CIRCUITPY_BUSDEVICE = 0
 MICROPY_PY_ASYNC_AWAIT = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/serpente/mpconfigboard.mk b/ports/atmel-samd/boards/serpente/mpconfigboard.mk
index 6e953adf72345..09036875f16cc 100644
--- a/ports/atmel-samd/boards/serpente/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/serpente/mpconfigboard.mk
@@ -14,6 +14,7 @@ LONGINT_IMPL = NONE
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_BUSDEVICE = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk
index e71bb07395de7..2e15bc042ac3c 100755
--- a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk
@@ -14,6 +14,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_VECTORIO = 0
+CIRCUITPY_BUSDEVICE = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
 
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index b1242d206eced..640d421e8150e 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -28,6 +28,7 @@ CIRCUITPY_RTC = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_BUSDEVICE = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/ugame10
 
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
index 76d15e6081ca3..c8cba2877cf5a 100644
--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -25,6 +25,7 @@ CIRCUITPY_RTC = 1
 CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_ULAB = 0
+CIRCUITPY_BUSDEVICE = 0
 MICROPY_PY_ASYNC_AWAIT = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index 14f9323fde49d..81c3772e72103 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -20,5 +20,6 @@ LD_FILE = boards/STM32F401xd_fs.ld
 # lto for this port, and if other stuff hasn't been added in the
 # meantime
 CIRCUITPY_ULAB = 0
+CIRCUITPY_BUSDEVICE = 0
 
 SUPEROPT_GC = 0