Merge pull request #1068 from dhalbert/micropython-25ae98f-merge

Micropython 25ae98f merge

7 files changed, 7 insertions, 5 deletions

diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index 3e0f3c1fc..9ddfc5f11 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -194,7 +194,7 @@ STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destinat
     uint32_t length = MP_OBJ_SMALL_INT_VALUE(destination_length);
 
     mp_buffer_info_t bufinfo;
-    if (MP_OBJ_IS_TYPE(destination, &fatfs_type_fileio)) {
+    if (MP_OBJ_IS_TYPE(destination, &mp_type_fileio)) {
         mp_raise_NotImplementedError("");
     } else if (mp_get_buffer(destination, &bufinfo, MP_BUFFER_WRITE)) {
         if (bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL) < length) {
diff --git a/shared-bindings/audiobusio/PDMIn.h b/shared-bindings/audiobusio/PDMIn.h
index eaed59830..c2a8bab2f 100644
--- a/shared-bindings/audiobusio/PDMIn.h
+++ b/shared-bindings/audiobusio/PDMIn.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/audiobusio/PDMIn.h"
 #include "common-hal/microcontroller/Pin.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 extern const mp_obj_type_t audiobusio_pdmin_type;
 
diff --git a/shared-bindings/audioio/WaveFile.c b/shared-bindings/audioio/WaveFile.c
index 13c4d6b8f..05768e14d 100644
--- a/shared-bindings/audioio/WaveFile.c
+++ b/shared-bindings/audioio/WaveFile.c
@@ -73,7 +73,7 @@ STATIC mp_obj_t audioio_wavefile_make_new(const mp_obj_type_t *type, size_t n_ar
 
     audioio_wavefile_obj_t *self = m_new_obj(audioio_wavefile_obj_t);
     self->base.type = &audioio_wavefile_type;
-    if (MP_OBJ_IS_TYPE(args[0], &fatfs_type_fileio)) {
+    if (MP_OBJ_IS_TYPE(args[0], &mp_type_fileio)) {
         common_hal_audioio_wavefile_construct(self, MP_OBJ_TO_PTR(args[0]));
     } else {
         mp_raise_TypeError("file must be a file opened in byte mode");
diff --git a/shared-bindings/audioio/WaveFile.h b/shared-bindings/audioio/WaveFile.h
index b6838ce19..255ffbcd5 100644
--- a/shared-bindings/audioio/WaveFile.h
+++ b/shared-bindings/audioio/WaveFile.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/audioio/AudioOut.h"
 #include "common-hal/microcontroller/Pin.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 extern const mp_obj_type_t audioio_wavefile_type;
 
diff --git a/shared-bindings/bleio/Adapter.c b/shared-bindings/bleio/Adapter.c
index 81efea54e..bfe87071d 100644
--- a/shared-bindings/bleio/Adapter.c
+++ b/shared-bindings/bleio/Adapter.c
@@ -86,7 +86,7 @@ STATIC mp_obj_t bleio_adapter_get_address(mp_obj_t self) {
 
     common_hal_bleio_adapter_get_address(&vstr);
 
-    const mp_obj_t mac_str = mp_obj_new_str(vstr.buf, vstr.len, false);
+    const mp_obj_t mac_str = mp_obj_new_str(vstr.buf, vstr.len);
 
     vstr_clear(&vstr);
 
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index ca9281a18..1cfeea59c 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -31,6 +31,7 @@
 #include "extmod/vfs_fat.h"
 #include "py/obj.h"
 #include "py/objnamedtuple.h"
+#include "py/runtime.h"
 #include "shared-bindings/storage/__init__.h"
 
 //| :mod:`storage` --- storage management
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index a105941c0..6a4dc90e2 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -30,6 +30,7 @@
 
 #include "py/obj.h"
 #include "py/objnamedtuple.h"
+#include "py/runtime.h"
 #include "lib/timeutils/timeutils.h"
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/time/__init__.h"