extmod/modmachine: Consolidate mem, i2c and spi headers to modmachine.h.

The contents of machine_mem.h, machine_i2c.h and machine_spi.h have been
moved into extmod/modmachine.h.

Signed-off-by: Damien George <damien@micropython.org>

45 files changed, 149 insertions, 265 deletions

diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index e33b2cce4..bac8a89bd 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #ifdef MICROPY_HW_WIFI_LED
 #include "led.h"
diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index 42770a33c..dc71c8260 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "nina_bsp.h"
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 3563b3243..44e692130 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -31,7 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
-#include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 
 #define SOFT_I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
 
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
deleted file mode 100644
index 600145bfe..000000000
--- a/extmod/machine_i2c.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
-
-#include "py/obj.h"
-#include "py/mphal.h"
-
-// Temporary support for legacy construction of SoftI2C via I2C type.
-#define MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args) \
-    do { \
-        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
-            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: I2C(-1, ...) is deprecated, use SoftI2C(...) instead\n"); \
-            if (n_args != 0) { \
-                --n_args; \
-                ++all_args; \
-            } \
-            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_i2c_type, make_new)(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
-        } \
-    } while (0)
-
-#define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
-#define MP_MACHINE_I2C_FLAG_STOP (0x02)
-
-#if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
-// If set, the first mp_machine_i2c_buf_t in a transfer is a write.
-#define MP_MACHINE_I2C_FLAG_WRITE1 (0x04)
-#endif
-
-typedef struct _mp_machine_i2c_buf_t {
-    size_t len;
-    uint8_t *buf;
-} mp_machine_i2c_buf_t;
-
-// I2C protocol
-// - init must be non-NULL
-// - start/stop/read/write can be NULL, meaning operation is not supported
-// - transfer must be non-NULL
-// - transfer_single only needs to be set if transfer=mp_machine_i2c_transfer_adaptor
-typedef struct _mp_machine_i2c_p_t {
-    #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
-    bool transfer_supports_write1;
-    #endif
-    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-    int (*start)(mp_obj_base_t *obj);
-    int (*stop)(mp_obj_base_t *obj);
-    int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
-    int (*write)(mp_obj_base_t *obj, const uint8_t *src, size_t len);
-    int (*transfer)(mp_obj_base_t *obj, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
-    int (*transfer_single)(mp_obj_base_t *obj, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags);
-} mp_machine_i2c_p_t;
-
-typedef struct _mp_machine_soft_i2c_obj_t {
-    mp_obj_base_t base;
-    uint32_t us_delay;
-    uint32_t us_timeout;
-    mp_hal_pin_obj_t scl;
-    mp_hal_pin_obj_t sda;
-} mp_machine_soft_i2c_obj_t;
-
-extern const mp_obj_type_t mp_machine_soft_i2c_type;
-extern const mp_obj_dict_t mp_machine_i2c_locals_dict;
-
-int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
-int mp_machine_soft_i2c_transfer(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index f27356e02..217c7ca08 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE
 
diff --git a/extmod/machine_mem.h b/extmod/machine_mem.h
deleted file mode 100644
index a48a52c82..000000000
--- a/extmod/machine_mem.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
-
-#include "py/obj.h"
-
-typedef struct _machine_mem_obj_t {
-    mp_obj_base_t base;
-    unsigned elem_size; // in bytes
-} machine_mem_obj_t;
-
-extern const mp_obj_type_t machine_mem_type;
-
-extern const machine_mem_obj_t machine_mem8_obj;
-extern const machine_mem_obj_t machine_mem16_obj;
-extern const machine_mem_obj_t machine_mem32_obj;
-
-#if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
-uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
-#endif
-#if defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
-uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
-#endif
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index 8c4d91a3c..e35e8b7fc 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -31,7 +31,7 @@
 
 #if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
 
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 
 // if a port didn't define MSB/LSB constants then provide them
 #ifndef MICROPY_PY_MACHINE_SPI_MSB
diff --git a/extmod/machine_spi.h b/extmod/machine_spi.h
deleted file mode 100644
index 93ee8d00c..000000000
--- a/extmod/machine_spi.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
-
-#include "py/obj.h"
-#include "py/mphal.h"
-#include "drivers/bus/spi.h"
-
-// Temporary support for legacy construction of SoftSPI via SPI type.
-#define MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args) \
-    do { \
-        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
-            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: SPI(-1, ...) is deprecated, use SoftSPI(...) instead\n"); \
-            if (n_args != 0) { \
-                --n_args; \
-                ++all_args; \
-            } \
-            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_spi_type, make_new)(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
-        } \
-    } while (0)
-
-// SPI protocol
-typedef struct _mp_machine_spi_p_t {
-    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-    void (*deinit)(mp_obj_base_t *obj); // can be NULL
-    void (*transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
-} mp_machine_spi_p_t;
-
-typedef struct _mp_machine_soft_spi_obj_t {
-    mp_obj_base_t base;
-    mp_soft_spi_obj_t spi;
-} mp_machine_soft_spi_obj_t;
-
-extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
-extern const mp_obj_type_t mp_machine_soft_spi_type;
-extern const mp_obj_dict_t mp_machine_spi_locals_dict;
-
-mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
-
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
-MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 4ef2bb3ad..6cace4f85 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -30,6 +30,10 @@
 #include "py/mphal.h"
 #include "py/obj.h"
 
+#if MICROPY_PY_MACHINE
+
+#include "drivers/bus/spi.h"
+
 // Whether to enable the ADC.init() method.
 // Requires a port to implement mp_machine_adc_init_helper().
 #ifndef MICROPY_PY_MACHINE_ADC_INIT
@@ -84,6 +88,44 @@
 #define MICROPY_PY_MACHINE_UART_IRQ (0)
 #endif
 
+// Temporary support for legacy construction of SoftI2C via I2C type.
+#define MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args) \
+    do { \
+        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
+            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: I2C(-1, ...) is deprecated, use SoftI2C(...) instead\n"); \
+            if (n_args != 0) { \
+                --n_args; \
+                ++all_args; \
+            } \
+            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_i2c_type, make_new)(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
+// Temporary support for legacy construction of SoftSPI via SPI type.
+#define MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args) \
+    do { \
+        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
+            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: SPI(-1, ...) is deprecated, use SoftSPI(...) instead\n"); \
+            if (n_args != 0) { \
+                --n_args; \
+                ++all_args; \
+            } \
+            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_spi_type, make_new)(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
+#if MICROPY_PY_MACHINE_I2C
+
+#define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
+#define MP_MACHINE_I2C_FLAG_STOP (0x02)
+
+#if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+// If set, the first mp_machine_i2c_buf_t in a transfer is a write.
+#define MP_MACHINE_I2C_FLAG_WRITE1 (0x04)
+#endif
+
+#endif
+
 // A port must provide these types, but they are otherwise opaque.
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
@@ -91,12 +133,76 @@ typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_uart_obj_t machine_uart_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 
+typedef struct _machine_mem_obj_t {
+    mp_obj_base_t base;
+    unsigned elem_size; // in bytes
+} machine_mem_obj_t;
+
+#if MICROPY_PY_MACHINE_I2C
+
+typedef struct _mp_machine_i2c_buf_t {
+    size_t len;
+    uint8_t *buf;
+} mp_machine_i2c_buf_t;
+
+// I2C protocol:
+// - init must be non-NULL
+// - start/stop/read/write can be NULL, meaning operation is not supported
+// - transfer must be non-NULL
+// - transfer_single only needs to be set if transfer=mp_machine_i2c_transfer_adaptor
+typedef struct _mp_machine_i2c_p_t {
+    #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+    bool transfer_supports_write1;
+    #endif
+    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+    int (*start)(mp_obj_base_t *obj);
+    int (*stop)(mp_obj_base_t *obj);
+    int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
+    int (*write)(mp_obj_base_t *obj, const uint8_t *src, size_t len);
+    int (*transfer)(mp_obj_base_t *obj, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
+    int (*transfer_single)(mp_obj_base_t *obj, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags);
+} mp_machine_i2c_p_t;
+
+// SoftI2C object.
+typedef struct _mp_machine_soft_i2c_obj_t {
+    mp_obj_base_t base;
+    uint32_t us_delay;
+    uint32_t us_timeout;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+} mp_machine_soft_i2c_obj_t;
+
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+
+// SPI protocol.
+typedef struct _mp_machine_spi_p_t {
+    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+    void (*deinit)(mp_obj_base_t *obj); // can be NULL
+    void (*transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
+} mp_machine_spi_p_t;
+
+// SoftSPI object.
+typedef struct _mp_machine_soft_spi_obj_t {
+    mp_obj_base_t base;
+    mp_soft_spi_obj_t spi;
+} mp_machine_soft_spi_obj_t;
+
+#endif
+
+// Objects for machine.mem8, machine.mem16 and machine.mem32.
+extern const machine_mem_obj_t machine_mem8_obj;
+extern const machine_mem_obj_t machine_mem16_obj;
+extern const machine_mem_obj_t machine_mem32_obj;
+
 // These classes correspond to machine.Type entries in the machine module.
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_i2s_type;
+extern const mp_obj_type_t machine_mem_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pinbase_type;
 extern const mp_obj_type_t machine_pwm_type;
@@ -107,10 +213,43 @@ extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_wdt_type;
 
+#if MICROPY_PY_MACHINE_I2C
+extern const mp_obj_type_t mp_machine_soft_i2c_type;
+extern const mp_obj_dict_t mp_machine_i2c_locals_dict;
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+extern const mp_obj_type_t mp_machine_soft_spi_type;
+extern const mp_obj_dict_t mp_machine_spi_locals_dict;
+extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
+#endif
+
+#if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
+#endif
+#if defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
+#endif
+
 void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
 
+#if MICROPY_PY_MACHINE_I2C
+int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
+int mp_machine_soft_i2c_transfer(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
+MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
+#endif
+
+#endif // MICROPY_PY_MACHINE
+
 #endif // MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index eed656ee2..d49ee8614 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -38,7 +38,7 @@
 
 #include "shared/netutils/netutils.h"
 #include "extmod/modnetwork.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
 #include "modmachine.h"
 #include "drivers/bus/spi.h"
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 6b2dc7ca0..c19288fe8 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
+#define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 3a1dd1064..399cb902e 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "driver/spi_master.h"
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 4e3a9ee81..50d568151 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "driver/i2c.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index bed29f7c0..be5348f0e 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -40,9 +40,6 @@
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 2edb294ad..1a7de7f49 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "hspi.h"
 
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index a28c7c87f..78d5bde26 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -36,9 +36,6 @@
 // This needs to be set before we include the RTOS headers
 #define USE_US_TIMER 1
 
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"
 
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 379001acd..cef17272c 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 #include "pin.h"
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 879687bd1..35deaa7ae 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -28,7 +28,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index c7d507074..aa12f44d4 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,9 +27,6 @@
 
 #include "py/runtime.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "led.h"
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 8bb9613df..6d2b83a45 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -34,7 +34,6 @@
 
 #if MICROPY_PY_MACHINE_I2C
 
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "i2c.h"
 #if NRFX_TWI_ENABLED
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 3c4fde983..9c69e3f4f 100644
--- a/ports/nrf/modules/machine/i2c.h
+++ b/ports/nrf/modules/machine/i2c.h
@@ -27,7 +27,7 @@
 #ifndef I2C_H__
 #define I2C_H__
 
-#include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 
 void i2c_init0(void);
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index df2662c62..9043b7a44 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -30,8 +30,6 @@
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 663e71c07..d0234244a 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -35,7 +35,6 @@
 
 #include "py/nlr.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "pin.h"
 #include "genhdr/pins.h"
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 026ab8974..8a22fe2bd 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "extmod/machine_mem.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index a642b8117..0e2d62f8a 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "ra_i2c.h"
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 977635f16..04505178d 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "pin.h"
 #include "spi.h"
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 8dbace21d..c8edf6126 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -35,9 +35,6 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 467c4e7e6..570f05aaa 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "hardware/i2c.h"
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 3d7f2d6ab..a3b82a0bc 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "hardware/spi.h"
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index a111da0f0..29a8dbed2 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -28,9 +28,6 @@
 #include "py/mphal.h"
 #include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "modmachine.h"
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index afd5921d5..ea5178dc0 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -31,7 +31,6 @@
 
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 9d9928bb0..3d5729c1f 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -30,7 +30,6 @@
 #if MICROPY_PY_MACHINE_SPI
 
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 4060ea515..7c3d96eb0 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -25,9 +25,6 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index 9bb79de5c..054bfd231 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -35,7 +35,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "modmachine.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "pin_af.h"
 #include "clock_config.h"
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index 833e3efa8..f17d3c45c 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -30,7 +30,6 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "pin_af.h"
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 1876c9a14..8beefcad6 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "i2c.h"
 
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index bc526635b..b916252da 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -25,7 +25,6 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "spi.h"
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 98456dc6c..83327bede 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -32,9 +32,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 251360594..896465d0c 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 #include "py/objint.h"
-#include "extmod/machine_mem.h"
+#include "extmod/modmachine.h"
 #include "rfcore.h"
 #include "portmodules.h"
 #include "subghz.h"
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index a612f6950..f36c04874 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "bufhelper.h"
 #include "spi.h"
 
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index a2a337f1e..7b89b48b5 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -28,7 +28,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "spi.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 // Possible DMA configurations for SPI buses:
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 2c1e0bed6..d0c6a43bf 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/obj.h"
 
-#include "extmod/machine_mem.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PLAT_DEV_MEM
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index a4b48e996..36d88204f 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -36,7 +36,6 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 6475018b0..5c882a6ae 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -35,7 +35,6 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 8498db1f0..24e004b40 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -32,9 +32,6 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"